diff --git a/boot.php b/boot.php
index 0475f6ab39..94b9fdc8f7 100644
--- a/boot.php
+++ b/boot.php
@@ -383,8 +383,13 @@ if(! class_exists('App')) {
 			'force_max_items' => 0,
 			'thread_allow' => true,
 			'stylesheet' => '',
-			'template_engine' => 'internal',
+			'template_engine' => 'smarty3',
 		);
+		
+		// array of registered template engines ('name'=>'class name')
+		public $template_engines = array();
+		// array of instanced template engines ('name'=>'instance')
+		public $template_engine_instance = array();
 
 		private $ldelim = array(
 			'internal' => '',
@@ -539,6 +544,17 @@ if(! class_exists('App')) {
 			$mobile_detect = new Mobile_Detect();
 			$this->is_mobile = $mobile_detect->isMobile();
 			$this->is_tablet = $mobile_detect->isTablet();
+			
+			/**
+			 * register template engines
+			 */
+			$dc = get_declared_classes();
+			foreach ($dc as $k) {
+				if (in_array("ITemplateEngine", class_implements($k))){
+					$this->register_template_engine($k);
+				}
+			}
+			
 		}
 
 		function get_basepath() {
@@ -712,13 +728,64 @@ if(! class_exists('App')) {
 			return $this->cached_profile_image[$avatar_image];
 		}
 
+
+		/**
+		 * register template engine class
+		 * if $name is "", is used class static property $class::$name
+		 * @param string $class
+		 * @param string $name
+		 */
+		function register_template_engine($class, $name = '') {
+			if ($name===""){
+				$v = get_class_vars( $class );
+				if(x($v,"name")) $name = $v['name'];
+			}
+	 		if ($name===""){
+ 				echo "template engine <tt>$class</tt> cannot be registered without a name.\n";
+				killme(); 
+ 			}
+			$this->template_engines[$name] = $class;
+		}
+
+		/**
+		 * return template engine instance. If $name is not defined,
+		 * return engine defined by theme, or default
+		 * 
+		 * @param strin $name Template engine name
+		 * @return object Template Engine instance
+		 */
+		function template_engine($name = ''){
+			if ($name!=="") {
+				$template_engine = $name;
+			} else {
+				$template_engine = 'smarty3';
+				if (x($this->theme, 'template_engine')) {
+					$template_engine = $this->theme['template_engine'];
+				}
+			}
+			
+			if (isset($this->template_engines[$template_engine])){
+				if(isset($this->template_engine_instance[$template_engine])){
+					return $this->template_engine_instance[$template_engine];
+				} else {
+					$class = $this->template_engines[$template_engine];
+					$obj = new $class;
+					$this->template_engine_instance[$template_engine] = $obj;
+					return $obj;
+				}
+			}
+			
+			echo "template engine <tt>$template_engine</tt> is not registered!\n"; killme();
+		}
+
 		function get_template_engine() {
 			return $this->theme['template_engine'];
 		}
 
-		function set_template_engine($engine = 'internal') {
-
-			$this->theme['template_engine'] = 'internal';
+		function set_template_engine($engine = 'smarty3') {
+			$this->theme['template_engine'] = $engine;
+			/*
+			$this->theme['template_engine'] = 'smarty3';
 
 			switch($engine) {
 				case 'smarty3':
@@ -728,13 +795,14 @@ if(! class_exists('App')) {
 				default:
 					break;
 			}
+			*/
 		}
 
-		function get_template_ldelim($engine = 'internal') {
+		function get_template_ldelim($engine = 'smarty3') {
 			return $this->ldelim[$engine];
 		}
 
-		function get_template_rdelim($engine = 'internal') {
+		function get_template_rdelim($engine = 'smarty3') {
 			return $this->rdelim[$engine];
 		}
 
diff --git a/include/friendica_smarty.php b/include/friendica_smarty.php
index b3f0d18a01..1326b0aca6 100644
--- a/include/friendica_smarty.php
+++ b/include/friendica_smarty.php
@@ -1,9 +1,11 @@
 <?php
 
+require_once "object/TemplateEngine.php";
 require_once("library/Smarty/libs/Smarty.class.php");
 
-class FriendicaSmarty extends Smarty {
+define('SMARTY3_TEMPLATE_FOLDER','templates');
 
+class FriendicaSmarty extends Smarty {
 	public $filename;
 
 	function __construct() {
@@ -14,10 +16,10 @@ class FriendicaSmarty extends Smarty {
 
 		// setTemplateDir can be set to an array, which Smarty will parse in order.
 		// The order is thus very important here
-		$template_dirs = array('theme' => "view/theme/$theme/smarty3/");
+		$template_dirs = array('theme' => "view/theme/$theme/".SMARTY3_TEMPLATE_FOLDER."/");
 		if( x($a->theme_info,"extends") )
-			$template_dirs = $template_dirs + array('extends' => "view/theme/".$a->theme_info["extends"]."/smarty3/");
-		$template_dirs = $template_dirs + array('base' => 'view/smarty3/');
+			$template_dirs = $template_dirs + array('extends' => "view/theme/".$a->theme_info["extends"]."/".SMARTY3_TEMPLATE_FOLDER."/");
+		$template_dirs = $template_dirs + array('base' => "view/".SMARTY3_TEMPLATE_FOLDER."/");
 		$this->setTemplateDir($template_dirs);
 
 		$this->setCompileDir('view/smarty3/compiled/');
@@ -37,7 +39,33 @@ class FriendicaSmarty extends Smarty {
 		}
 		return $this->fetch('file:' . $this->filename);
 	}
+	
+
 }
 
-
-
+class FriendicaSmartyEngine implements ITemplateEngine {
+	static $name ="smarty3";
+	// ITemplateEngine interface
+	public function replace_macros($s, $r) {
+		$template = '';
+		if(gettype($s) === 'string') {
+			$template = $s;
+			$s = new FriendicaSmarty();
+		}
+		foreach($r as $key=>$value) {
+			if($key[0] === '$') {
+				$key = substr($key, 1);
+			}
+			$s->assign($key, $value);
+		}
+		return $s->parsed($template);		
+	}
+	
+	public function get_template_file($file, $root=''){
+		$a = get_app();
+		$template_file = get_template_file($a, SMARTY3_TEMPLATE_FOLDER.'/'.$file, $root);
+		$template = new FriendicaSmarty();
+		$template->filename = $template_file;
+		return $template;
+	}
+}
diff --git a/include/template_processor.php b/include/template_processor.php
index ebc03b8d84..49d37488f9 100644
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -1,9 +1,11 @@
 <?php
+require_once 'object/TemplateEngine.php';
 
 define("KEY_NOT_EXISTS", '^R_key_not_Exists^');
 
-class Template {
-
+class Template implements ITemplateEngine {
+	static $name ="internal";
+	
 	var $r;
 	var $search;
 	var $replace;
@@ -256,7 +258,8 @@ class Template {
 		return $s;
 	}
 
-	public function replace($s, $r) {
+	// TemplateEngine interface
+	public function replace_macros($s, $r) {
 		$this->r = $r;
 
 		// remove comments block
@@ -276,12 +279,18 @@ class Template {
 			$count++;
 			$s = $this->var_replace($s);
 		}
-		return $s;
+		return template_unescape($s);
 	}
-
+	
+	public function get_template_file($file, $root='') {
+		$a = get_app();
+		$template_file = get_template_file($a, $file, $root);
+		$content = file_get_contents($template_file);
+		return $content;		
+	}
+	
 }
 
-$t = new Template;
 
 function template_escape($s) {
 
diff --git a/include/text.php b/include/text.php
index 3d244c61ff..72a2e1c372 100644
--- a/include/text.php
+++ b/include/text.php
@@ -15,39 +15,20 @@ if(! function_exists('replace_macros')) {
 /**
  * This is our template processor
  * 
- * @global Template $t
  * @param string|FriendicaSmarty $s the string requiring macro substitution, 
  *									or an instance of FriendicaSmarty
  * @param array $r key value pairs (search => replace)
  * @return string substituted string
  */
 function replace_macros($s,$r) {
-	global $t;
 	
 	$stamp1 = microtime(true);
 
 	$a = get_app();
 
-	if($a->theme['template_engine'] === 'smarty3') {
-		$template = '';
-		if(gettype($s) === 'string') {
-			$template = $s;
-			$s = new FriendicaSmarty();
-		}
-		foreach($r as $key=>$value) {
-			if($key[0] === '$') {
-				$key = substr($key, 1);
-			}
-			$s->assign($key, $value);
-		}
-		$output = $s->parsed($template);
-	}
-	else {
-		$r =  $t->replace($s,$r);
+	$t = $a->template_engine();
+	$output = $t->replace_macros($s,$r);
 
-		$output = template_unescape($r);
-	}
-	$a = get_app();
 	$a->save_timestamp($stamp1, "rendering");
 
 	return $output;
@@ -582,26 +563,13 @@ function get_markup_template($s, $root = '') {
 	$stamp1 = microtime(true);
 
 	$a = get_app();
-
-	if($a->theme['template_engine'] === 'smarty3') {
-		$template_file = get_template_file($a, 'smarty3/' . $s, $root);
-
-		$template = new FriendicaSmarty();
-		$template->filename = $template_file;
-		$a->save_timestamp($stamp1, "rendering");
-
-		return $template;
-	}
-	else {
-		$template_file = get_template_file($a, $s, $root);
-		$a->save_timestamp($stamp1, "rendering");
-
-		$stamp1 = microtime(true);
-		$content = file_get_contents($template_file);
-		$a->save_timestamp($stamp1, "file");
-		return $content;
-
-	}
+	$t = $a->template_engine();
+	
+	$template = $t->get_template_file($s, $root);
+	
+	$a->save_timestamp($stamp1, "file");
+	
+	return $template;
 }}
 
 if(! function_exists("get_template_file")) {
@@ -623,6 +591,8 @@ function get_template_file($a, $filename, $root = '') {
 		$template_file = "{$root}view/theme/$theme/$filename";
 	elseif (x($a->theme_info,"extends") && file_exists("{$root}view/theme/{$a->theme_info["extends"]}/$filename"))
 		$template_file = "{$root}view/theme/{$a->theme_info["extends"]}/$filename";
+	elseif (file_exists("{$root}/$filename"))
+		$template_file = "{$root}/$filename";
 	else
 		$template_file = "{$root}view/$filename";
 
diff --git a/object/TemplateEngine.php b/object/TemplateEngine.php
new file mode 100644
index 0000000000..cbd74aaec9
--- /dev/null
+++ b/object/TemplateEngine.php
@@ -0,0 +1,11 @@
+<?php
+require_once 'boot.php';
+
+
+/**
+ * Interface for template engines
+ */
+interface ITemplateEngine {
+	public function replace_macros($s,$v);
+	public function get_template_file($file, $root='');
+}
diff --git a/view/404.tpl b/view/404.tpl
deleted file mode 100644
index bf4d4e949c..0000000000
--- a/view/404.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<h1>$message</h1>
diff --git a/view/acl_selector.tpl b/view/acl_selector.tpl
deleted file mode 100644
index 837225a5b1..0000000000
--- a/view/acl_selector.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-<div id="acl-wrapper">
-	<input id="acl-search">
-	<a href="#" id="acl-showall">$showall</a>
-	<div id="acl-list">
-		<div id="acl-list-content">
-		</div>
-	</div>
-	<span id="acl-fields"></span>
-</div>
-
-<div class="acl-list-item" rel="acl-template" style="display:none">
-	<img data-src="{0}"><p>{1}</p>
-	<a href="#" class='acl-button-show'>$show</a>
-	<a href="#" class='acl-button-hide'>$hide</a>
-</div>
-
-<script>
-$(document).ready(function() {
-	if(typeof acl=="undefined"){
-		acl = new ACL(
-			baseurl+"/acl",
-			[ $allowcid,$allowgid,$denycid,$denygid ]
-		);
-	}
-});
-</script>
diff --git a/view/admin_aside.tpl b/view/admin_aside.tpl
deleted file mode 100644
index 2f43562bd1..0000000000
--- a/view/admin_aside.tpl
+++ /dev/null
@@ -1,42 +0,0 @@
-<script>
-	// update pending count //
-	$(function(){
-
-		$("nav").bind('nav-update',  function(e,data){
-			var elm = $('#pending-update');
-			var register = $(data).find('register').text();
-			if (register=="0") { register=""; elm.hide();} else { elm.show(); }
-			elm.html(register);
-		});
-	});
-</script>
-<h4><a href="$admurl">$admtxt</a></h4>
-<ul class='admin linklist'>
-	<li class='admin link button $admin.site.2'><a href='$admin.site.0'>$admin.site.1</a></li>
-	<li class='admin link button $admin.users.2'><a href='$admin.users.0'>$admin.users.1</a><span id='pending-update' title='$h_pending'></span></li>
-	<li class='admin link button $admin.plugins.2'><a href='$admin.plugins.0'>$admin.plugins.1</a></li>
-	<li class='admin link button $admin.themes.2'><a href='$admin.themes.0'>$admin.themes.1</a></li>
-	<li class='admin link button $admin.dbsync.2'><a href='$admin.dbsync.0'>$admin.dbsync.1</a></li>
-</ul>
-
-{{ if $admin.update }}
-<ul class='admin linklist'>
-	<li class='admin link button $admin.update.2'><a href='$admin.update.0'>$admin.update.1</a></li>
-	<li class='admin link button $admin.update.2'><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li>
-</ul>
-{{ endif }}
-
-
-{{ if $admin.plugins_admin }}<h4>$plugadmtxt</h4>{{ endif }}
-<ul class='admin linklist'>
-	{{ for $admin.plugins_admin as $l }}
-	<li class='admin link button $l.2'><a href='$l.0'>$l.1</a></li>
-	{{ endfor }}
-</ul>
-	
-	
-<h4>$logtxt</h4>
-<ul class='admin linklist'>
-	<li class='admin link button $admin.logs.2'><a href='$admin.logs.0'>$admin.logs.1</a></li>
-</ul>
-
diff --git a/view/admin_logs.tpl b/view/admin_logs.tpl
deleted file mode 100644
index b777cf4201..0000000000
--- a/view/admin_logs.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-	<form action="$baseurl/admin/logs" method="post">
-    <input type='hidden' name='form_security_token' value='$form_security_token'>
-
-	{{ inc field_checkbox.tpl with $field=$debugging }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$logfile }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$loglevel }}{{ endinc }}
-	
-	<div class="submit"><input type="submit" name="page_logs" value="$submit" /></div>
-	
-	</form>
-	
-	<h3>$logname</h3>
-	<div style="width:100%; height:400px; overflow: auto; "><pre>$data</pre></div>
-<!--	<iframe src='$baseurl/$logname' style="width:100%; height:400px"></iframe> -->
-	<!-- <div class="submit"><input type="submit" name="page_logs_clear_log" value="$clear" /></div> -->
-</div>
diff --git a/view/admin_plugins.tpl b/view/admin_plugins.tpl
deleted file mode 100644
index 74b56bb4e9..0000000000
--- a/view/admin_plugins.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-		<ul id='pluginslist'>
-		{{ for $plugins as $p }}
-			<li class='plugin $p.1'>
-				<a class='toggleplugin' href='$baseurl/admin/$function/$p.0?a=t&amp;t=$form_security_token' title="{{if $p.1==on }}Disable{{ else }}Enable{{ endif }}" ><span class='icon $p.1'></span></a>
-				<a href='$baseurl/admin/$function/$p.0'><span class='name'>$p.2.name</span></a> - <span class="version">$p.2.version</span>
-				{{ if $p.2.experimental }} $experimental {{ endif }}{{ if $p.2.unsupported }} $unsupported {{ endif }}
-
-					<div class='desc'>$p.2.description</div>
-			</li>
-		{{ endfor }}
-		</ul>
-</div>
diff --git a/view/admin_plugins_details.tpl b/view/admin_plugins_details.tpl
deleted file mode 100644
index 931c7b83cf..0000000000
--- a/view/admin_plugins_details.tpl
+++ /dev/null
@@ -1,36 +0,0 @@
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-	<p><span class='toggleplugin icon $status'></span> $info.name - $info.version : <a href="$baseurl/admin/$function/$plugin/?a=t&amp;t=$form_security_token">$action</a></p>
-	<p>$info.description</p>
-	
-	<p class="author">$str_author
-	{{ for $info.author as $a }}
-		{{ if $a.link }}<a href="$a.link">$a.name</a>{{ else }}$a.name{{ endif }},
-	{{ endfor }}
-	</p>
-
-	<p class="maintainer">$str_maintainer
-	{{ for $info.maintainer as $a }}
-		{{ if $a.link }}<a href="$a.link">$a.name</a>{{ else }}$a.name{{ endif }},
-	{{ endfor }}
-	</p>
-	
-	{{ if $screenshot }}
-	<a href="$screenshot.0" class='screenshot'><img src="$screenshot.0" alt="$screenshot.1" /></a>
-	{{ endif }}
-
-	{{ if $admin_form }}
-	<h3>$settings</h3>
-	<form method="post" action="$baseurl/admin/$function/$plugin/">
-		$admin_form
-	</form>
-	{{ endif }}
-
-	{{ if $readme }}
-	<h3>Readme</h3>
-	<div id="plugin_readme">
-		$readme
-	</div>
-	{{ endif }}
-</div>
diff --git a/view/admin_remoteupdate.tpl b/view/admin_remoteupdate.tpl
deleted file mode 100644
index 874c6e6267..0000000000
--- a/view/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/admin_site.tpl b/view/admin_site.tpl
deleted file mode 100644
index 0f0fdd4268..0000000000
--- a/view/admin_site.tpl
+++ /dev/null
@@ -1,116 +0,0 @@
-<script>
-	$(function(){
-		
-		$("#cnftheme").click(function(){
-			$.colorbox({
-				width: 800,
-				height: '90%',
-				/*onOpen: function(){
-					var theme = $("#id_theme :selected").val();
-					$("#cnftheme").attr('href',"$baseurl/admin/themes/"+theme);
-				},*/
-				href: "$baseurl/admin/themes/" + $("#id_theme :selected").val(),
-				onComplete: function(){
-					$("div#fancybox-content form").submit(function(e){
-						var url = $(this).attr('action');
-						// can't get .serialize() to work...
-						var data={};
-						$(this).find("input").each(function(){
-							data[$(this).attr('name')] = $(this).val();
-						});
-						$(this).find("select").each(function(){
-							data[$(this).attr('name')] = $(this).children(":selected").val();
-						});
-						console.log(":)", url, data);
-					
-						$.post(url, data, function(data) {
-							if(timer) clearTimeout(timer);
-							NavUpdate();
-							$.colorbox.close();
-						})
-					
-						return false;
-					});
-				
-				}
-			});
-			return false;
-		});
-	});
-</script>
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-	<form action="$baseurl/admin/site" method="post">
-    <input type='hidden' name='form_security_token' value='$form_security_token'>
-
-	{{ inc field_input.tpl with $field=$sitename }}{{ endinc }}
-	{{ inc field_textarea.tpl with $field=$banner }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$language }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$theme }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$theme_mobile }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$new_share }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$hide_help }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$singleuser }}{{ endinc }}
-
-	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-	
-	<h3>$registration</h3>
-	{{ inc field_input.tpl with $field=$register_text }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$register_policy }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$daily_registrations }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_multi_reg }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_openid }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_regfullname }}{{ endinc }}
-	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-
-	<h3>$upload</h3>
-	{{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$maximagelength }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$jpegimagequality }}{{ endinc }}
-	
-	<h3>$corporate</h3>
-	{{ inc field_input.tpl with $field=$allowed_sites }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$allowed_email }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$block_public }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$force_publish }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_community_page }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$ostatus_poll_interval }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$newuser_private }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$enotify_no_content }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$private_addons }}{{ endinc }}	
-	{{ inc field_checkbox.tpl with $field=$disable_embedded }}{{ endinc }}
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-	
-	<h3>$advanced</h3>
-	{{ inc field_checkbox.tpl with $field=$no_utf }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$verifyssl }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$proxy }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$timeout }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$poll_interval }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$maxloadavg }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$lockpath }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$temppath }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$basepath }}{{ endinc }}
-
-	<h3>$performance</h3>
-	{{ inc field_checkbox.tpl with $field=$use_fulltext_engine }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$itemcache }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$itemcache_duration }}{{ endinc }}
-
-	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-	
-	</form>
-</div>
diff --git a/view/admin_summary.tpl b/view/admin_summary.tpl
deleted file mode 100644
index 4efe1960c5..0000000000
--- a/view/admin_summary.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-
-	<dl>
-		<dt>$queues.label</dt>
-		<dd>$queues.deliverq - $queues.queue</dd>
-	</dl>
-	<dl>
-		<dt>$pending.0</dt>
-		<dd>$pending.1</dt>
-	</dl>
-
-	<dl>
-		<dt>$users.0</dt>
-		<dd>$users.1</dd>
-	</dl>
-	{{ for $accounts as $p }}
-		<dl>
-			<dt>$p.0</dt>
-			<dd>{{ if $p.1 }}$p.1{{ else }}0{{ endif }}</dd>
-		</dl>
-	{{ endfor }}
-
-
-	<dl>
-		<dt>$plugins.0</dt>
-		
-		{{ for $plugins.1 as $p }}
-			<dd>$p</dd>
-		{{ endfor }}
-		
-	</dl>
-
-	<dl>
-		<dt>$version.0</dt>
-		<dd>$version.1 - $build</dt>
-	</dl>
-
-
-</div>
diff --git a/view/admin_users.tpl b/view/admin_users.tpl
deleted file mode 100644
index d9a96d7df7..0000000000
--- a/view/admin_users.tpl
+++ /dev/null
@@ -1,98 +0,0 @@
-<script>
-	function confirm_delete(uname){
-		return confirm( "$confirm_delete".format(uname));
-	}
-	function confirm_delete_multi(){
-		return confirm("$confirm_delete_multi");
-	}
-	function selectall(cls){
-		$("."+cls).attr('checked','checked');
-		return false;
-	}
-</script>
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-	<form action="$baseurl/admin/users" method="post">
-        <input type='hidden' name='form_security_token' value='$form_security_token'>
-		
-		<h3>$h_pending</h3>
-		{{ if $pending }}
-			<table id='pending'>
-				<thead>
-				<tr>
-					{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-			{{ for $pending as $u }}
-				<tr>
-					<td class="created">$u.created</td>
-					<td class="name">$u.name</td>
-					<td class="email">$u.email</td>
-					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
-					<td class="tools">
-						<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='icon like'></span></a>
-						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='icon dislike'></span></a>
-					</td>
-				</tr>
-			{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>			
-		{{ else }}
-			<p>$no_pending</p>
-		{{ endif }}
-	
-	
-		
-	
-		<h3>$h_users</h3>
-		{{ if $users }}
-			<table id='users'>
-				<thead>
-				<tr>
-					<th></th>
-					{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{ for $users as $u }}
-					<tr>
-						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
-						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
-						<td class='email'>$u.email</td>
-						<td class='register_date'>$u.register_date</td>
-						<td class='login_date'>$u.login_date</td>
-						<td class='lastitem_date'>$u.lastitem_date</td>
-						<td class='login_date'>$u.page_flags {{ if $u.is_admin }}($siteadmin){{ endif }} {{ if $u.account_expired }}($accountexpired){{ endif }}</td>
-						<td class="checkbox"> 
-                                    {{ if $u.is_admin }}
-                                        &nbsp;
-                                    {{ else }}
-                                        <input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
-                                    {{ endif }}
-						<td class="tools">
-                                    {{ if $u.is_admin }}
-                                        &nbsp;
-                                    {{ else }}
-                                        <a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
-                                        <a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon drop'></span></a>
-                                    {{ endif }}
-						</td>
-					</tr>
-				{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>						
-		{{ else }}
-			NO USERS?!?
-		{{ endif }}
-	</form>
-</div>
diff --git a/view/album_edit.tpl b/view/album_edit.tpl
deleted file mode 100644
index 56a7b73fcd..0000000000
--- a/view/album_edit.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-<div id="photo-album-edit-wrapper">
-<form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/$nickname/album/$hexalbum" method="post" >
-
-
-<label id="photo-album-edit-name-label" for="photo-album-edit-name" >$nametext</label>
-<input type="text" size="64" name="albumname" value="$album" >
-
-<div id="photo-album-edit-name-end"></div>
-
-<input id="photo-album-edit-submit" type="submit" name="submit" value="$submit" />
-<input id="photo-album-edit-drop" type="submit" name="dropalbum" value="$dropsubmit" onclick="return confirmDelete();" />
-
-</form>
-</div>
-<div id="photo-album-edit-end" ></div>
diff --git a/view/api_config_xml.tpl b/view/api_config_xml.tpl
deleted file mode 100644
index 3281e59dd3..0000000000
--- a/view/api_config_xml.tpl
+++ /dev/null
@@ -1,66 +0,0 @@
-<config>
- <site>
-  <name>$config.site.name</name>
-  <server>$config.site.server</server>
-  <theme>default</theme>
-  <path></path>
-  <logo>$config.site.logo</logo>
-
-  <fancy>true</fancy>
-  <language>en</language>
-  <email>$config.site.email</email>
-  <broughtby></broughtby>
-  <broughtbyurl></broughtbyurl>
-  <timezone>UTC</timezone>
-  <closed>$config.site.closed</closed>
-
-  <inviteonly>false</inviteonly>
-  <private>$config.site.private</private>
-  <textlimit>$config.site.textlimit</textlimit>
-  <ssl>$config.site.ssl</ssl>
-  <sslserver>$config.site.sslserver</sslserver>
-  <shorturllength>30</shorturllength>
-
-</site>
- <license>
-  <type>cc</type>
-  <owner></owner>
-  <url>http://creativecommons.org/licenses/by/3.0/</url>
-  <title>Creative Commons Attribution 3.0</title>
-  <image>http://i.creativecommons.org/l/by/3.0/80x15.png</image>
-
-</license>
- <nickname>
-  <featured></featured>
-</nickname>
- <profile>
-  <biolimit></biolimit>
-</profile>
- <group>
-  <desclimit></desclimit>
-</group>
- <notice>
-
-  <contentlimit></contentlimit>
-</notice>
- <throttle>
-  <enabled>false</enabled>
-  <count>20</count>
-  <timespan>600</timespan>
-</throttle>
- <xmpp>
-
-  <enabled>false</enabled>
-  <server>INVALID SERVER</server>
-  <port>5222</port>
-  <user>update</user>
-</xmpp>
- <integration>
-  <source>StatusNet</source>
-
-</integration>
- <attachments>
-  <uploads>false</uploads>
-  <file_quota>0</file_quota>
-</attachments>
-</config>
diff --git a/view/api_friends_xml.tpl b/view/api_friends_xml.tpl
deleted file mode 100644
index 9bdf53222d..0000000000
--- a/view/api_friends_xml.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- TEMPLATE APPEARS UNUSED -->
-
-<users type="array">
-	{{for $users as $u }}
-	{{inc api_user_xml.tpl with $user=$u }}{{endinc}}
-	{{endfor}}
-</users>
diff --git a/view/api_ratelimit_xml.tpl b/view/api_ratelimit_xml.tpl
deleted file mode 100644
index 36ec1993df..0000000000
--- a/view/api_ratelimit_xml.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<hash>
- <remaining-hits type="integer">$hash.remaining_hits</remaining-hits>
- <hourly-limit type="integer">$hash.hourly_limit</hourly-limit>
- <reset-time type="datetime">$hash.reset_time</reset-time>
- <reset_time_in_seconds type="integer">$hash.resettime_in_seconds</reset_time_in_seconds>
-</hash>
diff --git a/view/api_status_xml.tpl b/view/api_status_xml.tpl
deleted file mode 100644
index f6cd9c2c02..0000000000
--- a/view/api_status_xml.tpl
+++ /dev/null
@@ -1,46 +0,0 @@
-<status>{{ if $status }}
-    <created_at>$status.created_at</created_at>
-    <id>$status.id</id>
-    <text>$status.text</text>
-    <source>$status.source</source>
-    <truncated>$status.truncated</truncated>
-    <in_reply_to_status_id>$status.in_reply_to_status_id</in_reply_to_status_id>
-    <in_reply_to_user_id>$status.in_reply_to_user_id</in_reply_to_user_id>
-    <favorited>$status.favorited</favorited>
-    <in_reply_to_screen_name>$status.in_reply_to_screen_name</in_reply_to_screen_name>
-    <geo>$status.geo</geo>
-    <coordinates>$status.coordinates</coordinates>
-    <place>$status.place</place>
-    <contributors>$status.contributors</contributors>
-	<user>
-	  <id>$status.user.id</id>
-	  <name>$status.user.name</name>
-	  <screen_name>$status.user.screen_name</screen_name>
-	  <location>$status.user.location</location>
-	  <description>$status.user.description</description>
-	  <profile_image_url>$status.user.profile_image_url</profile_image_url>
-	  <url>$status.user.url</url>
-	  <protected>$status.user.protected</protected>
-	  <followers_count>$status.user.followers</followers_count>
-	  <profile_background_color>$status.user.profile_background_color</profile_background_color>
-  	  <profile_text_color>$status.user.profile_text_color</profile_text_color>
-  	  <profile_link_color>$status.user.profile_link_color</profile_link_color>
-  	  <profile_sidebar_fill_color>$status.user.profile_sidebar_fill_color</profile_sidebar_fill_color>
-  	  <profile_sidebar_border_color>$status.user.profile_sidebar_border_color</profile_sidebar_border_color>
-  	  <friends_count>$status.user.friends_count</friends_count>
-  	  <created_at>$status.user.created_at</created_at>
-  	  <favourites_count>$status.user.favourites_count</favourites_count>
-  	  <utc_offset>$status.user.utc_offset</utc_offset>
-  	  <time_zone>$status.user.time_zone</time_zone>
-  	  <profile_background_image_url>$status.user.profile_background_image_url</profile_background_image_url>
-  	  <profile_background_tile>$status.user.profile_background_tile</profile_background_tile>
-  	  <profile_use_background_image>$status.user.profile_use_background_image</profile_use_background_image>
-  	  <notifications></notifications>
-  	  <geo_enabled>$status.user.geo_enabled</geo_enabled>
-  	  <verified>$status.user.verified</verified>
-  	  <following></following>
-  	  <statuses_count>$status.user.statuses_count</statuses_count>
-  	  <lang>$status.user.lang</lang>
-  	  <contributors_enabled>$status.user.contributors_enabled</contributors_enabled>
-	  </user>
-{{ endif }}</status>
diff --git a/view/api_test_xml.tpl b/view/api_test_xml.tpl
deleted file mode 100644
index 7509a2dc1b..0000000000
--- a/view/api_test_xml.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<ok>$ok</ok>
diff --git a/view/api_timeline_atom.tpl b/view/api_timeline_atom.tpl
deleted file mode 100644
index 3db91573ef..0000000000
--- a/view/api_timeline_atom.tpl
+++ /dev/null
@@ -1,90 +0,0 @@
-<feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:georss="http://www.georss.org/georss" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:media="http://purl.org/syndication/atommedia" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:statusnet="http://status.net/schema/api/1/">
- <generator uri="http://status.net" version="0.9.7">StatusNet</generator>
- <id>$rss.self</id>
- <title>Friendica</title>
- <subtitle>Friendica API feed</subtitle>
- <logo>$rss.logo</logo>
- <updated>$rss.atom_updated</updated>
- <link type="text/html" rel="alternate" href="$rss.alternate"/>
- <link type="application/atom+xml" rel="self" href="$rss.self"/>
- 
- 
- <author>
-	<activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
-	<uri>$user.url</uri>
-	<name>$user.name</name>
-	<link rel="alternate" type="text/html" href="$user.url"/>
-	<link rel="avatar" type="image/jpeg" media:width="106" media:height="106" href="$user.profile_image_url"/>
-	<link rel="avatar" type="image/jpeg" media:width="96" media:height="96" href="$user.profile_image_url"/>
-	<link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="$user.profile_image_url"/>
-	<link rel="avatar" type="image/jpeg" media:width="24" media:height="24" href="$user.profile_image_url"/>
-	<georss:point></georss:point>
-	<poco:preferredUsername>$user.screen_name</poco:preferredUsername>
-	<poco:displayName>$user.name</poco:displayName>
-	<poco:urls>
-		<poco:type>homepage</poco:type>
-		<poco:value>$user.url</poco:value>
-		<poco:primary>true</poco:primary>
-	</poco:urls>
-	<statusnet:profile_info local_id="$user.id"></statusnet:profile_info>
- </author>
-
- <!--Deprecation warning: activity:subject is present only for backward compatibility. It will be removed in the next version of StatusNet.-->
- <activity:subject>
-	<activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
-	<id>$user.contact_url</id>
-	<title>$user.name</title>
-	<link rel="alternate" type="text/html" href="$user.url"/>
-	<link rel="avatar" type="image/jpeg" media:width="106" media:height="106" href="$user.profile_image_url"/>
-	<link rel="avatar" type="image/jpeg" media:width="96" media:height="96" href="$user.profile_image_url"/>
-	<link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="$user.profile_image_url"/>
-	<link rel="avatar" type="image/jpeg" media:width="24" media:height="24" href="$user.profile_image_url"/>
-	<poco:preferredUsername>$user.screen_name</poco:preferredUsername>
-	<poco:displayName>$user.name</poco:displayName>
-	<poco:urls>
-		<poco:type>homepage</poco:type>
-		<poco:value>$user.url</poco:value>
-		<poco:primary>true</poco:primary>
-	</poco:urls>
-	<statusnet:profile_info local_id="$user.id"></statusnet:profile_info>
- </activity:subject>
- 
- 
-  	{{ for $statuses as $status }}
-	<entry>
-		<activity:object-type>$status.objecttype</activity:object-type>
-		<id>$status.message_id</id>
-		<title>$status.text</title>
-		<content type="html">$status.statusnet_html</content>
-		<link rel="alternate" type="text/html" href="$status.url"/>
-		<activity:verb>$status.verb</activity:verb>
-		<published>$status.published</published>
-		<updated>$status.updated</updated>
-
-		<link rel="self" type="application/atom+xml" href="$status.self"/>
-		<link rel="edit" type="application/atom+xml" href="$status.edit"/>
-		<statusnet:notice_info local_id="$status.id" source="$status.source" >
-		</statusnet:notice_info>
-
-		<author>
-			<activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
-			<uri>$status.user.url</uri>
-			<name>$status.user.name</name>
-			<link rel="alternate" type="text/html" href="$status.user.url"/>
-			<link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="$status.user.profile_image_url"/>
-
-			<georss:point/>
-			<poco:preferredUsername>$status.user.screen_name</poco:preferredUsername>
-			<poco:displayName>$status.user.name</poco:displayName>
-			<poco:address/>
-			<poco:urls>
-				<poco:type>homepage</poco:type>
-				<poco:value>$status.user.url</poco:value>
-				<poco:primary>true</poco:primary>
-			</poco:urls>
-		</author>
-		<link rel="ostatus:conversation" type="text/html" href="$status.url"/> 
-
-	</entry>    
-    {{ endfor }}
-</feed>
diff --git a/view/api_timeline_rss.tpl b/view/api_timeline_rss.tpl
deleted file mode 100644
index 99279ec372..0000000000
--- a/view/api_timeline_rss.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0" xmlns:georss="http://www.georss.org/georss" xmlns:twitter="http://api.twitter.com">
-  <channel>
-    <title>Friendica</title>
-    <link>$rss.alternate</link>
-    <atom:link type="application/rss+xml" rel="self" href="$rss.self"/>
-    <description>Friendica timeline</description>
-    <language>$rss.language</language>
-    <ttl>40</ttl>
-	<image>
-		<link>$user.link</link>
-		<title>$user.name's items</title>
-		<url>$user.profile_image_url</url>
-	</image>
-	
-{{ for $statuses as $status }}
-  <item>
-    <title>$status.user.name: $status.text</title>
-    <description>$status.text</description>
-    <pubDate>$status.created_at</pubDate>
-    <guid>$status.url</guid>
-    <link>$status.url</link>
-    <twitter:source>$status.source</twitter:source>
-  </item>
-{{ endfor }}
-  </channel>
-</rss>
diff --git a/view/api_timeline_xml.tpl b/view/api_timeline_xml.tpl
deleted file mode 100644
index 4a32b411b5..0000000000
--- a/view/api_timeline_xml.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<statuses type="array" xmlns:statusnet="http://status.net/schema/api/1/">
-{{ for $statuses as $status }} <status>
-  <text>$status.text</text>
-  <truncated>$status.truncated</truncated>
-  <created_at>$status.created_at</created_at>
-  <in_reply_to_status_id>$status.in_reply_to_status_id</in_reply_to_status_id>
-  <source>$status.source</source>
-  <id>$status.id</id>
-  <in_reply_to_user_id>$status.in_reply_to_user_id</in_reply_to_user_id>
-  <in_reply_to_screen_name>$status.in_reply_to_screen_name</in_reply_to_screen_name>
-  <geo>$status.geo</geo>
-  <favorited>$status.favorited</favorited>
-{{ inc api_user_xml.tpl with $user=$status.user }}{{ endinc }}  <statusnet:html>$status.statusnet_html</statusnet:html>
-  <statusnet:conversation_id>$status.statusnet_conversation_id</statusnet:conversation_id>
-  <url>$status.url</url>
-  <coordinates>$status.coordinates</coordinates>
-  <place>$status.place</place>
-  <contributors>$status.contributors</contributors>
- </status>
-{{ endfor }}</statuses>
diff --git a/view/api_user_xml.tpl b/view/api_user_xml.tpl
deleted file mode 100644
index d286652c03..0000000000
--- a/view/api_user_xml.tpl
+++ /dev/null
@@ -1,46 +0,0 @@
-  <user>
-   <id>$user.id</id>
-   <name>$user.name</name>
-   <screen_name>$user.screen_name</screen_name>
-   <location>$user.location</location>
-   <description>$user.description</description>
-   <profile_image_url>$user.profile_image_url</profile_image_url>
-   <url>$user.url</url>
-   <protected>$user.protected</protected>
-   <followers_count>$user.followers_count</followers_count>
-   <friends_count>$user.friends_count</friends_count>
-   <created_at>$user.created_at</created_at>
-   <favourites_count>$user.favourites_count</favourites_count>
-   <utc_offset>$user.utc_offset</utc_offset>
-   <time_zone>$user.time_zone</time_zone>
-   <statuses_count>$user.statuses_count</statuses_count>
-   <following>$user.following</following>
-   <profile_background_color>$user.profile_background_color</profile_background_color>
-   <profile_text_color>$user.profile_text_color</profile_text_color>
-   <profile_link_color>$user.profile_link_color</profile_link_color>
-   <profile_sidebar_fill_color>$user.profile_sidebar_fill_color</profile_sidebar_fill_color>
-   <profile_sidebar_border_color>$user.profile_sidebar_border_color</profile_sidebar_border_color>
-   <profile_background_image_url>$user.profile_background_image_url</profile_background_image_url>
-   <profile_background_tile>$user.profile_background_tile</profile_background_tile>
-   <profile_use_background_image>$user.profile_use_background_image</profile_use_background_image>
-   <notifications>$user.notifications</notifications>
-   <geo_enabled>$user.geo_enabled</geo_enabled>
-   <verified>$user.verified</verified>
-   <lang>$user.lang</lang>
-   <contributors_enabled>$user.contributors_enabled</contributors_enabled>
-   <status>{{ if $user.status }}
-    <created_at>$user.status.created_at</created_at>
-    <id>$user.status.id</id>
-    <text>$user.status.text</text>
-    <source>$user.status.source</source>
-    <truncated>$user.status.truncated</truncated>
-    <in_reply_to_status_id>$user.status.in_reply_to_status_id</in_reply_to_status_id>
-    <in_reply_to_user_id>$user.status.in_reply_to_user_id</in_reply_to_user_id>
-    <favorited>$user.status.favorited</favorited>
-    <in_reply_to_screen_name>$user.status.in_reply_to_screen_name</in_reply_to_screen_name>
-    <geo>$user.status.geo</geo>
-    <coordinates>$user.status.coordinates</coordinates>
-    <place>$user.status.place</place>
-    <contributors>$user.status.contributors</contributors>
-  {{ endif }}</status>
-  </user>
diff --git a/view/apps.tpl b/view/apps.tpl
deleted file mode 100644
index 4c7f8c94cc..0000000000
--- a/view/apps.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<h3>$title</h3>
-
-<ul>
-	{{ for $apps as $ap }}
-	<li>$ap</li>
-	{{ endfor }}
-</ul>
diff --git a/view/atom_feed.tpl b/view/atom_feed.tpl
deleted file mode 100644
index 2feb547ee2..0000000000
--- a/view/atom_feed.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<feed xmlns="http://www.w3.org/2005/Atom"
-      xmlns:thr="http://purl.org/syndication/thread/1.0"
-      xmlns:at="http://purl.org/atompub/tombstones/1.0"
-      xmlns:media="http://purl.org/syndication/atommedia"
-      xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0" 
-      xmlns:as="http://activitystrea.ms/spec/1.0/"
-      xmlns:georss="http://www.georss.org/georss" 
-      xmlns:poco="http://portablecontacts.net/spec/1.0" 
-      xmlns:ostatus="http://ostatus.org/schema/1.0" 
-	  xmlns:statusnet="http://status.net/schema/api/1/" > 
-
-  <id>$feed_id</id>
-  <title>$feed_title</title>
-  <generator uri="http://friendica.com" version="$version">Friendica</generator>
-  <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" />
-  $hub
-  $salmon
-  $community
-
-  <updated>$feed_updated</updated>
-
-  <dfrn:owner>
-    <name dfrn:updated="$namdate" >$name</name>
-    <uri dfrn:updated="$uridate" >$profile_page</uri>
-    <link rel="photo"  type="image/jpeg" dfrn:updated="$picdate" media:width="175" media:height="175" href="$photo" />
-    <link rel="avatar" type="image/jpeg" dfrn:updated="$picdate" media:width="175" media:height="175" href="$photo" />
-    $birthday
-  </dfrn:owner>
diff --git a/view/atom_feed_dfrn.tpl b/view/atom_feed_dfrn.tpl
deleted file mode 100644
index 0bae62b526..0000000000
--- a/view/atom_feed_dfrn.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<feed xmlns="http://www.w3.org/2005/Atom"
-      xmlns:thr="http://purl.org/syndication/thread/1.0"
-      xmlns:at="http://purl.org/atompub/tombstones/1.0"
-      xmlns:media="http://purl.org/syndication/atommedia"
-      xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0" 
-      xmlns:as="http://activitystrea.ms/spec/1.0/"
-      xmlns:georss="http://www.georss.org/georss" 
-      xmlns:poco="http://portablecontacts.net/spec/1.0" 
-      xmlns:ostatus="http://ostatus.org/schema/1.0" 
-	  xmlns:statusnet="http://status.net/schema/api/1/" > 
-
-  <id>$feed_id</id>
-  <title>$feed_title</title>
-  <generator uri="http://friendica.com" version="$version">Friendica</generator>
-  <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" />
-  $hub
-  $salmon
-  $community
-
-  <updated>$feed_updated</updated>
-
-  <author>
-    <name dfrn:updated="$namdate" >$name</name>
-    <uri dfrn:updated="$uridate" >$profile_page</uri>
-    <link rel="photo"  type="image/jpeg" dfrn:updated="$picdate" media:width="175" media:height="175" href="$photo" />
-    <link rel="avatar" type="image/jpeg" dfrn:updated="$picdate" media:width="175" media:height="175" href="$photo" />
-    $birthday
-  </author>
diff --git a/view/atom_mail.tpl b/view/atom_mail.tpl
deleted file mode 100644
index bf7c3efc86..0000000000
--- a/view/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/atom_relocate.tpl b/view/atom_relocate.tpl
deleted file mode 100644
index f7db934d7a..0000000000
--- a/view/atom_relocate.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-
-<dfrn:relocate>
-
-	<dfrn:url>$url</dfrn:url>
-	<dfrn:name>$name</dfrn:name>
-	<dfrn:photo>$photo</dfrn:photo>
-	<dfrn:thumb>$thumb</dfrn:thumb>
-	<dfrn:micro>$micro</dfrn:micro>
-	<dfrn:request>$request</dfrn:request>
-	<dfrn:confirm>$confirm</dfrn:confirm>
-	<dfrn:notify>$notify</dfrn:notify>
-	<dfrn:poll>$poll</dfrn:poll>
-	<dfrn:sitepubkey>$sitepubkey</dfrn:sitepubkey>
-
-
-</dfrn:relocate>
-
diff --git a/view/atom_suggest.tpl b/view/atom_suggest.tpl
deleted file mode 100644
index 66c61f9b6e..0000000000
--- a/view/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/auto_request.tpl b/view/auto_request.tpl
deleted file mode 100644
index 961de9bb39..0000000000
--- a/view/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/birthdays_reminder.tpl b/view/birthdays_reminder.tpl
deleted file mode 100644
index 971680a8cc..0000000000
--- a/view/birthdays_reminder.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{ if $count }}
-<div id="birthday-notice" class="birthday-notice fakelink $classtoday" onclick="openClose('birthday-wrapper');">$event_reminders ($count)</div>
-<div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">$event_title</div>
-<div id="birthday-title-end"></div>
-{{ for $events as $event }}
-<div class="birthday-list" id="birthday-$event.id"> <a href="$event.link">$event.title</a> $event.date </div>
-{{ endfor }}
-</div>
-{{ endif }}
-
diff --git a/view/categories_widget.tpl b/view/categories_widget.tpl
deleted file mode 100644
index 5dbd871a89..0000000000
--- a/view/categories_widget.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="categories-sidebar" class="widget">
-	<h3>$title</h3>
-	<div id="nets-desc">$desc</div>
-	
-	<ul class="categories-ul">
-		<li class="tool"><a href="$base" class="categories-link categories-all{{ if $sel_all }} categories-selected{{ endif }}">$all</a></li>
-		{{ for $terms as $term }}
-			<li class="tool"><a href="$base?f=&category=$term.name" class="categories-link{{ if $term.selected }} categories-selected{{ endif }}">$term.name</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/comment_item.tpl b/view/comment_item.tpl
deleted file mode 100644
index 1764f99d89..0000000000
--- a/view/comment_item.tpl
+++ /dev/null
@@ -1,39 +0,0 @@
-		{{ if $threaded }}
-		<div class="comment-wwedit-wrapper threaded" id="comment-edit-wrapper-$id" style="display: block;">
-		{{ else }}
-		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
-		{{ endif }}
-			<form class="comment-edit-form" style="display: block;" 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" />
-				<input type="hidden" name="post_id_random" value="$rand_num" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
-				{{ if $qcomment }}
-					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
-					<option value=""></option>
-				{{ for $qcomment as $qc }}
-					<option value="$qc">$qc</option>				
-				{{ endfor }}
-					</select>
-				{{ endif }}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" 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/common_friends.tpl b/view/common_friends.tpl
deleted file mode 100644
index 1f610d8c4f..0000000000
--- a/view/common_friends.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="profile-match-wrapper">
-	<div class="profile-match-photo">
-		<a href="$url">
-			<img src="$photo" alt="$name" width="80" height="80" title="$name [$url]" />
-		</a>
-	</div>
-	<div class="profile-match-break"></div>
-	<div class="profile-match-name">
-		<a href="$url" title="$name[$tags]">$name</a>
-	</div>
-	<div class="profile-match-end"></div>
-</div>
\ No newline at end of file
diff --git a/view/common_tabs.tpl b/view/common_tabs.tpl
deleted file mode 100644
index f8ceff46a3..0000000000
--- a/view/common_tabs.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<ul class="tabs">
-	{{ for $tabs as $tab }}
-		<li id="$tab.id"><a href="$tab.url" class="tab button $tab.sel"{{ if $tab.title }} title="$tab.title"{{ endif }}>$tab.label</a></li>
-	{{ endfor }}
-</ul>
diff --git a/view/confirm.tpl b/view/confirm.tpl
deleted file mode 100644
index 5e7e641c45..0000000000
--- a/view/confirm.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<center>
-<form action="$confirm_url" id="confirm-form" method="$method">
-
-	<span id="confirm-message">$message</span>
-	{{ for $extra_inputs as $input }}
-	<input type="hidden" name="$input.name" value="$input.value" />
-	{{ endfor }}
-
-	<input class="confirm-button" id="confirm-submit-button" type="submit" name="$confirm_name" value="$confirm" />
-	<input class="confirm-button" id="confirm-cancel-button" type="submit" name="canceled" value="$cancel" />
-
-</form>
-</center>
-
diff --git a/view/contact_block.tpl b/view/contact_block.tpl
deleted file mode 100644
index a796487122..0000000000
--- a/view/contact_block.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="contact-block">
-<h4 class="contact-block-h4">$contacts</h4>
-{{ if $micropro }}
-		<a class="allcontact-link" href="viewcontacts/$nickname">$viewcontacts</a>
-		<div class='contact-block-content'>
-		{{ for $micropro as $m }}
-			$m
-		{{ endfor }}
-		</div>
-{{ endif }}
-</div>
-<div class="clear"></div>
diff --git a/view/contact_edit.tpl b/view/contact_edit.tpl
deleted file mode 100644
index bec78bd7d9..0000000000
--- a/view/contact_edit.tpl
+++ /dev/null
@@ -1,88 +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/0?nets=all&cid=$contact_id" id="contact-edit-view-recent">$lblrecent</a></li>
-				{{ if $lblsuggest }}
-					<li><a href="fsuggest/$contact_id" id="contact-edit-suggest">$lblsuggest</a></li>
-				{{ endif }}
-
-			</ul>
-		</div>
-	</div>
-	<div id="contact-edit-nav-end"></div>
-
-
-<form action="contacts/$contact_id" method="post" >
-<input type="hidden" name="contact_id" value="$contact_id">
-
-	{{ if $poll_enabled }}
-		<div id="contact-edit-poll-wrapper">
-			<div id="contact-edit-last-update-text">$lastupdtext <span id="contact-edit-last-updated">$last_update</span></div>
-			<span id="contact-edit-poll-text">$updpub</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/contact_end.tpl b/view/contact_end.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/contact_head.tpl b/view/contact_head.tpl
deleted file mode 100644
index 0a7f0ef0f9..0000000000
--- a/view/contact_head.tpl
+++ /dev/null
@@ -1,30 +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">
-
-tinyMCE.init({
-	theme : "advanced",
-	mode : "$editselect",
-	elements: "contact-edit-info",
-	plugins : "bbcode",
-	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_styles : "blockquote,code",
-	gecko_spellcheck : true,
-	entity_encoding : "raw",
-	add_unload_trigger : false,
-	remove_linebreaks : false,
-	//force_p_newlines : false,
-	//force_br_newlines : true,
-	forced_root_block : 'div',
-	content_css: "$baseurl/view/custom_tinymce.css"
-
-
-});
-
-
-</script>
-
diff --git a/view/contact_template.tpl b/view/contact_template.tpl
deleted file mode 100644
index f7ed107509..0000000000
--- a/view/contact_template.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-	<div class="contact-entry-photo-wrapper" >
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
-		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
-		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
-
-			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
-
-			{{ if $contact.photo_menu }}
-			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
-                    <ul>
-						{{ for $contact.photo_menu as $c }}
-						{{ if $c.2 }}
-						<li><a target="redir" href="$c.1">$c.0</a></li>
-						{{ else }}
-						<li><a href="$c.1">$c.0</a></li>
-						{{ endif }}
-						{{ endfor }}
-                    </ul>
-                </div>
-			{{ endif }}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
-
-	<div class="contact-entry-end" ></div>
-</div>
diff --git a/view/contacts-end.tpl b/view/contacts-end.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/contacts-head.tpl b/view/contacts-head.tpl
deleted file mode 100644
index 011f55b981..0000000000
--- a/view/contacts-head.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-
-<script src="$baseurl/library/jquery_ac/friendica.complete.js" ></script>
-
-<script>
-$(document).ready(function() { 
-	var a; 
-	a = $("#contacts-search").autocomplete({ 
-		serviceUrl: '$base/acl',
-		minChars: 2,
-		width: 350,
-	});
-	a.setOptions({ params: { type: 'a' }});
-
-}); 
-
-</script>
-
diff --git a/view/contacts-template.tpl b/view/contacts-template.tpl
deleted file mode 100644
index ecb342bf44..0000000000
--- a/view/contacts-template.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-<h1>$header{{ if $total }} ($total){{ endif }}</h1>
-
-{{ if $finding }}<h4>$finding</h4>{{ endif }}
-
-<div id="contacts-search-wrapper">
-<form id="contacts-search-form" action="$cmd" method="get" >
-<span class="contacts-search-desc">$desc</span>
-<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="$search" />
-<input type="submit" name="submit" id="contacts-search-submit" value="$submit" />
-</form>
-</div>
-<div id="contacts-search-end"></div>
-
-$tabs
-
-
-{{ for $contacts as $contact }}
-	{{ inc contact_template.tpl }}{{ endinc }}
-{{ endfor }}
-<div id="contact-edit-end"></div>
-
-$paginate
-
-
-
-
diff --git a/view/contacts-widget-sidebar.tpl b/view/contacts-widget-sidebar.tpl
deleted file mode 100644
index c9450ce648..0000000000
--- a/view/contacts-widget-sidebar.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-$vcard_widget
-$follow_widget
-$groups_widget
-$findpeople_widget
-$networks_widget
-
diff --git a/view/content.tpl b/view/content.tpl
deleted file mode 100644
index 466045d396..0000000000
--- a/view/content.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<div id="content-begin"></div>
-<div id="content-end"></div>
diff --git a/view/conversation.tpl b/view/conversation.tpl
deleted file mode 100644
index 0e14646219..0000000000
--- a/view/conversation.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-$live_update
-
-{{ for $threads as $thread }}
-<div id="tread-wrapper-$thread.id" class="tread-wrapper">
-	{{ for $thread.items as $item }}
-		{{if $item.comment_firstcollapsed}}
-			<div class="hide-comments-outer">
-			<span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span>
-			</div>
-			<div id="collapsed-comments-$thread.id" class="collapsed-comments" style="display: none;">
-		{{endif}}
-		{{if $item.comment_lastcollapsed}}</div>{{endif}}
-		
-		{{ inc $item.template }}{{ endinc }}
-		
-		
-	{{ endfor }}
-</div>
-{{ endfor }}
-
-<div id="conversation-end"></div>
-
-{{ if $dropping }}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
-  <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
-  <div id="item-delete-selected-desc" >$dropping</div>
-</div>
-<div id="item-delete-selected-end"></div>
-{{ endif }}
diff --git a/view/crepair.tpl b/view/crepair.tpl
deleted file mode 100644
index a3e532b615..0000000000
--- a/view/crepair.tpl
+++ /dev/null
@@ -1,46 +0,0 @@
-
-<form id="crepair-form" action="crepair/$contact_id" method="post" >
-
-<h4>$contact_name</h4>
-
-<label id="crepair-name-label" class="crepair-label" for="crepair-name">$label_name</label>
-<input type="text" id="crepair-name" class="crepair-input" name="name" value="$contact_name" />
-<div class="clear"></div>
-
-<label id="crepair-nick-label" class="crepair-label" for="crepair-nick">$label_nick</label>
-<input type="text" id="crepair-nick" class="crepair-input" name="nick" value="$contact_nick" />
-<div class="clear"></div>
-
-<label id="crepair-attag-label" class="crepair-label" for="crepair-attag">$label_attag</label>
-<input type="text" id="crepair-attag" class="crepair-input" name="attag" value="$contact_attag" />
-<div class="clear"></div>
-
-<label id="crepair-url-label" class="crepair-label" for="crepair-url">$label_url</label>
-<input type="text" id="crepair-url" class="crepair-input" name="url" value="$contact_url" />
-<div class="clear"></div>
-
-<label id="crepair-request-label" class="crepair-label" for="crepair-request">$label_request</label>
-<input type="text" id="crepair-request" class="crepair-input" name="request" value="$request" />
-<div class="clear"></div>
- 
-<label id="crepair-confirm-label" class="crepair-label" for="crepair-confirm">$label_confirm</label>
-<input type="text" id="crepair-confirm" class="crepair-input" name="confirm" value="$confirm" />
-<div class="clear"></div>
-
-<label id="crepair-notify-label" class="crepair-label" for="crepair-notify">$label_notify</label>
-<input type="text" id="crepair-notify" class="crepair-input" name="notify" value="$notify" />
-<div class="clear"></div>
-
-<label id="crepair-poll-label" class="crepair-label" for="crepair-poll">$label_poll</label>
-<input type="text" id="crepair-poll" class="crepair-input" name="poll" value="$poll" />
-<div class="clear"></div>
-
-<label id="crepair-photo-label" class="crepair-label" for="crepair-photo">$label_photo</label>
-<input type="text" id="crepair-photo" class="crepair-input" name="photo" value="" />
-<div class="clear"></div>
-
-<input type="submit" name="submit" value="$lbl_submit" />
-
-</form>
-
-
diff --git a/view/cropbody.tpl b/view/cropbody.tpl
deleted file mode 100644
index 4c0ca3d634..0000000000
--- a/view/cropbody.tpl
+++ /dev/null
@@ -1,58 +0,0 @@
-<h1>$title</h1>
-<p id="cropimage-desc">
-$desc
-</p>
-<div id="cropimage-wrapper">
-<img src="$image_url" id="croppa" class="imgCrop" alt="$title" />
-</div>
-<div id="cropimage-preview-wrapper" >
-<div id="previewWrap" ></div>
-</div>
-
-<script type="text/javascript" language="javascript">
-
-	function onEndCrop( coords, dimensions ) {
-		$( 'x1' ).value = coords.x1;
-		$( 'y1' ).value = coords.y1;
-		$( 'x2' ).value = coords.x2;
-		$( 'y2' ).value = coords.y2;
-		$( 'width' ).value = dimensions.width;
-		$( 'height' ).value = dimensions.height;
-	}
-
-	Event.observe( window, 'load', function() {
-		new Cropper.ImgWithPreview(
-		'croppa',
-		{
-			previewWrap: 'previewWrap',
-			minWidth: 175,
-			minHeight: 175,
-			maxWidth: 640,
-			maxHeight: 640,
-			ratioDim: { x: 100, y:100 },
-			displayOnInit: true,
-			onEndCrop: onEndCrop
-		}
-		);
-	}
-	);
-
-</script>
-
-<form action="profile_photo/$resource" id="crop-image-form" method="post" />
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-<input type='hidden' name='profile' value='$profile'>
-<input type="hidden" name="cropfinal" value="1" />
-<input type="hidden" name="xstart" id="x1" />
-<input type="hidden" name="ystart" id="y1" />
-<input type="hidden" name="xfinal" id="x2" />
-<input type="hidden" name="yfinal" id="y2" />
-<input type="hidden" name="height" id="height" />
-<input type="hidden" name="width"  id="width" />
-
-<div id="crop-image-submit-wrapper" >
-<input type="submit" name="submit" value="$done" />
-</div>
-
-</form>
diff --git a/view/cropend.tpl b/view/cropend.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/crophead.tpl b/view/crophead.tpl
deleted file mode 100644
index 48f3754265..0000000000
--- a/view/crophead.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-      <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
-      <script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
-      <script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>
-      <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />
diff --git a/view/delegate.tpl b/view/delegate.tpl
deleted file mode 100644
index 9a7d2e18d2..0000000000
--- a/view/delegate.tpl
+++ /dev/null
@@ -1,57 +0,0 @@
-<h3>$header</h3>
-
-<div id="delegate-desc" class="delegate-desc">$desc</div>
-
-{{ if $managers }}
-<h3>$head_managers</h3>
-
-{{ for $managers as $x }}
-
-<div class="contact-block-div">
-<a class="contact-block-link" href="#" >
-<img class="contact-block-img" src="$base/photo/thumb/$x.uid" title="$x.username ($x.nickname)" />
-</a>
-</div>
-
-{{ endfor }}
-<div class="clear"></div>
-<hr />
-{{ endif }}
-
-
-<h3>$head_delegates</h3>
-
-{{ if $delegates }}
-{{ for $delegates as $x }}
-
-<div class="contact-block-div">
-<a class="contact-block-link" href="$base/delegate/remove/$x.uid" >
-<img class="contact-block-img" src="$base/photo/thumb/$x.uid" title="$x.username ($x.nickname)" />
-</a>
-</div>
-
-{{ endfor }}
-<div class="clear"></div>
-{{ else }}
-$none
-{{ endif }}
-<hr />
-
-
-<h3>$head_potentials</h3>
-{{ if $potentials }}
-{{ for $potentials as $x }}
-
-<div class="contact-block-div">
-<a class="contact-block-link" href="$base/delegate/add/$x.uid" >
-<img class="contact-block-img" src="$base/photo/thumb/$x.uid" title="$x.username ($x.nickname)" />
-</a>
-</div>
-
-{{ endfor }}
-<div class="clear"></div>
-{{ else }}
-$none
-{{ endif }}
-<hr />
-
diff --git a/view/dfrn_req_confirm.tpl b/view/dfrn_req_confirm.tpl
deleted file mode 100644
index 6c916323ce..0000000000
--- a/view/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/dfrn_request.tpl b/view/dfrn_request.tpl
deleted file mode 100644
index bd3bcbc42b..0000000000
--- a/view/dfrn_request.tpl
+++ /dev/null
@@ -1,65 +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>
-$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/diasp_dec_hdr.tpl b/view/diasp_dec_hdr.tpl
deleted file mode 100644
index e87c618888..0000000000
--- a/view/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/diaspora_comment.tpl b/view/diaspora_comment.tpl
deleted file mode 100644
index 6ef4ab664d..0000000000
--- a/view/diaspora_comment.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<XML>
-  <post>
-    <comment>
-      <guid>$guid</guid>
-      <parent_guid>$parent_guid</parent_guid>
-      <author_signature>$authorsig</author_signature>
-      <text>$body</text>
-      <diaspora_handle>$handle</diaspora_handle>
-    </comment>
-  </post>
-</XML>
\ No newline at end of file
diff --git a/view/diaspora_comment_relay.tpl b/view/diaspora_comment_relay.tpl
deleted file mode 100644
index e82de1171e..0000000000
--- a/view/diaspora_comment_relay.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<XML>
-  <post>
-    <comment>
-      <guid>$guid</guid>
-      <parent_guid>$parent_guid</parent_guid>
-      <parent_author_signature>$parentsig</parent_author_signature>
-      <author_signature>$authorsig</author_signature>
-      <text>$body</text>
-      <diaspora_handle>$handle</diaspora_handle>
-    </comment>
-  </post>
-</XML>
\ No newline at end of file
diff --git a/view/diaspora_conversation.tpl b/view/diaspora_conversation.tpl
deleted file mode 100644
index 12807ba599..0000000000
--- a/view/diaspora_conversation.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-<XML>
-  <post>
-    <conversation>
-      <guid>$conv.guid</guid>
-      <subject>$conv.subject</subject>
-      <created_at>$conv.created_at</created_at>
-
-      {{ for $conv.messages as $msg }}
-
-      <message>
-        <guid>$msg.guid</guid>
-        <parent_guid>$msg.parent_guid</parent_guid>
-        {{ if $msg.parent_author_signature }}
-        <parent_author_signature>$msg.parent_author_signature</parent_author_signature>
-        {{ endif }}
-        <author_signature>$msg.author_signature</author_signature>
-        <text>$msg.text</text>
-        <created_at>$msg.created_at</created_at>
-        <diaspora_handle>$msg.diaspora_handle</diaspora_handle>
-        <conversation_guid>$msg.conversation_guid</conversation_guid>
-      </message>
-
-      {{ endfor }}
-
-      <diaspora_handle>$conv.diaspora_handle</diaspora_handle>
-      <participant_handles>$conv.participant_handles</participant_handles>
-    </conversation>
-  </post>
-</XML>
diff --git a/view/diaspora_like.tpl b/view/diaspora_like.tpl
deleted file mode 100644
index a777aeebed..0000000000
--- a/view/diaspora_like.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<XML>
-  <post>
-    <like>
-      <target_type>$target_type</target_type>
-      <guid>$guid</guid>
-      <parent_guid>$parent_guid</parent_guid>
-      <author_signature>$authorsig</author_signature>
-      <positive>$positive</positive>
-      <diaspora_handle>$handle</diaspora_handle>
-    </like>
-  </post>
-</XML>
diff --git a/view/diaspora_like_relay.tpl b/view/diaspora_like_relay.tpl
deleted file mode 100755
index 8b67f4de33..0000000000
--- a/view/diaspora_like_relay.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<XML>
-  <post>
-    <like>
-      <guid>$guid</guid>
-      <target_type>$target_type</target_type>
-      <parent_guid>$parent_guid</parent_guid>
-      <parent_author_signature>$parentsig</parent_author_signature>
-      <author_signature>$authorsig</author_signature>
-      <positive>$positive</positive>
-      <diaspora_handle>$handle</diaspora_handle>
-    </like>
-  </post>
-</XML>
diff --git a/view/diaspora_message.tpl b/view/diaspora_message.tpl
deleted file mode 100644
index 667b8d53fa..0000000000
--- a/view/diaspora_message.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<XML>
-  <post>
-      <message>
-        <guid>$msg.guid</guid>
-        <parent_guid>$msg.parent_guid</parent_guid>
-        <author_signature>$msg.author_signature</author_signature>
-        <text>$msg.text</text>
-        <created_at>$msg.created_at</created_at>
-        <diaspora_handle>$msg.diaspora_handle</diaspora_handle>
-        <conversation_guid>$msg.conversation_guid</conversation_guid>
-      </message>
-  </post>
-</XML>
diff --git a/view/diaspora_photo.tpl b/view/diaspora_photo.tpl
deleted file mode 100644
index 75ca7f15c7..0000000000
--- a/view/diaspora_photo.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<XML>
-  <post>
-    <photo>
-      <remote_photo_path>$path</remote_photo_path>
-      <remote_photo_name>$filename</remote_photo_name>
-      <status_message_guid>$msg_guid</status_message_guid>
-      <guid>$guid</guid>
-      <diaspora_handle>$handle</diaspora_handle>
-      <public>$public</public>
-      <created_at>$created_at</created_at>
-    </photo>
-  </post>
-</XML>
\ No newline at end of file
diff --git a/view/diaspora_post.tpl b/view/diaspora_post.tpl
deleted file mode 100644
index 1ba3ebb1fc..0000000000
--- a/view/diaspora_post.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<XML>
-  <post>
-    <status_message>
-      <raw_message>$body</raw_message>
-      <guid>$guid</guid>
-      <diaspora_handle>$handle</diaspora_handle>
-      <public>$public</public>
-      <created_at>$created</created_at>
-    </status_message>
-  </post>
-</XML>
\ No newline at end of file
diff --git a/view/diaspora_profile.tpl b/view/diaspora_profile.tpl
deleted file mode 100644
index e5c3d3cad2..0000000000
--- a/view/diaspora_profile.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<XML>
- <post><profile>
-  <diaspora_handle>$handle</diaspora_handle>
-  <first_name>$first</first_name>
-  <last_name>$last</last_name>
-  <image_url>$large</image_url>
-  <image_url_small>$small</image_url_small>
-  <image_url_medium>$medium</image_url_medium>
-  <birthday>$dob</birthday>
-  <gender>$gender</gender>
-  <bio>$about</bio>
-  <location>$location</location>
-  <searchable>$searchable</searchable>
-  <tag_string>$tags</tag_string>
-</profile></post>
-      </XML>
diff --git a/view/diaspora_relay_retraction.tpl b/view/diaspora_relay_retraction.tpl
deleted file mode 100644
index e76c7c6c5e..0000000000
--- a/view/diaspora_relay_retraction.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<XML>
-  <post>
-    <relayable_retraction>
-      <target_type>$type</target_type>
-      <target_guid>$guid</target_guid>
-      <target_author_signature>$signature</target_author_signature>
-      <sender_handle>$handle</sender_handle>
-    </relayable_retraction>
-  </post>
-</XML>
diff --git a/view/diaspora_relayable_retraction.tpl b/view/diaspora_relayable_retraction.tpl
deleted file mode 100755
index 73cff8343a..0000000000
--- a/view/diaspora_relayable_retraction.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<XML>
-  <post>
-    <relayable_retraction>
-      <target_type>$target_type</target_type>
-      <target_guid>$guid</target_guid>
-      <parent_author_signature>$parentsig</parent_author_signature>
-      <target_author_signature>$authorsig</target_author_signature>
-      <sender_handle>$handle</sender_handle>
-    </relayable_retraction>
-  </post>
-</XML>
diff --git a/view/diaspora_retract.tpl b/view/diaspora_retract.tpl
deleted file mode 100644
index 6d5b6e22be..0000000000
--- a/view/diaspora_retract.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<XML>
-  <post>
-    <retraction>
-      <post_guid>$guid</post_guid>
-      <type>$type</type>
-      <diaspora_handle>$handle</diaspora_handle>
-    </retraction>
-  </post>
-</XML>
\ No newline at end of file
diff --git a/view/diaspora_share.tpl b/view/diaspora_share.tpl
deleted file mode 100644
index c16341b1e1..0000000000
--- a/view/diaspora_share.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<XML>
-  <post>
-    <request>
-      <sender_handle>$sender</sender_handle>
-      <recipient_handle>$recipient</recipient_handle>
-    </request>
-  </post>
-</XML>
\ No newline at end of file
diff --git a/view/diaspora_signed_retract.tpl b/view/diaspora_signed_retract.tpl
deleted file mode 100644
index 22120e2870..0000000000
--- a/view/diaspora_signed_retract.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<XML>
-  <post>
-    <signed_retraction>
-      <target_guid>$guid</target_guid>
-      <target_type>$type</target_type>
-      <sender_handle>$handle</sender_handle>
-      <target_author_signature>$signature</target_author_signature>
-    </signed_retraction>
-  </post>
-</XML>
diff --git a/view/diaspora_vcard.tpl b/view/diaspora_vcard.tpl
deleted file mode 100644
index de3981a94b..0000000000
--- a/view/diaspora_vcard.tpl
+++ /dev/null
@@ -1,57 +0,0 @@
-<div style="display:none;">
-	<dl class='entity_nickname'>
-		<dt>Nickname</dt>
-		<dd>		
-			<a class="nickname url uid" href="$diaspora.podloc/" rel="me">$diaspora.nickname</a>
-		</dd>
-	</dl>
-	<dl class='entity_fn'>
-		<dt>Full name</dt>
-		<dd>
-			<span class='fn'>$diaspora.fullname</span>
-		</dd>
-	</dl>
-
-	<dl class='entity_given_name'>
-		<dt>First name</dt>
-		<dd>
-		<span class='given_name'>$diaspora.firstname</span>
-		</dd>
-	</dl>
-	<dl class='entity_family_name'>
-		<dt>Family name</dt>
-		<dd>
-		<span class='family_name'>$diaspora.lastname</span>
-		</dd>
-	</dl>
-	<dl class="entity_url">
-		<dt>URL</dt>
-		<dd>
-			<a class="url" href="$diaspora.podloc/" id="pod_location" rel="me">$diaspora.podloc/</a>
-		</dd>
-	</dl>
-	<dl class="entity_photo">
-		<dt>Photo</dt>
-		<dd>
-			<img class="photo avatar" height="300" width="300" src="$diaspora.photo300">
-		</dd>
-	</dl>
-	<dl class="entity_photo_medium">
-		<dt>Photo</dt>
-		<dd> 
-			<img class="photo avatar" height="100" width="100" src="$diaspora.photo100">
-		</dd>
-	</dl>
-	<dl class="entity_photo_small">
-		<dt>Photo</dt>
-		<dd>
-			<img class="photo avatar" height="50" width="50" src="$diaspora.photo50">
-		</dd>
-	</dl>
-	<dl class="entity_searchable">
-		<dt>Searchable</dt>
-		<dd>
-			<span class="searchable">$diaspora.searchable</span>
-		</dd>
-	</dl>
-</div>
diff --git a/view/directory_header.tpl b/view/directory_header.tpl
deleted file mode 100644
index 1f03540f2c..0000000000
--- a/view/directory_header.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<h1>$sitedir</h1>
-
-$globaldir
-$admin
-
-$finding
-
-<div id="directory-search-wrapper">
-<form id="directory-search-form" action="directory" method="get" >
-<span class="dirsearch-desc">$desc</span>
-<input type="text" name="search" id="directory-search" class="search-input" onfocus="this.select();" value="$search" />
-<input type="submit" name="submit" id="directory-search-submit" value="$submit" class="button" />
-</form>
-</div>
-<div id="directory-search-end"></div>
-
diff --git a/view/directory_item.tpl b/view/directory_item.tpl
deleted file mode 100644
index d496cb2add..0000000000
--- a/view/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/display-head.tpl b/view/display-head.tpl
deleted file mode 100644
index 3d4e7e96ad..0000000000
--- a/view/display-head.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<script>
-$(document).ready(function() {
-	$(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
-	// make auto-complete work in more places
-	$(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
-});
-</script>
-
diff --git a/view/email_notify_html.tpl b/view/email_notify_html.tpl
deleted file mode 100644
index 4a8e5a9114..0000000000
--- a/view/email_notify_html.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
-<html>
-<head>
-	<title>$banner</title>
-	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-</head>
-<body>
-<table style="border:1px solid #ccc">
-	<tbody>
-	<tr><td colspan="2" style="background:#084769; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='$siteurl/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">$product</div><div style="clear: both;"></div></td></tr>
-
-
-	<tr><td style="padding-top:22px;" colspan="2">$preamble</td></tr>
-
-
-	{{ if $content_allowed }}
-	<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$source_link"><img style="border:0px;width:48px;height:48px;" src="$source_photo"></a></td>
-		<td style="padding-top:22px;"><a href="$source_link">$source_name</a></td></tr>
-	<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
-	<tr><td style="padding-right:22px;">$htmlversion</td></tr>
-	{{ endif }}
-	<tr><td style="padding-top:11px;" colspan="2">$hsitelink</td></tr>
-	<tr><td style="padding-bottom:11px;" colspan="2">$hitemlink</td></tr>
-	<tr><td></td><td>$thanks</td></tr>
-	<tr><td></td><td>$site_admin</td></tr>
-	</tbody>
-</table>
-</body>
-</html>
-
diff --git a/view/email_notify_text.tpl b/view/email_notify_text.tpl
deleted file mode 100644
index af7931e4b0..0000000000
--- a/view/email_notify_text.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$preamble
-
-{{ if $content_allowed }}
-$title
-
-$textversion
-
-{{ endif }}
-$tsitelink
-$titemlink
-
-$thanks
-$site_admin
-
-
diff --git a/view/end.tpl b/view/end.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/event.tpl b/view/event.tpl
deleted file mode 100644
index 1f71289b3a..0000000000
--- a/view/event.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{ for $events as $event }}
-	<div class="event">
-	
-	{{ 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" target="external-link" 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/event_end.tpl b/view/event_end.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/event_form.tpl b/view/event_form.tpl
deleted file mode 100644
index 536c52b0fa..0000000000
--- a/view/event_form.tpl
+++ /dev/null
@@ -1,49 +0,0 @@
-<h3>$title</h3>
-
-<p>
-$desc
-</p>
-
-<form action="$post" method="post" >
-
-<input type="hidden" name="event_id" value="$eid" />
-<input type="hidden" name="cid" value="$cid" />
-<input type="hidden" name="uri" value="$uri" />
-
-<div id="event-start-text">$s_text</div>
-$s_dsel $s_tsel
-
-<div id="event-finish-text">$f_text</div>
-$f_dsel $f_tsel
-
-<div id="event-datetime-break"></div>
-
-<input type="checkbox" name="nofinish" value="1" id="event-nofinish-checkbox" $n_checked /> <div id="event-nofinish-text">$n_text</div>
-
-<div id="event-nofinish-break"></div>
-
-<input type="checkbox" name="adjust" value="1" id="event-adjust-checkbox" $a_checked /> <div id="event-adjust-text">$a_text</div>
-
-<div id="event-adjust-break"></div>
-
-<div id="event-summary-text">$t_text</div>
-<input type="text" id="event-summary" name="summary" value="$t_orig" />
-
-
-<div id="event-desc-text">$d_text</div>
-<textarea id="event-desc-textarea" name="desc">$d_orig</textarea>
-
-
-<div id="event-location-text">$l_text</div>
-<textarea id="event-location-textarea" name="location">$l_orig</textarea>
-
-<input type="checkbox" name="share" value="1" id="event-share-checkbox" $sh_checked /> <div id="event-share-text">$sh_text</div>
-<div id="event-share-break"></div>
-
-$acl
-
-<div class="clear"></div>
-<input id="event-submit" type="submit" name="submit" value="$submit" />
-</form>
-
-
diff --git a/view/event_head.tpl b/view/event_head.tpl
deleted file mode 100644
index 559de24e31..0000000000
--- a/view/event_head.tpl
+++ /dev/null
@@ -1,139 +0,0 @@
-<link rel='stylesheet' type='text/css' href='$baseurl/library/fullcalendar/fullcalendar.css' />
-<script language="javascript" type="text/javascript"
-          src="$baseurl/library/fullcalendar/fullcalendar.min.js"></script>
-
-<script>
-	function showEvent(eventid) {
-		$.get(
-			'$baseurl/events/?id='+eventid,
-			function(data){
-				$.colorbox({html:data});
-			}
-		);			
-	}
-	
-	$(document).ready(function() {
-		$('#events-calendar').fullCalendar({
-			events: '$baseurl/events/json/',
-			header: {
-				left: 'prev,next today',
-				center: 'title',
-				right: 'month,agendaWeek,agendaDay'
-			},			
-			timeFormat: 'H(:mm)',
-			eventClick: function(calEvent, jsEvent, view) {
-				showEvent(calEvent.id);
-			},
-			
-			eventRender: function(event, element, view) {
-				//console.log(view.name);
-				if (event.item['author-name']==null) return;
-				switch(view.name){
-					case "month":
-					element.find(".fc-event-title").html(
-						"<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format(
-							event.item['author-avatar'],
-							event.item['author-name'],
-							event.title
-					));
-					break;
-					case "agendaWeek":
-					element.find(".fc-event-title").html(
-						"<img src='{0}' style='height:12px; width:12px'>{1}<p>{2}</p><p>{3}</p>".format(
-							event.item['author-avatar'],
-							event.item['author-name'],
-							event.item.desc,
-							event.item.location
-					));
-					break;
-					case "agendaDay":
-					element.find(".fc-event-title").html(
-						"<img src='{0}' style='height:24px;width:24px'>{1}<p>{2}</p><p>{3}</p>".format(
-							event.item['author-avatar'],
-							event.item['author-name'],
-							event.item.desc,
-							event.item.location
-					));
-					break;
-				}
-			}
-			
-		})
-		
-		// center on date
-		var args=location.href.replace(baseurl,"").split("/");
-		if (args.length>=4) {
-			$("#events-calendar").fullCalendar('gotoDate',args[2] , args[3]-1);
-		} 
-		
-		// show event popup
-		var hash = location.hash.split("-")
-		if (hash.length==2 && hash[0]=="#link") showEvent(hash[1]);
-		
-	});
-</script>
-
-
-<script language="javascript" type="text/javascript"
-          src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
-<script language="javascript" type="text/javascript">
-
-
-	tinyMCE.init({
-		theme : "advanced",
-		mode : "textareas",
-		plugins : "bbcode,paste",
-		theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
-		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 : 'div',
-		content_css: "$baseurl/view/custom_tinymce.css",
-		theme_advanced_path : false,
-		setup : function(ed) {
-			ed.onInit.add(function(ed) {
-				ed.pasteAsPlainText = true;
-			});
-		}
-
-	});
-
-
-	$(document).ready(function() { 
-
-		$('#event-share-checkbox').change(function() {
-
-			if ($('#event-share-checkbox').is(':checked')) { 
-				$('#acl-wrapper').show();
-			}
-			else {
-				$('#acl-wrapper').hide();
-			}
-		}).trigger('change');
-
-
-		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
-			var selstr;
-			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
-				selstr = $(this).text();
-				$('#jot-public').hide();
-			});
-			if(selstr == null) {
-				$('#jot-public').show();
-			}
-
-		}).trigger('change');
-
-	});
-
-</script>
-
diff --git a/view/events-js.tpl b/view/events-js.tpl
deleted file mode 100644
index b0e182c56d..0000000000
--- a/view/events-js.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-$tabs
-<h2>$title</h2>
-
-<div id="new-event-link"><a href="$new_event.0" >$new_event.1</a></div>
-
-<div id="events-calendar"></div>
diff --git a/view/events.tpl b/view/events.tpl
deleted file mode 100644
index be7dc2fb2d..0000000000
--- a/view/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" target="external-link" 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/events_reminder.tpl b/view/events_reminder.tpl
deleted file mode 100644
index 9746898c77..0000000000
--- a/view/events_reminder.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{ if $count }}
-<div id="event-notice" class="birthday-notice fakelink $classtoday" onclick="openClose('event-wrapper');">$event_reminders ($count)</div>
-<div id="event-wrapper" style="display: none;" ><div id="event-title">$event_title</div>
-<div id="event-title-end"></div>
-{{ for $events as $event }}
-<div class="event-list" id="event-$event.id"> <a href="events/$event.link">$event.title</a> $event.date </div>
-{{ endfor }}
-</div>
-{{ endif }}
-
diff --git a/view/failed_updates.tpl b/view/failed_updates.tpl
deleted file mode 100644
index c6e4cb08e1..0000000000
--- a/view/failed_updates.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<h2>$banner</h2>
-
-<div id="failed_updates_desc">$desc</div>
-
-{{ if $failed }}
-{{ for $failed as $f }}
-
-<h4>$f</h4>
-<ul>
-<li><a href="$base/admin/dbsync/mark/$f">$mark</a></li>
-<li><a href="$base/admin/dbsync/$f">$apply</a></li>
-</ul>
-
-<hr />
-{{ endfor }}
-{{ endif }}
-
diff --git a/view/fake_feed.tpl b/view/fake_feed.tpl
deleted file mode 100644
index c37071cf4a..0000000000
--- a/view/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/field.tpl b/view/field.tpl
deleted file mode 100644
index 35f5afd39c..0000000000
--- a/view/field.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-
- {{ if $field.0==select }}
- {{ inc field_select.tpl }}{{ endinc }}
- {{ endif }}
diff --git a/view/field_checkbox.tpl b/view/field_checkbox.tpl
deleted file mode 100644
index 5e170370ab..0000000000
--- a/view/field_checkbox.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field checkbox' id='div_id_$field.0'>
-		<label for='id_$field.0'>$field.1</label>
-		<input type="checkbox" name='$field.0' id='id_$field.0' value="1" {{ if $field.2 }}checked="checked"{{ endif }}>
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/field_combobox.tpl b/view/field_combobox.tpl
deleted file mode 100644
index a4dc8e5714..0000000000
--- a/view/field_combobox.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-	
-	<div class='field combobox'>
-		<label for='id_$field.0' id='id_$field.0_label'>$field.1</label>
-		{# html5 don't work on Chrome, Safari and IE9
-		<input id="id_$field.0" type="text" list="data_$field.0" >
-		<datalist id="data_$field.0" >
-		   {{ for $field.4 as $opt=>$val }}<option value="$val">{{ endfor }}
-		</datalist> #}
-		
-		<input id="id_$field.0" type="text" value="$field.2">
-		<select id="select_$field.0" onChange="$('#id_$field.0').val($(this).val())">
-			<option value="">$field.5</option>
-			{{ for $field.4 as $opt=>$val }}<option value="$val">$val</option>{{ endfor }}
-		</select>
-		
-		<span class='field_help'>$field.3</span>
-	</div>
-
diff --git a/view/field_custom.tpl b/view/field_custom.tpl
deleted file mode 100644
index be15d3f607..0000000000
--- a/view/field_custom.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field custom'>
-		<label for='$field.0'>$field.1</label>
-		$field.2
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/field_input.tpl b/view/field_input.tpl
deleted file mode 100644
index 748d93f3ee..0000000000
--- a/view/field_input.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field input'>
-		<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/field_intcheckbox.tpl b/view/field_intcheckbox.tpl
deleted file mode 100644
index 47a513a55e..0000000000
--- a/view/field_intcheckbox.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field checkbox'>
-		<label for='id_$field.0'>$field.1</label>
-		<input type="checkbox" name='$field.0' id='id_$field.0' value="$field.3" {{ if $field.2 }}checked="true"{{ endif }}>
-		<span class='field_help'>$field.4</span>
-	</div>
diff --git a/view/field_openid.tpl b/view/field_openid.tpl
deleted file mode 100644
index acd93ff62d..0000000000
--- a/view/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/field_password.tpl b/view/field_password.tpl
deleted file mode 100644
index e604b7f5da..0000000000
--- a/view/field_password.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field password'>
-		<label for='id_$field.0'>$field.1</label>
-		<input type='password' name='$field.0' id='id_$field.0' value="$field.2">
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/field_radio.tpl b/view/field_radio.tpl
deleted file mode 100644
index a915e8eb3c..0000000000
--- a/view/field_radio.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field radio'>
-		<label for='id_$field.0_$field.2'>$field.1</label>
-		<input type="radio" name='$field.0' id='id_$field.0_$field.2' value="$field.2" {{ if $field.4 }}checked="true"{{ endif }}>
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/field_richtext.tpl b/view/field_richtext.tpl
deleted file mode 100644
index c124ee000e..0000000000
--- a/view/field_richtext.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field richtext'>
-		<label for='id_$field.0'>$field.1</label>
-		<textarea name='$field.0' id='id_$field.0' class="fieldRichtext">$field.2</textarea>
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/field_select.tpl b/view/field_select.tpl
deleted file mode 100644
index d79eb48e0d..0000000000
--- a/view/field_select.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-	
-	<div class='field select'>
-		<label for='id_$field.0'>$field.1</label>
-		<select name='$field.0' id='id_$field.0'>
-			{{ for $field.4 as $opt=>$val }}<option value="$opt" {{ if $opt==$field.2 }}selected="selected"{{ endif }}>$val</option>{{ endfor }}
-		</select>
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/field_select_raw.tpl b/view/field_select_raw.tpl
deleted file mode 100644
index 765b285d99..0000000000
--- a/view/field_select_raw.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-	
-	<div class='field select'>
-		<label for='id_$field.0'>$field.1</label>
-		<select name='$field.0' id='id_$field.0'>
-			$field.4
-		</select>
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/field_textarea.tpl b/view/field_textarea.tpl
deleted file mode 100644
index 2425cdd3b7..0000000000
--- a/view/field_textarea.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field textarea'>
-		<label for='id_$field.0'>$field.1</label>
-		<textarea name='$field.0' id='id_$field.0'>$field.2</textarea>
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/field_themeselect.tpl b/view/field_themeselect.tpl
deleted file mode 100644
index 654c18d450..0000000000
--- a/view/field_themeselect.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-	<script>$(function(){ previewTheme($("#id_$field.0")[0]); });</script>
-	<div class='field select'>
-		<label for='id_$field.0'>$field.1</label>
-		<select name='$field.0' id='id_$field.0' {{ if $field.5 }}onchange="previewTheme(this);"{{ endif }} >
-			{{ for $field.4 as $opt=>$val }}<option value="$opt" {{ if $opt==$field.2 }}selected="selected"{{ endif }}>$val</option>{{ endfor }}
-		</select>
-		<span class='field_help'>$field.3</span>
-		<div id="theme-preview"></div>
-	</div>
diff --git a/view/field_yesno.tpl b/view/field_yesno.tpl
deleted file mode 100644
index 5d4a775c29..0000000000
--- a/view/field_yesno.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-	<div class='field yesno'>
-		<label for='id_$field.0'>$field.1</label>
-		<div class='onoff' id="id_$field.0_onoff">
-			<input  type="hidden" name='$field.0' id='id_$field.0' value="$field.2">
-			<a href="#" class='off'>
-				{{ if $field.4 }}$field.4.0{{ else }}OFF{{ endif }}
-			</a>
-			<a href="#" class='on'>
-				{{ if $field.4 }}$field.4.1{{ else }}ON{{ endif }}
-			</a>
-		</div>
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/fileas_widget.tpl b/view/fileas_widget.tpl
deleted file mode 100644
index 54fba7435f..0000000000
--- a/view/fileas_widget.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="fileas-sidebar" class="widget">
-	<h3>$title</h3>
-	<div id="nets-desc">$desc</div>
-	
-	<ul class="fileas-ul">
-		<li class="tool"><a href="$base" class="fileas-link fileas-all{{ if $sel_all }} fileas-selected{{ endif }}">$all</a></li>
-		{{ for $terms as $term }}
-			<li class="tool"><a href="$base?f=&file=$term.name" class="fileas-link{{ if $term.selected }} fileas-selected{{ endif }}">$term.name</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/filebrowser.tpl b/view/filebrowser.tpl
deleted file mode 100644
index 7db31d716f..0000000000
--- a/view/filebrowser.tpl
+++ /dev/null
@@ -1,84 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-	<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_popup.js"></script>
-	<style>
-		.panel_wrapper div.current{.overflow: auto; height: auto!important; }
-		.filebrowser.path { font-family: fixed; font-size: 10px; background-color: #f0f0ee; height:auto; overflow:auto;}
-		.filebrowser.path a { border-left: 1px solid #C0C0AA; background-color: #E0E0DD; display: block; float:left; padding: 0.3em 1em;}
-		.filebrowser ul{ list-style-type: none; padding:0px; }
-		.filebrowser.folders a { display: block; padding: 0.3em }
-		.filebrowser.folders a:hover { background-color: #f0f0ee; }
-		.filebrowser.files.image { overflow: auto; height: auto; }
-		.filebrowser.files.image img { height:50px;}
-		.filebrowser.files.image li { display: block; padding: 5px; float: left; }
-		.filebrowser.files.image span { display: none;}
-		.filebrowser.files.file img { height:16px; vertical-align: bottom;}
-		.filebrowser.files a { display: block;  padding: 0.3em}
-		.filebrowser.files a:hover { background-color: #f0f0ee; }
-		.filebrowser a { text-decoration: none; }
-	</style>
-	<script>
-		var FileBrowserDialogue = {
-			init : function () {
-				// Here goes your code for setting your custom things onLoad.
-			},
-			mySubmit : function (URL) {
-				//var URL = document.my_form.my_field.value;
-				var win = tinyMCEPopup.getWindowArg("window");
-
-				// insert information now
-				win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = URL;
-
-				// are we an image browser
-				if (typeof(win.ImageDialog) != "undefined") {
-					// we are, so update image dimensions...
-					if (win.ImageDialog.getImageData)
-						win.ImageDialog.getImageData();
-
-					// ... and preview if necessary
-					if (win.ImageDialog.showPreviewImage)
-						win.ImageDialog.showPreviewImage(URL);
-				}
-
-				// close popup window
-				tinyMCEPopup.close();
-			}
-		}
-
-		tinyMCEPopup.onInit.add(FileBrowserDialogue.init, FileBrowserDialogue);
-	</script>
-	</head>
-	<body>
-	
-	<div class="tabs">
-		<ul >
-			<li class="current"><span>FileBrowser</span></li>
-		</ul>
-	</div>
-	<div class="panel_wrapper">
-
-		<div id="general_panel" class="panel current">
-			<div class="filebrowser path">
-				{{ for $path as $p }}<a href="$p.0">$p.1</a>{{ endfor }}
-			</div>
-			<div class="filebrowser folders">
-				<ul>
-					{{ for $folders as $f }}<li><a href="$f.0/">$f.1</a></li>{{ endfor }}
-				</ul>
-			</div>
-			<div class="filebrowser files $type">
-				<ul>
-				{{ for $files as $f }}
-					<li><a href="#" onclick="FileBrowserDialogue.mySubmit('$f.0'); return false;"><img src="$f.2"><span>$f.1</span></a></li>
-				{{ endfor }}
-				</ul>
-			</div>
-		</div>
-	</div>
-	<div class="mceActionPanel">
-		<input type="button" id="cancel" name="cancel" value="$cancel" onclick="tinyMCEPopup.close();" />
-	</div>	
-	</body>
-	
-</html>
diff --git a/view/filer_dialog.tpl b/view/filer_dialog.tpl
deleted file mode 100644
index ae837d6b74..0000000000
--- a/view/filer_dialog.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-{{ inc field_combobox.tpl }}{{ endinc }}
-<div class="settings-submit-wrapper" >
-	<input id="filer_save" type="button" class="settings-submit" value="$submit" />
-</div>
diff --git a/view/follow.tpl b/view/follow.tpl
deleted file mode 100644
index d6f3261307..0000000000
--- a/view/follow.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div id="follow-sidebar" class="widget">
-	<h3>$connect</h3>
-	<div id="connect-desc">$desc</div>
-	<form action="follow" method="post" >
-		<input id="side-follow-url" type="text" name="url" size="24" title="$hint" /><input id="side-follow-submit" type="submit" name="submit" value="$follow" />
-	</form>
-</div>
-
diff --git a/view/follow_slap.tpl b/view/follow_slap.tpl
deleted file mode 100644
index 0d0889f7db..0000000000
--- a/view/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:object-type>http://activitystrea.ms/schema/1.0/person</as:object-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/generic_links_widget.tpl b/view/generic_links_widget.tpl
deleted file mode 100644
index f3404f783f..0000000000
--- a/view/generic_links_widget.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="widget{{ if $class }} $class{{ endif }}">
-	{{if $title}}<h3>$title</h3>{{endif}}
-	{{if $desc}}<div class="desc">$desc</div>{{endif}}
-	
-	<ul>
-		{{ for $items as $item }}
-			<li class="tool"><a href="$item.url" class="{{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/group_drop.tpl b/view/group_drop.tpl
deleted file mode 100644
index 2cbebbb8e5..0000000000
--- a/view/group_drop.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="group-delete-wrapper button" id="group-delete-wrapper-$id" >
-	<a href="group/drop/$id?t=$form_security_token" 
-		onclick="return confirmDelete();" 
-		id="group-delete-icon-$id" 
-		class="icon drophide group-delete-icon" 
-		onmouseover="imgbright(this);" 
-		onmouseout="imgdull(this);" ></a>
-</div>
-<div class="group-delete-end"></div>
diff --git a/view/group_edit.tpl b/view/group_edit.tpl
deleted file mode 100644
index 2fa2b1a552..0000000000
--- a/view/group_edit.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-<h2>$title</h2>
-
-
-<div id="group-edit-wrapper" >
-	<form action="group/$gid" id="group-edit-form" method="post" >
-		<input type='hidden' name='form_security_token' value='$form_security_token'>
-		
-		{{ inc field_input.tpl with $field=$gname }}{{ endinc }}
-		{{ if $drop }}$drop{{ endif }}
-		<div id="group-edit-submit-wrapper" >
-			<input type="submit" name="submit" value="$submit" >
-		</div>
-		<div id="group-edit-select-end" ></div>
-	</form>
-</div>
-
-
-{{ if $groupeditor }}
-	<div id="group-update-wrapper">
-		{{ inc groupeditor.tpl }}{{ endinc }}
-	</div>
-{{ endif }}
-{{ if $desc }}<div id="group-edit-desc">$desc</div>{{ endif }}
diff --git a/view/group_selection.tpl b/view/group_selection.tpl
deleted file mode 100644
index 3809cb9946..0000000000
--- a/view/group_selection.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="field custom">
-<label for="group-selection" id="group-selection-lbl">$label</label>
-<select name="group-selection" id="group-selection" >
-{{ for $groups as $group }}
-<option value="$group.id" {{ if $group.selected }}selected="selected"{{ endif }} >$group.name</option>
-{{ endfor }}
-</select>
-</div>
diff --git a/view/group_side.tpl b/view/group_side.tpl
deleted file mode 100644
index ebb194d9c0..0000000000
--- a/view/group_side.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-<div class="widget" id="group-sidebar">
-<h3>$title</h3>
-
-<div id="sidebar-group-list">
-	<ul id="sidebar-group-ul">
-		{{ for $groups as $group }}
-			<li class="sidebar-group-li">
-				{{ if $group.cid }}
-					<input type="checkbox" 
-						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
-						onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
-						{{ if $group.ismember }}checked="checked"{{ endif }}
-					/>
-				{{ endif }}			
-				{{ if $group.edit }}
-					<a class="groupsideedit" href="$group.edit.href" title="$edittext"><span id="edit-sidebar-group-element-$group.id" class="group-edit-icon iconspacer small-pencil"></span></a>
-				{{ endif }}
-				<a id="sidebar-group-element-$group.id" class="sidebar-group-element {{ if $group.selected }}group-selected{{ endif }}" href="$group.href">$group.text</a>
-			</li>
-		{{ endfor }}
-	</ul>
-	</div>
-  <div id="sidebar-new-group">
-  <a href="group/new">$createtext</a>
-  </div>
-  {{ if $ungrouped }}
-  <div id="sidebar-ungrouped">
-  <a href="nogroup">$ungrouped</a>
-  </div>
-  {{ endif }}
-</div>
-
-
diff --git a/view/groupeditor.tpl b/view/groupeditor.tpl
deleted file mode 100644
index 755985eb35..0000000000
--- a/view/groupeditor.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<div id="group">
-<h3>$groupeditor.label_members</h3>
-<div id="group-members" class="contact_list">
-{{ for $groupeditor.members as $c}} $c {{ endfor }}
-</div>
-<div id="group-members-end"></div>
-<hr id="group-separator" />
-</div>
-
-<div id="contacts">
-<h3>$groupeditor.label_contacts</h3>
-<div id="group-all-contacts" class="contact_list">
-{{ for $groupeditor.contacts as $m}} $m {{ endfor }}
-</div>
-<div id="group-all-contacts-end"></div>
-</div>
diff --git a/view/head.tpl b/view/head.tpl
deleted file mode 100644
index 7b1ed7de93..0000000000
--- a/view/head.tpl
+++ /dev/null
@@ -1,112 +0,0 @@
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<base href="$baseurl/" />
-<meta name="generator" content="$generator" />
-{#<!--<link rel="stylesheet" href="$baseurl/library/fancybox/jquery.fancybox.css" type="text/css" media="screen" />-->#}
-<link rel="stylesheet" href="$baseurl/library/colorbox/colorbox.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
-
-<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-
-<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
-
-<link rel="apple-touch-icon" href="$baseurl/images/friendica-128.png"/>
-<meta name="apple-mobile-web-app-capable" content="yes" /> 
-
-
-<link rel="search"
-         href="$baseurl/opensearch" 
-         type="application/opensearchdescription+xml" 
-         title="Search in Friendica" />
-
-<!--[if IE]>
-<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-<![endif]-->
-<script type="text/javascript" src="$baseurl/js/jquery.js" ></script>
-<script type="text/javascript" src="$baseurl/js/jquery.textinputs.js" ></script>
-<script type="text/javascript" src="$baseurl/js/fk.autocomplete.js" ></script>
-{#<!--<script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox.pack.js"></script>-->#}
-<script type="text/javascript" src="$baseurl/library/colorbox/jquery.colorbox-min.js"></script>
-<script type="text/javascript" src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script>
-<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js" ></script>
-<script type="text/javascript" src="$baseurl/js/acl.js" ></script>
-<script type="text/javascript" src="$baseurl/js/webtoolkit.base64.js" ></script>
-<script type="text/javascript" src="$baseurl/js/main.js" ></script>
-<script>
-
-	var updateInterval = $update_interval;
-	var localUser = {{ if $local_user }}$local_user{{ else }}false{{ endif }};
-
-	function confirmDelete() { return confirm("$delitem"); }
-	function commentOpen(obj,id) {
-		if(obj.value == '$comment') {
-			obj.value = '';
-			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-			$("#mod-cmnt-wrap-" + id).show();
-			openMenu("comment-edit-submit-wrapper-" + id);
-			return true;
-		}
-		return false;
-	}
-	function commentClose(obj,id) {
-		if(obj.value == '') {
-			obj.value = '$comment';
-			$("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
-			$("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
-			$("#mod-cmnt-wrap-" + id).hide();
-			closeMenu("comment-edit-submit-wrapper-" + id);
-			return true;
-		}
-		return false;
-	}
-
-
-	function commentInsert(obj,id) {
-		var tmpStr = $("#comment-edit-text-" + id).val();
-		if(tmpStr == '$comment') {
-			tmpStr = '';
-			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-			openMenu("comment-edit-submit-wrapper-" + id);
-		}
-		var ins = $(obj).html();
-		ins = ins.replace('&lt;','<');
-		ins = ins.replace('&gt;','>');
-		ins = ins.replace('&amp;','&');
-		ins = ins.replace('&quot;','"');
-		$("#comment-edit-text-" + id).val(tmpStr + ins);
-	}
-
-	function qCommentInsert(obj,id) {
-		var tmpStr = $("#comment-edit-text-" + id).val();
-		if(tmpStr == '$comment') {
-			tmpStr = '';
-			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-			openMenu("comment-edit-submit-wrapper-" + id);
-		}
-		var ins = $(obj).val();
-		ins = ins.replace('&lt;','<');
-		ins = ins.replace('&gt;','>');
-		ins = ins.replace('&amp;','&');
-		ins = ins.replace('&quot;','"');
-		$("#comment-edit-text-" + id).val(tmpStr + ins);
-		$(obj).val('');
-	}
-
-	window.showMore = "$showmore";
-	window.showFewer = "$showfewer";
-
-	function showHideCommentBox(id) {
-		if( $('#comment-edit-form-' + id).is(':visible')) {
-			$('#comment-edit-form-' + id).hide();
-		}
-		else {
-			$('#comment-edit-form-' + id).show();
-		}
-	}
-
-
-</script>
-
-
diff --git a/view/hide_comments.tpl b/view/hide_comments.tpl
deleted file mode 100644
index 55ee9dd7b1..0000000000
--- a/view/hide_comments.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="hide-comments-outer">
-<span id="hide-comments-total-$id" class="hide-comments-total">$num_comments</span> <span id="hide-comments-$id" class="hide-comments fakelink" onclick="showHideComments($id);">$hide_text</span>
-</div>
-<div id="collapsed-comments-$id" class="collapsed-comments" style="display: $display;">
diff --git a/view/install.tpl b/view/install.tpl
deleted file mode 100644
index b3a5f46fff..0000000000
--- a/view/install.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-
-<h1>$title</h1>
-<h2>$pass</h2>
-
-
-{{ if $status }}
-<h3 class="error-message">$status</h3>
-{{ endif }}
-
-$text
diff --git a/view/install_checks.tpl b/view/install_checks.tpl
deleted file mode 100644
index a3aa2b2660..0000000000
--- a/view/install_checks.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-<h1>$title</h1>
-<h2>$pass</h2>
-<form  action="$baseurl/index.php?q=install" method="post">
-<table>
-{{ for $checks as $check }}
-	<tr><td>$check.title </td><td><span class="icon s22 {{if $check.status}}on{{else}}{{if $check.required}}off{{else}}yellow{{endif}}{{endif}}"></td><td>{{if $check.required}}(required){{endif}}</td></tr>
-	{{if $check.help }}
-	<tr><td colspan="3"><blockquote>$check.help</blockquote></td></tr>
-	{{endif}}
-{{ endfor }}
-</table>
-
-{{ if $phpath }}
-	<input type="hidden" name="phpath" value="$phpath">
-{{ endif }}
-
-{{ if $passed }}
-	<input type="hidden" name="pass" value="2">
-	<input type="submit" value="$next">
-{{ else }}
-	<input type="hidden" name="pass" value="1">
-	<input type="submit" value="$reload">
-{{ endif }}
-</form>
diff --git a/view/install_db.tpl b/view/install_db.tpl
deleted file mode 100644
index 1302b5a708..0000000000
--- a/view/install_db.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-
-<h1>$title</h1>
-<h2>$pass</h2>
-
-
-<p>
-$info_01<br>
-$info_02<br>
-$info_03
-</p>
-
-{{ if $status }}
-<h3 class="error-message">$status</h3>
-{{ endif }}
-
-<form id="install-form" action="$baseurl/install" method="post">
-
-<input type="hidden" name="phpath" value="$phpath" />
-<input type="hidden" name="pass" value="3" />
-
-{{ inc field_input.tpl with $field=$dbhost }}{{endinc}}
-{{ inc field_input.tpl with $field=$dbuser }}{{endinc}}
-{{ inc field_password.tpl with $field=$dbpass }}{{endinc}}
-{{ inc field_input.tpl with $field=$dbdata }}{{endinc}}
-
-
-<input id="install-submit" type="submit" name="submit" value="$submit" /> 
-
-</form>
-
diff --git a/view/install_settings.tpl b/view/install_settings.tpl
deleted file mode 100644
index 05b87f904e..0000000000
--- a/view/install_settings.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-
-<h1>$title</h1>
-<h2>$pass</h2>
-
-
-{{ if $status }}
-<h3 class="error-message">$status</h3>
-{{ endif }}
-
-<form id="install-form" action="$baseurl/install" method="post">
-
-<input type="hidden" name="phpath" value="$phpath" />
-<input type="hidden" name="dbhost" value="$dbhost" />
-<input type="hidden" name="dbuser" value="$dbuser" />
-<input type="hidden" name="dbpass" value="$dbpass" />
-<input type="hidden" name="dbdata" value="$dbdata" />
-<input type="hidden" name="pass" value="4" />
-
-{{ inc field_input.tpl with $field=$adminmail }}{{endinc}}
-$timezone
-
-<input id="install-submit" type="submit" name="submit" value="$submit" /> 
-
-</form>
-
diff --git a/view/intros.tpl b/view/intros.tpl
deleted file mode 100644
index e7fd53ca4f..0000000000
--- a/view/intros.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-
-<div class="intro-wrapper" id="intro-$contact_id" >
-
-<p class="intro-desc">$str_notifytype $notify_type</p>
-<div class="intro-fullname" id="intro-fullname-$contact_id" >$fullname</div>
-<a class="intro-url-link" id="intro-url-link-$contact_id" href="$url" ><img id="photo-$contact_id" class="intro-photo" src="$photo" width="175" height=175" title="$fullname" alt="$fullname" /></a>
-<div class="intro-knowyou">$knowyou</div>
-<div class="intro-note" id="intro-note-$contact_id">$note</div>
-<div class="intro-wrapper-end" id="intro-wrapper-end-$contact_id"></div>
-<form class="intro-form" action="notifications/$intro_id" method="post">
-<input class="intro-submit-ignore" type="submit" name="submit" value="$ignore" />
-<input class="intro-submit-discard" type="submit" name="submit" value="$discard" />
-</form>
-<div class="intro-form-end"></div>
-
-<form class="intro-approve-form" action="dfrn_confirm" method="post">
-{{inc field_checkbox.tpl with $field=$hidden }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$activity }}{{endinc}}
-<input type="hidden" name="dfrn_id" value="$dfrn_id" >
-<input type="hidden" name="intro_id" value="$intro_id" >
-<input type="hidden" name="contact_id" value="$contact_id" >
-
-$dfrn_text
-
-<input class="intro-submit-approve" type="submit" name="submit" value="$approve" />
-</form>
-</div>
-<div class="intro-end"></div>
diff --git a/view/invite.tpl b/view/invite.tpl
deleted file mode 100644
index e00d27d4ae..0000000000
--- a/view/invite.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-<form action="invite" method="post" id="invite-form" >
-
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-<div id="invite-wrapper">
-
-<h3>$invite</h3>
-
-<div id="invite-recipient-text">
-$addr_text
-</div>
-
-<div id="invite-recipient-textarea">
-<textarea id="invite-recipients" name="recipients" rows="8" cols="32" ></textarea>
-</div>
-
-<div id="invite-message-text">
-$msg_text
-</div>
-
-<div id="invite-message-textarea">
-<textarea id="invite-message" name="message" rows="10" cols="72" >$default_message</textarea>
-</div>
-
-<div id="invite-submit-wrapper">
-<input type="submit" name="submit" value="$submit" />
-</div>
-
-</div>
-</form>
diff --git a/view/jot-end.tpl b/view/jot-end.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
deleted file mode 100644
index a442c4c648..0000000000
--- a/view/jot-header.tpl
+++ /dev/null
@@ -1,322 +0,0 @@
-
-<script language="javascript" type="text/javascript">
-
-var editor=false;
-var textlen = 0;
-var plaintext = '$editselect';
-
-function initEditor(cb){
-	if (editor==false){
-		$("#profile-jot-text-loading").show();
-		if(plaintext == 'none') {
-			$("#profile-jot-text-loading").hide();
-			$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
-			$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
-			editor = true;
-			$("a#jot-perms-icon").colorbox({
-				'inline' : true,
-				'transition' : 'elastic'
-			});
-			$(".jothidden").show();
-			if (typeof cb!="undefined") cb();
-			return;
-		}	
-		tinyMCE.init({
-			theme : "advanced",
-			mode : "specific_textareas",
-			editor_selector: $editselect,
-			auto_focus: "profile-jot-text",
-			plugins : "bbcode,paste,autoresize, inlinepopups",
-			theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
-			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 : 'div',
-			convert_urls: false,
-			content_css: "$baseurl/view/custom_tinymce.css",
-			theme_advanced_path : false,
-			file_browser_callback : "fcFileBrowser",
-			setup : function(ed) {
-				cPopup = null;
-				ed.onKeyDown.add(function(ed,e) {
-					if(cPopup !== null)
-						cPopup.onkey(e);
-				});
-
-				ed.onKeyUp.add(function(ed, e) {
-					var txt = tinyMCE.activeEditor.getContent();
-					match = txt.match(/@([^ \n]+)$/);
-					if(match!==null) {
-						if(cPopup === null) {
-							cPopup = new ACPopup(this,baseurl+"/acl");
-						}
-						if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
-						if(! cPopup.ready) cPopup = null;
-					}
-					else {
-						if(cPopup !== null) { cPopup.close(); cPopup = null; }
-					}
-
-					textlen = txt.length;
-					if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
-						$('#profile-jot-desc').html(ispublic);
-					}
-					else {
-						$('#profile-jot-desc').html('&nbsp;');
-					}	 
-
-				 //Character count
-
-					if(textlen <= 140) {
-						$('#character-counter').removeClass('red');
-						$('#character-counter').removeClass('orange');
-						$('#character-counter').addClass('grey');
-					}
-					if((textlen > 140) && (textlen <= 420)) {
-						$('#character-counter').removeClass('grey');
-						$('#character-counter').removeClass('red');
-						$('#character-counter').addClass('orange');
-					}
-					if(textlen > 420) {
-						$('#character-counter').removeClass('grey');
-						$('#character-counter').removeClass('orange');
-						$('#character-counter').addClass('red');
-					}
-					$('#character-counter').text(textlen);
-				});
-
-				ed.onInit.add(function(ed) {
-					ed.pasteAsPlainText = true;
-					$("#profile-jot-text-loading").hide();
-					$(".jothidden").show();
-					if (typeof cb!="undefined") cb();
-				});
-
-			}
-		});
-		editor = true;
-		// setup acl popup
-		$("a#jot-perms-icon").colorbox({
-			'inline' : true,
-			'transition' : 'elastic'
-		}); 
-	} else {
-		if (typeof cb!="undefined") cb();
-	}
-}
-
-function enableOnUser(){
-	if (editor) return;
-	$(this).val("");
-	initEditor();
-}
-
-</script>
-<script type="text/javascript" src="$baseurl/js/ajaxupload.js" ></script>
-<script>
-	var ispublic = '$ispublic';
-
-	$(document).ready(function() {
-		
-		/* enable tinymce on focus and click */
-		$("#profile-jot-text").focus(enableOnUser);
-		$("#profile-jot-text").click(enableOnUser);
-
-		var uploader = new window.AjaxUpload(
-			'wall-image-upload',
-			{ action: 'wall_upload/$nickname',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);
-		var file_uploader = new window.AjaxUpload(
-			'wall-file-upload',
-			{ action: 'wall_attach/$nickname',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);
-
-
-	});
-
-	function deleteCheckedItems() {
-		if(confirm('$delitems')) {
-			var checkedstr = '';
-
-			$("#item-delete-selected").hide();
-			$('#item-delete-selected-rotator').show();
-
-			$('.item-select').each( function() {
-				if($(this).is(':checked')) {
-					if(checkedstr.length != 0) {
-						checkedstr = checkedstr + ',' + $(this).val();
-					}
-					else {
-						checkedstr = $(this).val();
-					}
-				}	
-			});
-			$.post('item', { dropitems: checkedstr }, function(data) {
-				window.location.reload();
-			});
-		}
-	}
-
-	function jotGetLink() {
-		reply = prompt("$linkurl");
-		if(reply && reply.length) {
-			reply = bin2hex(reply);
-			$('#profile-rotator').show();
-			$.get('parse_url?binurl=' + reply, function(data) {
-				addeditortext(data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-	function jotVideoURL() {
-		reply = prompt("$vidurl");
-		if(reply && reply.length) {
-			addeditortext('[video]' + reply + '[/video]');
-		}
-	}
-
-	function jotAudioURL() {
-		reply = prompt("$audurl");
-		if(reply && reply.length) {
-			addeditortext('[audio]' + reply + '[/audio]');
-		}
-	}
-
-
-	function jotGetLocation() {
-		reply = prompt("$whereareu", $('#jot-location').val());
-		if(reply && reply.length) {
-			$('#jot-location').val(reply);
-		}
-	}
-
-	function jotShare(id) {
-		if ($('#jot-popup').length != 0) $('#jot-popup').show();
-
-		$('#like-rotator-' + id).show();
-		$.get('share/' + id, function(data) {
-			if (!editor) $("#profile-jot-text").val("");
-			initEditor(function(){
-				addeditortext(data);
-				$('#like-rotator-' + id).hide();
-				$(window).scrollTop(0);
-			});
-
-		});
-	}
-
-	function linkdropper(event) {
-		var linkFound = event.dataTransfer.types.contains("text/uri-list");
-		if(linkFound)
-			event.preventDefault();
-	}
-
-	function linkdrop(event) {
-		var reply = event.dataTransfer.getData("text/uri-list");
-		event.target.textContent = reply;
-		event.preventDefault();
-		if(reply && reply.length) {
-			reply = bin2hex(reply);
-			$('#profile-rotator').show();
-			$.get('parse_url?binurl=' + reply, function(data) {
-				if (!editor) $("#profile-jot-text").val("");
-				initEditor(function(){
-					addeditortext(data);
-					$('#profile-rotator').hide();
-				});
-			});
-		}
-	}
-
-	function itemTag(id) {
-		reply = prompt("$term");
-		if(reply && reply.length) {
-			reply = reply.replace('#','');
-			if(reply.length) {
-
-				commentBusy = true;
-				$('body').css('cursor', 'wait');
-
-				$.get('tagger/' + id + '?term=' + reply);
-				if(timer) clearTimeout(timer);
-				timer = setTimeout(NavUpdate,3000);
-				liking = 1;
-			}
-		}
-	}
-
-	function itemFiler(id) {
-		
-		var bordercolor = $("input").css("border-color");
-		
-		$.get('filer/', function(data){
-			$.colorbox({html:data});
-			$("#id_term").keypress(function(){
-				$(this).css("border-color",bordercolor);
-			})
-			$("#select_term").change(function(){
-				$("#id_term").css("border-color",bordercolor);
-			})
-			
-			$("#filer_save").click(function(e){
-				e.preventDefault();
-				reply = $("#id_term").val();
-				if(reply && reply.length) {
-					commentBusy = true;
-					$('body').css('cursor', 'wait');
-					$.get('filer/' + id + '?term=' + reply, NavUpdate);
-//					if(timer) clearTimeout(timer);
-//					timer = setTimeout(NavUpdate,3000);
-					liking = 1;
-					$.colorbox.close();
-				} else {
-					$("#id_term").css("border-color","#FF0000");
-				}
-				return false;
-			});
-		});
-		
-	}
-
-	function jotClearLocation() {
-		$('#jot-coord').val('');
-		$('#profile-nolocation-wrapper').hide();
-	}
-
-	function addeditortext(data) {
-		if(plaintext == 'none') {
-			var currentText = $("#profile-jot-text").val();
-			$("#profile-jot-text").val(currentText + data);
-		}
-		else
-			tinyMCE.execCommand('mceInsertRawHTML',false,data);
-	}	
-
-	$geotag
-
-</script>
-
diff --git a/view/jot.tpl b/view/jot.tpl
deleted file mode 100644
index 61d7273070..0000000000
--- a/view/jot.tpl
+++ /dev/null
@@ -1,88 +0,0 @@
-
-<div id="profile-jot-wrapper" >
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey"></div>
-	</div>
-	<div id="profile-jot-banner-end"></div>
-
-	<form id="profile-jot-form" action="$action" method="post" >
-		<input type="hidden" name="type" value="$ptyp" />
-		<input type="hidden" name="profile_uid" value="$profile_uid" />
-		<input type="hidden" name="return" value="$return_path" />
-		<input type="hidden" name="location" id="jot-location" value="$defloc" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="$post_id" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input type="hidden" name="post_id_random" value="$rand_num" />
-		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div>
-		{{ if $placeholdercategory }}
-		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
-		{{ endif }}
-		<div id="jot-text-wrap">
-		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
-		</div>
-
-<div id="profile-jot-submit-wrapper" class="jothidden">
-	<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
-
-	<div id="profile-upload-wrapper" style="display: $visitor;" >
-		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div>
-	</div> 
-	<div id="profile-attach-wrapper" style="display: $visitor;" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="$attach"></a></div>
-	</div> 
-
-	<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a id="profile-link" class="icon link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" style="display: $visitor;" >
-		<a id="profile-video" class="icon video" title="$video" onclick="jotVideoURL();return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" style="display: $visitor;" >
-		<a id="profile-audio" class="icon audio" title="$audio" onclick="jotAudioURL();return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" style="display: $visitor;" >
-		<a id="profile-location" class="icon globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" style="display: none;" >
-		<a id="profile-nolocation" class="icon noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
-	</div> 
-
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
-		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
-	</div>
-
-	<span onclick="preview_post();" id="jot-preview-link" class="fakelink">$preview</span>
-
-	<div id="profile-jot-perms-end"></div>
-
-
-	<div id="profile-jot-plugin-wrapper">
-  	$jotplugins
-	</div>
-
-	<div id="profile-rotator-wrapper" style="display: $visitor;" >
-		<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-	
-	<div id="jot-preview-content" style="display:none;"></div>
-
-	<div style="display: none;">
-		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-			$acl
-			<hr style="clear:both"/>
-			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-			<div id="profile-jot-email-end"></div>
-			$jotnets
-		</div>
-	</div>
-
-
-</div>
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
-		{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/jot_geotag.tpl b/view/jot_geotag.tpl
deleted file mode 100644
index b0f71e73bf..0000000000
--- a/view/jot_geotag.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-
-	if(navigator.geolocation) {
-		navigator.geolocation.getCurrentPosition(function(position) {
-			$('#jot-coord').val(position.coords.latitude + ' ' + position.coords.longitude);
-			$('#profile-nolocation-wrapper').show();
-		});
-	}
-
diff --git a/view/lang_selector.tpl b/view/lang_selector.tpl
deleted file mode 100644
index b3a527b40f..0000000000
--- a/view/lang_selector.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="lang-select-icon" class="icon s22 language" title="$title" onclick="openClose('language-selector');" >lang</div>
-<div id="language-selector" style="display: none;" >
-	<form action="#" method="post" >
-		<select name="system_language" onchange="this.form.submit();" >
-			{{ for $langs.0 as $v=>$l }}
-				<option value="$v" {{if $v==$langs.1}}selected="selected"{{endif}}>$l</option>
-			{{ endfor }}
-		</select>
-	</form>
-</div>
diff --git a/view/like_noshare.tpl b/view/like_noshare.tpl
deleted file mode 100644
index 777b2e3594..0000000000
--- a/view/like_noshare.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
-	<a href="#" class="icon like" title="$likethis" onclick="dolike($id,'like'); return false"></a>
-	{{ if $nolike }}
-	<a href="#" class="icon dislike" title="$nolike" onclick="dolike($id,'dislike'); return false"></a>
-	{{ endif }}
-	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-</div>
diff --git a/view/login.tpl b/view/login.tpl
deleted file mode 100644
index 297b36c9ac..0000000000
--- a/view/login.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-
-<form action="$dest_url" method="post" >
-	<input type="hidden" name="auth-params" value="login" />
-
-	<div id="login_standard">
-	{{ inc field_input.tpl with $field=$lname }}{{ endinc }}
-	{{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
-	</div>
-	
-	{{ if $openid }}
-			<div id="login_openid">
-			{{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
-			</div>
-	{{ endif }}
-
-	{{ inc field_checkbox.tpl with $field=$lremember }}{{ endinc }}
-
-	<div id="login-extra-links">
-		{{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
-        <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
-	</div>
-	
-	<div id="login-submit-wrapper" >
-		<input type="submit" name="submit" id="login-submit-button" value="$login" />
-	</div>
-	
-	{{ for $hiddens as $k=>$v }}
-		<input type="hidden" name="$k" value="$v" />
-	{{ endfor }}
-	
-	
-</form>
-
-
-<script type="text/javascript"> $(document).ready(function() { $("#id_$lname.0").focus();} );</script>
diff --git a/view/login_head.tpl b/view/login_head.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/logout.tpl b/view/logout.tpl
deleted file mode 100644
index efc971df84..0000000000
--- a/view/logout.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<form action="$dest_url" method="post" >
-<div class="logout-wrapper">
-<input type="hidden" name="auth-params" value="logout" />
-<input type="submit" name="submit" id="logout-button" value="$logout" />
-</div>
-</form>
diff --git a/view/lostpass.tpl b/view/lostpass.tpl
deleted file mode 100644
index cd3644157a..0000000000
--- a/view/lostpass.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<h3>$title</h3>
-
-<p id="lostpass-desc">
-$desc
-</p>
-
-<form action="lostpass" method="post" >
-<div id="login-name-wrapper">
-        <label for="login-name" id="label-login-name">$name</label>
-        <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
-</div>
-<div id="login-extra-end"></div>
-<div id="login-submit-wrapper" >
-        <input type="submit" name="submit" id="lostpass-submit-button" value="$submit" />
-</div>
-<div id="login-submit-end"></div>
-</form>
-
diff --git a/view/magicsig.tpl b/view/magicsig.tpl
deleted file mode 100644
index 75f9bc475b..0000000000
--- a/view/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/mail_conv.tpl b/view/mail_conv.tpl
deleted file mode 100644
index 75a4506f6a..0000000000
--- a/view/mail_conv.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="mail-conv-outside-wrapper">
-	<div class="mail-conv-sender" >
-		<a href="$mail.from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$mail.sparkle" src="$mail.from_photo" heigth="80" width="80" alt="$mail.from_name" /></a>
-	</div>
-	<div class="mail-conv-detail" >
-		<div class="mail-conv-sender-name" >$mail.from_name</div>
-		<div class="mail-conv-date">$mail.date</div>
-		<div class="mail-conv-subject">$mail.subject</div>
-		<div class="mail-conv-body">$mail.body</div>
-	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
-	<div class="mail-conv-outside-wrapper-end"></div>
-</div>
-</div>
-<hr class="mail-conv-break" />
diff --git a/view/mail_display.tpl b/view/mail_display.tpl
deleted file mode 100644
index b328d32a27..0000000000
--- a/view/mail_display.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-
-{{ for $mails as $mail }}
-	{{ inc mail_conv.tpl }}{{endinc}}
-{{ endfor }}
-
-{{ if $canreply }}
-{{ inc prv_message.tpl }}{{ endinc }}
-{{ else }}
-$unknown_text
-{{endif }}
diff --git a/view/mail_head.tpl b/view/mail_head.tpl
deleted file mode 100644
index afb65f5373..0000000000
--- a/view/mail_head.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<h3>$messages</h3>
-
-$tab_content
diff --git a/view/mail_list.tpl b/view/mail_list.tpl
deleted file mode 100644
index 22e35dec81..0000000000
--- a/view/mail_list.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="mail-list-outside-wrapper">
-	<div class="mail-list-sender" >
-		<a href="$from_url" class="mail-list-sender-url" ><img class="mail-list-sender-photo$sparkle" src="$from_photo" height="80" width="80" alt="$from_name" /></a>
-	</div>
-	<div class="mail-list-detail">
-		<div class="mail-list-sender-name" >$from_name</div>
-		<div class="mail-list-date">$date</div>
-		<div class="mail-list-subject"><a href="message/$id" class="mail-list-link">$subject</a></div>
-	<div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-$id" >
-		<a href="message/dropconv/$id" onclick="return confirmDelete();"  title="$delete" class="icon drophide mail-list-delete	delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
-	</div>
-</div>
-</div>
-<div class="mail-list-delete-end"></div>
-
-<div class="mail-list-outside-wrapper-end"></div>
diff --git a/view/maintenance.tpl b/view/maintenance.tpl
deleted file mode 100644
index bbe15d46a8..0000000000
--- a/view/maintenance.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<div id="maintenance-message">$sysdown</div>
diff --git a/view/manage.tpl b/view/manage.tpl
deleted file mode 100644
index 24497b42c6..0000000000
--- a/view/manage.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<h3>$title</h3>
-<div id="identity-manage-desc">$desc</div>
-<div id="identity-manage-choose">$choose</div>
-<div id="identity-selector-wrapper">
-	<form action="manage" method="post" >
-	<select name="identity" size="4" onchange="this.form.submit();" >
-
-	{{ for $identities as $id }}
-		<option $id.selected value="$id.uid">$id.username ($id.nickname)</option>
-	{{ endfor }}
-
-	</select>
-	<div id="identity-select-break"></div>
-
-	{#<!--<input id="identity-submit" type="submit" name="submit" value="$submit" />-->#}
-</div></form>
-
diff --git a/view/match.tpl b/view/match.tpl
deleted file mode 100644
index b052845ae7..0000000000
--- a/view/match.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="profile-match-wrapper">
-	<div class="profile-match-photo">
-		<a href="$url">
-			<img src="$photo" alt="$name" title="$name[$tags]" />
-		</a>
-	</div>
-	<div class="profile-match-break"></div>
-	<div class="profile-match-name">
-		<a href="$url" title="$name[$tags]">$name</a>
-	</div>
-	<div class="profile-match-end"></div>
-	{{ if $connlnk }}
-	<div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div>
-	{{ endif }}
-
-</div>
diff --git a/view/message-end.tpl b/view/message-end.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/message-head.tpl b/view/message-head.tpl
deleted file mode 100644
index 91c322fda4..0000000000
--- a/view/message-head.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<script src="$baseurl/library/jquery_ac/friendica.complete.js" ></script>
-
-<script>$(document).ready(function() { 
-	var a; 
-	a = $("#recip").autocomplete({ 
-		serviceUrl: '$base/acl',
-		minChars: 2,
-		width: 350,
-		onSelect: function(value,data) {
-			$("#recip-complete").val(data);
-		}			
-	});
-
-}); 
-
-</script>
-
diff --git a/view/message_side.tpl b/view/message_side.tpl
deleted file mode 100644
index fce771bd5d..0000000000
--- a/view/message_side.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="message-sidebar" class="widget">
-	<div id="message-new"><a href="$new.url" class="{{ if $new.sel }}newmessage-selected{{ endif }}">$new.label</a> </div>
-	
-	<ul class="message-ul">
-		{{ for $tabs as $t }}
-			<li class="tool"><a href="$t.url" class="message-link{{ if $t.sel }}message-selected{{ endif }}">$t.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/moderated_comment.tpl b/view/moderated_comment.tpl
deleted file mode 100644
index 911c35f33e..0000000000
--- a/view/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/mood_content.tpl b/view/mood_content.tpl
deleted file mode 100644
index 9349c56aef..0000000000
--- a/view/mood_content.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<h3>$title</h3>
-
-<div id="mood-desc">$desc</div>
-
-<form action="mood" method="get">
-<br />
-<br />
-
-<input id="mood-parent" type="hidden" value="$parent" name="parent" />
-
-<select name="verb" id="mood-verb-select" >
-{{ for $verbs as $v }}
-<option value="$v.0">$v.1</option>
-{{ endfor }}
-</select>
-<br />
-<br />
-<input type="submit" name="submit" value="$submit" />
-</form>
-
diff --git a/view/msg-end.tpl b/view/msg-end.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/msg-header.tpl b/view/msg-header.tpl
deleted file mode 100644
index 8517ef3832..0000000000
--- a/view/msg-header.tpl
+++ /dev/null
@@ -1,97 +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 : 'div',
-		convert_urls: false,
-		content_css: "$baseurl/view/custom_tinymce.css",
-		     //Character count
-		theme_advanced_path : false,
-		setup : function(ed) {
-			ed.onInit.add(function(ed) {
-				ed.pasteAsPlainText = true;
-				var editorId = ed.editorId;
-				var textarea = $('#'+editorId);
-				if (typeof(textarea.attr('tabindex')) != "undefined") {
-					$('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
-					textarea.attr('tabindex', null);
-				}
-			});
-		}
-	});
-}
-else
-	$("#prvmail-text").contact_autocomplete(baseurl+"/acl");
-
-
-</script>
-<script type="text/javascript" src="js/ajaxupload.js" ></script>
-<script>
-	$(document).ready(function() {
-		var uploader = new window.AjaxUpload(
-			'prvmail-upload',
-			{ action: 'wall_upload/$nickname',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					tinyMCE.execCommand('mceInsertRawHTML',false,response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);
-
-	});
-
-	function jotGetLink() {
-		reply = prompt("$linkurl");
-		if(reply && reply.length) {
-			$('#profile-rotator').show();
-			$.get('parse_url?url=' + reply, function(data) {
-				tinyMCE.execCommand('mceInsertRawHTML',false,data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-	function linkdropper(event) {
-		var linkFound = event.dataTransfer.types.contains("text/uri-list");
-		if(linkFound)
-			event.preventDefault();
-	}
-
-	function linkdrop(event) {
-		var reply = event.dataTransfer.getData("text/uri-list");
-		event.target.textContent = reply;
-		event.preventDefault();
-		if(reply && reply.length) {
-			$('#profile-rotator').show();
-			$.get('parse_url?url=' + reply, function(data) {
-				tinyMCE.execCommand('mceInsertRawHTML',false,data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-</script>
-
diff --git a/view/nav.tpl b/view/nav.tpl
deleted file mode 100644
index 04c4931fc6..0000000000
--- a/view/nav.tpl
+++ /dev/null
@@ -1,68 +0,0 @@
-<nav>
-	$langselector
-
-	<div id="site-location">$sitelocation</div>
-
-	{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
-	{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-
-	<span id="nav-link-wrapper" >
-
-	{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-		
-	{{ if $nav.help }} <a id="nav-help-link" class="nav-link $nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>{{ endif }}
-		
-	{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
-	<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
-	<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
-	{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
-	{{ if $nav.network }}
-	<a id="nav-network-link" class="nav-commlink $nav.network.2 $sel.network" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
-	<span id="net-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	{{ if $nav.home }}
-	<a id="nav-home-link" class="nav-commlink $nav.home.2 $sel.home" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
-	<span id="home-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	{{ if $nav.community }}
-	<a id="nav-community-link" class="nav-commlink $nav.community.2 $sel.community" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
-	{{ endif }}
-	{{ if $nav.introductions }}
-	<a id="nav-notify-link" class="nav-commlink $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a>
-	<span id="intro-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	{{ if $nav.messages }}
-	<a id="nav-messages-link" class="nav-commlink $nav.messages.2 $sel.messages" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
-	<span id="mail-update" class="nav-ajax-left"></span>
-	{{ endif }}
-
-
-
-	{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-
-
-		{{ if $nav.notifications }}
-			<a id="nav-notifications-linkmenu" class="nav-commlink" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>
-				<span id="notify-update" class="nav-ajax-left"></span>
-				<ul id="nav-notifications-menu" class="menu-popup">
-					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-					<li class="empty">$emptynotifications</li>
-				</ul>
-		{{ endif }}		
-
-	{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
-	{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
-	{{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
-	</span>
-	<span id="nav-end"></span>
-	<span id="banner">$banner</span>
-</nav>
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
-</ul>
diff --git a/view/navigation.tpl b/view/navigation.tpl
deleted file mode 100644
index 3e03efa30a..0000000000
--- a/view/navigation.tpl
+++ /dev/null
@@ -1,103 +0,0 @@
-{#
- # LOGIN/REGISTER
- #}
-<center>
-{# Use nested if's since the Friendica template engine doesn't support AND or OR in if statements #}
-{{ if $nav.login }}
-<div id="navigation-login-wrapper" >
-{{ else }}
-{{ if $nav.register }}
-<div id="navigation-login-wrapper" >
-{{ endif }}
-{{ endif }}
-{{ if $nav.login }}<a id="navigation-login-link" class="navigation-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a><br/> {{ endif }}
-{{ if $nav.register }}<a id="navigation-register-link" class="navigation-link $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a><br/>{{ endif }}
-{{ if $nav.login }}
-</div>
-{{ else }}
-{{ if $nav.register }}
-</div>
-{{ endif }}
-{{ endif }}
-
-{#
- # NETWORK/HOME
- #}
-{{ if $nav.network }}
-<div id="navigation-network-wrapper" >
-{{ else }}
-{{ if $nav.home }}
-<div id="navigation-network-wrapper" >
-{{ else }}
-{{ if $nav.community }}
-<div id="navigation-network-wrapper" >
-{{ endif }}
-{{ endif }}
-{{ endif }}
-{{ if $nav.network }}
-<a id="navigation-network-link" class="navigation-link navigation-commlink $nav.network.2 $sel.network" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a><br/>
-<a class="navigation-link navigation-commlink" href="$nav.net_reset.0" title="$nav.net_reset.3">$nav.net_reset.1</a><br/>
-{{ endif }}
-{{ if $nav.home }}
-<a id="navigation-home-link" class="navigation-link navigation-commlink $nav.home.2 $sel.home" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a><br/>
-{{ endif }}
-{{ if $nav.community }}
-<a id="navigation-community-link" class="navigation-link navigation-commlink $nav.community.2 $sel.community" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a><br/>
-{{ endif }}
-{{ if $nav.network }}
-</div>
-{{ else }}
-{{ if $nav.home }}
-</div>
-{{ else }}
-{{ if $nav.community }}
-</div>
-{{ endif }}
-{{ endif }}
-{{ endif }}
-
-{#
- # PRIVATE MESSAGES
- #}
-{{ if $nav.messages }}
-<div id="navigation-messages-wrapper">
-<a id="navigation-messages-link" class="navigation-link navigation-commlink $nav.messages.2 $sel.messages" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a><br/>
-</div>
-{{ endif }}
-
-	
-{#
- # CONTACTS
- #}
-<div id="navigation-contacts-wrapper">
-{{ if $nav.contacts }}<a id="navigation-contacts-link" class="navigation-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a><br/>{{ endif }}
-<a id="navigation-directory-link" class="navigation-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a><br/>
-{{ if $nav.introductions }}
-<a id="navigation-notify-link" class="navigation-link navigation-commlink $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a><br/>
-{{ endif }}
-</div>
-
-{#
- # NOTIFICATIONS
- #}
-{{ if $nav.notifications }}
-<div id="navigation-notifications-wrapper">
-<a id="navigation-notifications-link" class="navigation-link navigation-commlink" href="$nav.notifications.0" rel="#navigation-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a><br/>
-</div>
-{{ endif }}		
-
-{#
- # MISCELLANEOUS
- #}
-<div id="navigation-misc-wrapper">
-{{ if $nav.settings }}<a id="navigation-settings-link" class="navigation-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a><br/>{{ endif }}
-{{ if $nav.manage }}<a id="navigation-manage-link" class="navigation-link navigation-commlink $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a><br/>{{ endif }}
-{{ if $nav.profiles }}<a id="navigation-profiles-link" class="navigation-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a><br/>{{ endif }}
-{{ if $nav.admin }}<a id="navigation-admin-link" class="navigation-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a><br/>{{ endif }}
-<a id="navigation-search-link" class="navigation-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a><br/>
-{{ if $nav.apps }}<a id="navigation-apps-link" class="navigation-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a><br/>{{ endif }}
-{{ if $nav.help }} <a id="navigation-help-link" class="navigation-link $nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a><br/>{{ endif }}
-</div>
-
-{{ if $nav.logout }}<a id="navigation-logout-link" class="navigation-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a><br/>{{ endif }}
-</center>
diff --git a/view/netfriend.tpl b/view/netfriend.tpl
deleted file mode 100644
index c2a92ce9ed..0000000000
--- a/view/netfriend.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="intro-approve-as-friend-desc">$approve_as</div>
-
-<div class="intro-approve-as-friend-wrapper">
-	<label class="intro-approve-as-friend-label" for="intro-approve-as-friend-$intro_id">$as_friend</label>
-	<input type="radio" name="duplex" id="intro-approve-as-friend-$intro_id" class="intro-approve-as-friend" $friend_selected value="1" />
-	<div class="intro-approve-friend-break" ></div>	
-</div>
-<div class="intro-approve-as-friend-end"></div>
-<div class="intro-approve-as-fan-wrapper">
-	<label class="intro-approve-as-fan-label" for="intro-approve-as-fan-$intro_id">$as_fan</label>
-	<input type="radio" name="duplex" id="intro-approve-as-fan-$intro_id" class="intro-approve-as-fan" $fan_selected value="0"  />
-	<div class="intro-approve-fan-break"></div>
-</div>
-<div class="intro-approve-as-end"></div>
diff --git a/view/nets.tpl b/view/nets.tpl
deleted file mode 100644
index 920c2332b6..0000000000
--- a/view/nets.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="nets-sidebar" class="widget">
-	<h3>$title</h3>
-	<div id="nets-desc">$desc</div>
-	<a href="$base?nets=all" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a>
-	<ul class="nets-ul">
-	{{ for $nets as $net }}
-	<li><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
-	{{ endfor }}
-	</ul>
-</div>
diff --git a/view/nogroup-template.tpl b/view/nogroup-template.tpl
deleted file mode 100644
index dd00ed097a..0000000000
--- a/view/nogroup-template.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<h1>$header</h1>
-
-{{ for $contacts as $contact }}
-	{{ inc contact_template.tpl }}{{ endinc }}
-{{ endfor }}
-<div id="contact-edit-end"></div>
-
-$paginate
-
-
-
-
diff --git a/view/notifications.tpl b/view/notifications.tpl
deleted file mode 100644
index 1a13b68b90..0000000000
--- a/view/notifications.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-
-<h1>$notif_header</h1>
-
-{{ inc common_tabs.tpl }}{{ endinc }}
-
-<div class="notif-network-wrapper">
-	$notif_content
-</div>
diff --git a/view/notifications_comments_item.tpl b/view/notifications_comments_item.tpl
deleted file mode 100644
index 73cc9f9480..0000000000
--- a/view/notifications_comments_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>
\ No newline at end of file
diff --git a/view/notifications_dislikes_item.tpl b/view/notifications_dislikes_item.tpl
deleted file mode 100644
index 73cc9f9480..0000000000
--- a/view/notifications_dislikes_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>
\ No newline at end of file
diff --git a/view/notifications_friends_item.tpl b/view/notifications_friends_item.tpl
deleted file mode 100644
index 73cc9f9480..0000000000
--- a/view/notifications_friends_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>
\ No newline at end of file
diff --git a/view/notifications_likes_item.tpl b/view/notifications_likes_item.tpl
deleted file mode 100644
index 389144d9b1..0000000000
--- a/view/notifications_likes_item.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="notif-item">
-	<a href="$item_link" target="friendica-notification"><img src="$item_image" class="notif-image">$item_text <span class="notif-when">$item_when</span></a>
-</div>
\ No newline at end of file
diff --git a/view/notifications_network_item.tpl b/view/notifications_network_item.tpl
deleted file mode 100644
index 261ab36432..0000000000
--- a/view/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/notifications_posts_item.tpl b/view/notifications_posts_item.tpl
deleted file mode 100644
index 73cc9f9480..0000000000
--- a/view/notifications_posts_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>
\ No newline at end of file
diff --git a/view/notify.tpl b/view/notify.tpl
deleted file mode 100644
index 73cc9f9480..0000000000
--- a/view/notify.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>
\ No newline at end of file
diff --git a/view/oauth_authorize.tpl b/view/oauth_authorize.tpl
deleted file mode 100644
index 31f02ac505..0000000000
--- a/view/oauth_authorize.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<h1>$title</h1>
-
-<div class='oauthapp'>
-	<img src='$app.icon'>
-	<h4>$app.name</h4>
-</div>
-<h3>$authorize</h3>
-<form method="POST">
-<div class="settings-submit-wrapper"><input  class="settings-submit"  type="submit" name="oauth_yes" value="$yes" /></div>
-</form>
diff --git a/view/oauth_authorize_done.tpl b/view/oauth_authorize_done.tpl
deleted file mode 100644
index 51eaea2484..0000000000
--- a/view/oauth_authorize_done.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<h1>$title</h1>
-
-<p>$info</p>
-<code>$code</code>
diff --git a/view/oembed_video.tpl b/view/oembed_video.tpl
deleted file mode 100755
index d3a9a93113..0000000000
--- a/view/oembed_video.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<a href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); return false;' style='float:left; margin: 1em; position: relative;'>
-	<img width='$tw' height='$th' src='$turl' >
-	<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url($baseurl/images/icons/48/play.png) no-repeat center center;'></div>
-</a>
diff --git a/view/oexchange_xrd.tpl b/view/oexchange_xrd.tpl
deleted file mode 100644
index 6735a3e04d..0000000000
--- a/view/oexchange_xrd.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
-        
-    <Subject>$base</Subject>
-
-    <Property 
-        type="http://www.oexchange.org/spec/0.8/prop/vendor">Friendica</Property>
-    <Property 
-        type="http://www.oexchange.org/spec/0.8/prop/title">Friendica Social Network</Property>
-    <Property 
-        type="http://www.oexchange.org/spec/0.8/prop/name">Friendica</Property>
-    <Property 
-        type="http://www.oexchange.org/spec/0.8/prop/prompt">Send to Friendica</Property>
-
-    <Link 
-        rel="icon" 
-        href="$base/images/friendica-16.png"
-        type="image/png" 
-        />
-
-    <Link 
-        rel="icon32" 
-        href="$base/images/friendica-32.png"
-        type="image/png" 
-        />
-
-    <Link 
-        rel= "http://www.oexchange.org/spec/0.8/rel/offer" 
-        href="$base/oexchange"
-        type="text/html" 
-        />
-</XRD>
-
diff --git a/view/opensearch.tpl b/view/opensearch.tpl
deleted file mode 100644
index 4b5c01bc90..0000000000
--- a/view/opensearch.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
-	<ShortName>Friendica@$nodename</ShortName>
-	<Description>Search in Friendica@$nodename</Description>
-	<Contact>http://bugs.friendica.com/</Contact>
-	<Image height="16" width="16" type="image/png">$baseurl/images/friendica-16.png</Image>
-	<Image height="64" width="64" type="image/png">$baseurl/images/friendica-64.png</Image>
-	<Url type="text/html" 
-        template="$baseurl/search?search={searchTerms}"/>
-	<Url type="application/opensearchdescription+xml"
-      	rel="self"
-      	template="$baseurl/opensearch" />        
-</OpenSearchDescription>
\ No newline at end of file
diff --git a/view/pagetypes.tpl b/view/pagetypes.tpl
deleted file mode 100644
index c9022a1c14..0000000000
--- a/view/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/peoplefind.tpl b/view/peoplefind.tpl
deleted file mode 100644
index 3c2692d25e..0000000000
--- a/view/peoplefind.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<div id="peoplefind-sidebar" class="widget">
-	<h3>$findpeople</h3>
-	<div id="peoplefind-desc">$desc</div>
-	<form action="dirfind" method="post" />
-		<input id="side-peoplefind-url" type="text" name="search" size="24" title="$hint" /><input id="side-peoplefind-submit" type="submit" name="submit" value="$findthem" />
-	</form>
-	<div class="side-link" id="side-match-link"><a href="match" >$similar</a></div>
-	<div class="side-link" id="side-suggest-link"><a href="suggest" >$suggest</a></div>
-	<div class="side-link" id="side-random-profile-link" ><a href="randprof" target="extlink" >$random</a></div>
-	{{ if $inv }} 
-	<div class="side-link" id="side-invite-link" ><a href="invite" >$inv</a></div>
-	{{ endif }}
-</div>
-
diff --git a/view/photo_album.tpl b/view/photo_album.tpl
deleted file mode 100644
index cc3dcfb9cc..0000000000
--- a/view/photo_album.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="photo-album-image-wrapper" id="photo-album-image-wrapper-$id">
-	<a href="$photolink" class="photo-album-photo-link" id="photo-album-photo-link-$id" title="$phototitle">
-		<img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-album-photo lframe resize$twist" id="photo-album-photo-$id" />
-		<p class='caption'>$desc</p>		
-	</a>
-</div>
-<div class="photo-album-image-wrapper-end"></div>
diff --git a/view/photo_drop.tpl b/view/photo_drop.tpl
deleted file mode 100644
index b4ea62b451..0000000000
--- a/view/photo_drop.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
-	<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
-</div>
-<div class="wall-item-delete-end"></div>
diff --git a/view/photo_edit.tpl b/view/photo_edit.tpl
deleted file mode 100644
index 53b69caae5..0000000000
--- a/view/photo_edit.tpl
+++ /dev/null
@@ -1,50 +0,0 @@
-
-<form action="photos/$nickname/$resource_id" method="post" id="photo_edit_form" >
-
-	<input type="hidden" name="item_id" value="$item_id" />
-
-	<label id="photo-edit-albumname-label" for="photo-edit-albumname">$newalbum</label>
-	<input id="photo-edit-albumname" type="text" size="32" name="albname" value="$album" />
-
-	<div id="photo-edit-albumname-end"></div>
-
-	<label id="photo-edit-caption-label" for="photo-edit-caption">$capt_label</label>
-	<input id="photo-edit-caption" type="text" size="84" name="desc" value="$caption" />
-
-	<div id="photo-edit-caption-end"></div>
-
-	<label id="photo-edit-tags-label" for="photo-edit-newtag" >$tag_label</label>
-	<input name="newtag" id="photo-edit-newtag" size="84" title="$help_tags" type="text" />
-
-	<div id="photo-edit-tags-end"></div>
-	<div id="photo-edit-rotate-wrapper">
-		<div id="photo-edit-rotate-label">
-			$rotatecw<br>
-			$rotateccw
-		</div>
-		<input type="radio" name="rotate" value="1" /><br>
-		<input type="radio" name="rotate" value="2" />
-	</div>
-	<div id="photo-edit-rotate-end"></div>
-
-	<div id="photo-edit-perms" class="photo-edit-perms" >
-		<a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="button popupbox" title="$permissions"/>
-			<span id="jot-perms-icon" class="icon $lockstate" ></span>$permissions
-		</a>
-		<div id="photo-edit-perms-menu-end"></div>
-		
-		<div style="display: none;">
-			<div id="photo-edit-perms-select" >
-				$aclselect
-			</div>
-		</div>
-	</div>
-	<div id="photo-edit-perms-end"></div>
-
-	<input id="photo-edit-submit-button" type="submit" name="submit" value="$submit" />
-	<input id="photo-edit-delete-button" type="submit" name="delete" value="$delete" onclick="return confirmDelete()"; />
-
-	<div id="photo-edit-end"></div>
-</form>
-
-
diff --git a/view/photo_edit_head.tpl b/view/photo_edit_head.tpl
deleted file mode 100644
index c7a36c4ca6..0000000000
--- a/view/photo_edit_head.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-
-<script>
-
-	$(document).keydown(function(event) {
-
-		if("$prevlink" != '') { if(event.ctrlKey && event.keyCode == 37) { event.preventDefault(); window.location.href = "$prevlink"; }}
-		if("$nextlink" != '') { if(event.ctrlKey && event.keyCode == 39) { event.preventDefault(); window.location.href = "$nextlink"; }}
-
-	});
-
-</script>
diff --git a/view/photo_item.tpl b/view/photo_item.tpl
deleted file mode 100644
index 22884e848e..0000000000
--- a/view/photo_item.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
-	<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" >
-		<a href="$profile_url" title="View $name's profile" class="wall-item-photo-link" id="wall-item-photo-link-$id">
-		<img src="$thumb" class="wall-item-photo" id="wall-item-photo-$id" style="height: 80px; width: 80px;" alt="$name" /></a>
-	</div>
-
-	<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
-		<a href="$profile_url" title="View $name's profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-$id" >$name</span></a>
-		<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
-	</div>
-	<div class="wall-item-content" id="wall-item-content-$id" >
-		<div class="wall-item-title" id="wall-item-title-$id">$title</div>
-		<div class="wall-item-body" id="wall-item-body-$id" >$body</div>
-	</div>
-	$drop
-	<div class="wall-item-wrapper-end"></div>
-	<div class="wall-item-comment-separator"></div>
-	$comment
-
-<div class="wall-item-outside-wrapper-end$indent" ></div>
-</div>
-
diff --git a/view/photo_top.tpl b/view/photo_top.tpl
deleted file mode 100644
index 155cab51d5..0000000000
--- a/view/photo_top.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-
-<div class="photo-top-image-wrapper lframe" id="photo-top-image-wrapper-$photo.id">
-	<a href="$photo.link" class="photo-top-photo-link" id="photo-top-photo-link-$photo.id" title="$photo.title">
-		<img src="$photo.src" alt="$photo.alt" title="$photo.title" class="photo-top-photo$photo.twist" id="photo-top-photo-$photo.id" />
-	</a>
-	<div class="photo-top-album-name"><a href="$photo.album.link" class="photo-top-album-link" title="$photo.album.alt" >$photo.album.name</a></div>
-</div>
-
diff --git a/view/photo_view.tpl b/view/photo_view.tpl
deleted file mode 100644
index 732caf6900..0000000000
--- a/view/photo_view.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-<div id="live-display"></div>
-<h3><a href="$album.0">$album.1</a></h3>
-
-<div id="photo-edit-link-wrap">
-{{ if $tools }}
-<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
-|
-<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
-{{ endif }}
-{{ if $lock }} | <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo/$id');" /> {{ endif }}
-</div>
-
-{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
-<div id="photo-photo"><a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a></div>
-{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
-<div id="photo-photo-end"></div>
-<div id="photo-caption">$desc</div>
-{{ if $tags }}
-<div id="in-this-photo-text">$tags.0</div>
-<div id="in-this-photo">$tags.1</div>
-{{ endif }}
-{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
-
-{{ if $edit }}$edit{{ endif }}
-
-{{ if $likebuttons }}
-<div id="photo-like-div">
-	$likebuttons
-	$like
-	$dislike	
-</div>
-{{ endif }}
-
-$comments
-
-$paginate
-
diff --git a/view/photos_default_uploader_box.tpl b/view/photos_default_uploader_box.tpl
deleted file mode 100644
index 2f1f69a50d..0000000000
--- a/view/photos_default_uploader_box.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<input id="photos-upload-choose" type="file" name="userfile" />
diff --git a/view/photos_default_uploader_submit.tpl b/view/photos_default_uploader_submit.tpl
deleted file mode 100644
index cacb416569..0000000000
--- a/view/photos_default_uploader_submit.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="photos-upload-submit-wrapper" >
-	<input type="submit" name="submit" value="$submit" id="photos-upload-submit" />
-</div>
diff --git a/view/photos_head.tpl b/view/photos_head.tpl
deleted file mode 100644
index 2f5de0f159..0000000000
--- a/view/photos_head.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-
-<script>
-
-	var ispublic = "$ispublic";
-
-
-	$(document).ready(function() {
-
-		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
-			var selstr;
-			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
-				selstr = $(this).text();
-				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
-				$('#jot-public').hide();
-			});
-			if(selstr == null) { 
-				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
-				$('#jot-public').show();
-			}
-
-		}).trigger('change');
-
-	});
-
-</script>
-
diff --git a/view/photos_recent.tpl b/view/photos_recent.tpl
deleted file mode 100644
index 1df78cb7be..0000000000
--- a/view/photos_recent.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<h3>$title</h3>
-{{ if $can_post }}
-<a id="photo-top-upload-link" href="$upload.1">$upload.0</a>
-{{ endif }}
-
-<div class="photos">
-{{ for $photos as $photo }}
-	{{ inc photo_top.tpl }}{{ endinc }}
-{{ endfor }}
-</div>
-<div class="photos-end"></div>
diff --git a/view/photos_upload.tpl b/view/photos_upload.tpl
deleted file mode 100644
index 7de8d8ab74..0000000000
--- a/view/photos_upload.tpl
+++ /dev/null
@@ -1,49 +0,0 @@
-<h3>$pagename</h3>
-
-<div id="photos-usage-message">$usage</div>
-
-<form action="photos/$nickname" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" >
-	<div id="photos-upload-new-wrapper" >
-		<div id="photos-upload-newalbum-div">
-			<label id="photos-upload-newalbum-text" for="photos-upload-newalbum" >$newalbum</label>
-		</div>
-		<input id="photos-upload-newalbum" type="text" name="newalbum" />
-	</div>
-	<div id="photos-upload-new-end"></div>
-	<div id="photos-upload-exist-wrapper">
-		<div id="photos-upload-existing-album-text">$existalbumtext</div>
-		<select id="photos-upload-album-select" name="album" size="4">
-		$albumselect
-		</select>
-	</div>
-	<div id="photos-upload-exist-end"></div>
-
-	<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
-		<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" />
-		<label id="photos-upload-noshare-text" for="photos-upload-noshare" >$nosharetext</label>
-	</div>
-
-
-	<div id="photos-upload-perms" class="photos-upload-perms" >
-		<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button popupbox" />
-		<span id="jot-perms-icon" class="icon $lockstate" ></span>$permissions
-		</a>
-	</div>
-	<div id="photos-upload-perms-end"></div>
-
-	<div style="display: none;">
-		<div id="photos-upload-permissions-wrapper">
-			$aclselect
-		</div>
-	</div>
-
-	<div id="photos-upload-spacer"></div>
-
-	$alt_uploader
-
-	$default_upload_box
-	$default_upload_submit
-
-	<div class="photos-upload-end" ></div>
-</form>
-
diff --git a/view/poco_entry_xml.tpl b/view/poco_entry_xml.tpl
deleted file mode 100644
index 4d84cee416..0000000000
--- a/view/poco_entry_xml.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<entry>
-{{ if $entry.id }}<id>$entry.id</id>{{ endif }}
-{{ if $entry.displayName }}<displayName>$entry.displayName</displayName>{{ endif }}
-{{ if $entry.preferredUsername }}<preferredUsername>$entry.preferredUsername</preferredUsername>{{ endif }}
-{{ if $entry.urls }}{{ for $entry.urls as $url }}<urls><value>$url.value</value><type>$url.type</type></urls>{{ endfor }}{{ endif }}
-{{ if $entry.photos }}{{ for $entry.photos as $photo }}<photos><value>$photo.value</value><type>$photo.type</type></photos>{{ endfor }}{{ endif }}
-</entry>
diff --git a/view/poco_xml.tpl b/view/poco_xml.tpl
deleted file mode 100644
index 9549b695d1..0000000000
--- a/view/poco_xml.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<response>
-{{ if $response.sorted }}<sorted>$response.sorted</sorted>{{ endif }}
-{{ if $response.filtered }}<filtered>$response.filtered</filtered>{{ endif }}
-{{ if $response.updatedSince }}<updatedSince>$response.updatedSince</updatedSince>{{ endif }}
-<startIndex>$response.startIndex</startIndex>
-<itemsPerPage>$response.itemsPerPage</itemsPerPage>
-<totalResults>$response.totalResults</totalResults>
-
-
-{{ if $response.totalResults }}
-{{ for $response.entry as $entry }}
-{{ inc poco_entry_xml.tpl }}{{ endinc }}
-{{ endfor }}
-{{ else }}
-<entry></entry>
-{{ endif }}
-</response>
diff --git a/view/poke_content.tpl b/view/poke_content.tpl
deleted file mode 100644
index b9e089f5b3..0000000000
--- a/view/poke_content.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-<h3>$title</h3>
-
-<div id="poke-desc">$desc</div>
-
-<form action="poke" method="get">
-<br />
-<br />
-
-<div id="poke-recip-label">$clabel</div>
-<br />
-<input id="poke-recip" type="text" size="64" maxlength="255" value="$name" name="pokename" autocomplete="off" />
-<input id="poke-recip-complete" type="hidden" value="$id" name="cid" />
-<input id="poke-parent" type="hidden" value="$parent" name="parent" />
-<br />
-<br />
-<div id="poke-action-label">$choice</div>
-<br />
-<br />
-<select name="verb" id="poke-verb-select" >
-{{ for $verbs as $v }}
-<option value="$v.0">$v.1</option>
-{{ endfor }}
-</select>
-<br />
-<br />
-<div id="poke-private-desc">$prv_desc</div>
-<input type="checkbox" name="private" {{ if $parent }}disabled="disabled"{{ endif }} value="1" />
-<br />
-<br />
-<input type="submit" name="submit" value="$submit" />
-</form>
-
diff --git a/view/posted_date_widget.tpl b/view/posted_date_widget.tpl
deleted file mode 100644
index 3e2ee5a3ed..0000000000
--- a/view/posted_date_widget.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<div id="datebrowse-sidebar" class="widget">
-	<h3>$title</h3>
-<script>function dateSubmit(dateurl) { window.location.href = dateurl; } </script>
-<select id="posted-date-selector" name="posted-date-select" onchange="dateSubmit($(this).val());" size="$size">
-{{ for $dates as $d }}
-<option value="$url/$d.1/$d.2" >$d.0</option>
-{{ endfor }}
-</select>
-</div>
diff --git a/view/profed_end.tpl b/view/profed_end.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/profed_head.tpl b/view/profed_head.tpl
deleted file mode 100644
index 753e2fa5f3..0000000000
--- a/view/profed_head.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-<script type="text/javascript" src="js/country.js" ></script>
-
-<script language="javascript" type="text/javascript"
-          src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
-          <script language="javascript" type="text/javascript">
-
-
-tinyMCE.init({
-	theme : "advanced",
-	mode : "$editselect",
-	plugins : "bbcode,paste",
-	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
-	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 : 'div',
-	content_css: "$baseurl/view/custom_tinymce.css",
-	theme_advanced_path : false,
-	setup : function(ed) {
-		ed.onInit.add(function(ed) {
-            ed.pasteAsPlainText = true;
-        });
-    }
-
-});
-
-
-</script>
-
diff --git a/view/profile-hide-friends.tpl b/view/profile-hide-friends.tpl
deleted file mode 100644
index 9ecacfbe0f..0000000000
--- a/view/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/profile-hide-wall.tpl b/view/profile-hide-wall.tpl
deleted file mode 100644
index 10185e243d..0000000000
--- a/view/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/profile-in-directory.tpl b/view/profile-in-directory.tpl
deleted file mode 100644
index 56b28d37e3..0000000000
--- a/view/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/profile-in-netdir.tpl b/view/profile-in-netdir.tpl
deleted file mode 100644
index 882ad2d17c..0000000000
--- a/view/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/profile_advanced.tpl b/view/profile_advanced.tpl
deleted file mode 100644
index b02b7f27de..0000000000
--- a/view/profile_advanced.tpl
+++ /dev/null
@@ -1,170 +0,0 @@
-<h2>$title</h2>
-
-<dl id="aprofile-fullname" class="aprofile">
- <dt>$profile.fullname.0</dt>
- <dd>$profile.fullname.1</dd>
-</dl>
-
-{{ if $profile.gender }}
-<dl id="aprofile-gender" class="aprofile">
- <dt>$profile.gender.0</dt>
- <dd>$profile.gender.1</dd>
-</dl>
-{{ endif }}
-
-{{ if $profile.birthday }}
-<dl id="aprofile-birthday" class="aprofile">
- <dt>$profile.birthday.0</dt>
- <dd>$profile.birthday.1</dd>
-</dl>
-{{ endif }}
-
-{{ if $profile.age }}
-<dl id="aprofile-age" class="aprofile">
- <dt>$profile.age.0</dt>
- <dd>$profile.age.1</dd>
-</dl>
-{{ endif }}
-
-{{ if $profile.marital }}
-<dl id="aprofile-marital" class="aprofile">
- <dt><span class="heart">&hearts;</span>  $profile.marital.0</dt>
- <dd>$profile.marital.1{{ if $profile.marital.with }} ($profile.marital.with){{ endif }}{{ if $profile.howlong }} $profile.howlong{{ endif }}</dd>
-</dl>
-{{ endif }}
-
-{{ if $profile.sexual }}
-<dl id="aprofile-sexual" class="aprofile">
- <dt>$profile.sexual.0</dt>
- <dd>$profile.sexual.1</dd>
-</dl>
-{{ endif }}
-
-{{ if $profile.pub_keywords }}
-<dl id="aprofile-tags" class="aprofile">
- <dt>$profile.pub_keywords.0</dt>
- <dd>$profile.pub_keywords.1</dd>
-</dl>
-{{ endif }}
-
-{{ if $profile.homepage }}
-<dl id="aprofile-homepage" class="aprofile">
- <dt>$profile.homepage.0</dt>
- <dd>$profile.homepage.1</dd>
-</dl>
-{{ endif }}
-
-{{ if $profile.hometown }}
-<dl id="aprofile-hometown" class="aprofile">
- <dt>$profile.hometown.0</dt>
- <dd>$profile.hometown.1</dd>
-</dl>
-{{ endif }}
-
-{{ if $profile.politic }}
-<dl id="aprofile-politic" class="aprofile">
- <dt>$profile.politic.0</dt>
- <dd>$profile.politic.1</dd>
-</dl>
-{{ endif }}
-
-{{ if $profile.religion }}
-<dl id="aprofile-religion" class="aprofile">
- <dt>$profile.religion.0</dt>
- <dd>$profile.religion.1</dd>
-</dl>
-{{ endif }}
-
-{{ if $profile.about }}
-<dl id="aprofile-about" class="aprofile">
- <dt>$profile.about.0</dt>
- <dd>$profile.about.1</dd>
-</dl>
-{{ endif }}
-
-{{ if $profile.interest }}
-<dl id="aprofile-interest" class="aprofile">
- <dt>$profile.interest.0</dt>
- <dd>$profile.interest.1</dd>
-</dl>
-{{ endif }}
-
-{{ if $profile.likes }}
-<dl id="aprofile-likes" class="aprofile">
- <dt>$profile.likes.0</dt>
- <dd>$profile.likes.1</dd>
-</dl>
-{{ endif }}
-
-{{ if $profile.dislikes }}
-<dl id="aprofile-dislikes" class="aprofile">
- <dt>$profile.dislikes.0</dt>
- <dd>$profile.dislikes.1</dd>
-</dl>
-{{ endif }}
-
-{{ if $profile.contact }}
-<dl id="aprofile-contact" class="aprofile">
- <dt>$profile.contact.0</dt>
- <dd>$profile.contact.1</dd>
-</dl>
-{{ endif }}
-
-
-{{ if $profile.music }}
-<dl id="aprofile-music" class="aprofile">
- <dt>$profile.music.0</dt>
- <dd>$profile.music.1</dd>
-</dl>
-{{ endif }}
-
-
-{{ if $profile.book }}
-<dl id="aprofile-book" class="aprofile">
- <dt>$profile.book.0</dt>
- <dd>$profile.book.1</dd>
-</dl>
-{{ endif }}
-
-
-{{ if $profile.tv }}
-<dl id="aprofile-tv" class="aprofile">
- <dt>$profile.tv.0</dt>
- <dd>$profile.tv.1</dd>
-</dl>
-{{ endif }}
-
-
-{{ if $profile.film }}
-<dl id="aprofile-film" class="aprofile">
- <dt>$profile.film.0</dt>
- <dd>$profile.film.1</dd>
-</dl>
-{{ endif }}
-
-
-{{ if $profile.romance }}
-<dl id="aprofile-romance" class="aprofile">
- <dt>$profile.romance.0</dt>
- <dd>$profile.romance.1</dd>
-</dl>
-{{ endif }}
-
-
-{{ if $profile.work }}
-<dl id="aprofile-work" class="aprofile">
- <dt>$profile.work.0</dt>
- <dd>$profile.work.1</dd>
-</dl>
-{{ endif }}
-
-{{ if $profile.education }}
-<dl id="aprofile-education" class="aprofile">
- <dt>$profile.education.0</dt>
- <dd>$profile.education.1</dd>
-</dl>
-{{ endif }}
-
-
-
-
diff --git a/view/profile_edit.tpl b/view/profile_edit.tpl
deleted file mode 100644
index 4df6ecc694..0000000000
--- a/view/profile_edit.tpl
+++ /dev/null
@@ -1,323 +0,0 @@
-$default
-
-<h1>$banner</h1>
-
-<div id="profile-edit-links">
-<ul>
-<li><a href="profile_photo" id="profile-photo_upload-link" title="$profpic">$profpic</a></li>
-<li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="$viewprof">$viewprof</a></li>
-<li><a href="$profile_clone_link" id="profile-edit-clone-link" title="$cr_prof">$cl_prof</a></li>
-<li></li>
-<li><a href="$profile_drop_link" id="profile-edit-drop-link" title="$del_prof" $disabled >$del_prof</a></li>
-
-</ul>
-</div>
-
-<div id="profile-edit-links-end"></div>
-
-
-<div id="profile-edit-wrapper" >
-<form id="profile-edit-form" name="form1" action="profiles/$profile_id" method="post" >
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-<div id="profile-edit-profile-name-wrapper" >
-<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >$lbl_profname </label>
-<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="$profile_name" /><div class="required">*</div>
-</div>
-<div id="profile-edit-profile-name-end"></div>
-
-<div id="profile-edit-name-wrapper" >
-<label id="profile-edit-name-label" for="profile-edit-name" >$lbl_fullname </label>
-<input type="text" size="32" name="name" id="profile-edit-name" value="$name" />
-</div>
-<div id="profile-edit-name-end"></div>
-
-<div id="profile-edit-pdesc-wrapper" >
-<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >$lbl_title </label>
-<input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="$pdesc" />
-</div>
-<div id="profile-edit-pdesc-end"></div>
-
-
-<div id="profile-edit-gender-wrapper" >
-<label id="profile-edit-gender-label" for="gender-select" >$lbl_gender </label>
-$gender
-</div>
-<div id="profile-edit-gender-end"></div>
-
-<div id="profile-edit-dob-wrapper" >
-<label id="profile-edit-dob-label" for="dob-select" >$lbl_bd </label>
-<div id="profile-edit-dob" >
-$dob $age
-</div>
-</div>
-<div id="profile-edit-dob-end"></div>
-
-$hide_friends
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="profile-edit-address-wrapper" >
-<label id="profile-edit-address-label" for="profile-edit-address" >$lbl_address </label>
-<input type="text" size="32" name="address" id="profile-edit-address" value="$address" />
-</div>
-<div id="profile-edit-address-end"></div>
-
-<div id="profile-edit-locality-wrapper" >
-<label id="profile-edit-locality-label" for="profile-edit-locality" >$lbl_city </label>
-<input type="text" size="32" name="locality" id="profile-edit-locality" value="$locality" />
-</div>
-<div id="profile-edit-locality-end"></div>
-
-
-<div id="profile-edit-postal-code-wrapper" >
-<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >$lbl_zip </label>
-<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="$postal_code" />
-</div>
-<div id="profile-edit-postal-code-end"></div>
-
-<div id="profile-edit-country-name-wrapper" >
-<label id="profile-edit-country-name-label" for="profile-edit-country-name" >$lbl_country </label>
-<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('$region');">
-<option selected="selected" >$country_name</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-country-name-end"></div>
-
-<div id="profile-edit-region-wrapper" >
-<label id="profile-edit-region-label" for="profile-edit-region" >$lbl_region </label>
-<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
-<option selected="selected" >$region</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-region-end"></div>
-
-<div id="profile-edit-hometown-wrapper" >
-<label id="profile-edit-hometown-label" for="profile-edit-hometown" >$lbl_hometown </label>
-<input type="text" size="32" name="hometown" id="profile-edit-hometown" value="$hometown" />
-</div>
-<div id="profile-edit-hometown-end"></div>
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="profile-edit-marital-wrapper" >
-<label id="profile-edit-marital-label" for="profile-edit-marital" >$lbl_marital </label>
-$marital
-</div>
-<label id="profile-edit-with-label" for="profile-edit-with" > $lbl_with </label>
-<input type="text" size="32" name="with" id="profile-edit-with" title="$lbl_ex1" value="$with" />
-<label id="profile-edit-howlong-label" for="profile-edit-howlong" > $lbl_howlong </label>
-<input type="text" size="32" name="howlong" id="profile-edit-howlong" title="$lbl_howlong" value="$howlong" />
-
-<div id="profile-edit-marital-end"></div>
-
-<div id="profile-edit-sexual-wrapper" >
-<label id="profile-edit-sexual-label" for="sexual-select" >$lbl_sexual </label>
-$sexual
-</div>
-<div id="profile-edit-sexual-end"></div>
-
-
-
-<div id="profile-edit-homepage-wrapper" >
-<label id="profile-edit-homepage-label" for="profile-edit-homepage" >$lbl_homepage </label>
-<input type="text" size="32" name="homepage" id="profile-edit-homepage" value="$homepage" />
-</div>
-<div id="profile-edit-homepage-end"></div>
-
-<div id="profile-edit-politic-wrapper" >
-<label id="profile-edit-politic-label" for="profile-edit-politic" >$lbl_politic </label>
-<input type="text" size="32" name="politic" id="profile-edit-politic" value="$politic" />
-</div>
-<div id="profile-edit-politic-end"></div>
-
-<div id="profile-edit-religion-wrapper" >
-<label id="profile-edit-religion-label" for="profile-edit-religion" >$lbl_religion </label>
-<input type="text" size="32" name="religion" id="profile-edit-religion" value="$religion" />
-</div>
-<div id="profile-edit-religion-end"></div>
-
-<div id="profile-edit-pubkeywords-wrapper" >
-<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >$lbl_pubkey </label>
-<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="$lbl_ex2" value="$pub_keywords" />
-</div><div id="profile-edit-pubkeywords-desc">$lbl_pubdsc</div>
-<div id="profile-edit-pubkeywords-end"></div>
-
-<div id="profile-edit-prvkeywords-wrapper" >
-<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >$lbl_prvkey </label>
-<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="$lbl_ex2" value="$prv_keywords" />
-</div><div id="profile-edit-prvkeywords-desc">$lbl_prvdsc</div>
-<div id="profile-edit-prvkeywords-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="about-jot-wrapper" >
-<p id="about-jot-desc" >
-$lbl_about
-</p>
-
-<textarea rows="10" cols="72" id="profile-about-text" name="about" >$about</textarea>
-
-</div>
-<div id="about-jot-end"></div>
-
-
-<div id="interest-jot-wrapper" >
-<p id="interest-jot-desc" >
-$lbl_hobbies
-</p>
-
-<textarea rows="10" cols="72" id="interest-jot-text" name="interest" >$interest</textarea>
-
-</div>
-<div id="interest-jot-end"></div>
-
-
-<div id="likes-jot-wrapper" >
-<p id="likes-jot-desc" >
-$lbl_likes
-</p>
-
-<textarea rows="10" cols="72" id="likes-jot-text" name="likes" >$likes</textarea>
-
-</div>
-<div id="likes-jot-end"></div>
-
-
-<div id="dislikes-jot-wrapper" >
-<p id="dislikes-jot-desc" >
-$lbl_dislikes
-</p>
-
-<textarea rows="10" cols="72" id="dislikes-jot-text" name="dislikes" >$dislikes</textarea>
-
-</div>
-<div id="dislikes-jot-end"></div>
-
-
-<div id="contact-jot-wrapper" >
-<p id="contact-jot-desc" >
-$lbl_social
-</p>
-
-<textarea rows="10" cols="72" id="contact-jot-text" name="contact" >$contact</textarea>
-
-</div>
-<div id="contact-jot-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="music-jot-wrapper" >
-<p id="music-jot-desc" >
-$lbl_music
-</p>
-
-<textarea rows="10" cols="72" id="music-jot-text" name="music" >$music</textarea>
-
-</div>
-<div id="music-jot-end"></div>
-
-<div id="book-jot-wrapper" >
-<p id="book-jot-desc" >
-$lbl_book
-</p>
-
-<textarea rows="10" cols="72" id="book-jot-text" name="book" >$book</textarea>
-
-</div>
-<div id="book-jot-end"></div>
-
-
-
-<div id="tv-jot-wrapper" >
-<p id="tv-jot-desc" >
-$lbl_tv 
-</p>
-
-<textarea rows="10" cols="72" id="tv-jot-text" name="tv" >$tv</textarea>
-
-</div>
-<div id="tv-jot-end"></div>
-
-
-
-<div id="film-jot-wrapper" >
-<p id="film-jot-desc" >
-$lbl_film
-</p>
-
-<textarea rows="10" cols="72" id="film-jot-text" name="film" >$film</textarea>
-
-</div>
-<div id="film-jot-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="romance-jot-wrapper" >
-<p id="romance-jot-desc" >
-$lbl_love
-</p>
-
-<textarea rows="10" cols="72" id="romance-jot-text" name="romance" >$romance</textarea>
-
-</div>
-<div id="romance-jot-end"></div>
-
-
-
-<div id="work-jot-wrapper" >
-<p id="work-jot-desc" >
-$lbl_work
-</p>
-
-<textarea rows="10" cols="72" id="work-jot-text" name="work" >$work</textarea>
-
-</div>
-<div id="work-jot-end"></div>
-
-
-
-<div id="education-jot-wrapper" >
-<p id="education-jot-desc" >
-$lbl_school 
-</p>
-
-<textarea rows="10" cols="72" id="education-jot-text" name="education" >$education</textarea>
-
-</div>
-<div id="education-jot-end"></div>
-
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-</form>
-</div>
-<script type="text/javascript">Fill_Country('$country_name');Fill_States('$region');</script>
diff --git a/view/profile_edlink.tpl b/view/profile_edlink.tpl
deleted file mode 100644
index ea787b9f53..0000000000
--- a/view/profile_edlink.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="$editprofile" href="profiles/$profid" ></a></div>
-<div class="clear"></div>
\ No newline at end of file
diff --git a/view/profile_entry.tpl b/view/profile_entry.tpl
deleted file mode 100644
index 7ff6d685b8..0000000000
--- a/view/profile_entry.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-
-<div class="profile-listing" >
-<div class="profile-listing-photo-wrapper" >
-<a href="profiles/$id" class="profile-listing-edit-link"><img class="profile-listing-photo" id="profile-listing-photo-$id" src="$photo" alt="$alt" /></a>
-</div>
-<div class="profile-listing-photo-end"></div>
-<div class="profile-listing-name" id="profile-listing-name-$id"><a href="profiles/$id" class="profile-listing-edit-link" >$profile_name</a></div>
-<div class="profile-listing-visible">$visible</div>
-</div>
-<div class="profile-listing-end"></div>
-
diff --git a/view/profile_listing_header.tpl b/view/profile_listing_header.tpl
deleted file mode 100644
index 61a2737929..0000000000
--- a/view/profile_listing_header.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<h1>$header</h1>
-<p id="profile-listing-desc" class="button" >
-<a href="profile_photo" >$chg_photo</a>
-</p>
-<div id="profile-listing-new-link-wrapper" class="button" >
-<a href="$cr_new_link" id="profile-listing-new-link" title="$cr_new" >$cr_new</a>
-</div>
-
diff --git a/view/profile_photo.tpl b/view/profile_photo.tpl
deleted file mode 100644
index 04ee8f9167..0000000000
--- a/view/profile_photo.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-<h1>$title</h1>
-
-<form enctype="multipart/form-data" action="profile_photo" method="post">
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-<div id="profile-photo-upload-wrapper">
-<label id="profile-photo-upload-label" for="profile-photo-upload">$lbl_upfile </label>
-<input name="userfile" type="file" id="profile-photo-upload" size="48" />
-</div>
-
-<label id="profile-photo-profiles-label" for="profile-photo-profiles">$lbl_profiles </label>
-<select name="profile" id="profile-photo-profiles" />
-{{ for $profiles as $p }}
-<option value="$p.id" {{ if $p.default }}selected="selected"{{ endif }}>$p.name</option>
-{{ endfor }}
-</select>
-
-<div id="profile-photo-submit-wrapper">
-<input type="submit" name="submit" id="profile-photo-submit" value="$submit">
-</div>
-
-</form>
-
-<div id="profile-photo-link-select-wrapper">
-$select
-</div>
\ No newline at end of file
diff --git a/view/profile_publish.tpl b/view/profile_publish.tpl
deleted file mode 100644
index 8fd0bc913b..0000000000
--- a/view/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/profile_vcard.tpl b/view/profile_vcard.tpl
deleted file mode 100644
index 6e137f28fa..0000000000
--- a/view/profile_vcard.tpl
+++ /dev/null
@@ -1,50 +0,0 @@
-<div class="vcard">
-
-	<div class="fn label">$profile.name</div>
-	
-				
-	
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name"></div>
-
-
-
-	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt> 
-		<dd class="adr">
-			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal_code</span>
-			</span>
-			{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
-		</dd>
-		</dl>
-	{{ endif }}
-
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
-
-	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-
-	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-			{{ if $wallmessage }}
-				<li><a id="wallmessage-link" href="wallmessage/$profile.nickname">$wallmessage</a></li>
-			{{ endif }}
-		</ul>
-	</div>
-</div>
-
-$contact_block
-
-
diff --git a/view/prv_message.tpl b/view/prv_message.tpl
deleted file mode 100644
index ecfef95d6b..0000000000
--- a/view/prv_message.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-
-<h3>$header</h3>
-
-<div id="prvmail-wrapper" >
-<form id="prvmail-form" action="message" method="post" >
-
-$parent
-
-<div id="prvmail-to-label">$to</div>
-$select
-
-<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-upload-wrapper" >
-		<div id="prvmail-upload" class="icon border camera" title="$upload" ></div>
-	</div> 
-	<div id="prvmail-link-wrapper" >
-		<div id="prvmail-link" class="icon border link" title="$insert" onclick="jotGetLink();" ></div>
-	</div> 
-	<div id="prvmail-rotator-wrapper" >
-		<img id="prvmail-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-</div>
-<div id="prvmail-end"></div>
-</form>
-</div>
diff --git a/view/pwdreset.tpl b/view/pwdreset.tpl
deleted file mode 100644
index 497b93396d..0000000000
--- a/view/pwdreset.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<h3>$lbl1</h3>
-
-<p>
-$lbl2
-</p>
-<p>
-$lbl3
-</p>
-<p>
-$newpass
-</p>
-<p>
-$lbl4 $lbl5
-</p>
-<p>
-$lbl6
-</p>
diff --git a/view/register.tpl b/view/register.tpl
deleted file mode 100644
index 2275356a21..0000000000
--- a/view/register.tpl
+++ /dev/null
@@ -1,65 +0,0 @@
-<h3>$regtitle</h3>
-
-<form action="register" method="post" id="register-form">
-
-	<input type="hidden" name="photo" value="$photo" />
-
-	$registertext
-
-	<p id="register-realpeople">$realpeople</p>
-
-	<p id="register-fill-desc">$fillwith</p>
-	<p id="register-fill-ext">$fillext</p>
-
-{{ if $oidlabel }}
-	<div id="register-openid-wrapper" >
-    	<label for="register-openid" id="label-register-openid" >$oidlabel</label><input 	type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="$openid" >
-	</div>
-	<div id="register-openid-end" ></div>
-{{ endif }}
-
-{{ if $invitations }}
-
-	<p id="register-invite-desc">$invite_desc</p>
-	<div id="register-invite-wrapper" >
-		<label for="register-invite" id="label-register-invite" >$invite_label</label>
-		<input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" value="$invite_id" >
-	</div>
-	<div id="register-name-end" ></div>
-
-{{ endif }}
-
-
-	<div id="register-name-wrapper" >
-		<label for="register-name" id="label-register-name" >$namelabel</label>
-		<input type="text" maxlength="60" size="32" name="username" id="register-name" value="$username" >
-	</div>
-	<div id="register-name-end" ></div>
-
-
-	<div id="register-email-wrapper" >
-		<label for="register-email" id="label-register-email" >$addrlabel</label>
-		<input type="text" maxlength="60" size="32" name="email" id="register-email" value="$email" >
-	</div>
-	<div id="register-email-end" ></div>
-
-	<p id="register-nickname-desc" >$nickdesc</p>
-
-	<div id="register-nickname-wrapper" >
-		<label for="register-nickname" id="label-register-nickname" >$nicklabel</label>
-		<input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" value="$nickname" ><div id="register-sitename">@$sitename</div>
-	</div>
-	<div id="register-nickname-end" ></div>
-
-	$publish
-
-	<div id="register-submit-wrapper">
-		<input type="submit" name="submit" id="register-submit-button" value="$regbutt" />
-	</div>
-	<div id="register-submit-end" ></div>
-    
-</form>
-
-$license
-
-
diff --git a/view/remote_friends_common.tpl b/view/remote_friends_common.tpl
deleted file mode 100644
index 9e0562878e..0000000000
--- a/view/remote_friends_common.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<div id="remote-friends-in-common" class="bigwidget">
-	<div id="rfic-desc">$desc &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ if $linkmore }}<a href="$base/common/rem/$uid/$cid">$more</a>{{ endif }}</div>
-	{{ if $items }}
-	{{ for $items as $item }}
-	<div class="profile-match-wrapper">
-		<div class="profile-match-photo">
-			<a href="$item.url">
-				<img src="$item.photo" width="80" height="80" alt="$item.name" title="$item.name" />
-			</a>
-		</div>
-		<div class="profile-match-break"></div>
-		<div class="profile-match-name">
-			<a href="$itemurl" title="$item.name">$item.name</a>
-		</div>
-		<div class="profile-match-end"></div>
-	</div>
-	{{ endfor }}
-	{{ endif }}
-	<div id="rfic-end" class="clear"></div>
-</div>
-
diff --git a/view/removeme.tpl b/view/removeme.tpl
deleted file mode 100644
index a3ca8d4cfa..0000000000
--- a/view/removeme.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<h1>$title</h1>
-
-<div id="remove-account-wrapper">
-
-<div id="remove-account-desc">$desc</div>
-
-<form action="$basedir/removeme" autocomplete="off" method="post" >
-<input type="hidden" name="verify" value="$hash" />
-
-<div id="remove-account-pass-wrapper">
-<label id="remove-account-pass-label" for="remove-account-pass">$passwd</label>
-<input type="password" id="remove-account-pass" name="qxz_password" />
-</div>
-<div id="remove-account-pass-end"></div>
-
-<input type="submit" name="submit" value="$submit" />
-
-</form>
-</div>
-
diff --git a/view/saved_searches_aside.tpl b/view/saved_searches_aside.tpl
deleted file mode 100644
index e6a0d6278d..0000000000
--- a/view/saved_searches_aside.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="widget" id="saved-search-list">
-	<h3 id="search">$title</h3>
-	$searchbox
-	
-	<ul id="saved-search-ul">
-		{{ for $saved as $search }}
-		<li class="saved-search-li clear">
-			<a title="$search.delete" onclick="return confirmDelete();" id="drop-saved-search-term-$search.id" class="iconspacer savedsearchdrop " href="network/?f=&amp;remove=1&amp;search=$search.encodedterm"></a>
-			<a id="saved-search-term-$search.id" class="savedsearchterm" href="network/?f=&amp;search=$search.encodedterm">$search.term</a>
-		</li>
-		{{ endfor }}
-	</ul>
-	<div class="clear"></div>
-</div>
diff --git a/view/search_item.tpl b/view/search_item.tpl
deleted file mode 100644
index 384f6087ac..0000000000
--- a/view/search_item.tpl
+++ /dev/null
@@ -1,64 +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" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-					<ul>
-						$item.item_photo_menu
-					</ul>
-				</div>
-			</div>
-			<div class="wall-item-photo-end"></div>	
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
-			</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div>
-				
-		</div>			
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
-			{{ if $item.has_cats }}
-			<div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name{{ if $cat.removeurl }} <a href="$cat.removeurl" title="$remove">[$remove]</a>{{ endif }} {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-
-			{{ if $item.has_folders }}
-			<div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name{{ if $cat.removeurl }} <a href="$cat.removeurl" title="$remove">[$remove]</a>{{ endif }}{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" 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-conv" id="wall-item-conv-$item.id" >
-	{{ if $item.conv }}
-			<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
-	{{ endif }}
-	</div>
-
-<div class="wall-item-outside-wrapper-end $item.indent" ></div>
-
-</div>
-
-
diff --git a/view/settings-end.tpl b/view/settings-end.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/settings-head.tpl b/view/settings-head.tpl
deleted file mode 100644
index 2555bedc86..0000000000
--- a/view/settings-head.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-
-<script>
-	var ispublic = "$ispublic";
-
-
-	$(document).ready(function() {
-
-		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
-			var selstr;
-			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
-				selstr = $(this).text();
-				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
-				$('#jot-public').hide();
-			});
-			if(selstr == null) { 
-				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
-				$('#jot-public').show();
-			}
-
-		}).trigger('change');
-
-	});
-
-</script>
-
diff --git a/view/settings.tpl b/view/settings.tpl
deleted file mode 100644
index 569ebcf101..0000000000
--- a/view/settings.tpl
+++ /dev/null
@@ -1,147 +0,0 @@
-<h1>$ptitle</h1>
-
-$nickname_block
-
-<form action="settings" id="settings-form" method="post" autocomplete="off" >
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-<h3 class="settings-heading">$h_pass</h3>
-
-{{inc field_password.tpl with $field=$password1 }}{{endinc}}
-{{inc field_password.tpl with $field=$password2 }}{{endinc}}
-{{inc field_password.tpl with $field=$password3 }}{{endinc}}
-
-{{ if $oid_enable }}
-{{inc field_input.tpl with $field=$openid }}{{endinc}}
-{{ endif }}
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
-<h3 class="settings-heading">$h_basic</h3>
-
-{{inc field_input.tpl with $field=$username }}{{endinc}}
-{{inc field_input.tpl with $field=$email }}{{endinc}}
-{{inc field_password.tpl with $field=$password4 }}{{endinc}}
-{{inc field_custom.tpl with $field=$timezone }}{{endinc}}
-{{inc field_input.tpl with $field=$defloc }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}}
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
-<h3 class="settings-heading">$h_prv</h3>
-
-
-<input type="hidden" name="visibility" value="$visibility" />
-
-{{inc field_input.tpl with $field=$maxreq }}{{endinc}}
-
-$profile_in_dir
-
-$profile_in_net_dir
-
-$hide_friends
-
-$hide_wall
-
-$blockwall
-
-$blocktags
-
-$suggestme
-
-$unkmail
-
-
-{{inc field_input.tpl with $field=$cntunkmail }}{{endinc}}
-
-{{inc field_input.tpl with $field=$expire.days }}{{endinc}}
-
-
-<div class="field input">
-	<span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span>
-	<div style="display: none;">
-		<div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
-			<h3>$expire.advanced</h3>
-			{{ inc field_yesno.tpl with $field=$expire.items }}{{endinc}}
-			{{ inc field_yesno.tpl with $field=$expire.notes }}{{endinc}}
-			{{ inc field_yesno.tpl with $field=$expire.starred }}{{endinc}}
-			{{ inc field_yesno.tpl with $field=$expire.network_only }}{{endinc}}
-		</div>
-	</div>
-
-</div>
-
-
-<div id="settings-default-perms" class="settings-default-perms" >
-	<a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>$permissions $permdesc</a>
-	<div id="settings-default-perms-menu-end"></div>
-
-	<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >
-	
-	<div style="display: none;">
-		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-			$aclselect
-		</div>
-	</div>
-
-	</div>
-</div>
-<br/>
-<div id="settings-default-perms-end"></div>
-
-$group_select
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
-
-<h3 class="settings-heading">$h_not</h3>
-<div id="settings-notifications">
-
-<div id="settings-activity-desc">$activity_options</div>
-
-{{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$post_joingroup }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}}
-
-
-<div id="settings-notify-desc">$lbl_not</div>
-
-<div class="group">
-{{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify2 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify3 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify4 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify6 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify8 }}{{endinc}}
-</div>
-
-</div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
-<h3 class="settings-heading">$h_advn</h3>
-<div id="settings-pagetype-desc">$h_descadvn</div>
-
-$pagetype
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
diff --git a/view/settings_addons.tpl b/view/settings_addons.tpl
deleted file mode 100644
index 84171dc8db..0000000000
--- a/view/settings_addons.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<h1>$title</h1>
-
-
-<form action="settings/addon" method="post" autocomplete="off">
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-$settings_addons
-
-</form>
-
diff --git a/view/settings_connectors.tpl b/view/settings_connectors.tpl
deleted file mode 100644
index bd3d60f0f4..0000000000
--- a/view/settings_connectors.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-<h1>$title</h1>
-
-<div class="connector_statusmsg">$diasp_enabled</div>
-<div class="connector_statusmsg">$ostat_enabled</div>
-
-<form action="settings/connectors" method="post" autocomplete="off">
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-$settings_connectors
-
-{{ if $mail_disabled }}
-
-{{ else }}
-	<div class="settings-block">
-	<h3 class="settings-heading">$h_imap</h3>
-	<p>$imap_desc</p>
-	{{inc field_custom.tpl with $field=$imap_lastcheck }}{{endinc}}
-	{{inc field_input.tpl with $field=$mail_server }}{{endinc}}
-	{{inc field_input.tpl with $field=$mail_port }}{{endinc}}
-	{{inc field_select.tpl with $field=$mail_ssl }}{{endinc}}
-	{{inc field_input.tpl with $field=$mail_user }}{{endinc}}
-	{{inc field_password.tpl with $field=$mail_pass }}{{endinc}}
-	{{inc field_input.tpl with $field=$mail_replyto }}{{endinc}}
-	{{inc field_checkbox.tpl with $field=$mail_pubmail }}{{endinc}}
-	{{inc field_select.tpl with $field=$mail_action }}{{endinc}}
-	{{inc field_input.tpl with $field=$mail_movetofolder }}{{endinc}}
-
-	<div class="settings-submit-wrapper" >
-		<input type="submit" id="imap-submit" name="imap-submit" class="settings-submit" value="$submit" />
-	</div>
-	</div>
-{{ endif }}
-
-</form>
-
diff --git a/view/settings_display.tpl b/view/settings_display.tpl
deleted file mode 100644
index 24fc110270..0000000000
--- a/view/settings_display.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-<h1>$ptitle</h1>
-
-<form action="settings/display" id="settings-form" method="post" autocomplete="off" >
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-{{inc field_themeselect.tpl with $field=$theme }}{{endinc}}
-{{inc field_themeselect.tpl with $field=$mobile_theme }}{{endinc}}
-{{inc field_input.tpl with $field=$ajaxint }}{{endinc}}
-{{inc field_input.tpl with $field=$itemspage_network }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$nosmile}}{{endinc}}
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-{{ if $theme_config }}
-<h2>Theme settings</h2>
-$theme_config
-{{ endif }}
-
-</form>
diff --git a/view/settings_display_end.tpl b/view/settings_display_end.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/settings_features.tpl b/view/settings_features.tpl
deleted file mode 100644
index 1b106d4111..0000000000
--- a/view/settings_features.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<h1>$title</h1>
-
-
-<form action="settings/features" method="post" autocomplete="off">
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-{{ for $features as $f }}
-<h3 class="settings-heading">$f.0</h3>
-
-{{ for $f.1 as $fcat }}
-	{{ inc field_yesno.tpl with $field=$fcat }}{{endinc}}
-{{ endfor }}
-{{ endfor }}
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-features-submit" value="$submit" />
-</div>
-
-</form>
-
diff --git a/view/settings_nick_set.tpl b/view/settings_nick_set.tpl
deleted file mode 100644
index eb4721d50d..0000000000
--- a/view/settings_nick_set.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-
-<div id="settings-nick-wrapper" >
-<div id="settings-nickname-desc" class="info-message">$desc <strong>'$nickname@$basepath'</strong>$subdir</div>
-</div>
-<div id="settings-nick-end" ></div>
diff --git a/view/settings_nick_subdir.tpl b/view/settings_nick_subdir.tpl
deleted file mode 100644
index 303c24df71..0000000000
--- a/view/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/settings_oauth.tpl b/view/settings_oauth.tpl
deleted file mode 100644
index 890c4ee6c8..0000000000
--- a/view/settings_oauth.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-<h1>$title</h1>
-
-
-<form action="settings/oauth" method="post" autocomplete="off">
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-	<div id="profile-edit-links">
-		<ul>
-			<li>
-				<a id="profile-edit-view-link" href="$baseurl/settings/oauth/add">$add</a>
-			</li>
-		</ul>
-	</div>
-
-	{{ for $apps as $app }}
-	<div class='oauthapp'>
-		<img src='$app.icon' class="{{ if $app.icon }} {{ else }}noicon{{ endif }}">
-		{{ if $app.name }}<h4>$app.name</h4>{{ else }}<h4>$noname</h4>{{ endif }}
-		{{ if $app.my }}
-			{{ if $app.oauth_token }}
-			<div class="settings-submit-wrapper" ><button class="settings-submit"  type="submit" name="remove" value="$app.oauth_token">$remove</button></div>
-			{{ endif }}
-		{{ endif }}
-		{{ if $app.my }}
-		<a href="$baseurl/settings/oauth/edit/$app.client_id" class="icon s22 edit" title="$edit">&nbsp;</a>
-		<a href="$baseurl/settings/oauth/delete/$app.client_id?t=$form_security_token" class="icon s22 delete" title="$delete">&nbsp;</a>
-		{{ endif }}		
-	</div>
-	{{ endfor }}
-
-</form>
diff --git a/view/settings_oauth_edit.tpl b/view/settings_oauth_edit.tpl
deleted file mode 100644
index e6f2abdc24..0000000000
--- a/view/settings_oauth_edit.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<h1>$title</h1>
-
-<form method="POST">
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-{{ inc field_input.tpl with $field=$name }}{{ endinc }}
-{{ inc field_input.tpl with $field=$key }}{{ endinc }}
-{{ inc field_input.tpl with $field=$secret }}{{ endinc }}
-{{ inc field_input.tpl with $field=$redirect }}{{ endinc }}
-{{ inc field_input.tpl with $field=$icon }}{{ endinc }}
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-<input type="submit" name="cancel" class="settings-submit" value="$cancel" />
-</div>
-
-</form>
diff --git a/view/suggest_friends.tpl b/view/suggest_friends.tpl
deleted file mode 100644
index e97b5e8cce..0000000000
--- a/view/suggest_friends.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="profile-match-wrapper">
-	<a href="$ignlnk" title="$ignore" class="icon drophide profile-match-ignore" onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" ></a>
-	<div class="profile-match-photo">
-		<a href="$url">
-			<img src="$photo" alt="$name" width="80" height="80" title="$name [$url]" />
-		</a>
-	</div>
-	<div class="profile-match-break"></div>
-	<div class="profile-match-name">
-		<a href="$url" title="$name">$name</a>
-	</div>
-	<div class="profile-match-end"></div>
-	{{ if $connlnk }}
-	<div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div>
-	{{ endif }}
-</div>
\ No newline at end of file
diff --git a/view/suggestions.tpl b/view/suggestions.tpl
deleted file mode 100644
index 656336496c..0000000000
--- a/view/suggestions.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-
-<div class="intro-wrapper" >
-
-<p class="intro-desc">$str_notifytype $notify_type</p>
-<div class="intro-madeby">$madeby</div>
-<div class="intro-fullname" >$fullname</div>
-<a class="intro-url-link" href="$url" ><img class="intro-photo lframe" src="$photo" width="175" height=175" title="$fullname" alt="$fullname" /></a>
-<div class="intro-note" >$note</div>
-<div class="intro-wrapper-end"></div>
-<form class="intro-form" action="notifications/$intro_id" method="post">
-<input class="intro-submit-ignore" type="submit" name="submit" value="$ignore" />
-<input class="intro-submit-discard" type="submit" name="submit" value="$discard" />
-</form>
-<div class="intro-form-end"></div>
-
-<form class="intro-approve-form" action="$request" method="get">
-{{inc field_checkbox.tpl with $field=$hidden }}{{endinc}}
-<input class="intro-submit-approve" type="submit" name="submit" value="$approve" />
-</form>
-</div>
-<div class="intro-end"></div>
diff --git a/view/tag_slap.tpl b/view/tag_slap.tpl
deleted file mode 100644
index 6449df4967..0000000000
--- a/view/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:object-type>http://activitystrea.ms/schema/1.0/person</as:object-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:object-type></as:object-type>
-		</as:object>
-		<as:target>
-		<as:object-type></as:object-type>
-		</as:target>
-	</entry>
diff --git a/view/smarty3/404.tpl b/view/templates/404.tpl
similarity index 100%
rename from view/smarty3/404.tpl
rename to view/templates/404.tpl
diff --git a/view/smarty3/acl_selector.tpl b/view/templates/acl_selector.tpl
similarity index 100%
rename from view/smarty3/acl_selector.tpl
rename to view/templates/acl_selector.tpl
diff --git a/view/smarty3/admin_aside.tpl b/view/templates/admin_aside.tpl
similarity index 100%
rename from view/smarty3/admin_aside.tpl
rename to view/templates/admin_aside.tpl
diff --git a/view/smarty3/admin_logs.tpl b/view/templates/admin_logs.tpl
similarity index 100%
rename from view/smarty3/admin_logs.tpl
rename to view/templates/admin_logs.tpl
diff --git a/view/smarty3/admin_plugins.tpl b/view/templates/admin_plugins.tpl
similarity index 100%
rename from view/smarty3/admin_plugins.tpl
rename to view/templates/admin_plugins.tpl
diff --git a/view/smarty3/admin_plugins_details.tpl b/view/templates/admin_plugins_details.tpl
similarity index 100%
rename from view/smarty3/admin_plugins_details.tpl
rename to view/templates/admin_plugins_details.tpl
diff --git a/view/smarty3/admin_remoteupdate.tpl b/view/templates/admin_remoteupdate.tpl
similarity index 100%
rename from view/smarty3/admin_remoteupdate.tpl
rename to view/templates/admin_remoteupdate.tpl
diff --git a/view/smarty3/admin_site.tpl b/view/templates/admin_site.tpl
similarity index 100%
rename from view/smarty3/admin_site.tpl
rename to view/templates/admin_site.tpl
diff --git a/view/smarty3/admin_summary.tpl b/view/templates/admin_summary.tpl
similarity index 100%
rename from view/smarty3/admin_summary.tpl
rename to view/templates/admin_summary.tpl
diff --git a/view/smarty3/admin_users.tpl b/view/templates/admin_users.tpl
similarity index 100%
rename from view/smarty3/admin_users.tpl
rename to view/templates/admin_users.tpl
diff --git a/view/smarty3/album_edit.tpl b/view/templates/album_edit.tpl
similarity index 100%
rename from view/smarty3/album_edit.tpl
rename to view/templates/album_edit.tpl
diff --git a/view/smarty3/api_config_xml.tpl b/view/templates/api_config_xml.tpl
similarity index 100%
rename from view/smarty3/api_config_xml.tpl
rename to view/templates/api_config_xml.tpl
diff --git a/view/smarty3/api_friends_xml.tpl b/view/templates/api_friends_xml.tpl
similarity index 100%
rename from view/smarty3/api_friends_xml.tpl
rename to view/templates/api_friends_xml.tpl
diff --git a/view/smarty3/api_ratelimit_xml.tpl b/view/templates/api_ratelimit_xml.tpl
similarity index 100%
rename from view/smarty3/api_ratelimit_xml.tpl
rename to view/templates/api_ratelimit_xml.tpl
diff --git a/view/smarty3/api_status_xml.tpl b/view/templates/api_status_xml.tpl
similarity index 100%
rename from view/smarty3/api_status_xml.tpl
rename to view/templates/api_status_xml.tpl
diff --git a/view/smarty3/api_test_xml.tpl b/view/templates/api_test_xml.tpl
similarity index 100%
rename from view/smarty3/api_test_xml.tpl
rename to view/templates/api_test_xml.tpl
diff --git a/view/smarty3/api_timeline_atom.tpl b/view/templates/api_timeline_atom.tpl
similarity index 100%
rename from view/smarty3/api_timeline_atom.tpl
rename to view/templates/api_timeline_atom.tpl
diff --git a/view/smarty3/api_timeline_rss.tpl b/view/templates/api_timeline_rss.tpl
similarity index 100%
rename from view/smarty3/api_timeline_rss.tpl
rename to view/templates/api_timeline_rss.tpl
diff --git a/view/smarty3/api_timeline_xml.tpl b/view/templates/api_timeline_xml.tpl
similarity index 100%
rename from view/smarty3/api_timeline_xml.tpl
rename to view/templates/api_timeline_xml.tpl
diff --git a/view/smarty3/api_user_xml.tpl b/view/templates/api_user_xml.tpl
similarity index 100%
rename from view/smarty3/api_user_xml.tpl
rename to view/templates/api_user_xml.tpl
diff --git a/view/smarty3/apps.tpl b/view/templates/apps.tpl
similarity index 100%
rename from view/smarty3/apps.tpl
rename to view/templates/apps.tpl
diff --git a/view/smarty3/atom_feed.tpl b/view/templates/atom_feed.tpl
similarity index 100%
rename from view/smarty3/atom_feed.tpl
rename to view/templates/atom_feed.tpl
diff --git a/view/smarty3/atom_feed_dfrn.tpl b/view/templates/atom_feed_dfrn.tpl
similarity index 100%
rename from view/smarty3/atom_feed_dfrn.tpl
rename to view/templates/atom_feed_dfrn.tpl
diff --git a/view/smarty3/atom_mail.tpl b/view/templates/atom_mail.tpl
similarity index 100%
rename from view/smarty3/atom_mail.tpl
rename to view/templates/atom_mail.tpl
diff --git a/view/smarty3/atom_relocate.tpl b/view/templates/atom_relocate.tpl
similarity index 100%
rename from view/smarty3/atom_relocate.tpl
rename to view/templates/atom_relocate.tpl
diff --git a/view/smarty3/atom_suggest.tpl b/view/templates/atom_suggest.tpl
similarity index 100%
rename from view/smarty3/atom_suggest.tpl
rename to view/templates/atom_suggest.tpl
diff --git a/view/smarty3/auto_request.tpl b/view/templates/auto_request.tpl
similarity index 100%
rename from view/smarty3/auto_request.tpl
rename to view/templates/auto_request.tpl
diff --git a/view/smarty3/birthdays_reminder.tpl b/view/templates/birthdays_reminder.tpl
similarity index 100%
rename from view/smarty3/birthdays_reminder.tpl
rename to view/templates/birthdays_reminder.tpl
diff --git a/view/smarty3/categories_widget.tpl b/view/templates/categories_widget.tpl
similarity index 100%
rename from view/smarty3/categories_widget.tpl
rename to view/templates/categories_widget.tpl
diff --git a/view/smarty3/comment_item.tpl b/view/templates/comment_item.tpl
similarity index 100%
rename from view/smarty3/comment_item.tpl
rename to view/templates/comment_item.tpl
diff --git a/view/smarty3/common_friends.tpl b/view/templates/common_friends.tpl
similarity index 100%
rename from view/smarty3/common_friends.tpl
rename to view/templates/common_friends.tpl
diff --git a/view/smarty3/common_tabs.tpl b/view/templates/common_tabs.tpl
similarity index 100%
rename from view/smarty3/common_tabs.tpl
rename to view/templates/common_tabs.tpl
diff --git a/view/smarty3/confirm.tpl b/view/templates/confirm.tpl
similarity index 100%
rename from view/smarty3/confirm.tpl
rename to view/templates/confirm.tpl
diff --git a/view/smarty3/contact_block.tpl b/view/templates/contact_block.tpl
similarity index 100%
rename from view/smarty3/contact_block.tpl
rename to view/templates/contact_block.tpl
diff --git a/view/smarty3/contact_edit.tpl b/view/templates/contact_edit.tpl
similarity index 100%
rename from view/smarty3/contact_edit.tpl
rename to view/templates/contact_edit.tpl
diff --git a/view/smarty3/contact_end.tpl b/view/templates/contact_end.tpl
similarity index 100%
rename from view/smarty3/contact_end.tpl
rename to view/templates/contact_end.tpl
diff --git a/view/smarty3/contact_head.tpl b/view/templates/contact_head.tpl
similarity index 100%
rename from view/smarty3/contact_head.tpl
rename to view/templates/contact_head.tpl
diff --git a/view/smarty3/contact_template.tpl b/view/templates/contact_template.tpl
similarity index 100%
rename from view/smarty3/contact_template.tpl
rename to view/templates/contact_template.tpl
diff --git a/view/smarty3/contacts-end.tpl b/view/templates/contacts-end.tpl
similarity index 100%
rename from view/smarty3/contacts-end.tpl
rename to view/templates/contacts-end.tpl
diff --git a/view/smarty3/contacts-head.tpl b/view/templates/contacts-head.tpl
similarity index 100%
rename from view/smarty3/contacts-head.tpl
rename to view/templates/contacts-head.tpl
diff --git a/view/smarty3/contacts-template.tpl b/view/templates/contacts-template.tpl
similarity index 100%
rename from view/smarty3/contacts-template.tpl
rename to view/templates/contacts-template.tpl
diff --git a/view/smarty3/contacts-widget-sidebar.tpl b/view/templates/contacts-widget-sidebar.tpl
similarity index 100%
rename from view/smarty3/contacts-widget-sidebar.tpl
rename to view/templates/contacts-widget-sidebar.tpl
diff --git a/view/smarty3/content.tpl b/view/templates/content.tpl
similarity index 100%
rename from view/smarty3/content.tpl
rename to view/templates/content.tpl
diff --git a/view/smarty3/conversation.tpl b/view/templates/conversation.tpl
similarity index 100%
rename from view/smarty3/conversation.tpl
rename to view/templates/conversation.tpl
diff --git a/view/smarty3/crepair.tpl b/view/templates/crepair.tpl
similarity index 100%
rename from view/smarty3/crepair.tpl
rename to view/templates/crepair.tpl
diff --git a/view/smarty3/cropbody.tpl b/view/templates/cropbody.tpl
similarity index 100%
rename from view/smarty3/cropbody.tpl
rename to view/templates/cropbody.tpl
diff --git a/view/smarty3/cropend.tpl b/view/templates/cropend.tpl
similarity index 100%
rename from view/smarty3/cropend.tpl
rename to view/templates/cropend.tpl
diff --git a/view/smarty3/crophead.tpl b/view/templates/crophead.tpl
similarity index 100%
rename from view/smarty3/crophead.tpl
rename to view/templates/crophead.tpl
diff --git a/view/smarty3/delegate.tpl b/view/templates/delegate.tpl
similarity index 100%
rename from view/smarty3/delegate.tpl
rename to view/templates/delegate.tpl
diff --git a/view/smarty3/dfrn_req_confirm.tpl b/view/templates/dfrn_req_confirm.tpl
similarity index 100%
rename from view/smarty3/dfrn_req_confirm.tpl
rename to view/templates/dfrn_req_confirm.tpl
diff --git a/view/smarty3/dfrn_request.tpl b/view/templates/dfrn_request.tpl
similarity index 100%
rename from view/smarty3/dfrn_request.tpl
rename to view/templates/dfrn_request.tpl
diff --git a/view/smarty3/diasp_dec_hdr.tpl b/view/templates/diasp_dec_hdr.tpl
similarity index 100%
rename from view/smarty3/diasp_dec_hdr.tpl
rename to view/templates/diasp_dec_hdr.tpl
diff --git a/view/smarty3/diaspora_comment.tpl b/view/templates/diaspora_comment.tpl
similarity index 100%
rename from view/smarty3/diaspora_comment.tpl
rename to view/templates/diaspora_comment.tpl
diff --git a/view/smarty3/diaspora_comment_relay.tpl b/view/templates/diaspora_comment_relay.tpl
similarity index 100%
rename from view/smarty3/diaspora_comment_relay.tpl
rename to view/templates/diaspora_comment_relay.tpl
diff --git a/view/smarty3/diaspora_conversation.tpl b/view/templates/diaspora_conversation.tpl
similarity index 100%
rename from view/smarty3/diaspora_conversation.tpl
rename to view/templates/diaspora_conversation.tpl
diff --git a/view/smarty3/diaspora_like.tpl b/view/templates/diaspora_like.tpl
similarity index 100%
rename from view/smarty3/diaspora_like.tpl
rename to view/templates/diaspora_like.tpl
diff --git a/view/smarty3/diaspora_like_relay.tpl b/view/templates/diaspora_like_relay.tpl
similarity index 100%
rename from view/smarty3/diaspora_like_relay.tpl
rename to view/templates/diaspora_like_relay.tpl
diff --git a/view/smarty3/diaspora_message.tpl b/view/templates/diaspora_message.tpl
similarity index 100%
rename from view/smarty3/diaspora_message.tpl
rename to view/templates/diaspora_message.tpl
diff --git a/view/smarty3/diaspora_photo.tpl b/view/templates/diaspora_photo.tpl
similarity index 100%
rename from view/smarty3/diaspora_photo.tpl
rename to view/templates/diaspora_photo.tpl
diff --git a/view/smarty3/diaspora_post.tpl b/view/templates/diaspora_post.tpl
similarity index 100%
rename from view/smarty3/diaspora_post.tpl
rename to view/templates/diaspora_post.tpl
diff --git a/view/smarty3/diaspora_profile.tpl b/view/templates/diaspora_profile.tpl
similarity index 100%
rename from view/smarty3/diaspora_profile.tpl
rename to view/templates/diaspora_profile.tpl
diff --git a/view/smarty3/diaspora_relay_retraction.tpl b/view/templates/diaspora_relay_retraction.tpl
similarity index 100%
rename from view/smarty3/diaspora_relay_retraction.tpl
rename to view/templates/diaspora_relay_retraction.tpl
diff --git a/view/smarty3/diaspora_relayable_retraction.tpl b/view/templates/diaspora_relayable_retraction.tpl
similarity index 100%
rename from view/smarty3/diaspora_relayable_retraction.tpl
rename to view/templates/diaspora_relayable_retraction.tpl
diff --git a/view/smarty3/diaspora_retract.tpl b/view/templates/diaspora_retract.tpl
similarity index 100%
rename from view/smarty3/diaspora_retract.tpl
rename to view/templates/diaspora_retract.tpl
diff --git a/view/smarty3/diaspora_share.tpl b/view/templates/diaspora_share.tpl
similarity index 100%
rename from view/smarty3/diaspora_share.tpl
rename to view/templates/diaspora_share.tpl
diff --git a/view/smarty3/diaspora_signed_retract.tpl b/view/templates/diaspora_signed_retract.tpl
similarity index 100%
rename from view/smarty3/diaspora_signed_retract.tpl
rename to view/templates/diaspora_signed_retract.tpl
diff --git a/view/smarty3/diaspora_vcard.tpl b/view/templates/diaspora_vcard.tpl
similarity index 100%
rename from view/smarty3/diaspora_vcard.tpl
rename to view/templates/diaspora_vcard.tpl
diff --git a/view/smarty3/directory_header.tpl b/view/templates/directory_header.tpl
similarity index 100%
rename from view/smarty3/directory_header.tpl
rename to view/templates/directory_header.tpl
diff --git a/view/smarty3/directory_item.tpl b/view/templates/directory_item.tpl
similarity index 100%
rename from view/smarty3/directory_item.tpl
rename to view/templates/directory_item.tpl
diff --git a/view/smarty3/display-head.tpl b/view/templates/display-head.tpl
similarity index 100%
rename from view/smarty3/display-head.tpl
rename to view/templates/display-head.tpl
diff --git a/view/smarty3/email_notify_html.tpl b/view/templates/email_notify_html.tpl
similarity index 100%
rename from view/smarty3/email_notify_html.tpl
rename to view/templates/email_notify_html.tpl
diff --git a/view/smarty3/email_notify_text.tpl b/view/templates/email_notify_text.tpl
similarity index 100%
rename from view/smarty3/email_notify_text.tpl
rename to view/templates/email_notify_text.tpl
diff --git a/view/smarty3/end.tpl b/view/templates/end.tpl
similarity index 100%
rename from view/smarty3/end.tpl
rename to view/templates/end.tpl
diff --git a/view/smarty3/event.tpl b/view/templates/event.tpl
similarity index 100%
rename from view/smarty3/event.tpl
rename to view/templates/event.tpl
diff --git a/view/smarty3/event_end.tpl b/view/templates/event_end.tpl
similarity index 100%
rename from view/smarty3/event_end.tpl
rename to view/templates/event_end.tpl
diff --git a/view/smarty3/event_form.tpl b/view/templates/event_form.tpl
similarity index 100%
rename from view/smarty3/event_form.tpl
rename to view/templates/event_form.tpl
diff --git a/view/smarty3/event_head.tpl b/view/templates/event_head.tpl
similarity index 100%
rename from view/smarty3/event_head.tpl
rename to view/templates/event_head.tpl
diff --git a/view/smarty3/events-js.tpl b/view/templates/events-js.tpl
similarity index 100%
rename from view/smarty3/events-js.tpl
rename to view/templates/events-js.tpl
diff --git a/view/smarty3/events.tpl b/view/templates/events.tpl
similarity index 100%
rename from view/smarty3/events.tpl
rename to view/templates/events.tpl
diff --git a/view/smarty3/events_reminder.tpl b/view/templates/events_reminder.tpl
similarity index 100%
rename from view/smarty3/events_reminder.tpl
rename to view/templates/events_reminder.tpl
diff --git a/view/smarty3/failed_updates.tpl b/view/templates/failed_updates.tpl
similarity index 100%
rename from view/smarty3/failed_updates.tpl
rename to view/templates/failed_updates.tpl
diff --git a/view/smarty3/fake_feed.tpl b/view/templates/fake_feed.tpl
similarity index 100%
rename from view/smarty3/fake_feed.tpl
rename to view/templates/fake_feed.tpl
diff --git a/view/smarty3/field.tpl b/view/templates/field.tpl
similarity index 100%
rename from view/smarty3/field.tpl
rename to view/templates/field.tpl
diff --git a/view/smarty3/field_checkbox.tpl b/view/templates/field_checkbox.tpl
similarity index 100%
rename from view/smarty3/field_checkbox.tpl
rename to view/templates/field_checkbox.tpl
diff --git a/view/smarty3/field_combobox.tpl b/view/templates/field_combobox.tpl
similarity index 100%
rename from view/smarty3/field_combobox.tpl
rename to view/templates/field_combobox.tpl
diff --git a/view/smarty3/field_custom.tpl b/view/templates/field_custom.tpl
similarity index 100%
rename from view/smarty3/field_custom.tpl
rename to view/templates/field_custom.tpl
diff --git a/view/smarty3/field_input.tpl b/view/templates/field_input.tpl
similarity index 100%
rename from view/smarty3/field_input.tpl
rename to view/templates/field_input.tpl
diff --git a/view/smarty3/field_intcheckbox.tpl b/view/templates/field_intcheckbox.tpl
similarity index 100%
rename from view/smarty3/field_intcheckbox.tpl
rename to view/templates/field_intcheckbox.tpl
diff --git a/view/smarty3/field_openid.tpl b/view/templates/field_openid.tpl
similarity index 100%
rename from view/smarty3/field_openid.tpl
rename to view/templates/field_openid.tpl
diff --git a/view/smarty3/field_password.tpl b/view/templates/field_password.tpl
similarity index 100%
rename from view/smarty3/field_password.tpl
rename to view/templates/field_password.tpl
diff --git a/view/smarty3/field_radio.tpl b/view/templates/field_radio.tpl
similarity index 100%
rename from view/smarty3/field_radio.tpl
rename to view/templates/field_radio.tpl
diff --git a/view/smarty3/field_richtext.tpl b/view/templates/field_richtext.tpl
similarity index 100%
rename from view/smarty3/field_richtext.tpl
rename to view/templates/field_richtext.tpl
diff --git a/view/smarty3/field_select.tpl b/view/templates/field_select.tpl
similarity index 100%
rename from view/smarty3/field_select.tpl
rename to view/templates/field_select.tpl
diff --git a/view/smarty3/field_select_raw.tpl b/view/templates/field_select_raw.tpl
similarity index 100%
rename from view/smarty3/field_select_raw.tpl
rename to view/templates/field_select_raw.tpl
diff --git a/view/smarty3/field_textarea.tpl b/view/templates/field_textarea.tpl
similarity index 100%
rename from view/smarty3/field_textarea.tpl
rename to view/templates/field_textarea.tpl
diff --git a/view/smarty3/field_themeselect.tpl b/view/templates/field_themeselect.tpl
similarity index 100%
rename from view/smarty3/field_themeselect.tpl
rename to view/templates/field_themeselect.tpl
diff --git a/view/smarty3/field_yesno.tpl b/view/templates/field_yesno.tpl
similarity index 100%
rename from view/smarty3/field_yesno.tpl
rename to view/templates/field_yesno.tpl
diff --git a/view/smarty3/fileas_widget.tpl b/view/templates/fileas_widget.tpl
similarity index 100%
rename from view/smarty3/fileas_widget.tpl
rename to view/templates/fileas_widget.tpl
diff --git a/view/smarty3/filebrowser.tpl b/view/templates/filebrowser.tpl
similarity index 100%
rename from view/smarty3/filebrowser.tpl
rename to view/templates/filebrowser.tpl
diff --git a/view/smarty3/filer_dialog.tpl b/view/templates/filer_dialog.tpl
similarity index 100%
rename from view/smarty3/filer_dialog.tpl
rename to view/templates/filer_dialog.tpl
diff --git a/view/smarty3/follow.tpl b/view/templates/follow.tpl
similarity index 100%
rename from view/smarty3/follow.tpl
rename to view/templates/follow.tpl
diff --git a/view/smarty3/follow_slap.tpl b/view/templates/follow_slap.tpl
similarity index 100%
rename from view/smarty3/follow_slap.tpl
rename to view/templates/follow_slap.tpl
diff --git a/view/smarty3/generic_links_widget.tpl b/view/templates/generic_links_widget.tpl
similarity index 100%
rename from view/smarty3/generic_links_widget.tpl
rename to view/templates/generic_links_widget.tpl
diff --git a/view/smarty3/group_drop.tpl b/view/templates/group_drop.tpl
similarity index 100%
rename from view/smarty3/group_drop.tpl
rename to view/templates/group_drop.tpl
diff --git a/view/smarty3/group_edit.tpl b/view/templates/group_edit.tpl
similarity index 100%
rename from view/smarty3/group_edit.tpl
rename to view/templates/group_edit.tpl
diff --git a/view/smarty3/group_selection.tpl b/view/templates/group_selection.tpl
similarity index 100%
rename from view/smarty3/group_selection.tpl
rename to view/templates/group_selection.tpl
diff --git a/view/smarty3/group_side.tpl b/view/templates/group_side.tpl
similarity index 100%
rename from view/smarty3/group_side.tpl
rename to view/templates/group_side.tpl
diff --git a/view/smarty3/groupeditor.tpl b/view/templates/groupeditor.tpl
similarity index 100%
rename from view/smarty3/groupeditor.tpl
rename to view/templates/groupeditor.tpl
diff --git a/view/smarty3/head.tpl b/view/templates/head.tpl
similarity index 100%
rename from view/smarty3/head.tpl
rename to view/templates/head.tpl
diff --git a/view/smarty3/hide_comments.tpl b/view/templates/hide_comments.tpl
similarity index 100%
rename from view/smarty3/hide_comments.tpl
rename to view/templates/hide_comments.tpl
diff --git a/view/smarty3/install.tpl b/view/templates/install.tpl
similarity index 100%
rename from view/smarty3/install.tpl
rename to view/templates/install.tpl
diff --git a/view/smarty3/install_checks.tpl b/view/templates/install_checks.tpl
similarity index 100%
rename from view/smarty3/install_checks.tpl
rename to view/templates/install_checks.tpl
diff --git a/view/smarty3/install_db.tpl b/view/templates/install_db.tpl
similarity index 100%
rename from view/smarty3/install_db.tpl
rename to view/templates/install_db.tpl
diff --git a/view/smarty3/install_settings.tpl b/view/templates/install_settings.tpl
similarity index 100%
rename from view/smarty3/install_settings.tpl
rename to view/templates/install_settings.tpl
diff --git a/view/smarty3/intros.tpl b/view/templates/intros.tpl
similarity index 100%
rename from view/smarty3/intros.tpl
rename to view/templates/intros.tpl
diff --git a/view/smarty3/invite.tpl b/view/templates/invite.tpl
similarity index 100%
rename from view/smarty3/invite.tpl
rename to view/templates/invite.tpl
diff --git a/view/smarty3/jot-end.tpl b/view/templates/jot-end.tpl
similarity index 100%
rename from view/smarty3/jot-end.tpl
rename to view/templates/jot-end.tpl
diff --git a/view/smarty3/jot-header.tpl b/view/templates/jot-header.tpl
similarity index 100%
rename from view/smarty3/jot-header.tpl
rename to view/templates/jot-header.tpl
diff --git a/view/smarty3/jot.tpl b/view/templates/jot.tpl
similarity index 100%
rename from view/smarty3/jot.tpl
rename to view/templates/jot.tpl
diff --git a/view/smarty3/jot_geotag.tpl b/view/templates/jot_geotag.tpl
similarity index 100%
rename from view/smarty3/jot_geotag.tpl
rename to view/templates/jot_geotag.tpl
diff --git a/view/smarty3/lang_selector.tpl b/view/templates/lang_selector.tpl
similarity index 100%
rename from view/smarty3/lang_selector.tpl
rename to view/templates/lang_selector.tpl
diff --git a/view/smarty3/like_noshare.tpl b/view/templates/like_noshare.tpl
similarity index 100%
rename from view/smarty3/like_noshare.tpl
rename to view/templates/like_noshare.tpl
diff --git a/view/smarty3/login.tpl b/view/templates/login.tpl
similarity index 100%
rename from view/smarty3/login.tpl
rename to view/templates/login.tpl
diff --git a/view/smarty3/login_head.tpl b/view/templates/login_head.tpl
similarity index 100%
rename from view/smarty3/login_head.tpl
rename to view/templates/login_head.tpl
diff --git a/view/smarty3/logout.tpl b/view/templates/logout.tpl
similarity index 100%
rename from view/smarty3/logout.tpl
rename to view/templates/logout.tpl
diff --git a/view/smarty3/lostpass.tpl b/view/templates/lostpass.tpl
similarity index 100%
rename from view/smarty3/lostpass.tpl
rename to view/templates/lostpass.tpl
diff --git a/view/smarty3/magicsig.tpl b/view/templates/magicsig.tpl
similarity index 100%
rename from view/smarty3/magicsig.tpl
rename to view/templates/magicsig.tpl
diff --git a/view/smarty3/mail_conv.tpl b/view/templates/mail_conv.tpl
similarity index 100%
rename from view/smarty3/mail_conv.tpl
rename to view/templates/mail_conv.tpl
diff --git a/view/smarty3/mail_display.tpl b/view/templates/mail_display.tpl
similarity index 100%
rename from view/smarty3/mail_display.tpl
rename to view/templates/mail_display.tpl
diff --git a/view/smarty3/mail_head.tpl b/view/templates/mail_head.tpl
similarity index 100%
rename from view/smarty3/mail_head.tpl
rename to view/templates/mail_head.tpl
diff --git a/view/smarty3/mail_list.tpl b/view/templates/mail_list.tpl
similarity index 100%
rename from view/smarty3/mail_list.tpl
rename to view/templates/mail_list.tpl
diff --git a/view/smarty3/maintenance.tpl b/view/templates/maintenance.tpl
similarity index 100%
rename from view/smarty3/maintenance.tpl
rename to view/templates/maintenance.tpl
diff --git a/view/smarty3/manage.tpl b/view/templates/manage.tpl
similarity index 100%
rename from view/smarty3/manage.tpl
rename to view/templates/manage.tpl
diff --git a/view/smarty3/match.tpl b/view/templates/match.tpl
similarity index 100%
rename from view/smarty3/match.tpl
rename to view/templates/match.tpl
diff --git a/view/smarty3/message-end.tpl b/view/templates/message-end.tpl
similarity index 100%
rename from view/smarty3/message-end.tpl
rename to view/templates/message-end.tpl
diff --git a/view/smarty3/message-head.tpl b/view/templates/message-head.tpl
similarity index 100%
rename from view/smarty3/message-head.tpl
rename to view/templates/message-head.tpl
diff --git a/view/smarty3/message_side.tpl b/view/templates/message_side.tpl
similarity index 100%
rename from view/smarty3/message_side.tpl
rename to view/templates/message_side.tpl
diff --git a/view/smarty3/moderated_comment.tpl b/view/templates/moderated_comment.tpl
similarity index 100%
rename from view/smarty3/moderated_comment.tpl
rename to view/templates/moderated_comment.tpl
diff --git a/view/smarty3/mood_content.tpl b/view/templates/mood_content.tpl
similarity index 100%
rename from view/smarty3/mood_content.tpl
rename to view/templates/mood_content.tpl
diff --git a/view/smarty3/msg-end.tpl b/view/templates/msg-end.tpl
similarity index 100%
rename from view/smarty3/msg-end.tpl
rename to view/templates/msg-end.tpl
diff --git a/view/smarty3/msg-header.tpl b/view/templates/msg-header.tpl
similarity index 100%
rename from view/smarty3/msg-header.tpl
rename to view/templates/msg-header.tpl
diff --git a/view/smarty3/nav.tpl b/view/templates/nav.tpl
similarity index 100%
rename from view/smarty3/nav.tpl
rename to view/templates/nav.tpl
diff --git a/view/smarty3/navigation.tpl b/view/templates/navigation.tpl
similarity index 100%
rename from view/smarty3/navigation.tpl
rename to view/templates/navigation.tpl
diff --git a/view/smarty3/netfriend.tpl b/view/templates/netfriend.tpl
similarity index 100%
rename from view/smarty3/netfriend.tpl
rename to view/templates/netfriend.tpl
diff --git a/view/smarty3/nets.tpl b/view/templates/nets.tpl
similarity index 100%
rename from view/smarty3/nets.tpl
rename to view/templates/nets.tpl
diff --git a/view/smarty3/nogroup-template.tpl b/view/templates/nogroup-template.tpl
similarity index 100%
rename from view/smarty3/nogroup-template.tpl
rename to view/templates/nogroup-template.tpl
diff --git a/view/smarty3/notifications.tpl b/view/templates/notifications.tpl
similarity index 100%
rename from view/smarty3/notifications.tpl
rename to view/templates/notifications.tpl
diff --git a/view/smarty3/notifications_comments_item.tpl b/view/templates/notifications_comments_item.tpl
similarity index 100%
rename from view/smarty3/notifications_comments_item.tpl
rename to view/templates/notifications_comments_item.tpl
diff --git a/view/smarty3/notifications_dislikes_item.tpl b/view/templates/notifications_dislikes_item.tpl
similarity index 100%
rename from view/smarty3/notifications_dislikes_item.tpl
rename to view/templates/notifications_dislikes_item.tpl
diff --git a/view/smarty3/notifications_friends_item.tpl b/view/templates/notifications_friends_item.tpl
similarity index 100%
rename from view/smarty3/notifications_friends_item.tpl
rename to view/templates/notifications_friends_item.tpl
diff --git a/view/smarty3/notifications_likes_item.tpl b/view/templates/notifications_likes_item.tpl
similarity index 100%
rename from view/smarty3/notifications_likes_item.tpl
rename to view/templates/notifications_likes_item.tpl
diff --git a/view/smarty3/notifications_network_item.tpl b/view/templates/notifications_network_item.tpl
similarity index 100%
rename from view/smarty3/notifications_network_item.tpl
rename to view/templates/notifications_network_item.tpl
diff --git a/view/smarty3/notifications_posts_item.tpl b/view/templates/notifications_posts_item.tpl
similarity index 100%
rename from view/smarty3/notifications_posts_item.tpl
rename to view/templates/notifications_posts_item.tpl
diff --git a/view/smarty3/notify.tpl b/view/templates/notify.tpl
similarity index 100%
rename from view/smarty3/notify.tpl
rename to view/templates/notify.tpl
diff --git a/view/smarty3/oauth_authorize.tpl b/view/templates/oauth_authorize.tpl
similarity index 100%
rename from view/smarty3/oauth_authorize.tpl
rename to view/templates/oauth_authorize.tpl
diff --git a/view/smarty3/oauth_authorize_done.tpl b/view/templates/oauth_authorize_done.tpl
similarity index 100%
rename from view/smarty3/oauth_authorize_done.tpl
rename to view/templates/oauth_authorize_done.tpl
diff --git a/view/smarty3/oembed_video.tpl b/view/templates/oembed_video.tpl
similarity index 100%
rename from view/smarty3/oembed_video.tpl
rename to view/templates/oembed_video.tpl
diff --git a/view/smarty3/oexchange_xrd.tpl b/view/templates/oexchange_xrd.tpl
similarity index 100%
rename from view/smarty3/oexchange_xrd.tpl
rename to view/templates/oexchange_xrd.tpl
diff --git a/view/smarty3/opensearch.tpl b/view/templates/opensearch.tpl
similarity index 100%
rename from view/smarty3/opensearch.tpl
rename to view/templates/opensearch.tpl
diff --git a/view/smarty3/pagetypes.tpl b/view/templates/pagetypes.tpl
similarity index 100%
rename from view/smarty3/pagetypes.tpl
rename to view/templates/pagetypes.tpl
diff --git a/view/smarty3/peoplefind.tpl b/view/templates/peoplefind.tpl
similarity index 100%
rename from view/smarty3/peoplefind.tpl
rename to view/templates/peoplefind.tpl
diff --git a/view/smarty3/photo_album.tpl b/view/templates/photo_album.tpl
similarity index 100%
rename from view/smarty3/photo_album.tpl
rename to view/templates/photo_album.tpl
diff --git a/view/smarty3/photo_drop.tpl b/view/templates/photo_drop.tpl
similarity index 100%
rename from view/smarty3/photo_drop.tpl
rename to view/templates/photo_drop.tpl
diff --git a/view/smarty3/photo_edit.tpl b/view/templates/photo_edit.tpl
similarity index 100%
rename from view/smarty3/photo_edit.tpl
rename to view/templates/photo_edit.tpl
diff --git a/view/smarty3/photo_edit_head.tpl b/view/templates/photo_edit_head.tpl
similarity index 100%
rename from view/smarty3/photo_edit_head.tpl
rename to view/templates/photo_edit_head.tpl
diff --git a/view/smarty3/photo_item.tpl b/view/templates/photo_item.tpl
similarity index 100%
rename from view/smarty3/photo_item.tpl
rename to view/templates/photo_item.tpl
diff --git a/view/smarty3/photo_top.tpl b/view/templates/photo_top.tpl
similarity index 100%
rename from view/smarty3/photo_top.tpl
rename to view/templates/photo_top.tpl
diff --git a/view/smarty3/photo_view.tpl b/view/templates/photo_view.tpl
similarity index 100%
rename from view/smarty3/photo_view.tpl
rename to view/templates/photo_view.tpl
diff --git a/view/smarty3/photos_default_uploader_box.tpl b/view/templates/photos_default_uploader_box.tpl
similarity index 100%
rename from view/smarty3/photos_default_uploader_box.tpl
rename to view/templates/photos_default_uploader_box.tpl
diff --git a/view/smarty3/photos_default_uploader_submit.tpl b/view/templates/photos_default_uploader_submit.tpl
similarity index 100%
rename from view/smarty3/photos_default_uploader_submit.tpl
rename to view/templates/photos_default_uploader_submit.tpl
diff --git a/view/smarty3/photos_head.tpl b/view/templates/photos_head.tpl
similarity index 100%
rename from view/smarty3/photos_head.tpl
rename to view/templates/photos_head.tpl
diff --git a/view/smarty3/photos_recent.tpl b/view/templates/photos_recent.tpl
similarity index 100%
rename from view/smarty3/photos_recent.tpl
rename to view/templates/photos_recent.tpl
diff --git a/view/smarty3/photos_upload.tpl b/view/templates/photos_upload.tpl
similarity index 100%
rename from view/smarty3/photos_upload.tpl
rename to view/templates/photos_upload.tpl
diff --git a/view/smarty3/poco_entry_xml.tpl b/view/templates/poco_entry_xml.tpl
similarity index 100%
rename from view/smarty3/poco_entry_xml.tpl
rename to view/templates/poco_entry_xml.tpl
diff --git a/view/smarty3/poco_xml.tpl b/view/templates/poco_xml.tpl
similarity index 100%
rename from view/smarty3/poco_xml.tpl
rename to view/templates/poco_xml.tpl
diff --git a/view/smarty3/poke_content.tpl b/view/templates/poke_content.tpl
similarity index 100%
rename from view/smarty3/poke_content.tpl
rename to view/templates/poke_content.tpl
diff --git a/view/smarty3/posted_date_widget.tpl b/view/templates/posted_date_widget.tpl
similarity index 100%
rename from view/smarty3/posted_date_widget.tpl
rename to view/templates/posted_date_widget.tpl
diff --git a/view/smarty3/profed_end.tpl b/view/templates/profed_end.tpl
similarity index 100%
rename from view/smarty3/profed_end.tpl
rename to view/templates/profed_end.tpl
diff --git a/view/smarty3/profed_head.tpl b/view/templates/profed_head.tpl
similarity index 100%
rename from view/smarty3/profed_head.tpl
rename to view/templates/profed_head.tpl
diff --git a/view/smarty3/profile-hide-friends.tpl b/view/templates/profile-hide-friends.tpl
similarity index 100%
rename from view/smarty3/profile-hide-friends.tpl
rename to view/templates/profile-hide-friends.tpl
diff --git a/view/smarty3/profile-hide-wall.tpl b/view/templates/profile-hide-wall.tpl
similarity index 100%
rename from view/smarty3/profile-hide-wall.tpl
rename to view/templates/profile-hide-wall.tpl
diff --git a/view/smarty3/profile-in-directory.tpl b/view/templates/profile-in-directory.tpl
similarity index 100%
rename from view/smarty3/profile-in-directory.tpl
rename to view/templates/profile-in-directory.tpl
diff --git a/view/smarty3/profile-in-netdir.tpl b/view/templates/profile-in-netdir.tpl
similarity index 100%
rename from view/smarty3/profile-in-netdir.tpl
rename to view/templates/profile-in-netdir.tpl
diff --git a/view/smarty3/profile_advanced.tpl b/view/templates/profile_advanced.tpl
similarity index 100%
rename from view/smarty3/profile_advanced.tpl
rename to view/templates/profile_advanced.tpl
diff --git a/view/smarty3/profile_edit.tpl b/view/templates/profile_edit.tpl
similarity index 100%
rename from view/smarty3/profile_edit.tpl
rename to view/templates/profile_edit.tpl
diff --git a/view/smarty3/profile_edlink.tpl b/view/templates/profile_edlink.tpl
similarity index 100%
rename from view/smarty3/profile_edlink.tpl
rename to view/templates/profile_edlink.tpl
diff --git a/view/smarty3/profile_entry.tpl b/view/templates/profile_entry.tpl
similarity index 100%
rename from view/smarty3/profile_entry.tpl
rename to view/templates/profile_entry.tpl
diff --git a/view/smarty3/profile_listing_header.tpl b/view/templates/profile_listing_header.tpl
similarity index 100%
rename from view/smarty3/profile_listing_header.tpl
rename to view/templates/profile_listing_header.tpl
diff --git a/view/smarty3/profile_photo.tpl b/view/templates/profile_photo.tpl
similarity index 100%
rename from view/smarty3/profile_photo.tpl
rename to view/templates/profile_photo.tpl
diff --git a/view/smarty3/profile_publish.tpl b/view/templates/profile_publish.tpl
similarity index 100%
rename from view/smarty3/profile_publish.tpl
rename to view/templates/profile_publish.tpl
diff --git a/view/smarty3/profile_vcard.tpl b/view/templates/profile_vcard.tpl
similarity index 100%
rename from view/smarty3/profile_vcard.tpl
rename to view/templates/profile_vcard.tpl
diff --git a/view/smarty3/prv_message.tpl b/view/templates/prv_message.tpl
similarity index 100%
rename from view/smarty3/prv_message.tpl
rename to view/templates/prv_message.tpl
diff --git a/view/smarty3/pwdreset.tpl b/view/templates/pwdreset.tpl
similarity index 100%
rename from view/smarty3/pwdreset.tpl
rename to view/templates/pwdreset.tpl
diff --git a/view/smarty3/register.tpl b/view/templates/register.tpl
similarity index 100%
rename from view/smarty3/register.tpl
rename to view/templates/register.tpl
diff --git a/view/smarty3/remote_friends_common.tpl b/view/templates/remote_friends_common.tpl
similarity index 100%
rename from view/smarty3/remote_friends_common.tpl
rename to view/templates/remote_friends_common.tpl
diff --git a/view/smarty3/removeme.tpl b/view/templates/removeme.tpl
similarity index 100%
rename from view/smarty3/removeme.tpl
rename to view/templates/removeme.tpl
diff --git a/view/smarty3/saved_searches_aside.tpl b/view/templates/saved_searches_aside.tpl
similarity index 100%
rename from view/smarty3/saved_searches_aside.tpl
rename to view/templates/saved_searches_aside.tpl
diff --git a/view/smarty3/search_item.tpl b/view/templates/search_item.tpl
similarity index 100%
rename from view/smarty3/search_item.tpl
rename to view/templates/search_item.tpl
diff --git a/view/smarty3/settings-end.tpl b/view/templates/settings-end.tpl
similarity index 100%
rename from view/smarty3/settings-end.tpl
rename to view/templates/settings-end.tpl
diff --git a/view/smarty3/settings-head.tpl b/view/templates/settings-head.tpl
similarity index 100%
rename from view/smarty3/settings-head.tpl
rename to view/templates/settings-head.tpl
diff --git a/view/smarty3/settings.tpl b/view/templates/settings.tpl
similarity index 100%
rename from view/smarty3/settings.tpl
rename to view/templates/settings.tpl
diff --git a/view/smarty3/settings_addons.tpl b/view/templates/settings_addons.tpl
similarity index 100%
rename from view/smarty3/settings_addons.tpl
rename to view/templates/settings_addons.tpl
diff --git a/view/smarty3/settings_connectors.tpl b/view/templates/settings_connectors.tpl
similarity index 100%
rename from view/smarty3/settings_connectors.tpl
rename to view/templates/settings_connectors.tpl
diff --git a/view/smarty3/settings_display.tpl b/view/templates/settings_display.tpl
similarity index 100%
rename from view/smarty3/settings_display.tpl
rename to view/templates/settings_display.tpl
diff --git a/view/smarty3/settings_display_end.tpl b/view/templates/settings_display_end.tpl
similarity index 100%
rename from view/smarty3/settings_display_end.tpl
rename to view/templates/settings_display_end.tpl
diff --git a/view/smarty3/settings_features.tpl b/view/templates/settings_features.tpl
similarity index 100%
rename from view/smarty3/settings_features.tpl
rename to view/templates/settings_features.tpl
diff --git a/view/smarty3/settings_nick_set.tpl b/view/templates/settings_nick_set.tpl
similarity index 100%
rename from view/smarty3/settings_nick_set.tpl
rename to view/templates/settings_nick_set.tpl
diff --git a/view/smarty3/settings_nick_subdir.tpl b/view/templates/settings_nick_subdir.tpl
similarity index 100%
rename from view/smarty3/settings_nick_subdir.tpl
rename to view/templates/settings_nick_subdir.tpl
diff --git a/view/smarty3/settings_oauth.tpl b/view/templates/settings_oauth.tpl
similarity index 100%
rename from view/smarty3/settings_oauth.tpl
rename to view/templates/settings_oauth.tpl
diff --git a/view/smarty3/settings_oauth_edit.tpl b/view/templates/settings_oauth_edit.tpl
similarity index 100%
rename from view/smarty3/settings_oauth_edit.tpl
rename to view/templates/settings_oauth_edit.tpl
diff --git a/view/smarty3/suggest_friends.tpl b/view/templates/suggest_friends.tpl
similarity index 100%
rename from view/smarty3/suggest_friends.tpl
rename to view/templates/suggest_friends.tpl
diff --git a/view/smarty3/suggestions.tpl b/view/templates/suggestions.tpl
similarity index 100%
rename from view/smarty3/suggestions.tpl
rename to view/templates/suggestions.tpl
diff --git a/view/smarty3/tag_slap.tpl b/view/templates/tag_slap.tpl
similarity index 100%
rename from view/smarty3/tag_slap.tpl
rename to view/templates/tag_slap.tpl
diff --git a/view/smarty3/threaded_conversation.tpl b/view/templates/threaded_conversation.tpl
similarity index 100%
rename from view/smarty3/threaded_conversation.tpl
rename to view/templates/threaded_conversation.tpl
diff --git a/view/smarty3/toggle_mobile_footer.tpl b/view/templates/toggle_mobile_footer.tpl
similarity index 100%
rename from view/smarty3/toggle_mobile_footer.tpl
rename to view/templates/toggle_mobile_footer.tpl
diff --git a/view/smarty3/uexport.tpl b/view/templates/uexport.tpl
similarity index 100%
rename from view/smarty3/uexport.tpl
rename to view/templates/uexport.tpl
diff --git a/view/smarty3/uimport.tpl b/view/templates/uimport.tpl
similarity index 100%
rename from view/smarty3/uimport.tpl
rename to view/templates/uimport.tpl
diff --git a/view/smarty3/vcard-widget.tpl b/view/templates/vcard-widget.tpl
similarity index 100%
rename from view/smarty3/vcard-widget.tpl
rename to view/templates/vcard-widget.tpl
diff --git a/view/smarty3/viewcontact_template.tpl b/view/templates/viewcontact_template.tpl
similarity index 100%
rename from view/smarty3/viewcontact_template.tpl
rename to view/templates/viewcontact_template.tpl
diff --git a/view/smarty3/voting_fakelink.tpl b/view/templates/voting_fakelink.tpl
similarity index 100%
rename from view/smarty3/voting_fakelink.tpl
rename to view/templates/voting_fakelink.tpl
diff --git a/view/smarty3/wall_thread.tpl b/view/templates/wall_thread.tpl
similarity index 100%
rename from view/smarty3/wall_thread.tpl
rename to view/templates/wall_thread.tpl
diff --git a/view/smarty3/wallmessage.tpl b/view/templates/wallmessage.tpl
similarity index 100%
rename from view/smarty3/wallmessage.tpl
rename to view/templates/wallmessage.tpl
diff --git a/view/smarty3/wallmsg-end.tpl b/view/templates/wallmsg-end.tpl
similarity index 100%
rename from view/smarty3/wallmsg-end.tpl
rename to view/templates/wallmsg-end.tpl
diff --git a/view/smarty3/wallmsg-header.tpl b/view/templates/wallmsg-header.tpl
similarity index 100%
rename from view/smarty3/wallmsg-header.tpl
rename to view/templates/wallmsg-header.tpl
diff --git a/view/smarty3/xrd_diaspora.tpl b/view/templates/xrd_diaspora.tpl
similarity index 100%
rename from view/smarty3/xrd_diaspora.tpl
rename to view/templates/xrd_diaspora.tpl
diff --git a/view/smarty3/xrd_host.tpl b/view/templates/xrd_host.tpl
similarity index 100%
rename from view/smarty3/xrd_host.tpl
rename to view/templates/xrd_host.tpl
diff --git a/view/smarty3/xrd_person.tpl b/view/templates/xrd_person.tpl
similarity index 100%
rename from view/smarty3/xrd_person.tpl
rename to view/templates/xrd_person.tpl
diff --git a/view/theme/cleanzero/nav.tpl b/view/theme/cleanzero/nav.tpl
deleted file mode 100644
index 17a2f72590..0000000000
--- a/view/theme/cleanzero/nav.tpl
+++ /dev/null
@@ -1,85 +0,0 @@
- <nav>
-	$langselector
-
-	<div id="site-location">$sitelocation</div>
-
-
-	<span id="nav-commlink-wrapper">
-
-	{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-		
-
-
-	{{ if $nav.network }}
-	<a id="nav-network-link" class="nav-commlink $nav.network.2 $sel.network" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
-	<span id="net-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	{{ if $nav.home }}
-	<a id="nav-home-link" class="nav-commlink $nav.home.2 $sel.home" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
-	<span id="home-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	{{ if $nav.community }}
-	<a id="nav-community-link" class="nav-commlink $nav.community.2 $sel.community" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
-	{{ endif }}
-	{{ if $nav.introductions }}
-	<a id="nav-notify-link" class="nav-commlink $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a>
-	<span id="intro-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	{{ if $nav.messages }}
-	<a id="nav-messages-link" class="nav-commlink $nav.messages.2 $sel.messages" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
-	<span id="mail-update" class="nav-ajax-left"></span>
-	{{ endif }}
-		{{ if $nav.notifications }}
-			<a id="nav-notifications-linkmenu" class="nav-commlink" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>
-				<span id="notify-update" class="nav-ajax-left"></span>
-				<ul id="nav-notifications-menu" class="menu-popup">
-					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-					<li class="empty">$emptynotifications</li>
-				</ul>
-		{{ endif }}	
-	</span>
-       <span id="banner">$banner</span>
-	<span id="nav-link-wrapper">
-	{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
-	{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-	{{ if $nav.help }} <a id="nav-help-link" class="nav-link $nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>{{ endif }}
-		
-	{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
-	<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
-	<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
-	{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
-
-
-	
-
-	{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
-	{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
-	{{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
-
-
-	{{ if $nav.manage }}<a id="nav-manage-link" class="nav-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-	</span>
-	<span id="nav-end"></span>
-	
-</nav>
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
-</ul>
-<script>
-var pagetitle = null;
-$("nav").bind('nav-update', function(e,data){
-if (pagetitle==null) pagetitle = document.title;
-var count = $(data).find('notif').attr('count');
-if (count>0) {
-document.title = "("+count+") "+pagetitle;
-} else {
-document.title = pagetitle;
-}
-});
-</script>
diff --git a/view/theme/cleanzero/smarty3/nav.tpl b/view/theme/cleanzero/templates/nav.tpl
similarity index 100%
rename from view/theme/cleanzero/smarty3/nav.tpl
rename to view/theme/cleanzero/templates/nav.tpl
diff --git a/view/theme/cleanzero/smarty3/theme_settings.tpl b/view/theme/cleanzero/templates/theme_settings.tpl
similarity index 100%
rename from view/theme/cleanzero/smarty3/theme_settings.tpl
rename to view/theme/cleanzero/templates/theme_settings.tpl
diff --git a/view/theme/cleanzero/theme_settings.tpl b/view/theme/cleanzero/theme_settings.tpl
deleted file mode 100644
index bfe18af27d..0000000000
--- a/view/theme/cleanzero/theme_settings.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{inc field_select.tpl with $field=$color}}{{endinc}}
-{{inc field_select.tpl with $field=$font_size}}{{endinc}}
-{{inc field_select.tpl with $field=$resize}}{{endinc}}
-{{inc field_select.tpl with $field=$theme_width}}{{endinc}}
-
-
-<div class="settings-submit-wrapper">
-	<input type="submit" value="$submit" class="settings-submit" name="cleanzero-settings-submit" />
-</div>
-
diff --git a/view/theme/comix-plain/comment_item.tpl b/view/theme/comix-plain/comment_item.tpl
deleted file mode 100644
index 045a350f6d..0000000000
--- a/view/theme/comix-plain/comment_item.tpl
+++ /dev/null
@@ -1,33 +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" />
-				<input type="hidden" name="post_id_random" value="$rand_num" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty triangle-isosceles left" style="display: block;" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
-				{{ if $qcomment }}
-				{{ for $qcomment as $qc }}				
-					<span class="fakelink qcomment" onclick="commentInsert(this,$id); return false;" >$qc</span>
-					&nbsp;
-				{{ endfor }}
-				{{ endif }}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/comix-plain/search_item.tpl b/view/theme/comix-plain/search_item.tpl
deleted file mode 100644
index cf1c388cd2..0000000000
--- a/view/theme/comix-plain/search_item.tpl
+++ /dev/null
@@ -1,54 +0,0 @@
-<div class="wall-item-outside-wrapper $item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
-	<div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
-		<div class="wall-item-info" id="wall-item-info-$item.id">
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
-				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-					<ul>
-						$item.item_photo_menu
-					</ul>
-				</div>
-			</div>
-			<div class="wall-item-photo-end"></div>	
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
-			</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
-				
-		</div>			
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body triangle-isosceles left" id="wall-item-body-$item.id" >$item.body</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-			</div>
-				{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
-			<div class="wall-item-delete-end"></div>
-		</div>
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-
-
-	<div class="wall-item-conv" id="wall-item-conv-$item.id" >
-	{{ if $item.conv }}
-			<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
-	{{ endif }}
-	</div>
-
-<div class="wall-item-outside-wrapper-end $item.indent" ></div>
-
-</div>
-
-
diff --git a/view/theme/comix-plain/smarty3/comment_item.tpl b/view/theme/comix-plain/templates/comment_item.tpl
similarity index 100%
rename from view/theme/comix-plain/smarty3/comment_item.tpl
rename to view/theme/comix-plain/templates/comment_item.tpl
diff --git a/view/theme/comix-plain/smarty3/search_item.tpl b/view/theme/comix-plain/templates/search_item.tpl
similarity index 100%
rename from view/theme/comix-plain/smarty3/search_item.tpl
rename to view/theme/comix-plain/templates/search_item.tpl
diff --git a/view/theme/comix/comment_item.tpl b/view/theme/comix/comment_item.tpl
deleted file mode 100644
index 045a350f6d..0000000000
--- a/view/theme/comix/comment_item.tpl
+++ /dev/null
@@ -1,33 +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" />
-				<input type="hidden" name="post_id_random" value="$rand_num" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty triangle-isosceles left" style="display: block;" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
-				{{ if $qcomment }}
-				{{ for $qcomment as $qc }}				
-					<span class="fakelink qcomment" onclick="commentInsert(this,$id); return false;" >$qc</span>
-					&nbsp;
-				{{ endfor }}
-				{{ endif }}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/comix/search_item.tpl b/view/theme/comix/search_item.tpl
deleted file mode 100644
index 34c176ceef..0000000000
--- a/view/theme/comix/search_item.tpl
+++ /dev/null
@@ -1,54 +0,0 @@
-<div class="wall-item-outside-wrapper $item.indent $item.shiny$item.previewing" id="wall-item-outside-wrapper-$item.id" >
-	<div class="wall-item-content-wrapper $item.indent $item.shiny" id="wall-item-content-wrapper-$item.id" >
-		<div class="wall-item-info" id="wall-item-info-$item.id">
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
-				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-					<ul>
-						$item.item_photo_menu
-					</ul>
-				</div>
-			</div>
-			<div class="wall-item-photo-end"></div>	
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
-			</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
-				
-		</div>			
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body triangle-isosceles left" id="wall-item-body-$item.id" >$item.body</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-			</div>
-				{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
-			<div class="wall-item-delete-end"></div>
-		</div>
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-
-
-	<div class="wall-item-conv" id="wall-item-conv-$item.id" >
-	{{ if $item.conv }}
-			<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
-	{{ endif }}
-	</div>
-
-<div class="wall-item-outside-wrapper-end $item.indent $item.shiny" ></div>
-
-</div>
-
-
diff --git a/view/theme/comix/smarty3/comment_item.tpl b/view/theme/comix/templates/comment_item.tpl
similarity index 100%
rename from view/theme/comix/smarty3/comment_item.tpl
rename to view/theme/comix/templates/comment_item.tpl
diff --git a/view/theme/comix/smarty3/search_item.tpl b/view/theme/comix/templates/search_item.tpl
similarity index 100%
rename from view/theme/comix/smarty3/search_item.tpl
rename to view/theme/comix/templates/search_item.tpl
diff --git a/view/theme/decaf-mobile/acl_html_selector.tpl b/view/theme/decaf-mobile/acl_html_selector.tpl
deleted file mode 100644
index e84b0eefca..0000000000
--- a/view/theme/decaf-mobile/acl_html_selector.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-<a name="acl-wrapper-target"></a>
-<div id="acl-wrapper">
-	<div id="acl-public-switch">
-		<a href="$return_path#acl-wrapper-target" {{ if $is_private == 1 }}class="acl-public-switch-selected"{{ endif }} >$private</a>
-		<a href="$return_path$public_link#acl-wrapper-target" {{ if $is_private == 0 }}class="acl-public-switch-selected"{{ endif }} >$public</a>
-	</div>
-	<div id="acl-list">
-		<div id="acl-list-content">
-			<div id="acl-html-groups" class="acl-html-select-wrapper">
-			$group_perms<br />
-			<select name="group_allow[]" multiple {{ if $is_private == 0 }}disabled{{ endif }} id="acl-html-group-select" class="acl-html-select" size=7>
-				{{ for $acl_data.groups as $group }}
-				<option value="$group.id" {{ if $is_private == 1 }}{{ if $group.selected }}selected{{ endif }}{{ endif }}>$group.name</option>
-				{{ endfor }}
-			</select>
-			</div>
-			<div id="acl-html-contacts" class="acl-html-select-wrapper">
-			$contact_perms<br />
-			<select name="contact_allow[]" multiple {{ if $is_private == 0 }}disabled{{ endif }} id="acl-html-contact-select" class="acl-html-select" size=7>
-				{{ for $acl_data.contacts as $contact }}
-				<option value="$contact.id" {{ if $is_private == 1 }}{{ if $contact.selected }}selected{{ endif }}{{ endif }}>$contact.name ($contact.networkName)</option>
-				{{ endfor }}
-			</select>
-			</div>
-		</div>
-	</div>
-	<span id="acl-fields"></span>
-</div>
-
diff --git a/view/theme/decaf-mobile/acl_selector.tpl b/view/theme/decaf-mobile/acl_selector.tpl
deleted file mode 100644
index 8e9916c950..0000000000
--- a/view/theme/decaf-mobile/acl_selector.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-<div id="acl-wrapper">
-	<input id="acl-search">
-	<a href="#" id="acl-showall">$showall</a>
-	<div id="acl-list">
-		<div id="acl-list-content">
-		</div>
-	</div>
-	<span id="acl-fields"></span>
-</div>
-
-<div class="acl-list-item" rel="acl-template" style="display:none">
-	<img data-src="{0}"><p>{1}</p>
-	<a href="#" class='acl-button-show'>$show</a>
-	<a href="#" class='acl-button-hide'>$hide</a>
-</div>
-
-{#<!--<script>
-	window.allowCID = $allowcid;
-	window.allowGID = $allowgid;
-	window.denyCID = $denycid;
-	window.denyGID = $denygid;
-	window.aclInit = "true";
-</script>-->#}
diff --git a/view/theme/decaf-mobile/admin_aside.tpl b/view/theme/decaf-mobile/admin_aside.tpl
deleted file mode 100644
index da3ed23a88..0000000000
--- a/view/theme/decaf-mobile/admin_aside.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-
-<h4><a href="$admurl">$admtxt</a></h4>
-<ul class='admin linklist'>
-	<li class='admin button $admin.site.2'><a href='$admin.site.0'>$admin.site.1</a></li>
-	<li class='admin button $admin.users.2'><a href='$admin.users.0'>$admin.users.1</a><span id='pending-update' title='$h_pending'></span></li>
-	<li class='admin button $admin.plugins.2'><a href='$admin.plugins.0'>$admin.plugins.1</a></li>
-	<li class='admin button $admin.themes.2'><a href='$admin.themes.0'>$admin.themes.1</a></li>
-	<li class='admin button $admin.dbsync.2'><a href='$admin.dbsync.0'>$admin.dbsync.1</a></li>
-</ul>
-
-{{ if $admin.update }}
-<ul class='admin linklist'>
-	<li class='admin button $admin.update.2'><a href='$admin.update.0'>$admin.update.1</a></li>
-	<li class='admin button $admin.update.2'><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li>
-</ul>
-{{ endif }}
-
-
-{{ if $admin.plugins_admin }}<h4>$plugadmtxt</h4>{{ endif }}
-<ul class='admin linklist'>
-	{{ for $admin.plugins_admin as $l }}
-	<li class='admin button $l.2'><a href='$l.0'>$l.1</a></li>
-	{{ endfor }}
-</ul>
-	
-	
-<h4>$logtxt</h4>
-<ul class='admin linklist'>
-	<li class='admin button $admin.logs.2'><a href='$admin.logs.0'>$admin.logs.1</a></li>
-</ul>
-
diff --git a/view/theme/decaf-mobile/admin_site.tpl b/view/theme/decaf-mobile/admin_site.tpl
deleted file mode 100644
index 61f52b18dc..0000000000
--- a/view/theme/decaf-mobile/admin_site.tpl
+++ /dev/null
@@ -1,67 +0,0 @@
-
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-	<form action="$baseurl/admin/site" method="post">
-    <input type='hidden' name='form_security_token' value='$form_security_token'>
-
-	{{ inc field_input.tpl with $field=$sitename }}{{ endinc }}
-	{{ inc field_textarea.tpl with $field=$banner }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$language }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$theme }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$theme_mobile }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$new_share }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$hide_help }}{{ endinc }} 
-	{{ inc field_select.tpl with $field=$singleuser }}{{ endinc }} 
-	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-	
-	<h3>$registration</h3>
-	{{ inc field_input.tpl with $field=$register_text }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$register_policy }}{{ endinc }}
-	
-	{{ inc field_checkbox.tpl with $field=$no_multi_reg }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_openid }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_regfullname }}{{ endinc }}
-	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-
-	<h3>$upload</h3>
-	{{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$maximagelength }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$jpegimagequality }}{{ endinc }}
-	
-	<h3>$corporate</h3>
-	{{ inc field_input.tpl with $field=$allowed_sites }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$allowed_email }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$block_public }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$force_publish }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_community_page }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$ostatus_poll_interval }}{{ endinc }} 
-	{{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$newuser_private }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$enotify_no_content }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$private_addons }}{{ endinc }}	
-	{{ inc field_checkbox.tpl with $field=$disable_embedded }}{{ endinc }}	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-	
-	<h3>$advanced</h3>
-	{{ inc field_checkbox.tpl with $field=$no_utf }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$verifyssl }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$proxy }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$timeout }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$poll_interval }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$maxloadavg }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
-	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-	
-	</form>
-</div>
diff --git a/view/theme/decaf-mobile/admin_users.tpl b/view/theme/decaf-mobile/admin_users.tpl
deleted file mode 100644
index c3abbeb9c0..0000000000
--- a/view/theme/decaf-mobile/admin_users.tpl
+++ /dev/null
@@ -1,98 +0,0 @@
-<script>
-	function confirm_delete(uname){
-		return confirm( "$confirm_delete".format(uname));
-	}
-	function confirm_delete_multi(){
-		return confirm("$confirm_delete_multi");
-	}
-	{#/*function selectall(cls){
-		$j("."+cls).attr('checked','checked');
-		return false;
-	}*/#}
-</script>
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-	<form action="$baseurl/admin/users" method="post">
-        <input type='hidden' name='form_security_token' value='$form_security_token'>
-		
-		<h3>$h_pending</h3>
-		{{ if $pending }}
-			<table id='pending'>
-				<thead>
-				<tr>
-					{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-			{{ for $pending as $u }}
-				<tr>
-					<td class="created">$u.created</td>
-					<td class="name">$u.name</td>
-					<td class="email">$u.email</td>
-					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
-					<td class="tools">
-						<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='tool like'></span></a>
-						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='tool dislike'></span></a>
-					</td>
-				</tr>
-			{{ endfor }}
-				</tbody>
-			</table>
-			{#<!--<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>-->#}
-			<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>			
-		{{ else }}
-			<p>$no_pending</p>
-		{{ endif }}
-	
-	
-		
-	
-		<h3>$h_users</h3>
-		{{ if $users }}
-			<table id='users'>
-				<thead>
-				<tr>
-					<th></th>
-					{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{ for $users as $u }}
-					<tr>
-						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
-						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
-						<td class='email'>$u.email</td>
-						<td class='register_date'>$u.register_date</td>
-						<td class='login_date'>$u.login_date</td>
-						<td class='lastitem_date'>$u.lastitem_date</td>
-						<td class='login_date'>$u.page_flags {{ if $u.is_admin }}($siteadmin){{ endif }} {{ if $u.account_expired }}($accountexpired){{ endif }}</td>
-						<td class="checkbox"> 
-                                    {{ if $u.is_admin }}
-                                        &nbsp;
-                                    {{ else }}
-                                        <input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
-                                    {{ endif }}
-						<td class="tools">
-                                    {{ if $u.is_admin }}
-                                        &nbsp;
-                                    {{ else }}
-                                        <a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
-                                        <a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon drop'></span></a>
-                                    {{ endif }}
-						</td>
-					</tr>
-				{{ endfor }}
-				</tbody>
-			</table>
-			{#<!--<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>-->#}
-			<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>						
-		{{ else }}
-			NO USERS?!?
-		{{ endif }}
-	</form>
-</div>
diff --git a/view/theme/decaf-mobile/album_edit.tpl b/view/theme/decaf-mobile/album_edit.tpl
deleted file mode 100644
index 3fe2d9fe92..0000000000
--- a/view/theme/decaf-mobile/album_edit.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-<div id="photo-album-edit-wrapper">
-<form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/$nickname/album/$hexalbum" method="post" >
-	<input id="photo-album-edit-form-confirm" type="hidden" name="confirm" value="1" />
-
-	<label id="photo-album-edit-name-label" for="photo-album-edit-name" >$nametext</label>
-	<input type="text" size="64" name="albumname" value="$album" >
-
-	<div id="photo-album-edit-name-end"></div>
-
-	<input id="photo-album-edit-submit" type="submit" name="submit" value="$submit" />
-	<input id="photo-album-edit-drop" type="submit" name="dropalbum" value="$dropsubmit" onclick="return confirmDelete(function(){remove('photo-album-edit-form-confirm');});" />
-
-</form>
-</div>
-<div id="photo-album-edit-end" ></div>
diff --git a/view/theme/decaf-mobile/categories_widget.tpl b/view/theme/decaf-mobile/categories_widget.tpl
deleted file mode 100644
index ebc62404b8..0000000000
--- a/view/theme/decaf-mobile/categories_widget.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-{#<!--<div id="categories-sidebar" class="widget">
-	<h3>$title</h3>
-	<div id="nets-desc">$desc</div>
-	
-	<ul class="categories-ul">
-		<li class="tool"><a href="$base" class="categories-link categories-all{{ if $sel_all }} categories-selected{{ endif }}">$all</a></li>
-		{{ for $terms as $term }}
-			<li class="tool"><a href="$base?f=&category=$term.name" class="categories-link{{ if $term.selected }} categories-selected{{ endif }}">$term.name</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>-->#}
diff --git a/view/theme/decaf-mobile/comment_item.tpl b/view/theme/decaf-mobile/comment_item.tpl
deleted file mode 100755
index ee0e8c7916..0000000000
--- a/view/theme/decaf-mobile/comment_item.tpl
+++ /dev/null
@@ -1,79 +0,0 @@
-{#<!--		<script>
-		$(document).ready( function () {
-			$(document).mouseup(function(e) {
-				var container = $("#comment-edit-wrapper-$id");
-				if( container.has(e.target).length === 0) {
-					commentClose(document.getElementById('comment-edit-text-$id'),$id);
-					cmtBbClose($id);
-				}
-			});
-		});
-		</script>-->#}
-
-		<div class="comment-wwedit-wrapper $indent" id="comment-edit-wrapper-$id" style="display: block;" >
-			<a name="comment-wwedit-wrapper-pos"></a>
-			<form class="comment-edit-form $indent" id="comment-edit-form-$id" action="item" method="post" >
-{#<!--			<span id="hide-commentbox-$id" class="hide-commentbox fakelink" onclick="showHideCommentBox($id);">$comment</span>
-			<form class="comment-edit-form" style="display: none;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">-->#}
-				<input type="hidden" name="type" value="$type" />
-				<input type="hidden" name="source" value="$sourceapp" />
-				<input type="hidden" name="profile_uid" value="$profile_uid" />
-				<input type="hidden" name="parent" value="$parent" />
-				<input type="hidden" name="return" value="$return_path#comment-wwedit-wrapper-pos" />
-				<input type="hidden" name="jsreload" value="$jsreload" />
-				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
-				<input type="hidden" name="post_id_random" value="$rand_num" />
-
-				{#<!--<div class="comment-edit-photo" id="comment-edit-photo-$id" >-->#}
-					<a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-$id" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				{#<!--</div>-->#}
-				{#<!--<div class="comment-edit-photo-end"></div>-->#}
-				{#<!--<ul class="comment-edit-bb-$id">
-					<li><a class="editicon boldbb shadow"
-						style="cursor: pointer;" title="$edbold"
-						onclick="insertFormatting('$comment','b', $id);"></a></li>
-					<li><a class="editicon italicbb shadow"
-						style="cursor: pointer;" title="$editalic"
-						onclick="insertFormatting('$comment','i', $id);"></a></li>
-					<li><a class="editicon underlinebb shadow"
-						style="cursor: pointer;" title="$eduline"
-						onclick="insertFormatting('$comment','u', $id);"></a></li>
-					<li><a class="editicon quotebb shadow"
-						style="cursor: pointer;" title="$edquote"
-						onclick="insertFormatting('$comment','quote', $id);"></a></li>
-					<li><a class="editicon codebb shadow"
-						style="cursor: pointer;" title="$edcode"
-						onclick="insertFormatting('$comment','code', $id);"></a></li>-->#}
-{#<!--					<li><a class="editicon imagebb shadow"
-						style="cursor: pointer;" title="$edimg"
-						onclick="insertFormatting('$comment','img', $id);"></a></li>
-					<li><a class="editicon urlbb shadow"
-						style="cursor: pointer;" title="$edurl"
-						onclick="insertFormatting('$comment','url', $id);"></a></li>
-					<li><a class="editicon videobb shadow"
-						style="cursor: pointer;" title="$edvideo"
-						onclick="insertFormatting('$comment','video', $id);"></a></li>-->#}
-				{#<!--</ul>	-->#}
-				{#<!--<div class="comment-edit-bb-end"></div>-->#}
-{#<!--				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);cmtBbClose($id);" >$comment</textarea>-->#}
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-full" name="body" ></textarea>
-				{#<!--{{ if $qcomment }}
-					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
-					<option value=""></option>
-				{{ for $qcomment as $qc }}
-					<option value="$qc">$qc</option>				
-				{{ endfor }}
-					</select>
-				{{ endif }}-->#}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" >
-					<input type="submit" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					{#<!--<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="preview-link fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>-->#}
-				</div>
-
-				{#<!--<div class="comment-edit-end"></div>-->#}
-			</form>
-
-		</div>
diff --git a/view/theme/decaf-mobile/common_tabs.tpl b/view/theme/decaf-mobile/common_tabs.tpl
deleted file mode 100644
index 940e5aeb2f..0000000000
--- a/view/theme/decaf-mobile/common_tabs.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<ul class="tabs">
-	{{ for $tabs as $tab }}
-		<li id="$tab.id"><a href="$tab.url" class="tab button $tab.sel"{{ if $tab.title }} title="$tab.title"{{ endif }}>$tab.label</a></li>
-	{{ endfor }}
-	<div id="tabs-end"></div>
-</ul>
diff --git a/view/theme/decaf-mobile/contact_block.tpl b/view/theme/decaf-mobile/contact_block.tpl
deleted file mode 100644
index a8e34fce16..0000000000
--- a/view/theme/decaf-mobile/contact_block.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-{#<!--<div id="contact-block">
-<h4 class="contact-block-h4">$contacts</h4>
-{{ if $micropro }}
-		<a class="allcontact-link" href="viewcontacts/$nickname">$viewcontacts</a>
-		<div class='contact-block-content'>
-		{{ for $micropro as $m }}
-			$m
-		{{ endfor }}
-		</div>
-{{ endif }}
-</div>
-<div class="clear"></div>-->#}
diff --git a/view/theme/decaf-mobile/contact_edit.tpl b/view/theme/decaf-mobile/contact_edit.tpl
deleted file mode 100644
index e113018b31..0000000000
--- a/view/theme/decaf-mobile/contact_edit.tpl
+++ /dev/null
@@ -1,93 +0,0 @@
-
-<h2>$header</h2>
-
-<div id="contact-edit-wrapper" >
-
-	$tab_str
-
-	<div id="contact-edit-drop-link-wrapper" >
-		<a href="contacts/$contact_id/drop?confirm=1" class="icon drophide" id="contact-edit-drop-link" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'contacts/$contact_id/drop')});"  title="$delete" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);"#}></a>
-	</div>
-
-	<div id="contact-edit-drop-link-end"></div>
-
-	<div class="vcard">
-		<div class="fn">$name</div>
-		<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="$photo" alt="$name" /></div>
-	</div>
-
-
-	<div id="contact-edit-nav-wrapper" >
-		<div id="contact-edit-links">
-			<ul>
-				<li><div id="contact-edit-rel">$relation_text</div></li>
-				<li><div id="contact-edit-nettype">$nettype</div></li>
-				{{ if $lost_contact }}
-					<li><div id="lost-contact-message">$lost_contact</div></li>
-				{{ endif }}
-				{{ if $insecure }}
-					<li><div id="insecure-message">$insecure</div></li>
-				{{ endif }}
-				{{ if $blocked }}
-					<li><div id="block-message">$blocked</div></li>
-				{{ endif }}
-				{{ if $ignored }}
-					<li><div id="ignore-message">$ignored</div></li>
-				{{ endif }}
-				{{ if $archived }}
-					<li><div id="archive-message">$archived</div></li>
-				{{ endif }}
-
-				<li>&nbsp;</li>
-
-				{{ if $common_text }}
-					<li><div id="contact-edit-common"><a href="$common_link">$common_text</a></div></li>
-				{{ endif }}
-				{{ if $all_friends }}
-					<li><div id="contact-edit-allfriends"><a href="allfriends/$contact_id">$all_friends</a></div></li>
-				{{ endif }}
-
-
-				<li><a href="network/0?nets=all&cid=$contact_id" id="contact-edit-view-recent">$lblrecent</a></li>
-				{{ if $lblsuggest }}
-					<li><a href="fsuggest/$contact_id" id="contact-edit-suggest">$lblsuggest</a></li>
-				{{ endif }}
-
-			</ul>
-		</div>
-	</div>
-	<div id="contact-edit-nav-end"></div>
-
-
-<form action="contacts/$contact_id" method="post" >
-<input type="hidden" name="contact_id" value="$contact_id">
-
-	{{ if $poll_enabled }}
-		<div id="contact-edit-poll-wrapper">
-			<div id="contact-edit-last-update-text">$lastupdtext <span id="contact-edit-last-updated">$last_update</span></div>
-			<span id="contact-edit-poll-text">$updpub $poll_interval</span> <span id="contact-edit-update-now" class="button"><a id="update_now_link" href="contacts/$contact_id/update" >$udnow</a></span>
-		</div>
-	{{ endif }}
-	<div id="contact-edit-end" ></div>
-
-	{{inc field_checkbox.tpl with $field=$hidden }}{{endinc}}
-
-<div id="contact-edit-info-wrapper">
-<h4>$lbl_info1</h4>
-	<textarea id="contact-edit-info" rows="8"{# cols="35"#} name="info">$info</textarea>
-	<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
-</div>
-<div id="contact-edit-info-end"></div>
-
-
-<div id="contact-edit-profile-select-text">
-<h4>$lbl_vis1</h4>
-<p>$lbl_vis2</p> 
-</div>
-$profile_select
-<div id="contact-edit-profile-select-end"></div>
-
-<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
-
-</form>
-</div>
diff --git a/view/theme/decaf-mobile/contact_head.tpl b/view/theme/decaf-mobile/contact_head.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/theme/decaf-mobile/contact_template.tpl b/view/theme/decaf-mobile/contact_template.tpl
deleted file mode 100644
index 4ef0405b7b..0000000000
--- a/view/theme/decaf-mobile/contact_template.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-	<div class="contact-entry-photo-wrapper" >
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
-		{#onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id);" 
-		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-$contact.id\');',200)"#} >
-
-{#<!--			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>-->#}
-			{#<!--<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">-->#}
-			<a href="$contact.photo_menu.edit.1" title="$contact.photo_menu.edit.0">
-			<img src="$contact.thumb" $contact.sparkle alt="$contact.name" />
-			</a>
-			{#<!--</span>-->#}
-
-{#<!--			{{ if $contact.photo_menu }}
-			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
-                    <ul>
-						{{ for $contact.photo_menu as $c }}
-						{{ if $c.2 }}
-						<li><a target="redir" href="$c.1">$c.0</a></li>
-						{{ else }}
-						<li><a href="$c.1">$c.0</a></li>
-						{{ endif }}
-						{{ endfor }}
-                    </ul>
-                </div>
-			{{ endif }}-->#}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div><br />
-{{ if $contact.alt_text }}<div class="contact-entry-details" id="contact-entry-rel-$contact.id" >$contact.alt_text</div>{{ endif }}
-	<div class="contact-entry-network" id="contact-entry-network-$contact.id" >$contact.network</div>
-
-	<div class="contact-entry-end" ></div>
-</div>
diff --git a/view/theme/decaf-mobile/contacts-end.tpl b/view/theme/decaf-mobile/contacts-end.tpl
deleted file mode 100644
index fea596360b..0000000000
--- a/view/theme/decaf-mobile/contacts-end.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-{#<!--
-<script src="$baseurl/library/jquery_ac/friendica.complete.min.js" ></script>
-
--->#}
diff --git a/view/theme/decaf-mobile/contacts-head.tpl b/view/theme/decaf-mobile/contacts-head.tpl
deleted file mode 100644
index 6c7355f4c7..0000000000
--- a/view/theme/decaf-mobile/contacts-head.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{#<!--
-<script>
-	window.autocompleteType = 'contacts-head';
-</script>
--->#}
diff --git a/view/theme/decaf-mobile/contacts-template.tpl b/view/theme/decaf-mobile/contacts-template.tpl
deleted file mode 100644
index 76254c1ca8..0000000000
--- a/view/theme/decaf-mobile/contacts-template.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-<h1>$header{{ if $total }} ($total){{ endif }}</h1>
-
-{{ if $finding }}<h4>$finding</h4>{{ endif }}
-
-<div id="contacts-search-wrapper">
-<form id="contacts-search-form" action="$cmd" method="get" >
-<span class="contacts-search-desc">$desc</span>
-<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="$search" />
-<input type="submit" name="submit" id="contacts-search-submit" value="$submit" />
-</form>
-</div>
-<div id="contacts-search-end"></div>
-
-$tabs
-
-
-<div id="contacts-display-wrapper">
-{{ for $contacts as $contact }}
-	{{ inc contact_template.tpl }}{{ endinc }}
-{{ endfor }}
-</div>
-<div id="contact-edit-end"></div>
-
-$paginate
-
-
-
-
diff --git a/view/theme/decaf-mobile/contacts-widget-sidebar.tpl b/view/theme/decaf-mobile/contacts-widget-sidebar.tpl
deleted file mode 100644
index 1c63f9eab2..0000000000
--- a/view/theme/decaf-mobile/contacts-widget-sidebar.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-$follow_widget
-
diff --git a/view/theme/decaf-mobile/conversation.tpl b/view/theme/decaf-mobile/conversation.tpl
deleted file mode 100644
index d39976f39f..0000000000
--- a/view/theme/decaf-mobile/conversation.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-$live_update
-
-{{ for $threads as $thread }}
-<div id="tread-wrapper-$thread.id" class="tread-wrapper">
-	{{ for $thread.items as $item }}
-		{{if $item.comment_firstcollapsed}}
-			<div class="hide-comments-outer">
-			<span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span>
-			</div>
-			<div id="collapsed-comments-$thread.id" class="collapsed-comments" style="display: none;">
-		{{endif}}
-		{{if $item.comment_lastcollapsed}}</div>{{endif}}
-		
-		{{ inc $item.template }}{{ endinc }}
-		
-		
-	{{ endfor }}
-</div>
-{{ endfor }}
-
-<div id="conversation-end"></div>
-
-{#<!--{{ if $dropping }}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
-  <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
-  <div id="item-delete-selected-desc" >$dropping</div>
-</div>
-<div id="item-delete-selected-end"></div>
-{{ endif }}-->#}
diff --git a/view/theme/decaf-mobile/cropbody.tpl b/view/theme/decaf-mobile/cropbody.tpl
deleted file mode 100644
index 3283084cad..0000000000
--- a/view/theme/decaf-mobile/cropbody.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-<h1>$title</h1>
-<p id="cropimage-desc">
-$desc
-</p>
-<div id="cropimage-wrapper">
-<img src="$image_url" id="croppa" class="imgCrop" alt="$title" />
-</div>
-<div id="cropimage-preview-wrapper" >
-<div id="previewWrap" ></div>
-</div>
-
-<form action="profile_photo/$resource" id="crop-image-form" method="post" />
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-<input type="hidden" name="cropfinal" value="1" />
-<input type="hidden" name="xstart" id="x1" />
-<input type="hidden" name="ystart" id="y1" />
-<input type="hidden" name="xfinal" id="x2" />
-<input type="hidden" name="yfinal" id="y2" />
-<input type="hidden" name="height" id="height" />
-<input type="hidden" name="width"  id="width" />
-
-<div id="crop-image-submit-wrapper" >
-<input type="submit" name="submit" value="$done" />
-</div>
-
-</form>
diff --git a/view/theme/decaf-mobile/cropend.tpl b/view/theme/decaf-mobile/cropend.tpl
deleted file mode 100644
index a27de0e2f8..0000000000
--- a/view/theme/decaf-mobile/cropend.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-{#<!--      <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
-      <script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
-      <script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>
-      <script type="text/javascript" language="javascript">initCrop();</script>-->#}
diff --git a/view/theme/decaf-mobile/crophead.tpl b/view/theme/decaf-mobile/crophead.tpl
deleted file mode 100644
index 56e941e3ab..0000000000
--- a/view/theme/decaf-mobile/crophead.tpl
+++ /dev/null
@@ -1 +0,0 @@
-      <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />
diff --git a/view/theme/decaf-mobile/display-head.tpl b/view/theme/decaf-mobile/display-head.tpl
deleted file mode 100644
index 1c990657f0..0000000000
--- a/view/theme/decaf-mobile/display-head.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-{#<!--<script>
-	window.autoCompleteType = 'display-head';
-</script>
--->#}
diff --git a/view/theme/decaf-mobile/end.tpl b/view/theme/decaf-mobile/end.tpl
deleted file mode 100644
index 2e78838e01..0000000000
--- a/view/theme/decaf-mobile/end.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--[if IE]>
-<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-<![endif]-->
-{#<!--<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></script>
-<script type="text/javascript">
-  tinyMCE.init({ mode : "none"});
-</script>-->#}
-{#<!--<script type="text/javascript" src="$baseurl/js/jquery.js" ></script>
-<script type="text/javascript">var $j = jQuery.noConflict();</script>
-<script type="text/javascript" src="$baseurl/view/theme/decaf-mobile/js/jquery.divgrow-1.3.1.f1.js" ></script>
-<script type="text/javascript" src="$baseurl/js/jquery.textinputs.js" ></script>
-<script type="text/javascript" src="$baseurl/view/theme/decaf-mobile/js/fk.autocomplete.js" ></script>-->#}
-{#<!--<script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
-<script type="text/javascript" src="$baseurl/library/colorbox/jquery.colorbox-min.js"></script>-->#}
-{#<!--<script type="text/javascript" src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script>-->#}
-{#<!--<script type="text/javascript" src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script>
-<script type="text/javascript" src="$baseurl/view/theme/decaf-mobile/js/acl.js" ></script>
-<script type="text/javascript" src="$baseurl/js/webtoolkit.base64.js" ></script>
-<script type="text/javascript" src="$baseurl/view/theme/decaf-mobile/js/main.js" ></script>-->#}
-<script type="text/javascript" src="$baseurl/view/theme/decaf-mobile/js/theme.js"></script>
-
-<!--<script type="text/javascript" src="$baseurl/view/theme/decaf-mobile/js/jquery.package.js" ></script>
-<script type="text/javascript">var $j = jQuery.noConflict();</script>
-<script type="text/javascript" src="$baseurl/view/theme/decaf-mobile/js/decaf-mobile.package.js" ></script>-->
-
diff --git a/view/theme/decaf-mobile/event_end.tpl b/view/theme/decaf-mobile/event_end.tpl
deleted file mode 100644
index 3e4be6ec61..0000000000
--- a/view/theme/decaf-mobile/event_end.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-{#<!--<script language="javascript" type="text/javascript"
-          src="$baseurl/library/fullcalendar/fullcalendar.min.js"></script>
-
--->#}
diff --git a/view/theme/decaf-mobile/event_head.tpl b/view/theme/decaf-mobile/event_head.tpl
deleted file mode 100644
index 63a1135af6..0000000000
--- a/view/theme/decaf-mobile/event_head.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<link rel='stylesheet' type='text/css' href='$baseurl/library/fullcalendar/fullcalendar.css' />
-{#<!--
-<script language="javascript" type="text/javascript">
-window.aclType = 'event_head';
-</script>
--->#}
diff --git a/view/theme/decaf-mobile/field_checkbox.tpl b/view/theme/decaf-mobile/field_checkbox.tpl
deleted file mode 100644
index 9fbf84eac9..0000000000
--- a/view/theme/decaf-mobile/field_checkbox.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field checkbox' id='div_id_$field.0'>
-		<label id='label_id_$field.0' for='id_$field.0'>$field.1</label>
-		<input type="checkbox" name='$field.0' id='id_$field.0' value="1" {{ if $field.2 }}checked="checked"{{ endif }}><br />
-		<span class='field_help' id='help_id_$field.0'>$field.3</span>
-	</div>
diff --git a/view/theme/decaf-mobile/field_input.tpl b/view/theme/decaf-mobile/field_input.tpl
deleted file mode 100644
index 58e17406c0..0000000000
--- a/view/theme/decaf-mobile/field_input.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field input' id='wrapper_$field.0'>
-		<label for='id_$field.0'>$field.1</label><br />
-		<input name='$field.0' id='id_$field.0' value="$field.2">
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/theme/decaf-mobile/field_openid.tpl b/view/theme/decaf-mobile/field_openid.tpl
deleted file mode 100644
index 8d330a30a0..0000000000
--- a/view/theme/decaf-mobile/field_openid.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field input openid' id='wrapper_$field.0'>
-		<label for='id_$field.0'>$field.1</label><br />
-		<input name='$field.0' id='id_$field.0' value="$field.2">
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/theme/decaf-mobile/field_password.tpl b/view/theme/decaf-mobile/field_password.tpl
deleted file mode 100644
index 7a0d3fe9f4..0000000000
--- a/view/theme/decaf-mobile/field_password.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field password' id='wrapper_$field.0'>
-		<label for='id_$field.0'>$field.1</label><br />
-		<input type='password' name='$field.0' id='id_$field.0' value="$field.2">
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/theme/decaf-mobile/field_themeselect.tpl b/view/theme/decaf-mobile/field_themeselect.tpl
deleted file mode 100644
index 5ac310f804..0000000000
--- a/view/theme/decaf-mobile/field_themeselect.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-
-	<div class='field select'>
-		<label for='id_$field.0'>$field.1</label>
-		<select name='$field.0' id='id_$field.0' {#{{ if $field.5 }}onchange="previewTheme(this);"{{ endif }}#} >
-			{{ for $field.4 as $opt=>$val }}<option value="$opt" {{ if $opt==$field.2 }}selected="selected"{{ endif }}>$val</option>{{ endfor }}
-		</select>
-		<span class='field_help'>$field.3</span>
-		<div id="theme-preview"></div>
-	</div>
diff --git a/view/theme/decaf-mobile/field_yesno.tpl b/view/theme/decaf-mobile/field_yesno.tpl
deleted file mode 100644
index c399579b29..0000000000
--- a/view/theme/decaf-mobile/field_yesno.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-{#<!--	<div class='field yesno'>
-		<label for='id_$field.0'>$field.1</label>
-		<div class='onoff' id="id_$field.0_onoff">
-			<input  type="hidden" name='$field.0' id='id_$field.0' value="$field.2">
-			<a href="#" class='off'>
-				{{ if $field.4 }}$field.4.0{{ else }}OFF{{ endif }}
-			</a>
-			<a href="#" class='on'>
-				{{ if $field.4 }}$field.4.1{{ else }}ON{{ endif }}
-			</a>
-		</div>
-		<span class='field_help'>$field.3</span>
-	</div>-->#}
-{{ inc field_checkbox.tpl }}{{ endinc }}
diff --git a/view/theme/decaf-mobile/generic_links_widget.tpl b/view/theme/decaf-mobile/generic_links_widget.tpl
deleted file mode 100644
index a976d4573c..0000000000
--- a/view/theme/decaf-mobile/generic_links_widget.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="widget{{ if $class }} $class{{ endif }}">
-{#<!--	{{if $title}}<h3>$title</h3>{{endif}}-->#}
-	{{if $desc}}<div class="desc">$desc</div>{{endif}}
-	
-	<ul class="tabs links-widget">
-		{{ for $items as $item }}
-			<li class="tool"><a href="$item.url" class="tab {{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
-		{{ endfor }}
-		<div id="tabs-end"></div>
-	</ul>
-	
-</div>
diff --git a/view/theme/decaf-mobile/group_drop.tpl b/view/theme/decaf-mobile/group_drop.tpl
deleted file mode 100644
index 959b77bb21..0000000000
--- a/view/theme/decaf-mobile/group_drop.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="group-delete-wrapper button" id="group-delete-wrapper-$id" >
-	<a href="group/drop/$id?t=$form_security_token" 
-		onclick="return confirmDelete();" 
-		id="group-delete-icon-$id" 
-		class="icon drophide group-delete-icon" 
-		{#onmouseover="imgbright(this);" 
-		onmouseout="imgdull(this);"#} ></a>
-</div>
-<div class="group-delete-end"></div>
diff --git a/view/theme/decaf-mobile/group_side.tpl b/view/theme/decaf-mobile/group_side.tpl
deleted file mode 100644
index 0b4564077a..0000000000
--- a/view/theme/decaf-mobile/group_side.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-<div class="widget" id="group-sidebar">
-<h3>$title</h3>
-
-<div id="sidebar-group-list">
-	<ul id="sidebar-group-ul">
-		{{ for $groups as $group }}
-			<li class="sidebar-group-li">
-				{{ if $group.cid }}
-					<input type="checkbox" 
-						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
-						{#onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"#}
-						{{ if $group.ismember }}checked="checked"{{ endif }}
-					/>
-				{{ endif }}			
-				{{ if $group.edit }}
-					<a class="groupsideedit" href="$group.edit.href" title="$edittext"><span id="edit-sidebar-group-element-$group.id" class="group-edit-icon iconspacer small-pencil"></span></a>
-				{{ endif }}
-				<a id="sidebar-group-element-$group.id" class="sidebar-group-element {{ if $group.selected }}group-selected{{ endif }}" href="$group.href">$group.text</a>
-			</li>
-		{{ endfor }}
-	</ul>
-	</div>
-  <div id="sidebar-new-group">
-  <a href="group/new">$createtext</a>
-  </div>
-  {{ if $ungrouped }}
-  <div id="sidebar-ungrouped">
-  <a href="nogroup">$ungrouped</a>
-  </div>
-  {{ endif }}
-</div>
-
-
diff --git a/view/theme/decaf-mobile/head.tpl b/view/theme/decaf-mobile/head.tpl
deleted file mode 100644
index a8b2133189..0000000000
--- a/view/theme/decaf-mobile/head.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-{#<!--<meta content='width=device-width, minimum-scale=1 maximum-scale=1' name='viewport'>
-<meta content='True' name='HandheldFriendly'>
-<meta content='320' name='MobileOptimized'>-->#}
-<meta name="viewport" content="width=device-width; initial-scale = 1.0; maximum-scale=1.0; user-scalable=no" />
-{#<!--<meta name="viewport" content="width=100%;  initial-scale=1; maximum-scale=1; minimum-scale=1; user-scalable=no;" />-->#}
-
-<base href="$baseurl/" />
-<meta name="generator" content="$generator" />
-{#<!--<link rel="stylesheet" href="$baseurl/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="$baseurl/library/colorbox/colorbox.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="$baseurl/library/tiptip/tipTip.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />-->#}
-
-<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-
-<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
-<link rel="search"
-         href="$baseurl/opensearch" 
-         type="application/opensearchdescription+xml" 
-         title="Search in Friendica" />
-
-<script>
-	window.delItem = "$delitem";
-{#/*	window.commentEmptyText = "$comment";
-	window.showMore = "$showmore";
-	window.showFewer = "$showfewer";
-	var updateInterval = $update_interval;
-	var localUser = {{ if $local_user }}$local_user{{ else }}false{{ endif }};*/#}
-</script>
diff --git a/view/theme/decaf-mobile/jot-end.tpl b/view/theme/decaf-mobile/jot-end.tpl
deleted file mode 100644
index 59585d01d5..0000000000
--- a/view/theme/decaf-mobile/jot-end.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-
-<script type="text/javascript" src="$baseurl/js/ajaxupload.min.js" ></script>
-{#<!--
-<script>if(typeof window.jotInit != 'undefined') initEditor();</script>
--->#}
diff --git a/view/theme/decaf-mobile/jot-header.tpl b/view/theme/decaf-mobile/jot-header.tpl
deleted file mode 100644
index c239aeecd8..0000000000
--- a/view/theme/decaf-mobile/jot-header.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-
-<script>
-{#/*	var none = "none"; // ugly hack: $editselect shouldn't be a string if TinyMCE is enabled, but should if it isn't
-	window.editSelect = $editselect;
-	window.isPublic = "$ispublic";
-	window.nickname = "$nickname";
-	window.linkURL = "$linkurl";
-	window.vidURL = "$vidurl";
-	window.audURL = "$audurl";
-	window.whereAreU = "$whereareu";
-	window.term = "$term";
-	window.baseURL = "$baseurl";
-	window.geoTag = function () { $geotag }*/#}
-	window.jotId = "#profile-jot-text";
-	window.imageUploadButton = 'wall-image-upload';
-</script>
-
diff --git a/view/theme/decaf-mobile/jot.tpl b/view/theme/decaf-mobile/jot.tpl
deleted file mode 100644
index 697a7c8094..0000000000
--- a/view/theme/decaf-mobile/jot.tpl
+++ /dev/null
@@ -1,99 +0,0 @@
-
-<div id="profile-jot-wrapper" >
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey"></div>
-	</div>
-	<div id="profile-jot-banner-end"></div>
-
-	<form id="profile-jot-form" action="$action" method="post" >
-		<input type="hidden" name="type" value="$ptyp" />
-		<input type="hidden" name="profile_uid" value="$profile_uid" />
-		<input type="hidden" name="return" value="$return_path" />
-		<input type="hidden" name="location" id="jot-location" value="$defloc" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="$post_id" />
-		<input type="hidden" name="source" value="$sourceapp" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input type="hidden" name="post_id_random" value="$rand_num" />
-		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" ></div>
-		{{ if $placeholdercategory }}
-		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" /></div>
-		{{ endif }}
-		<div id="jot-text-wrap">
-		{#<!--<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />-->#}
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" placeholder=$share >{{ if $content }}$content{{ endif }}</textarea>
-		</div>
-
-<div id="profile-jot-submit-wrapper" class="jothidden">
-	<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
-
-	<div id="profile-rotator-wrapper" style="display: $visitor;" >
-		<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-	
-	<div id="profile-upload-wrapper" style="display: $visitor;" >
-		<div id="wall-image-upload-div" style="display: none;" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div>
-	</div> 
-	<div id="profile-attach-wrapper" style="display: $visitor;" >
-		<div id="wall-file-upload-div" style="display: none;" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="$attach"></a></div>
-	</div> 
-
-	{#<!--<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a id="profile-link" class="icon link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>-->#}
-	{#<!--<div id="profile-link-wrapper" style="display: $visitor;" >
-		<a id="profile-link" class="icon link" title="$weblink" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" style="display: $visitor;" >
-		<a id="profile-video" class="icon video" title="$video" onclick="jotVideoURL();return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" style="display: $visitor;" >
-		<a id="profile-audio" class="icon audio" title="$audio" onclick="jotAudioURL();return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" style="display: $visitor;" >
-		<a id="profile-location" class="icon globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" style="display: none;" >
-		<a id="profile-nolocation" class="icon noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
-	</div> -->#}
-
-	{#<!--<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
-		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
-	</div>
-
-	<span onclick="preview_post();" id="jot-preview-link" class="fakelink">$preview</span>-->#}
-
-	<div id="profile-jot-perms-end"></div>
-
-
-	<div id="profile-jot-plugin-wrapper">
-  	$jotplugins
-	</div>
-
-	<div id="jot-preview-content" style="display:none;"></div>
-
-	{#<!--<div style="display: none;">-->#}
-		<div id="profile-jot-acl-wrapper">
-			{#<!--$acl
-			<hr style="clear:both"/>
-			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-			$jotnets
-			<div id="profile-jot-networks-end"></div>-->#}
-			{{ if $acl_data }}
-			{{ inc acl_html_selector.tpl }}{{ endinc }}
-			{{ endif }}
-			$jotnets
-		</div>
-	{#<!--</div>-->#}
-
-
-</div>
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
-		{#<!--{{ if $content }}<script>window.jotInit = true;</script>{{ endif }}-->#}
-<script>
-document.getElementById('wall-image-upload-div').style.display = "inherit";
-document.getElementById('wall-file-upload-div').style.display = "inherit";
-</script>
diff --git a/view/theme/decaf-mobile/jot_geotag.tpl b/view/theme/decaf-mobile/jot_geotag.tpl
deleted file mode 100644
index 3f8bee91a7..0000000000
--- a/view/theme/decaf-mobile/jot_geotag.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-
-	if(navigator.geolocation) {
-		navigator.geolocation.getCurrentPosition(function(position) {
-			var lat = position.coords.latitude.toFixed(4);
-			var lon = position.coords.longitude.toFixed(4);
-
-			$j('#jot-coord').val(lat + ', ' + lon);
-			$j('#profile-nolocation-wrapper').show();
-		});
-	}
-
diff --git a/view/theme/decaf-mobile/lang_selector.tpl b/view/theme/decaf-mobile/lang_selector.tpl
deleted file mode 100644
index e777a0a861..0000000000
--- a/view/theme/decaf-mobile/lang_selector.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="lang-select-icon" class="icon s22 language" title="$title" onclick="openClose('language-selector');" ></div>
-<div id="language-selector" style="display: none;" >
-	<form action="#" method="post" >
-		<select name="system_language" onchange="this.form.submit();" >
-			{{ for $langs.0 as $v=>$l }}
-				<option value="$v" {{if $v==$langs.1}}selected="selected"{{endif}}>$l</option>
-			{{ endfor }}
-		</select>
-	</form>
-</div>
diff --git a/view/theme/decaf-mobile/like_noshare.tpl b/view/theme/decaf-mobile/like_noshare.tpl
deleted file mode 100644
index 5e74850a7a..0000000000
--- a/view/theme/decaf-mobile/like_noshare.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
-	<a href="like/$id?verb=like&return=$return_path#$item.id" class="icon like" title="$likethis" ></a>
-	{{ if $nolike }}
-	<a href="like/$id?verb=dislike&return=$return_path#$item.id" class="icon dislike" title="$nolike" ></a>
-	{{ endif }}
-	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-</div>
diff --git a/view/theme/decaf-mobile/login.tpl b/view/theme/decaf-mobile/login.tpl
deleted file mode 100644
index 926ab769d2..0000000000
--- a/view/theme/decaf-mobile/login.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-
-<div class="login-form">
-<form action="$dest_url" method="post" >
-	<input type="hidden" name="auth-params" value="login" />
-
-	<div id="login_standard">
-	{{ inc field_input.tpl with $field=$lname }}{{ endinc }}
-	{{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
-	</div>
-	
-	{{ if $openid }}
-			<div id="login_openid">
-			{{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
-			</div>
-	{{ endif }}
-
-	<br />
-	<div id='login-footer'>
-	{#<!--<div class="login-extra-links">
-	By signing in you agree to the latest <a href="tos.html" title="$tostitle" id="terms-of-service-link" >$toslink</a> and <a href="privacy.html" title="$privacytitle" id="privacy-link" >$privacylink</a>
-	</div>-->#}
-
-	<br />
-	{{ inc field_checkbox.tpl with $field=$lremember }}{{ endinc }}
-
-	<div id="login-submit-wrapper" >
-		<input type="submit" name="submit" id="login-submit-button" value="$login" />
-	</div>
-
-	<br /><br />
-	<div class="login-extra-links">
-		{{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
-        <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
-	</div>
-	</div>
-	
-	{{ for $hiddens as $k=>$v }}
-		<input type="hidden" name="$k" value="$v" />
-	{{ endfor }}
-	
-	
-</form>
-</div>
-
-{#<!--<script type="text/javascript">window.loginName = "$lname.0";</script>-->#}
diff --git a/view/theme/decaf-mobile/login_head.tpl b/view/theme/decaf-mobile/login_head.tpl
deleted file mode 100644
index 14734821ce..0000000000
--- a/view/theme/decaf-mobile/login_head.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-{#<!--<link rel="stylesheet" href="$baseurl/view/theme/frost-mobile/login-style.css" type="text/css" media="all" />-->#}
-
diff --git a/view/theme/decaf-mobile/lostpass.tpl b/view/theme/decaf-mobile/lostpass.tpl
deleted file mode 100644
index 583e3dbaff..0000000000
--- a/view/theme/decaf-mobile/lostpass.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="lostpass-form">
-<h2>$title</h2>
-<br /><br /><br />
-
-<form action="lostpass" method="post" >
-<div id="login-name-wrapper" class="field input">
-        <label for="login-name" id="label-login-name">$name</label><br />
-        <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
-</div>
-<div id="login-extra-end"></div>
-<p id="lostpass-desc">
-$desc
-</p>
-<br />
-
-<div id="login-submit-wrapper" >
-        <input type="submit" name="submit" id="lostpass-submit-button" value="$submit" />
-</div>
-<div id="login-submit-end"></div>
-</form>
-</div>
diff --git a/view/theme/decaf-mobile/mail_conv.tpl b/view/theme/decaf-mobile/mail_conv.tpl
deleted file mode 100644
index 7aac8370b2..0000000000
--- a/view/theme/decaf-mobile/mail_conv.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="mail-conv-outside-wrapper">
-	<div class="mail-conv-sender" >
-		<a href="$mail.from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$mail.sparkle" src="$mail.from_photo" heigth="80" width="80" alt="$mail.from_name" /></a>
-	</div>
-	<div class="mail-conv-detail" >
-		<div class="mail-conv-sender-name" >$mail.from_name</div>
-		<div class="mail-conv-date">$mail.date</div>
-		<div class="mail-conv-subject">$mail.subject</div>
-	</div>
-	<div class="mail-conv-body">$mail.body</div>
-</div>
-<div class="mail-conv-outside-wrapper-end"></div>
-
-
-<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id?confirm=1" class="icon drophide delete-icon mail-list-delete-icon" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'message/drop/$mail.id')});" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);#}" ></a></div>
-<div class="mail-conv-delete-end"></div>
-
-<hr class="mail-conv-break" />
diff --git a/view/theme/decaf-mobile/mail_list.tpl b/view/theme/decaf-mobile/mail_list.tpl
deleted file mode 100644
index 74274a246a..0000000000
--- a/view/theme/decaf-mobile/mail_list.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="mail-list-outside-wrapper">
-	<div class="mail-list-sender" >
-		<a href="$from_url" class="mail-list-sender-url" ><img class="mail-list-sender-photo$sparkle" src="$from_photo" height="80" width="80" alt="$from_name" /></a>
-	</div>
-	<div class="mail-list-detail">
-		<div class="mail-list-sender-name" >$from_name</div>
-		<div class="mail-list-date">$date</div>
-		<div class="mail-list-subject"><a href="message/$id" class="mail-list-link">$subject</a></div>
-	<div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-$id" >
-		<a href="message/dropconv/$id?confirm=1" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'message/dropconv/$id')});"  title="$delete" class="icon drophide mail-list-delete	delete-icon" id="mail-list-delete-$id" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);"#} ></a>
-	</div>
-</div>
-</div>
-<div class="mail-list-delete-end"></div>
-
-<div class="mail-list-outside-wrapper-end"></div>
diff --git a/view/theme/decaf-mobile/manage.tpl b/view/theme/decaf-mobile/manage.tpl
deleted file mode 100644
index fec30db9b0..0000000000
--- a/view/theme/decaf-mobile/manage.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<h3>$title</h3>
-<div id="identity-manage-desc">$desc</div>
-<div id="identity-manage-choose">$choose</div>
-<div id="identity-selector-wrapper">
-	<form action="manage" method="post" >
-	<select name="identity" size="4" onchange="this.form.submit();" >
-
-	{{ for $identities as $id }}
-		<option $id.selected value="$id.uid">$id.username ($id.nickname)</option>
-	{{ endfor }}
-
-	</select>
-	<div id="identity-select-break"></div>
-
-	{# name="submit" interferes with this.form.submit() #}
-	<input id="identity-submit" type="submit" {#name="submit"#} value="$submit" />
-</div></form>
-
diff --git a/view/theme/decaf-mobile/message-end.tpl b/view/theme/decaf-mobile/message-end.tpl
deleted file mode 100644
index fea596360b..0000000000
--- a/view/theme/decaf-mobile/message-end.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-{#<!--
-<script src="$baseurl/library/jquery_ac/friendica.complete.min.js" ></script>
-
--->#}
diff --git a/view/theme/decaf-mobile/message-head.tpl b/view/theme/decaf-mobile/message-head.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/theme/decaf-mobile/msg-end.tpl b/view/theme/decaf-mobile/msg-end.tpl
deleted file mode 100644
index 6074133798..0000000000
--- a/view/theme/decaf-mobile/msg-end.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<script type="text/javascript" src="$baseurl/js/ajaxupload.min.js" ></script>
-
diff --git a/view/theme/decaf-mobile/msg-header.tpl b/view/theme/decaf-mobile/msg-header.tpl
deleted file mode 100644
index 9ccf5d6fa2..0000000000
--- a/view/theme/decaf-mobile/msg-header.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-
-<script language="javascript" type="text/javascript">
-{#/*	window.nickname = "$nickname";
-	window.linkURL = "$linkurl";
-	var plaintext = "none";
-	window.autocompleteType = 'msg-header';*/#}
-	window.jotId = "#prvmail-text";
-	window.imageUploadButton = 'prvmail-upload';
-</script>
-
diff --git a/view/theme/decaf-mobile/nav.tpl b/view/theme/decaf-mobile/nav.tpl
deleted file mode 100644
index 45b7beeefc..0000000000
--- a/view/theme/decaf-mobile/nav.tpl
+++ /dev/null
@@ -1,155 +0,0 @@
-<nav>
-{#<!--	$langselector -->#}
-
-{#<!--	<div id="site-location">$sitelocation</div> -->#}
-
-	<span id="nav-link-wrapper" >
-
-{#<!--	<a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>-->#}
-	<div class="nav-button-container">
-{#<!--	<a class="system-menu-link nav-link" href="#system-menu" title="Menu">-->#}
-	<a href="$nav.navigation.0" title="$nav.navigation.3" >
-	<img rel="#system-menu-list" class="nav-link" src="view/theme/decaf-mobile/images/menu.png">
-	</a>
-{#<!--	</a>-->#}
-	{#<!--<ul id="system-menu-list" class="nav-menu-list">
-		{{ if $nav.login }}
-		<a id="nav-login-link" class="nav-load-page-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
-		{{ endif }}
-
-		{{ if $nav.register }}
-		<a id="nav-register-link" class="nav-load-page-link $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>
-		{{ endif }}
-
-		{{ if $nav.settings }}
-		<li><a id="nav-settings-link" class="$nav.settings.2 nav-load-page-link" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>
-		{{ endif }}
-
-		{{ if $nav.manage }}
-		<li>
-		<a id="nav-manage-link" class="nav-load-page-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>
-		</li>
-		{{ endif }}
-
-		{{ if $nav.profiles }}
-		<li><a id="nav-profiles-link" class="$nav.profiles.2 nav-load-page-link" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a></li>
-		{{ endif }}
-
-		{{ if $nav.admin }}
-		<li><a id="nav-admin-link" class="$nav.admin.2 nav-load-page-link" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>
-		{{ endif }}
-
-		<li><a id="nav-search-link" class="$nav.search.2 nav-load-page-link" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a></li>
-
-		{{ if $nav.apps }}
-		<li><a id="nav-apps-link" class="$nav.apps.2 nav-load-page-link" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a></li>
-		{{ endif }}
-
-		{{ if $nav.help }}
-		<li><a id="nav-help-link" class="$nav.help.2 nav-load-page-link" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>
-		{{ endif }}
-		
-		{{ if $nav.logout }}
-		<li><a id="nav-logout-link" class="$nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>
-		{{ endif }}
-	</ul>-->#}
-	</div>
-
-	{{ if $nav.notifications }}
-{#<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>-->#}
-	<div class="nav-button-container">
-{#<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">-->#}
-	<a href="$nav.notifications.all.0">
-	<img rel="#nav-notifications-menu" class="nav-link" src="view/theme/decaf-mobile/images/notifications.png">
-	</a>
-{#<!--	</a>-->#}
-	{#<!--<span id="notify-update" class="nav-ajax-left"></span>
-	<ul id="nav-notifications-menu" class="notifications-menu-popup">
-		<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-		<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-		<li class="empty">$emptynotifications</li>
-	</ul>-->#}
-	</div>
-	{{ endif }}		
-
-{#<!--	<a id="contacts-menu-link" class="nav-link" href="#contacts-menu" title="Contacts">Contacts</a>-->#}
-	{{ if $nav.contacts }}
-	<div class="nav-button-container">
-{#<!--	<a class="contacts-menu-link nav-link" href="#contacts-menu" title="Contacts">-->#}
-	<a id="nav-contacts-link" class="$nav.contacts.2 nav-load-page-link" href="$nav.contacts.0" title="$nav.contacts.3" >
-	<img rel="#contacts-menu-list"  class="nav-link" src="view/theme/decaf-mobile/images/contacts.png">
-	</a>
-	{#<!--</a>-->#}
-	{{ if $nav.introductions }}
-	<span id="intro-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	{#<!--<ul id="contacts-menu-list" class="nav-menu-list">
-		{{ if $nav.contacts }}
-		<li><a id="nav-contacts-link" class="$nav.contacts.2 nav-load-page-link" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a><li>
-		{{ endif }}
-
-		<li><a id="nav-directory-link" class="$nav.directory.2 nav-load-page-link" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a><li>
-
-		{{ if $nav.introductions }}
-		<li>
-		<a id="nav-notify-link" class="$nav.introductions.2 $sel.introductions nav-load-page-link" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a>
-		</li>
-		{{ endif }}
-	</ul>-->#}
-	</div>
-	{{ endif }}
-
-	{{ if $nav.messages }}
-{#<!--	<a id="nav-messages-link" class="nav-link $nav.messages.2 $sel.messages nav-load-page-link" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>-->#}
-	<div class="nav-button-container">
-	<a id="nav-messages-link" class="$nav.messages.2 $sel.messages nav-load-page-link" href="$nav.messages.0" title="$nav.messages.3" >
-	<img src="view/theme/decaf-mobile/images/message.png" class="nav-link">
-	</a>
-	<span id="mail-update" class="nav-ajax-left"></span>
-	</div>
-	{{ endif }}
-
-{#<!--	<a id="network-menu-link" class="nav-link" href="#network-menu" title="Network">Network</a>-->#}
-	{{ if $nav.network }}
-	<div class="nav-button-container">
-{#<!--	<a class="network-menu-link nav-link" href="#network-menu" title="Network">-->#}
-	<a id="nav-network-link" class="$nav.network.2 $sel.network nav-load-page-link" href="/" >
-	<img rel="#network-menu-list" class="nav-link" src="view/theme/decaf-mobile/images/network.png">
-	</a>
-{#<!--	</a>-->#}
-	<span id="net-update" class="nav-ajax-left"></span>
-	</div>
-	{{ endif }}
-<!--	<ul id="network-menu-list" class="nav-menu-list">
-		{{ if $nav.network }}
-		<li>
-		<a id="nav-network-link" class="$nav.network.2 $sel.network nav-load-page-link" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
-		</li>
-		{{ endif }}
-
-		{{ if $nav.network }}
-		<li>
-		<a class="nav-menu-icon network-reset-link nav-link" href="$nav.net_reset.0" title="$nav.net_reset.3">$nav.net_reset.1</a>
-		</li>
-		{{ endif }}
-
-		{{ if $nav.home }}
-		<li><a id="nav-home-link" class="$nav.home.2 $sel.home nav-load-page-link" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a></li>
-		{{ endif }}
-
-		{{ if $nav.community }}
-		<li>
-		<a id="nav-community-link" class="$nav.community.2 $sel.community nav-load-page-link" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
-		</li>
-		{{ endif }}
-	</ul>
-	</div>-->
-
-	</span>
-	{#<!--<span id="nav-end"></span>-->#}
-	<span id="banner">$banner</span>
-</nav>
-
-{#<!--<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
-</ul>-->#}
diff --git a/view/theme/decaf-mobile/photo_drop.tpl b/view/theme/decaf-mobile/photo_drop.tpl
deleted file mode 100644
index 296b829091..0000000000
--- a/view/theme/decaf-mobile/photo_drop.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
-	<a href="item/drop/$id?confirm=1" onclick="return confirmDelete(function(){this.href='item/drop/$id'});" class="icon drophide" title="$delete" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);"#} ></a>
-</div>
-<div class="wall-item-delete-end"></div>
diff --git a/view/theme/decaf-mobile/photo_edit.tpl b/view/theme/decaf-mobile/photo_edit.tpl
deleted file mode 100644
index 5bfa37c366..0000000000
--- a/view/theme/decaf-mobile/photo_edit.tpl
+++ /dev/null
@@ -1,60 +0,0 @@
-
-<form action="photos/$nickname/$resource_id" method="post" id="photo_edit_form" >
-
-	<input type="hidden" name="item_id" value="$item_id" />
-	<input id="photo-edit-form-confirm" type="hidden" name="confirm" value="1" />
-
-	<div class="photo-edit-input-text">
-	<label id="photo-edit-albumname-label" for="photo-edit-albumname">$newalbum</label>
-	<input id="photo-edit-albumname" type="text" size="32" name="albname" value="$album" />
-	</div>
-
-	<div id="photo-edit-albumname-end"></div>
-
-	<div class="photo-edit-input-text">
-	<label id="photo-edit-caption-label" for="photo-edit-caption">$capt_label</label>
-	<input id="photo-edit-caption" type="text" size="32" name="desc" value="$caption" />
-	</div>
-
-	<div id="photo-edit-caption-end"></div>
-
-	<div class="photo-edit-input-text">
-	<label id="photo-edit-tags-label" for="photo-edit-newtag" >$tag_label</label>
-	<input name="newtag" id="photo-edit-newtag" size="32" title="$help_tags" type="text" />
-	</div>
-
-	<div id="photo-edit-tags-end"></div>
-
-	<div class="photo-edit-rotate-choice">
-	<label id="photo-edit-rotate-cw-label" for="photo-edit-rotate-cw">$rotatecw</label>
-	<input id="photo-edit-rotate-cw" class="photo-edit-rotate" type="radio" name="rotate" value="1" /><br />
-	</div>
-
-	<div class="photo-edit-rotate-choice">
-	<label id="photo-edit-rotate-ccw-label" for="photo-edit-rotate-ccw">$rotateccw</label>
-	<input id="photo-edit-rotate-ccw" class="photo-edit-rotate" type="radio" name="rotate" value="2" />
-	</div>
-	<div id="photo-edit-rotate-end"></div>
-
-	<div id="photo-edit-perms" class="photo-edit-perms" >
-		{#<!--<a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="popupbox button" title="$permissions"/>
-			<span id="jot-perms-icon" class="icon $lockstate photo-perms-icon" ></span><div class="photo-jot-perms-text">$permissions</div>
-		</a>
-		<div id="photo-edit-perms-menu-end"></div>
-		
-		<div style="display: none;">-->#}
-			<div id="photo-edit-perms-select" >
-				{#<!--$aclselect-->#}
-				{{ inc acl_html_selector.tpl }}{{ endinc }}
-			</div>
-		{#<!--</div>-->#}
-	</div>
-	<div id="photo-edit-perms-end"></div>
-
-	<input id="photo-edit-submit-button" type="submit" name="submit" value="$submit" />
-	<input id="photo-edit-delete-button" type="submit" name="delete" value="$delete" onclick="return confirmDelete(function(){remove('photo-edit-form-confirm');});" />
-
-	<div id="photo-edit-end"></div>
-</form>
-
-
diff --git a/view/theme/decaf-mobile/photo_edit_head.tpl b/view/theme/decaf-mobile/photo_edit_head.tpl
deleted file mode 100644
index c819e24ce3..0000000000
--- a/view/theme/decaf-mobile/photo_edit_head.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-{#<!--
-<script>
-	window.prevLink = "$prevlink";
-	window.nextLink = "$nextlink";
-	window.photoEdit = true;
-
-</script>-->#}
diff --git a/view/theme/decaf-mobile/photo_view.tpl b/view/theme/decaf-mobile/photo_view.tpl
deleted file mode 100644
index 329e0a4e05..0000000000
--- a/view/theme/decaf-mobile/photo_view.tpl
+++ /dev/null
@@ -1,42 +0,0 @@
-<div id="live-display"></div>
-<h3><a href="$album.0">$album.1</a></h3>
-
-<div id="photo-edit-link-wrap">
-{{ if $tools }}
-<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
-|
-<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
-{{ endif }}
-{{ if $lock }} | <img src="images/lock_icon.gif" class="lockview" alt="$lock" {#onclick="lockview(event,'photo/$id');"#} /> {{ endif }}
-</div>
-
-<div id="photo-nav">
-	{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0"><img src="view/theme/decaf-mobile/images/arrow-left.png"></a></div>{{ endif }}
-	{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0"><img src="view/theme/decaf-mobile/images/arrow-right.png"></a></div>{{ endif }}
-</div>
-<div id="photo-photo"><a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a></div>
-<div id="photo-photo-end"></div>
-<div id="photo-caption">$desc</div>
-{{ if $tags }}
-<div id="in-this-photo-text">$tags.0</div>
-<div id="in-this-photo">$tags.1</div>
-{{ endif }}
-{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
-
-{{ if $edit }}
-$edit
-{{ else }}
-
-{{ if $likebuttons }}
-<div id="photo-like-div">
-	$likebuttons
-	$like
-	$dislike	
-</div>
-{{ endif }}
-
-$comments
-
-$paginate
-{{ endif }}
-
diff --git a/view/theme/decaf-mobile/photos_head.tpl b/view/theme/decaf-mobile/photos_head.tpl
deleted file mode 100644
index 5c13a0ae6c..0000000000
--- a/view/theme/decaf-mobile/photos_head.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{#<!--
-<script>
-	window.isPublic = "$ispublic";
-</script>
--->#}
diff --git a/view/theme/decaf-mobile/photos_upload.tpl b/view/theme/decaf-mobile/photos_upload.tpl
deleted file mode 100644
index 31ad468015..0000000000
--- a/view/theme/decaf-mobile/photos_upload.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-<h3>$pagename</h3>
-
-<div id="photos-usage-message">$usage</div>
-
-<form action="photos/$nickname" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" >
-	<div id="photos-upload-new-wrapper" >
-		<div id="photos-upload-newalbum-div">
-			<label id="photos-upload-newalbum-text" for="photos-upload-newalbum" >$newalbum</label>
-		</div>
-		<input id="photos-upload-newalbum" type="text" name="newalbum" />
-	</div>
-	<div id="photos-upload-new-end"></div>
-	<div id="photos-upload-exist-wrapper">
-		<div id="photos-upload-existing-album-text">$existalbumtext</div>
-		<select id="photos-upload-album-select" name="album">
-		$albumselect
-		</select>
-	</div>
-	<div id="photos-upload-exist-end"></div>
-
-	$default_upload_box
-
-	<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
-		<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" checked />
-		<label id="photos-upload-noshare-text" for="photos-upload-noshare" >$nosharetext</label>
-	</div>
-
-
-	{#<!--<div id="photos-upload-perms" class="photos-upload-perms" >
-		<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button popupbox" />
-		<span id="jot-perms-icon" class="icon $lockstate" ></span>$permissions
-		</a>
-	</div>
-	<div id="photos-upload-perms-end"></div>
-
-	<div style="display: none;">-->#}
-		<div id="photos-upload-permissions-wrapper">
-			{#<!--$aclselect-->#}
-			{{ inc acl_html_selector.tpl }}{{ endinc }}
-		</div>
-	{#<!--</div>-->#}
-
-	<div id="photos-upload-spacer"></div>
-
-	$alt_uploader
-
-	$default_upload_submit
-
-	<div class="photos-upload-end" ></div>
-</form>
-
diff --git a/view/theme/decaf-mobile/profed_end.tpl b/view/theme/decaf-mobile/profed_end.tpl
deleted file mode 100644
index ff56fda467..0000000000
--- a/view/theme/decaf-mobile/profed_end.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-{#<!--
-<script type="text/javascript" src="js/country.min.js" ></script>
-
-<script language="javascript" type="text/javascript">
-	Fill_Country('$country_name');
-	Fill_States('$region');
-</script>
--->#}
diff --git a/view/theme/decaf-mobile/profed_head.tpl b/view/theme/decaf-mobile/profed_head.tpl
deleted file mode 100644
index 02fd46aa49..0000000000
--- a/view/theme/decaf-mobile/profed_head.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{#<!--
-<script language="javascript" type="text/javascript">
-	window.editSelect = "none";
-</script>
--->#}
diff --git a/view/theme/decaf-mobile/profile_edit.tpl b/view/theme/decaf-mobile/profile_edit.tpl
deleted file mode 100644
index bed1de35ae..0000000000
--- a/view/theme/decaf-mobile/profile_edit.tpl
+++ /dev/null
@@ -1,324 +0,0 @@
-$default
-
-<h1>$banner</h1>
-
-<div id="profile-edit-links">
-<ul>
-<li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="$viewprof">$viewprof</a></li>
-<li><a href="$profile_clone_link" id="profile-edit-clone-link" title="$cr_prof">$cl_prof</a></li>
-<li></li>
-<li><a href="$profile_drop_link" id="profile-edit-drop-link" title="$del_prof" $disabled >$del_prof</a></li>
-
-</ul>
-</div>
-
-<div id="profile-edit-links-end"></div>
-
-
-<div id="profile-edit-wrapper" >
-<form id="profile-edit-form" name="form1" action="profiles/$profile_id" method="post" >
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-<div id="profile-edit-profile-name-wrapper" >
-<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >$lbl_profname </label>
-<input type="text" size="28" name="profile_name" id="profile-edit-profile-name" value="$profile_name" /><div class="required">*</div>
-</div>
-<div id="profile-edit-profile-name-end"></div>
-
-<div id="profile-edit-name-wrapper" >
-<label id="profile-edit-name-label" for="profile-edit-name" >$lbl_fullname </label>
-<input type="text" size="28" name="name" id="profile-edit-name" value="$name" />
-</div>
-<div id="profile-edit-name-end"></div>
-
-<div id="profile-edit-pdesc-wrapper" >
-<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >$lbl_title </label>
-<input type="text" size="28" name="pdesc" id="profile-edit-pdesc" value="$pdesc" />
-</div>
-<div id="profile-edit-pdesc-end"></div>
-
-
-<div id="profile-edit-gender-wrapper" >
-<label id="profile-edit-gender-label" for="gender-select" >$lbl_gender </label>
-$gender
-</div>
-<div id="profile-edit-gender-end"></div>
-
-<div id="profile-edit-dob-wrapper" >
-<label id="profile-edit-dob-label" for="dob-select" >$lbl_bd </label>
-<div id="profile-edit-dob" >
-$dob $age
-</div>
-</div>
-<div id="profile-edit-dob-end"></div>
-
-$hide_friends
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="profile-edit-address-wrapper" >
-<label id="profile-edit-address-label" for="profile-edit-address" >$lbl_address </label>
-<input type="text" size="28" name="address" id="profile-edit-address" value="$address" />
-</div>
-<div id="profile-edit-address-end"></div>
-
-<div id="profile-edit-locality-wrapper" >
-<label id="profile-edit-locality-label" for="profile-edit-locality" >$lbl_city </label>
-<input type="text" size="28" name="locality" id="profile-edit-locality" value="$locality" />
-</div>
-<div id="profile-edit-locality-end"></div>
-
-
-<div id="profile-edit-postal-code-wrapper" >
-<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >$lbl_zip </label>
-<input type="text" size="28" name="postal_code" id="profile-edit-postal-code" value="$postal_code" />
-</div>
-<div id="profile-edit-postal-code-end"></div>
-
-<div id="profile-edit-country-name-wrapper" >
-<label id="profile-edit-country-name-label" for="profile-edit-country-name" >$lbl_country </label>
-<input type="text" size="28" name="country_name" id="profile-edit-country-name" value="$country_name" />
-{#<!--<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('$region');">
-<option selected="selected" >$country_name</option>
-<option>temp</option>
-</select>-->#}
-</div>
-<div id="profile-edit-country-name-end"></div>
-
-<div id="profile-edit-region-wrapper" >
-<label id="profile-edit-region-label" for="profile-edit-region" >$lbl_region </label>
-<input type="text" size="28" name="region" id="profile-edit-region" value="$region" />
-{#<!--<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
-<option selected="selected" >$region</option>
-<option>temp</option>
-</select>-->#}
-</div>
-<div id="profile-edit-region-end"></div>
-
-<div id="profile-edit-hometown-wrapper" >
-<label id="profile-edit-hometown-label" for="profile-edit-hometown" >$lbl_hometown </label>
-<input type="text" size="28" name="hometown" id="profile-edit-hometown" value="$hometown" />
-</div>
-<div id="profile-edit-hometown-end"></div>
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="profile-edit-marital-wrapper" >
-<label id="profile-edit-marital-label" for="profile-edit-marital" >$lbl_marital </label>
-$marital
-</div>
-<label id="profile-edit-with-label" for="profile-edit-with" > $lbl_with </label>
-<input type="text" size="28" name="with" id="profile-edit-with" title="$lbl_ex1" value="$with" />
-<label id="profile-edit-howlong-label" for="profile-edit-howlong" > $lbl_howlong </label>
-<input type="text" size="28" name="howlong" id="profile-edit-howlong" title="$lbl_howlong" value="$howlong" />
-
-<div id="profile-edit-marital-end"></div>
-
-<div id="profile-edit-sexual-wrapper" >
-<label id="profile-edit-sexual-label" for="sexual-select" >$lbl_sexual </label>
-$sexual
-</div>
-<div id="profile-edit-sexual-end"></div>
-
-
-
-<div id="profile-edit-homepage-wrapper" >
-<label id="profile-edit-homepage-label" for="profile-edit-homepage" >$lbl_homepage </label>
-<input type="text" size="28" name="homepage" id="profile-edit-homepage" value="$homepage" />
-</div>
-<div id="profile-edit-homepage-end"></div>
-
-<div id="profile-edit-politic-wrapper" >
-<label id="profile-edit-politic-label" for="profile-edit-politic" >$lbl_politic </label>
-<input type="text" size="28" name="politic" id="profile-edit-politic" value="$politic" />
-</div>
-<div id="profile-edit-politic-end"></div>
-
-<div id="profile-edit-religion-wrapper" >
-<label id="profile-edit-religion-label" for="profile-edit-religion" >$lbl_religion </label>
-<input type="text" size="28" name="religion" id="profile-edit-religion" value="$religion" />
-</div>
-<div id="profile-edit-religion-end"></div>
-
-<div id="profile-edit-pubkeywords-wrapper" >
-<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >$lbl_pubkey </label>
-<input type="text" size="28" name="pub_keywords" id="profile-edit-pubkeywords" title="$lbl_ex2" value="$pub_keywords" />
-</div><div id="profile-edit-pubkeywords-desc">$lbl_pubdsc</div>
-<div id="profile-edit-pubkeywords-end"></div>
-
-<div id="profile-edit-prvkeywords-wrapper" >
-<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >$lbl_prvkey </label>
-<input type="text" size="28" name="prv_keywords" id="profile-edit-prvkeywords" title="$lbl_ex2" value="$prv_keywords" />
-</div><div id="profile-edit-prvkeywords-desc">$lbl_prvdsc</div>
-<div id="profile-edit-prvkeywords-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="about-jot-wrapper" class="profile-jot-box">
-<p id="about-jot-desc" >
-$lbl_about
-</p>
-
-<textarea rows="10" cols="30" id="profile-about-text" class="profile-edit-textarea" name="about" >$about</textarea>
-
-</div>
-<div id="about-jot-end"></div>
-
-
-<div id="interest-jot-wrapper" class="profile-jot-box" >
-<p id="interest-jot-desc" >
-$lbl_hobbies
-</p>
-
-<textarea rows="10" cols="30" id="interest-jot-text" class="profile-edit-textarea" name="interest" >$interest</textarea>
-
-</div>
-<div id="interest-jot-end"></div>
-
-
-<div id="likes-jot-wrapper" class="profile-jot-box" >
-<p id="likes-jot-desc" >
-$lbl_likes
-</p>
-
-<textarea rows="10" cols="30" id="likes-jot-text" class="profile-edit-textarea" name="likes" >$likes</textarea>
-
-</div>
-<div id="likes-jot-end"></div>
-
-
-<div id="dislikes-jot-wrapper" class="profile-jot-box" >
-<p id="dislikes-jot-desc" >
-$lbl_dislikes
-</p>
-
-<textarea rows="10" cols="30" id="dislikes-jot-text" class="profile-edit-textarea" name="dislikes" >$dislikes</textarea>
-
-</div>
-<div id="dislikes-jot-end"></div>
-
-
-<div id="contact-jot-wrapper" class="profile-jot-box" >
-<p id="contact-jot-desc" >
-$lbl_social
-</p>
-
-<textarea rows="10" cols="30" id="contact-jot-text" class="profile-edit-textarea" name="contact" >$contact</textarea>
-
-</div>
-<div id="contact-jot-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="music-jot-wrapper" class="profile-jot-box" >
-<p id="music-jot-desc" >
-$lbl_music
-</p>
-
-<textarea rows="10" cols="30" id="music-jot-text" class="profile-edit-textarea" name="music" >$music</textarea>
-
-</div>
-<div id="music-jot-end"></div>
-
-<div id="book-jot-wrapper" class="profile-jot-box" >
-<p id="book-jot-desc" >
-$lbl_book
-</p>
-
-<textarea rows="10" cols="30" id="book-jot-text" class="profile-edit-textarea" name="book" >$book</textarea>
-
-</div>
-<div id="book-jot-end"></div>
-
-
-
-<div id="tv-jot-wrapper" class="profile-jot-box" >
-<p id="tv-jot-desc" >
-$lbl_tv 
-</p>
-
-<textarea rows="10" cols="30" id="tv-jot-text" class="profile-edit-textarea" name="tv" >$tv</textarea>
-
-</div>
-<div id="tv-jot-end"></div>
-
-
-
-<div id="film-jot-wrapper" class="profile-jot-box" >
-<p id="film-jot-desc" >
-$lbl_film
-</p>
-
-<textarea rows="10" cols="30" id="film-jot-text" class="profile-edit-textarea" name="film" >$film</textarea>
-
-</div>
-<div id="film-jot-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="romance-jot-wrapper" class="profile-jot-box" >
-<p id="romance-jot-desc" >
-$lbl_love
-</p>
-
-<textarea rows="10" cols="30" id="romance-jot-text" class="profile-edit-textarea" name="romance" >$romance</textarea>
-
-</div>
-<div id="romance-jot-end"></div>
-
-
-
-<div id="work-jot-wrapper" class="profile-jot-box" >
-<p id="work-jot-desc" >
-$lbl_work
-</p>
-
-<textarea rows="10" cols="30" id="work-jot-text" class="profile-edit-textarea" name="work" >$work</textarea>
-
-</div>
-<div id="work-jot-end"></div>
-
-
-
-<div id="education-jot-wrapper" class="profile-jot-box" >
-<p id="education-jot-desc" >
-$lbl_school 
-</p>
-
-<textarea rows="10" cols="30" id="education-jot-text" class="profile-edit-textarea" name="education" >$education</textarea>
-
-</div>
-<div id="education-jot-end"></div>
-
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-</form>
-</div>
-
diff --git a/view/theme/decaf-mobile/profile_photo.tpl b/view/theme/decaf-mobile/profile_photo.tpl
deleted file mode 100644
index 42fc139f8f..0000000000
--- a/view/theme/decaf-mobile/profile_photo.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-<h1>$title</h1>
-
-<form enctype="multipart/form-data" action="profile_photo" method="post">
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-<div id="profile-photo-upload-wrapper">
-<label id="profile-photo-upload-label" for="profile-photo-upload">$lbl_upfile </label>
-<input name="userfile" type="file" id="profile-photo-upload" size="25" />
-</div>
-
-<div id="profile-photo-submit-wrapper">
-<input type="submit" name="submit" id="profile-photo-submit" value="$submit">
-</div>
-
-</form>
-
-<div id="profile-photo-link-select-wrapper">
-$select
-</div>
diff --git a/view/theme/decaf-mobile/profile_vcard.tpl b/view/theme/decaf-mobile/profile_vcard.tpl
deleted file mode 100644
index e91e6125ff..0000000000
--- a/view/theme/decaf-mobile/profile_vcard.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-<div class="vcard">
-
-	<div class="fn label">$profile.name</div>
-	
-				
-	
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name"></div>
-
-
-
-	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt> 
-		<dd class="adr">
-			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal_code</span>
-			</span>
-			{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
-		</dd>
-		</dl>
-	{{ endif }}
-
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
-
-	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-
-	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-
-	<div id="profile-vcard-break"></div>	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-			{{ if $wallmessage }}
-				<li><a id="wallmessage-link" href="wallmessage/$profile.nickname">$wallmessage</a></li>
-			{{ endif }}
-		</ul>
-	</div>
-</div>
-
-$contact_block
-
-
diff --git a/view/theme/decaf-mobile/prv_message.tpl b/view/theme/decaf-mobile/prv_message.tpl
deleted file mode 100644
index 5d9925297d..0000000000
--- a/view/theme/decaf-mobile/prv_message.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-
-<h3>$header</h3>
-
-<div id="prvmail-wrapper" >
-<form id="prvmail-form" action="message" method="post" >
-
-$parent
-
-<div id="prvmail-to-label">$to</div>
-
-{{ if $showinputs }}
-<input type="text" id="recip" name="messageto" value="$prefill" maxlength="255" size="64" tabindex="10" />
-<input type="hidden" id="recip-complete" name="messageto" value="$preid">
-{{ else }}
-$select
-{{ endif }}
-
-<div id="prvmail-subject-label">$subject</div>
-<input type="text" size="28" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly tabindex="11" />
-
-<div id="prvmail-message-label">$yourmessage</div>
-<textarea rows="8" cols="32" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$text</textarea>
-
-
-<div id="prvmail-submit-wrapper" >
-	<input type="submit" id="prvmail-submit" name="submit" value="$submit" tabindex="13" />
-	<div id="prvmail-upload-wrapper"  style="display: none;">
-		<div id="prvmail-upload" class="icon border camera" title="$upload" ></div>
-	</div> 
-	{#<!--<div id="prvmail-link-wrapper" >
-		<div id="prvmail-link" class="icon border link" title="$insert" onclick="jotGetLink();" ></div>
-	</div>-->#} 
-	<div id="prvmail-rotator-wrapper" >
-		<img id="prvmail-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-</div>
-<div id="prvmail-end"></div>
-</form>
-</div>
-
-<script>
-document.getElementById('prvmail-upload-wrapper').style.display = "inherit";
-</script>
diff --git a/view/theme/decaf-mobile/register.tpl b/view/theme/decaf-mobile/register.tpl
deleted file mode 100644
index b1f39048e9..0000000000
--- a/view/theme/decaf-mobile/register.tpl
+++ /dev/null
@@ -1,80 +0,0 @@
-<div class='register-form'>
-<h2>$regtitle</h2>
-<br />
-
-<form action="register" method="post" id="register-form">
-
-	<input type="hidden" name="photo" value="$photo" />
-
-	$registertext
-
-	<p id="register-realpeople">$realpeople</p>
-
-	<br />
-{{ if $oidlabel }}
-	<div id="register-openid-wrapper" >
-    	<label for="register-openid" id="label-register-openid" >$oidlabel</label><input 	type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="$openid" >
-	</div>
-	<div id="register-openid-end" ></div>
-{{ endif }}
-
-	<div class="register-explain-wrapper">
-	<p id="register-fill-desc">$fillwith $fillext</p>
-	</div>
-
-	<br /><br />
-
-{{ if $invitations }}
-
-	<p id="register-invite-desc">$invite_desc</p>
-	<div id="register-invite-wrapper" >
-		<label for="register-invite" id="label-register-invite" >$invite_label</label>
-		<input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" value="$invite_id" >
-	</div>
-	<div id="register-name-end" ></div>
-
-{{ endif }}
-
-
-	<div id="register-name-wrapper" class="field input" >
-		<label for="register-name" id="label-register-name" >$namelabel</label><br />
-		<input type="text" maxlength="60" size="32" name="username" id="register-name" value="$username" >
-	</div>
-	<div id="register-name-end" ></div>
-
-
-	<div id="register-email-wrapper"  class="field input" >
-		<label for="register-email" id="label-register-email" >$addrlabel</label><br />
-		<input type="text" maxlength="60" size="32" name="email" id="register-email" value="$email" >
-	</div>
-	<div id="register-email-end" ></div>
-
-	<div id="register-nickname-wrapper" class="field input" >
-		<label for="register-nickname" id="label-register-nickname" >$nicklabel</label><br />
-		<input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" value="$nickname" >
-	</div>
-	<div id="register-nickname-end" ></div>
-
-	<div class="register-explain-wrapper">
-	<p id="register-nickname-desc" >$nickdesc</p>
-	</div>
-
-	$publish
-
-	<div id="register-footer">
-	{#<!--<div class="agreement">
-	By clicking '$regbutt' you are agreeing to the latest <a href="tos.html" title="$tostitle" id="terms-of-service-link" >$toslink</a> and <a href="privacy.html" title="$privacytitle" id="privacy-link" >$privacylink</a>
-	</div>-->#}
-	<br />
-
-	<div id="register-submit-wrapper">
-		<input type="submit" name="submit" id="register-submit-button" value="$regbutt" />
-	</div>
-	<div id="register-submit-end" ></div>
-	</div>
-</form>
-<br /><br /><br />
-
-$license
-
-</div>
diff --git a/view/theme/decaf-mobile/search_item.tpl b/view/theme/decaf-mobile/search_item.tpl
deleted file mode 100644
index 3e14b644b0..0000000000
--- a/view/theme/decaf-mobile/search_item.tpl
+++ /dev/null
@@ -1,64 +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" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-				{#<!--<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-					<ul>
-						$item.item_photo_menu
-					</ul>
-				</div>
-			</div>-->#}
-			<div class="wall-item-photo-end"></div>	
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-				{{ if $item.lock }}{#<!--<div class="wall-item-lock">-->#}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="$item.lock" {#onclick="lockview(event,$item.id);" #}/>{#<!--</div>-->#}
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
-			</div>
-		</div>
-		{#<!--<div class="wall-item-author">-->#}
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div>
-				
-		{#<!--</div>-->#}
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			{#<!--<div class="wall-item-title-end"></div>-->#}
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
-			{{ if $item.has_cats }}
-			<div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name{{ if $cat.removeurl }} <a href="$cat.removeurl" title="$remove">[$remove]</a>{{ endif }} {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-
-			{{ if $item.has_folders }}
-			<div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name{{ if $cat.removeurl }} <a href="$cat.removeurl" title="$remove">[$remove]</a>{{ endif }}{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			{#<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >-->#}
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id?confirm=1" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'item/drop/$item.id')});" class="wall-item-delete-wrapper icon drophide" title="$item.drop.delete" id="wall-item-delete-wrapper-$item.id" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);"#} ></a>{{ endif }}
-			{#<!--</div>-->#}
-				{#<!--{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}-->#}
-			{#<!--<div class="wall-item-delete-end"></div>-->#}
-		</div>
-	</div>
-	{#<!--<div class="wall-item-wrapper-end"></div>-->#}
-
-
-	<div class="wall-item-conv" id="wall-item-conv-$item.id" >
-	{{ if $item.conv }}
-			<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
-	{{ endif }}
-	</div>
-
-{#<!--<div class="wall-item-outside-wrapper-end $item.indent" ></div>-->#}
-
-{#<!--</div>-->#}
-
-
diff --git a/view/theme/decaf-mobile/settings-head.tpl b/view/theme/decaf-mobile/settings-head.tpl
deleted file mode 100644
index 5c13a0ae6c..0000000000
--- a/view/theme/decaf-mobile/settings-head.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{#<!--
-<script>
-	window.isPublic = "$ispublic";
-</script>
--->#}
diff --git a/view/theme/decaf-mobile/settings.tpl b/view/theme/decaf-mobile/settings.tpl
deleted file mode 100644
index 036cc16916..0000000000
--- a/view/theme/decaf-mobile/settings.tpl
+++ /dev/null
@@ -1,151 +0,0 @@
-<h1>$ptitle</h1>
-
-$nickname_block
-
-<form action="settings" id="settings-form" method="post" autocomplete="off" >
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-<h3 class="settings-heading">$h_pass</h3>
-
-{{inc field_password.tpl with $field=$password1 }}{{endinc}}
-{{inc field_password.tpl with $field=$password2 }}{{endinc}}
-{{inc field_password.tpl with $field=$password3 }}{{endinc}}
-
-{{ if $oid_enable }}
-{{inc field_input.tpl with $field=$openid }}{{endinc}}
-{{ endif }}
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
-<h3 class="settings-heading">$h_basic</h3>
-
-{{inc field_input.tpl with $field=$username }}{{endinc}}
-{{inc field_input.tpl with $field=$email }}{{endinc}}
-{{inc field_password.tpl with $field=$password4 }}{{endinc}}
-{{inc field_custom.tpl with $field=$timezone }}{{endinc}}
-{{inc field_input.tpl with $field=$defloc }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}}
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
-<h3 class="settings-heading">$h_prv</h3>
-
-
-<input type="hidden" name="visibility" value="$visibility" />
-
-{{inc field_input.tpl with $field=$maxreq }}{{endinc}}
-
-$profile_in_dir
-
-$profile_in_net_dir
-
-$hide_friends
-
-$hide_wall
-
-$blockwall
-
-$blocktags
-
-$suggestme
-
-$unkmail
-
-
-{{inc field_input.tpl with $field=$cntunkmail }}{{endinc}}
-
-{{inc field_input.tpl with $field=$expire.days }}{{endinc}}
-
-
-<div class="field input">
-	<span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span>
-	<div style="display: none;">
-		<div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
-			<h3>$expire.advanced</h3>
-			{{ inc field_yesno.tpl with $field=$expire.items }}{{endinc}}
-			{{ inc field_yesno.tpl with $field=$expire.notes }}{{endinc}}
-			{{ inc field_yesno.tpl with $field=$expire.starred }}{{endinc}}
-			{{ inc field_yesno.tpl with $field=$expire.network_only }}{{endinc}}
-		</div>
-	</div>
-
-</div>
-
-
-<div id="settings-perms-wrapper" class="field">
-<label for="settings-default-perms">$settings_perms</label><br/>
-<div id="settings-default-perms" class="settings-default-perms" >
-{#<!--	<a href="#settings-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>$permissions $permdesc</a>
-	<div id="settings-default-perms-menu-end"></div>
-
-	<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >
-	
-	<div style="display: none;">-->#}
-		<div id="settings-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;margin-bottom: 20px">
-			{#<!--$aclselect-->#}
-			{{ inc acl_html_selector.tpl }}{{ endinc }}
-		</div>
-{#<!--	</div>
-
-	</div>-->#}
-</div>
-</div>
-<br/>
-<div id="settings-default-perms-end"></div>
-
-$group_select
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
-
-<h3 class="settings-heading">$h_not</h3>
-<div id="settings-notifications">
-
-<div id="settings-activity-desc">$activity_options</div>
-
-{{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$post_joingroup }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}}
-
-
-<div id="settings-notify-desc">$lbl_not</div>
-
-<div class="group">
-{{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify2 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify3 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify4 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify6 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify8 }}{{endinc}}
-</div>
-
-</div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
-<h3 class="settings-heading">$h_advn</h3>
-<div id="settings-pagetype-desc">$h_descadvn</div>
-
-$pagetype
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
diff --git a/view/theme/decaf-mobile/settings_display_end.tpl b/view/theme/decaf-mobile/settings_display_end.tpl
deleted file mode 100644
index 739c43b35a..0000000000
--- a/view/theme/decaf-mobile/settings_display_end.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-	<script>$j(function(){ previewTheme($j("#id_$theme.0")[0]); });</script>
-
diff --git a/view/theme/decaf-mobile/suggest_friends.tpl b/view/theme/decaf-mobile/suggest_friends.tpl
deleted file mode 100644
index d5051e33b5..0000000000
--- a/view/theme/decaf-mobile/suggest_friends.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="profile-match-wrapper">
-	<div class="profile-match-photo">
-		<a href="$url">
-			<img src="$photo" alt="$name" width="80" height="80" title="$name [$url]" onError="this.src='../../../images/person-48.jpg';" />
-		</a>
-	</div>
-	<div class="profile-match-break"></div>
-	<div class="profile-match-name">
-		<a href="$url" title="$name">$name</a>
-	</div>
-	<div class="profile-match-end"></div>
-	{{ if $connlnk }}
-	<div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div>
-	{{ endif }}
-	<a href="$ignlnk&confirm=1" title="$ignore" class="icon drophide profile-match-ignore" id="profile-match-drop-$ignid" {#onmouseout="imgdull(this);" onmouseover="imgbright(this);"#} onclick="id=this.id;return confirmDelete(function(){changeHref(id, '$ignlnk')});" ></a>
-</div>
diff --git a/view/theme/decaf-mobile/smarty3/acl_html_selector.tpl b/view/theme/decaf-mobile/templates/acl_html_selector.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/acl_html_selector.tpl
rename to view/theme/decaf-mobile/templates/acl_html_selector.tpl
diff --git a/view/theme/decaf-mobile/smarty3/acl_selector.tpl b/view/theme/decaf-mobile/templates/acl_selector.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/acl_selector.tpl
rename to view/theme/decaf-mobile/templates/acl_selector.tpl
diff --git a/view/theme/decaf-mobile/smarty3/admin_aside.tpl b/view/theme/decaf-mobile/templates/admin_aside.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/admin_aside.tpl
rename to view/theme/decaf-mobile/templates/admin_aside.tpl
diff --git a/view/theme/decaf-mobile/smarty3/admin_site.tpl b/view/theme/decaf-mobile/templates/admin_site.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/admin_site.tpl
rename to view/theme/decaf-mobile/templates/admin_site.tpl
diff --git a/view/theme/decaf-mobile/smarty3/admin_users.tpl b/view/theme/decaf-mobile/templates/admin_users.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/admin_users.tpl
rename to view/theme/decaf-mobile/templates/admin_users.tpl
diff --git a/view/theme/decaf-mobile/smarty3/album_edit.tpl b/view/theme/decaf-mobile/templates/album_edit.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/album_edit.tpl
rename to view/theme/decaf-mobile/templates/album_edit.tpl
diff --git a/view/theme/decaf-mobile/smarty3/categories_widget.tpl b/view/theme/decaf-mobile/templates/categories_widget.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/categories_widget.tpl
rename to view/theme/decaf-mobile/templates/categories_widget.tpl
diff --git a/view/theme/decaf-mobile/smarty3/comment_item.tpl b/view/theme/decaf-mobile/templates/comment_item.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/comment_item.tpl
rename to view/theme/decaf-mobile/templates/comment_item.tpl
diff --git a/view/theme/decaf-mobile/smarty3/common_tabs.tpl b/view/theme/decaf-mobile/templates/common_tabs.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/common_tabs.tpl
rename to view/theme/decaf-mobile/templates/common_tabs.tpl
diff --git a/view/theme/decaf-mobile/smarty3/contact_block.tpl b/view/theme/decaf-mobile/templates/contact_block.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/contact_block.tpl
rename to view/theme/decaf-mobile/templates/contact_block.tpl
diff --git a/view/theme/decaf-mobile/smarty3/contact_edit.tpl b/view/theme/decaf-mobile/templates/contact_edit.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/contact_edit.tpl
rename to view/theme/decaf-mobile/templates/contact_edit.tpl
diff --git a/view/theme/decaf-mobile/smarty3/contact_head.tpl b/view/theme/decaf-mobile/templates/contact_head.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/contact_head.tpl
rename to view/theme/decaf-mobile/templates/contact_head.tpl
diff --git a/view/theme/decaf-mobile/smarty3/contact_template.tpl b/view/theme/decaf-mobile/templates/contact_template.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/contact_template.tpl
rename to view/theme/decaf-mobile/templates/contact_template.tpl
diff --git a/view/theme/decaf-mobile/smarty3/contacts-end.tpl b/view/theme/decaf-mobile/templates/contacts-end.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/contacts-end.tpl
rename to view/theme/decaf-mobile/templates/contacts-end.tpl
diff --git a/view/theme/decaf-mobile/smarty3/contacts-head.tpl b/view/theme/decaf-mobile/templates/contacts-head.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/contacts-head.tpl
rename to view/theme/decaf-mobile/templates/contacts-head.tpl
diff --git a/view/theme/decaf-mobile/smarty3/contacts-template.tpl b/view/theme/decaf-mobile/templates/contacts-template.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/contacts-template.tpl
rename to view/theme/decaf-mobile/templates/contacts-template.tpl
diff --git a/view/theme/decaf-mobile/smarty3/contacts-widget-sidebar.tpl b/view/theme/decaf-mobile/templates/contacts-widget-sidebar.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/contacts-widget-sidebar.tpl
rename to view/theme/decaf-mobile/templates/contacts-widget-sidebar.tpl
diff --git a/view/theme/decaf-mobile/smarty3/conversation.tpl b/view/theme/decaf-mobile/templates/conversation.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/conversation.tpl
rename to view/theme/decaf-mobile/templates/conversation.tpl
diff --git a/view/theme/decaf-mobile/smarty3/cropbody.tpl b/view/theme/decaf-mobile/templates/cropbody.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/cropbody.tpl
rename to view/theme/decaf-mobile/templates/cropbody.tpl
diff --git a/view/theme/decaf-mobile/smarty3/cropend.tpl b/view/theme/decaf-mobile/templates/cropend.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/cropend.tpl
rename to view/theme/decaf-mobile/templates/cropend.tpl
diff --git a/view/theme/decaf-mobile/smarty3/crophead.tpl b/view/theme/decaf-mobile/templates/crophead.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/crophead.tpl
rename to view/theme/decaf-mobile/templates/crophead.tpl
diff --git a/view/theme/decaf-mobile/smarty3/display-head.tpl b/view/theme/decaf-mobile/templates/display-head.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/display-head.tpl
rename to view/theme/decaf-mobile/templates/display-head.tpl
diff --git a/view/theme/decaf-mobile/smarty3/end.tpl b/view/theme/decaf-mobile/templates/end.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/end.tpl
rename to view/theme/decaf-mobile/templates/end.tpl
diff --git a/view/theme/decaf-mobile/smarty3/event_end.tpl b/view/theme/decaf-mobile/templates/event_end.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/event_end.tpl
rename to view/theme/decaf-mobile/templates/event_end.tpl
diff --git a/view/theme/decaf-mobile/smarty3/event_head.tpl b/view/theme/decaf-mobile/templates/event_head.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/event_head.tpl
rename to view/theme/decaf-mobile/templates/event_head.tpl
diff --git a/view/theme/decaf-mobile/smarty3/field_checkbox.tpl b/view/theme/decaf-mobile/templates/field_checkbox.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/field_checkbox.tpl
rename to view/theme/decaf-mobile/templates/field_checkbox.tpl
diff --git a/view/theme/decaf-mobile/smarty3/field_input.tpl b/view/theme/decaf-mobile/templates/field_input.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/field_input.tpl
rename to view/theme/decaf-mobile/templates/field_input.tpl
diff --git a/view/theme/decaf-mobile/smarty3/field_openid.tpl b/view/theme/decaf-mobile/templates/field_openid.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/field_openid.tpl
rename to view/theme/decaf-mobile/templates/field_openid.tpl
diff --git a/view/theme/decaf-mobile/smarty3/field_password.tpl b/view/theme/decaf-mobile/templates/field_password.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/field_password.tpl
rename to view/theme/decaf-mobile/templates/field_password.tpl
diff --git a/view/theme/decaf-mobile/smarty3/field_themeselect.tpl b/view/theme/decaf-mobile/templates/field_themeselect.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/field_themeselect.tpl
rename to view/theme/decaf-mobile/templates/field_themeselect.tpl
diff --git a/view/theme/decaf-mobile/smarty3/field_yesno.tpl b/view/theme/decaf-mobile/templates/field_yesno.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/field_yesno.tpl
rename to view/theme/decaf-mobile/templates/field_yesno.tpl
diff --git a/view/theme/decaf-mobile/smarty3/generic_links_widget.tpl b/view/theme/decaf-mobile/templates/generic_links_widget.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/generic_links_widget.tpl
rename to view/theme/decaf-mobile/templates/generic_links_widget.tpl
diff --git a/view/theme/decaf-mobile/smarty3/group_drop.tpl b/view/theme/decaf-mobile/templates/group_drop.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/group_drop.tpl
rename to view/theme/decaf-mobile/templates/group_drop.tpl
diff --git a/view/theme/decaf-mobile/smarty3/group_side.tpl b/view/theme/decaf-mobile/templates/group_side.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/group_side.tpl
rename to view/theme/decaf-mobile/templates/group_side.tpl
diff --git a/view/theme/decaf-mobile/smarty3/head.tpl b/view/theme/decaf-mobile/templates/head.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/head.tpl
rename to view/theme/decaf-mobile/templates/head.tpl
diff --git a/view/theme/decaf-mobile/smarty3/jot-end.tpl b/view/theme/decaf-mobile/templates/jot-end.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/jot-end.tpl
rename to view/theme/decaf-mobile/templates/jot-end.tpl
diff --git a/view/theme/decaf-mobile/smarty3/jot-header.tpl b/view/theme/decaf-mobile/templates/jot-header.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/jot-header.tpl
rename to view/theme/decaf-mobile/templates/jot-header.tpl
diff --git a/view/theme/decaf-mobile/smarty3/jot.tpl b/view/theme/decaf-mobile/templates/jot.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/jot.tpl
rename to view/theme/decaf-mobile/templates/jot.tpl
diff --git a/view/theme/decaf-mobile/smarty3/jot_geotag.tpl b/view/theme/decaf-mobile/templates/jot_geotag.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/jot_geotag.tpl
rename to view/theme/decaf-mobile/templates/jot_geotag.tpl
diff --git a/view/theme/decaf-mobile/smarty3/lang_selector.tpl b/view/theme/decaf-mobile/templates/lang_selector.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/lang_selector.tpl
rename to view/theme/decaf-mobile/templates/lang_selector.tpl
diff --git a/view/theme/decaf-mobile/smarty3/like_noshare.tpl b/view/theme/decaf-mobile/templates/like_noshare.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/like_noshare.tpl
rename to view/theme/decaf-mobile/templates/like_noshare.tpl
diff --git a/view/theme/decaf-mobile/smarty3/login.tpl b/view/theme/decaf-mobile/templates/login.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/login.tpl
rename to view/theme/decaf-mobile/templates/login.tpl
diff --git a/view/theme/decaf-mobile/smarty3/login_head.tpl b/view/theme/decaf-mobile/templates/login_head.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/login_head.tpl
rename to view/theme/decaf-mobile/templates/login_head.tpl
diff --git a/view/theme/decaf-mobile/smarty3/lostpass.tpl b/view/theme/decaf-mobile/templates/lostpass.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/lostpass.tpl
rename to view/theme/decaf-mobile/templates/lostpass.tpl
diff --git a/view/theme/decaf-mobile/smarty3/mail_conv.tpl b/view/theme/decaf-mobile/templates/mail_conv.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/mail_conv.tpl
rename to view/theme/decaf-mobile/templates/mail_conv.tpl
diff --git a/view/theme/decaf-mobile/smarty3/mail_list.tpl b/view/theme/decaf-mobile/templates/mail_list.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/mail_list.tpl
rename to view/theme/decaf-mobile/templates/mail_list.tpl
diff --git a/view/theme/decaf-mobile/smarty3/manage.tpl b/view/theme/decaf-mobile/templates/manage.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/manage.tpl
rename to view/theme/decaf-mobile/templates/manage.tpl
diff --git a/view/theme/decaf-mobile/smarty3/message-end.tpl b/view/theme/decaf-mobile/templates/message-end.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/message-end.tpl
rename to view/theme/decaf-mobile/templates/message-end.tpl
diff --git a/view/theme/decaf-mobile/smarty3/message-head.tpl b/view/theme/decaf-mobile/templates/message-head.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/message-head.tpl
rename to view/theme/decaf-mobile/templates/message-head.tpl
diff --git a/view/theme/decaf-mobile/smarty3/moderated_comment.tpl b/view/theme/decaf-mobile/templates/moderated_comment.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/moderated_comment.tpl
rename to view/theme/decaf-mobile/templates/moderated_comment.tpl
diff --git a/view/theme/decaf-mobile/smarty3/msg-end.tpl b/view/theme/decaf-mobile/templates/msg-end.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/msg-end.tpl
rename to view/theme/decaf-mobile/templates/msg-end.tpl
diff --git a/view/theme/decaf-mobile/smarty3/msg-header.tpl b/view/theme/decaf-mobile/templates/msg-header.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/msg-header.tpl
rename to view/theme/decaf-mobile/templates/msg-header.tpl
diff --git a/view/theme/decaf-mobile/smarty3/nav.tpl b/view/theme/decaf-mobile/templates/nav.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/nav.tpl
rename to view/theme/decaf-mobile/templates/nav.tpl
diff --git a/view/theme/decaf-mobile/smarty3/photo_drop.tpl b/view/theme/decaf-mobile/templates/photo_drop.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/photo_drop.tpl
rename to view/theme/decaf-mobile/templates/photo_drop.tpl
diff --git a/view/theme/decaf-mobile/smarty3/photo_edit.tpl b/view/theme/decaf-mobile/templates/photo_edit.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/photo_edit.tpl
rename to view/theme/decaf-mobile/templates/photo_edit.tpl
diff --git a/view/theme/decaf-mobile/smarty3/photo_edit_head.tpl b/view/theme/decaf-mobile/templates/photo_edit_head.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/photo_edit_head.tpl
rename to view/theme/decaf-mobile/templates/photo_edit_head.tpl
diff --git a/view/theme/decaf-mobile/smarty3/photo_view.tpl b/view/theme/decaf-mobile/templates/photo_view.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/photo_view.tpl
rename to view/theme/decaf-mobile/templates/photo_view.tpl
diff --git a/view/theme/decaf-mobile/smarty3/photos_head.tpl b/view/theme/decaf-mobile/templates/photos_head.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/photos_head.tpl
rename to view/theme/decaf-mobile/templates/photos_head.tpl
diff --git a/view/theme/decaf-mobile/smarty3/photos_upload.tpl b/view/theme/decaf-mobile/templates/photos_upload.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/photos_upload.tpl
rename to view/theme/decaf-mobile/templates/photos_upload.tpl
diff --git a/view/theme/decaf-mobile/smarty3/profed_end.tpl b/view/theme/decaf-mobile/templates/profed_end.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/profed_end.tpl
rename to view/theme/decaf-mobile/templates/profed_end.tpl
diff --git a/view/theme/decaf-mobile/smarty3/profed_head.tpl b/view/theme/decaf-mobile/templates/profed_head.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/profed_head.tpl
rename to view/theme/decaf-mobile/templates/profed_head.tpl
diff --git a/view/theme/decaf-mobile/smarty3/profile_edit.tpl b/view/theme/decaf-mobile/templates/profile_edit.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/profile_edit.tpl
rename to view/theme/decaf-mobile/templates/profile_edit.tpl
diff --git a/view/theme/decaf-mobile/smarty3/profile_photo.tpl b/view/theme/decaf-mobile/templates/profile_photo.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/profile_photo.tpl
rename to view/theme/decaf-mobile/templates/profile_photo.tpl
diff --git a/view/theme/decaf-mobile/smarty3/profile_vcard.tpl b/view/theme/decaf-mobile/templates/profile_vcard.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/profile_vcard.tpl
rename to view/theme/decaf-mobile/templates/profile_vcard.tpl
diff --git a/view/theme/decaf-mobile/smarty3/prv_message.tpl b/view/theme/decaf-mobile/templates/prv_message.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/prv_message.tpl
rename to view/theme/decaf-mobile/templates/prv_message.tpl
diff --git a/view/theme/decaf-mobile/smarty3/register.tpl b/view/theme/decaf-mobile/templates/register.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/register.tpl
rename to view/theme/decaf-mobile/templates/register.tpl
diff --git a/view/theme/decaf-mobile/smarty3/search_item.tpl b/view/theme/decaf-mobile/templates/search_item.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/search_item.tpl
rename to view/theme/decaf-mobile/templates/search_item.tpl
diff --git a/view/theme/decaf-mobile/smarty3/settings-head.tpl b/view/theme/decaf-mobile/templates/settings-head.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/settings-head.tpl
rename to view/theme/decaf-mobile/templates/settings-head.tpl
diff --git a/view/theme/decaf-mobile/smarty3/settings.tpl b/view/theme/decaf-mobile/templates/settings.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/settings.tpl
rename to view/theme/decaf-mobile/templates/settings.tpl
diff --git a/view/theme/decaf-mobile/smarty3/settings_display_end.tpl b/view/theme/decaf-mobile/templates/settings_display_end.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/settings_display_end.tpl
rename to view/theme/decaf-mobile/templates/settings_display_end.tpl
diff --git a/view/theme/decaf-mobile/smarty3/suggest_friends.tpl b/view/theme/decaf-mobile/templates/suggest_friends.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/suggest_friends.tpl
rename to view/theme/decaf-mobile/templates/suggest_friends.tpl
diff --git a/view/theme/decaf-mobile/smarty3/threaded_conversation.tpl b/view/theme/decaf-mobile/templates/threaded_conversation.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/threaded_conversation.tpl
rename to view/theme/decaf-mobile/templates/threaded_conversation.tpl
diff --git a/view/theme/decaf-mobile/smarty3/voting_fakelink.tpl b/view/theme/decaf-mobile/templates/voting_fakelink.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/voting_fakelink.tpl
rename to view/theme/decaf-mobile/templates/voting_fakelink.tpl
diff --git a/view/theme/decaf-mobile/smarty3/wall_thread.tpl b/view/theme/decaf-mobile/templates/wall_thread.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/wall_thread.tpl
rename to view/theme/decaf-mobile/templates/wall_thread.tpl
diff --git a/view/theme/decaf-mobile/smarty3/wall_thread_toponly.tpl b/view/theme/decaf-mobile/templates/wall_thread_toponly.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/wall_thread_toponly.tpl
rename to view/theme/decaf-mobile/templates/wall_thread_toponly.tpl
diff --git a/view/theme/decaf-mobile/smarty3/wallmessage.tpl b/view/theme/decaf-mobile/templates/wallmessage.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/wallmessage.tpl
rename to view/theme/decaf-mobile/templates/wallmessage.tpl
diff --git a/view/theme/decaf-mobile/smarty3/wallmsg-end.tpl b/view/theme/decaf-mobile/templates/wallmsg-end.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/wallmsg-end.tpl
rename to view/theme/decaf-mobile/templates/wallmsg-end.tpl
diff --git a/view/theme/decaf-mobile/smarty3/wallmsg-header.tpl b/view/theme/decaf-mobile/templates/wallmsg-header.tpl
similarity index 100%
rename from view/theme/decaf-mobile/smarty3/wallmsg-header.tpl
rename to view/theme/decaf-mobile/templates/wallmsg-header.tpl
diff --git a/view/theme/decaf-mobile/threaded_conversation.tpl b/view/theme/decaf-mobile/threaded_conversation.tpl
deleted file mode 100644
index 5310b323a9..0000000000
--- a/view/theme/decaf-mobile/threaded_conversation.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-$live_update
-
-{{ for $threads as $thread }}
-{{ if $mode == display }}
-{{ inc $thread.template with $item=$thread }}{{ endinc }}
-{{ else }}
-{{ inc wall_thread_toponly.tpl with $item=$thread }}{{ endinc }}
-{{ endif }}
-{{ endfor }}
-
-<div id="conversation-end"></div>
-
diff --git a/view/theme/decaf-mobile/voting_fakelink.tpl b/view/theme/decaf-mobile/voting_fakelink.tpl
deleted file mode 100644
index b66302cc27..0000000000
--- a/view/theme/decaf-mobile/voting_fakelink.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<span class="fakelink-wrapper"  id="$[type]list-$id-wrapper">$phrase</span>
diff --git a/view/theme/decaf-mobile/wall_thread.tpl b/view/theme/decaf-mobile/wall_thread.tpl
deleted file mode 100644
index a5bcbda7ea..0000000000
--- a/view/theme/decaf-mobile/wall_thread.tpl
+++ /dev/null
@@ -1,119 +0,0 @@
-<div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
-<a name="$item.id" ></a>
-{#<!--<div class="wall-item-outside-wrapper $item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" >-->#}
-	<div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
-		<div class="wall-item-info{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-info-$item.id">
-			{{ if $item.owner_url }}
-			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
-				<img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" onError="this.src='../../../images/person-48.jpg';" />
-				</a>
-			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
-			{{ endif }}
-			{#<!--<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id" 
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
-                onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">-->#}
-			{#<!--<div class="wall-item-photo-wrapper{{ if $item.owner_url }} wwfrom{{ endif }}" id="wall-item-photo-wrapper-$item.id">-->#}
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" onError="this.src='../../../images/person-48.jpg';" />
-				</a>
-				{#<!--<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-                    <ul class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-                        $item.item_photo_menu
-                    </ul>
-                </div>-->#}
-
-			{#<!--</div>-->#}
-			{#<!--<div class="wall-item-photo-end"></div>-->#}
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-				{{ if $item.lock }}{#<!--<div class="wall-item-lock">-->#}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="$item.lock" {#onclick="lockview(event,$item.id);"#} />{#<!--</div>-->#}
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
-			</div>
-		</div>
-		{#<!--<div class="wall-item-author">-->#}
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>{{ if $item.owner_url }} $item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall{{ endif }}<br />
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>				
-		{#<!--</div>-->#}
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			{#<!--<div class="wall-item-title-end"></div>-->#}
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
-					{#<!--<div class="body-tag">-->#}
-						{{ for $item.tags as $tag }}
-							<span class='body-tag tag'>$tag</span>
-						{{ endfor }}
-					{#<!--</div>-->#}
-			{{ if $item.has_cats }}
-			<div class="categorytags">$item.txt_cats {{ for $item.categories as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-
-			{{ if $item.has_folders }}
-			<div class="filesavetags">$item.txt_folders {{ for $item.folders as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-			</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			{{ if $item.vote }}
-			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
-				<a href="like/$item.id?verb=like&return=$return_path#$item.id" class="icon like" title="$item.vote.like.0" ></a>
-				{{ if $item.vote.dislike }}
-				<a href="like/$item.id?verb=dislike&return=$return_path#$item.id" class="icon dislike" title="$item.vote.dislike.0" ></a>
-				{{ endif }}
-				{#<!--{{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}-->#}
-				<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-			</div>
-			{{ endif }}
-			{{ if $item.plink }}
-				{#<!--<div class="wall-item-links-wrapper">-->#}<a href="$item.plink.href" title="$item.plink.title" target="external-link" class="wall-item-links-wrapper icon remote-link$item.sparkle"></a>{#<!--</div>-->#}
-			{{ endif }}
-			{{ if $item.edpost }}
-				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-			{{ endif }}
-			 
-			{{ if $item.star }}
-			<a href="starred/$item.id?return=$return_path#$item.id" id="starred-$item.id" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
-			{{ endif }}
-			{#<!--{{ if $item.tagger }}
-			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.tagger.add"></a>
-			{{ endif }}-->#}
-			{#<!--{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
-			{{ endif }}			-->#}
-			
-			{#<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >-->#}
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id?confirm=1" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'item/drop/$item.id')});" class="wall-item-delete-wrapper icon drophide" title="$item.drop.delete" id="wall-item-delete-wrapper-$item.id" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);"#} ></a>{{ endif }}
-			{#<!--</div>-->#}
-				{#<!--{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}-->#}
-			{#<!--<div class="wall-item-delete-end"></div>-->#}
-		</div>
-	</div>	
-	{#<!--<div class="wall-item-wrapper-end"></div>-->#}
-	<div class="wall-item-like wall-item-like-full $item.indent" id="wall-item-like-$item.id">$item.like</div>
-	<div class="wall-item-dislike wall-item-dislike-full $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
-
-	{{ if $item.threaded }}
-	{{ if $item.comment }}
-	{#<!--<div class="wall-item-comment-wrapper $item.indent" >-->#}
-		$item.comment
-	{#<!--</div>-->#}
-	{{ endif }}
-	{{ endif }}
-
-{#<!--<div class="wall-item-outside-wrapper-end $item.indent" ></div>-->#}
-{#<!--</div>-->#}
-{{ for $item.children as $child }}
-	{{ inc $child.template with $item=$child }}{{ endinc }}
-{{ endfor }}
-
-{{ if $item.flatten }}
-{#<!--<div class="wall-item-comment-wrapper" >-->#}
-	$item.comment
-{#<!--</div>-->#}
-{{ endif }}
-</div>
-
diff --git a/view/theme/decaf-mobile/wall_thread_toponly.tpl b/view/theme/decaf-mobile/wall_thread_toponly.tpl
deleted file mode 100644
index 817432da53..0000000000
--- a/view/theme/decaf-mobile/wall_thread_toponly.tpl
+++ /dev/null
@@ -1,101 +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-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
-		<div class="wall-item-info{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-info-$item.id">
-			{{ if $item.owner_url }}
-			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
-				<img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" onError="this.src='../../../images/person-48.jpg';" />
-				</a>
-			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
-			{{ endif }}
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" onError="this.src='../../../images/person-48.jpg';" />
-				</a>
-
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-				{{ if $item.lock }}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="$item.lock" {#onclick="lockview(event,$item.id);"#} />
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
-			</div>
-		</div>
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>{{ if $item.owner_url }} $item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall{{ endif }}<br />
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>				
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
-						{{ for $item.tags as $tag }}
-							<span class='body-tag tag'>$tag</span>
-						{{ endfor }}
-			{{ if $item.has_cats }}
-			<div class="categorytags">$item.txt_cats {{ for $item.categories as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-
-			{{ if $item.has_folders }}
-			<div class="filesavetags">$item.txt_folders {{ for $item.folders as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-			</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			{{ if $item.vote }}
-			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
-				<a href="like/$item.id?verb=like&return=$return_path#$item.id" class="icon like" title="$item.vote.like.0" ></a>
-				{{ if $item.vote.dislike }}
-				<a href="like/$item.id?verb=dislike&return=$return_path#$item.id" class="icon dislike" title="$item.vote.dislike.0" ></a>
-				{{ endif }}
-				{#<!--{{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}-->#}
-				<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-			</div>
-			{{ endif }}
-			{{ if $item.plink }}
-				<a href="$item.plink.href" title="$item.plink.title" target="external-link" class="wall-item-links-wrapper icon remote-link$item.sparkle"></a>
-			{{ endif }}
-			{{ if $item.edpost }}
-				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-			{{ endif }}
-			 
-			{{ if $item.star }}
-			<a href="starred/$item.id?return=$return_path#$item.id" id="starred-$item.id" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
-			{{ endif }}
-			{#<!--{{ if $item.tagger }}
-			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.tagger.add"></a>
-			{{ endif }}
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
-			{{ endif }}			-->#}
-			
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id?confirm=1" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'item/drop/$item.id')});" class="wall-item-delete-wrapper icon drophide" title="$item.drop.delete" id="wall-item-delete-wrapper-$item.id" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);"#} ></a>{{ endif }}
-				{#<!--{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}-->#}
-		</div>
-	</div>	
-	<div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div>
-	<div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
-
-	<div class="hide-comments-outer">
-	<a href="display/$user.nickname/$item.id"><span id="hide-comments-total-$item.id" class="hide-comments-total">$item.total_comments_num $item.total_comments_text</span></a>
-	</div>
-<!--	{{ if $item.threaded }}
-	{{ if $item.comment }}
-		$item.comment
-	{{ endif }}
-	{{ endif }}
-
-{{ for $item.children as $child }}
-	{{ inc $child.template with $item=$child }}{{ endinc }}
-{{ endfor }}
-
-{{ if $item.flatten }}
-	$item.comment
-{{ endif }}-->
-</div>
-<!--{{if $item.comment_lastcollapsed}}</div>{{endif}}-->
-
diff --git a/view/theme/decaf-mobile/wallmessage.tpl b/view/theme/decaf-mobile/wallmessage.tpl
deleted file mode 100644
index e7fa0ec048..0000000000
--- a/view/theme/decaf-mobile/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/theme/decaf-mobile/wallmsg-end.tpl b/view/theme/decaf-mobile/wallmsg-end.tpl
deleted file mode 100644
index 6074133798..0000000000
--- a/view/theme/decaf-mobile/wallmsg-end.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<script type="text/javascript" src="$baseurl/js/ajaxupload.min.js" ></script>
-
diff --git a/view/theme/decaf-mobile/wallmsg-header.tpl b/view/theme/decaf-mobile/wallmsg-header.tpl
deleted file mode 100644
index dc6cb82199..0000000000
--- a/view/theme/decaf-mobile/wallmsg-header.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-
-<script language="javascript" type="text/javascript">
-{#//window.editSelect = "none";#}
-window.jotId = "#prvmail-text";
-window.imageUploadButton = 'prvmail-upload';
-</script>
-
diff --git a/view/theme/diabook/admin_users.tpl b/view/theme/diabook/admin_users.tpl
deleted file mode 100644
index b455a8c2ee..0000000000
--- a/view/theme/diabook/admin_users.tpl
+++ /dev/null
@@ -1,88 +0,0 @@
-<script>
-	function confirm_delete(uname){
-		return confirm( "$confirm_delete".format(uname));
-	}
-	function confirm_delete_multi(){
-		return confirm("$confirm_delete_multi");
-	}
-	function selectall(cls){
-		$("."+cls).attr('checked','checked');
-		return false;
-	}
-</script>
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-	<form action="$baseurl/admin/users" method="post">
-		        <input type='hidden' name='form_security_token' value='$form_security_token'>
-		<h3>$h_pending</h3>
-		{{ if $pending }}
-			<table id='pending'>
-				<thead>
-				<tr>
-					{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-			{{ for $pending as $u }}
-				<tr>
-					<td class="created">$u.created</td>
-					<td class="name">$u.name</td>
-					<td class="email">$u.email</td>
-					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
-					<td class="tools">
-						<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='icon like'></span></a>
-						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='icon dislike'></span></a>
-					</td>
-				</tr>
-			{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>			
-		{{ else }}
-			<p>$no_pending</p>
-		{{ endif }}
-	
-	
-		
-	
-		<h3>$h_users</h3>
-		{{ if $users }}
-			<table id='users'>
-				<thead>
-				<tr>
-					<th></th>
-					{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{ for $users as $u }}
-					<tr>
-						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
-						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
-						<td class='email'>$u.email</td>
-						<td class='register_date'>$u.register_date</td>
-						<td class='login_date'>$u.login_date</td>
-						<td class='lastitem_date'>$u.lastitem_date</td>
-						<td class='login_date'>$u.page_flags {{ if $u.is_admin }}($siteadmin){{ endif }} {{ if $u.account_expired }}($accountexpired){{ endif }}</td>
-						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
-						<td class="tools" style="width:60px;">
-							<a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
-							<a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
-						</td>
-					</tr>
-				{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>						
-		{{ else }}
-			NO USERS?!?
-		{{ endif }}
-	</form>
-</div>
diff --git a/view/theme/diabook/bottom.tpl b/view/theme/diabook/bottom.tpl
deleted file mode 100644
index 08952aad65..0000000000
--- a/view/theme/diabook/bottom.tpl
+++ /dev/null
@@ -1,155 +0,0 @@
-<script type="text/javascript" src="$baseurl/view/theme/diabook/js/jquery.autogrow.textarea.js"></script>
-<script type="text/javascript">
-
-$(document).ready(function() {
-    $("iframe").each(function(){
-        var ifr_source = $(this).attr("src");
-        var wmode = "wmode=transparent";
-        if(ifr_source.indexOf("?") != -1) {
-            var getQString = ifr_source.split("?");
-            var oldString = getQString[1];
-            var newString = getQString[0];
-            $(this).attr("src",newString+"?"+wmode+"&"+oldString);
-        }
-        else $(this).attr("src",ifr_source+"?"+wmode);
-       
-    });
-    
-    $("div#pause").attr("style", "position: fixed;bottom: 43px;left: 5px;");
-    $("div#pause").html("<img src='images/pause.gif' alt='pause' title='pause live-updates (ctrl+space)' style='border: 1px solid black;opacity: 0.2;'>");
-    $(document).keydown(function(event) {
-    if (!$("div#pause").html()){
-    $("div#pause").html("<img src='images/pause.gif' alt='pause' title='pause live-updates (ctrl+space)' style='border: 1px solid black;opacity: 0.2;'>");
-		}});  
-    $(".autocomplete").attr("style", "width: 350px;color: black;border: 1px solid #D2D2D2;background: white;cursor: pointer;text-align: left;max-height: 350px;overflow: auto;");
-	 
-	});
-	
-	$(document).ready(function(){
-		$("#sortable_boxes").sortable({
-			update: function(event, ui) {
-				var BoxOrder = $(this).sortable("toArray").toString();
-				$.cookie("Boxorder", BoxOrder , { expires: 365, path: "/" });
-			}
-		});
-
-    	var cookie = $.cookie("Boxorder");		
-    	if (!cookie) return;
-    	var SavedID = cookie.split(",");
-	   for (var Sitem=0, m = SavedID.length; Sitem < m; Sitem++) {
-           $("#sortable_boxes").append($("#sortable_boxes").children("#" + SavedID[Sitem]));
-	       }
-	     
-	});
-	
-	
-	function tautogrow(id){
-		$("textarea#comment-edit-text-" +id).autogrow(); 	
- 	};
- 	
- 	function open_boxsettings() {
-		$("div#boxsettings").attr("style","display: block;height:500px;width:300px;");
-		$("label").attr("style","width: 150px;");
-		};
- 	
-	function yt_iframe() {
-	$("iframe").load(function() { 
-	var ifr_src = $(this).contents().find("body iframe").attr("src");
-	$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
-    });
-
-	};
-
-	function scrolldown(){
-			$("html, body").animate({scrollTop:$(document).height()}, "slow");
-			return false;
-		};
-		
-	function scrolltop(){
-			$("html, body").animate({scrollTop:0}, "slow");
-			return false;
-		};
-	 	
-	$(window).scroll(function () { 
-		
-		var footer_top = $(document).height() - 30;
-		$("div#footerbox").css("top", footer_top);
-	
-		var scrollInfo = $(window).scrollTop();      
-		
-		if (scrollInfo <= "900"){
-      $("a#top").attr("id","down");
-      $("a#down").attr("onclick","scrolldown()");
-	 	$("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_bottom.png");
-	 	$("img#scroll_top_bottom").attr("title","Scroll to bottom");
-	 	} 
-	 	    
-      if (scrollInfo > "900"){
-      $("a#down").attr("id","top");
-      $("a#top").attr("onclick","scrolltop()");
-	 	$("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_top.png");
-	 	$("img#scroll_top_bottom").attr("title","Back to top");
-	 	}
-		
-    });
-  
-
-	function insertFormatting(comment,BBcode,id) {
-	
-		var tmpStr = $("#comment-edit-text-" + id).val();
-		if(tmpStr == comment) {
-			tmpStr = "";
-			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-			openMenu("comment-edit-submit-wrapper-" + id);
-								}
-
-	textarea = document.getElementById("comment-edit-text-" +id);
-	if (document.selection) {
-		textarea.focus();
-		selected = document.selection.createRange();
-		if (BBcode == "url"){
-			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-			} else			
-		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
-		var start = textarea.selectionStart;
-		var end = textarea.selectionEnd;
-		if (BBcode == "url"){
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-			} else
-		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-	}
-	return true;
-	}
-
-	function cmtBbOpen(id) {
-	$(".comment-edit-bb-" + id).show();
-	}
-	function cmtBbClose(id) {
-	$(".comment-edit-bb-" + id).hide();
-	}
-	
-	/*$(document).ready(function(){
-	var doctitle = document.title;
-	function checkNotify() {
-	if(document.getElementById("notify-update").innerHTML != "")
-	document.title = "("+document.getElementById("notify-update").innerHTML+") " + doctitle;
-	else
-	document.title = doctitle;
-	};
-	setInterval(function () {checkNotify();}, 10 * 1000);
-	})*/
-</script>
-<script>
-var pagetitle = null;
-$("nav").bind('nav-update',  function(e,data){
-  if (pagetitle==null) pagetitle = document.title;
-  var count = $(data).find('notif').attr('count');
-  if (count>0) {
-    document.title = "("+count+") "+pagetitle;
-  } else {
-    document.title = pagetitle;
-  }
-});
-</script>
diff --git a/view/theme/diabook/ch_directory_item.tpl b/view/theme/diabook/ch_directory_item.tpl
deleted file mode 100644
index f32f5a4f78..0000000000
--- a/view/theme/diabook/ch_directory_item.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-
-<div class="directory-item" id="directory-item-$id" >
-	<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
-		<div class="directory-photo" id="directory-photo-$id" >
-			<a href="$profile_link" class="directory-profile-link" id="directory-profile-link-$id" >
-				<img class="directory-photo-img" src="$photo" alt="$alt_text" title="$alt_text" />
-			</a>
-		</div>
-	</div>
-</div>
diff --git a/view/theme/diabook/comment_item.tpl b/view/theme/diabook/comment_item.tpl
deleted file mode 100644
index 6f263b3d3a..0000000000
--- a/view/theme/diabook/comment_item.tpl
+++ /dev/null
@@ -1,43 +0,0 @@
-		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
-			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
-				<input type="hidden" name="type" value="$type" />
-				<input type="hidden" name="profile_uid" value="$profile_uid" />
-				<input type="hidden" name="parent" value="$parent" />
-				{#<!--<input type="hidden" name="return" value="$return_path" />-->#}
-				<input type="hidden" name="jsreload" value="$jsreload" />
-				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id);cmtBbOpen($id);"  >$comment</textarea>
-				<div class="comment-edit-bb-$id" style="display:none;">				
-				<a class="icon bb-image" style="cursor: pointer;" title="$edimg" onclick="insertFormatting('$comment','img',$id);">img</a>	
-				<a class="icon bb-url" style="cursor: pointer;" title="$edurl" onclick="insertFormatting('$comment','url',$id);">url</a>
-				<a class="icon bb-video" style="cursor: pointer;" title="$edvideo" onclick="insertFormatting('$comment','video',$id);">video</a>														
-				<a class="icon underline" style="cursor: pointer;" title="$eduline" onclick="insertFormatting('$comment','u',$id);">u</a>
-				<a class="icon italic" style="cursor: pointer;" title="$editalic" onclick="insertFormatting('$comment','i',$id);">i</a>
-				<a class="icon bold" style="cursor: pointer;"  title="$edbold" onclick="insertFormatting('$comment','b',$id);">b</a>
-				<a class="icon quote" style="cursor: pointer;" title="$edquote" onclick="insertFormatting('$comment','quote',$id);">quote</a>																			
-				</div>				
-				{{ if $qcomment }}
-					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
-					<option value=""></option>
-				{{ for $qcomment as $qc }}
-					<option value="$qc">$qc</option>				
-				{{ endfor }}
-					</select>
-				{{ endif }}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl
deleted file mode 100644
index dda674f75b..0000000000
--- a/view/theme/diabook/communityhome.tpl
+++ /dev/null
@@ -1,172 +0,0 @@
-
-<div id="twittersettings" style="display:none">
-<form id="twittersettingsform" action="network" method="post" >
-{{inc field_input.tpl with $field=$TSearchTerm}}{{endinc}}
-<div class="settings-submit-wrapper">
-<input id="twittersub" type="submit" value="$sub" class="settings-submit" name="diabook-settings-sub"></input>
-</div>
-</form>
-</div>
-
-<div id="mapcontrol" style="display:none;">
-<form id="mapform" action="network" method="post" >
-<div id="layermanager" style="width: 350px;position: relative;float: right;right:20px;height: 300px;"></div>
-<div id="map2" style="height:350px;width:350px;"></div>
-<div id="mouseposition" style="width: 350px;"></div>
-{{inc field_input.tpl with $field=$ELZoom}}{{endinc}}
-{{inc field_input.tpl with $field=$ELPosX}}{{endinc}}
-{{inc field_input.tpl with $field=$ELPosY}}{{endinc}}
-<div class="settings-submit-wrapper">
-<input id="mapsub" type="submit" value="$sub" class="settings-submit" name="diabook-settings-map-sub"></input>
-</div>
-<span style="width: 500px;"><p>this ist still under development. 
-the idea is to provide a map with different layers(e.g. earth population, atomic power plants, wheat growing acreages, sunrise or what you want) 
-and markers(events, demos, friends, anything, that is intersting for you). 
-These layer and markers should be importable and deletable by the user.</p>
-<p>help on this feature is very appreciated. i am not that good in js so it's a start, but needs tweaks and further dev.
-just contact me, if you are intesrested in joining</p>
-<p>https://toktan.org/profile/thomas</p>
-<p>this is build with <b>mapquery</b> http://mapquery.org/ and 
-<b>openlayers</b>http://openlayers.org/</p>
-</span>
-</form>
-</div>
-
-<div id="boxsettings" style="display:none">
-<form id="boxsettingsform" action="network" method="post" >
-<fieldset><legend>$boxsettings.title.1</legend>
-{{inc field_select.tpl with $field=$close_pages}}{{endinc}}
-{{inc field_select.tpl with $field=$close_profiles}}{{endinc}}
-{{inc field_select.tpl with $field=$close_helpers}}{{endinc}}
-{{inc field_select.tpl with $field=$close_services}}{{endinc}}
-{{inc field_select.tpl with $field=$close_friends}}{{endinc}}
-{{inc field_select.tpl with $field=$close_lastusers}}{{endinc}}
-{{inc field_select.tpl with $field=$close_lastphotos}}{{endinc}}
-{{inc field_select.tpl with $field=$close_lastlikes}}{{endinc}}
-{{inc field_select.tpl with $field=$close_twitter}}{{endinc}}
-{{inc field_select.tpl with $field=$close_mapquery}}{{endinc}}
-<div class="settings-submit-wrapper">
-<input id="boxsub" type="submit" value="$sub" class="settings-submit" name="diabook-settings-box-sub"></input>
-</div>
-</fieldset>
-</form>
-</div>
-
-<div id="pos_null" style="margin-bottom:-30px;">
-</div>
-
-<div id="sortable_boxes">
-
-<div id="close_pages" style="margin-top:30px;">
-{{ if $page }}
-<div>$page</div>
-{{ endif }}
-</div>
-
-<div id="close_profiles">
-{{ if $comunity_profiles_title }}
-<h3>$comunity_profiles_title<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="$close"></a></h3>
-<div id='lastusers-wrapper' class='items-wrapper'>
-{{ for $comunity_profiles_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-</div>
-
-<div id="close_helpers">
-{{ if $helpers }}
-<h3>$helpers.title.1<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="$close"></a></h3>
-<a href="http://friendica.com/resources" title="How-to's" style="margin-left: 10px; " target="blank">How-To Guides</a><br>
-<a href="http://kakste.com/profile/newhere" title="@NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
-<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
-<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
-<a href="http://newzot.hydra.uberspace.de/profile/newzot" title="Local Friendica" style="margin-left: 10px; " target="blank">Local Friendica</a>
-{{ endif }}
-</div>
-
-<div id="close_services">
-{{ if $con_services }}
-<h3>$con_services.title.1<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="$close"></a></h3>
-<div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;">
-<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook/icons/facebook.png" title="Facebook"></a>
-<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook/icons/StatusNet.png?" title="StatusNet"></a>
-<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook/icons/livejournal.png?" title="LiveJournal"></a>
-<a href="$url/settings/connectors"><img alt="Posterous" src="view/theme/diabook/icons/posterous.png?" title="Posterous"></a>
-<a href="$url/settings/connectors"><img alt="Tumblr" src="view/theme/diabook/icons/tumblr.png?" title="Tumblr"></a>
-<a href="$url/settings/connectors"><img alt="Twitter" src="view/theme/diabook/icons/twitter.png?" title="Twitter"></a>
-<a href="$url/settings/connectors"><img alt="WordPress" src="view/theme/diabook/icons/wordpress.png?" title="WordPress"></a>
-<a href="$url/settings/connectors"><img alt="E-Mail" src="view/theme/diabook/icons/email.png?" title="E-Mail"></a>
-</div>
-{{ endif }}
-</div>
-
-<div id="close_friends" style="margin-bottom:53px;">
-{{ if $nv }}
-<h3>$nv.title.1<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="$close"></a></h3>
-<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
-<a class="$nv.global_directory.2" href="$nv.global_directory.0" target="blank" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
-<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
-<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
-<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>
-$nv.search
-{{ endif }}
-</div>
-
-<div id="close_lastusers">
-{{ if $lastusers_title }}
-<h3>$lastusers_title<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="$close"></a></h3>
-<div id='lastusers-wrapper' class='items-wrapper'>
-{{ for $lastusers_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-</div>
-
-{{ if $activeusers_title }}
-<h3>$activeusers_title</h3>
-<div class='items-wrapper'>
-{{ for $activeusers_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-
-<div id="close_lastphotos">
-{{ if $photos_title }}
-<h3>$photos_title<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="$close"></a></h3>
-<div id='ra-photos-wrapper' class='items-wrapper'>
-{{ for $photos_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-</div>
-
-<div id="close_lastlikes">
-{{ if $like_title }}
-<h3>$like_title<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="$close"></a></h3>
-<ul id='likes'>
-{{ for $like_items as $i }}
-	<li id='ra-photos-wrapper'>$i</li>
-{{ endfor }}
-</ul>
-{{ endif }}
-</div>
-
-<div id="close_twitter">
-<h3 style="height:1.17em">$twitter.title.1<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="$close"></a></h3>
-<div id="twitter">
-</div>
-</div>
-
-<div id="close_mapquery">
-{{ if $mapquery }}
-<h3>$mapquery.title.1<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="$close"></a></h3>
-<div id="map" style="height:165px;width:165px;margin-left:3px;margin-top:3px;margin-bottom:1px;">
-</div>
-<div style="font-size:9px;margin-left:3px;">Data CC-By-SA by <a href="http://openstreetmap.org/">OpenStreetMap</a></div>
-{{ endif }}
-</div>
-</div>
diff --git a/view/theme/diabook/contact_template.tpl b/view/theme/diabook/contact_template.tpl
deleted file mode 100644
index f7ed107509..0000000000
--- a/view/theme/diabook/contact_template.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-	<div class="contact-entry-photo-wrapper" >
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
-		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
-		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
-
-			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
-
-			{{ if $contact.photo_menu }}
-			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
-                    <ul>
-						{{ for $contact.photo_menu as $c }}
-						{{ if $c.2 }}
-						<li><a target="redir" href="$c.1">$c.0</a></li>
-						{{ else }}
-						<li><a href="$c.1">$c.0</a></li>
-						{{ endif }}
-						{{ endfor }}
-                    </ul>
-                </div>
-			{{ endif }}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
-
-	<div class="contact-entry-end" ></div>
-</div>
diff --git a/view/theme/diabook/directory_item.tpl b/view/theme/diabook/directory_item.tpl
deleted file mode 100644
index 163c0c80e7..0000000000
--- a/view/theme/diabook/directory_item.tpl
+++ /dev/null
@@ -1,42 +0,0 @@
-
-<div class="directory-item" id="directory-item-$id" >
-	<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
-		<div class="directory-photo" id="directory-photo-$id" >
-			<a href="$profile_link" class="directory-profile-link" id="directory-profile-link-$id" >
-				<img class="directory-photo-img photo" src="$photo" alt="$alt_text" title="$alt_text" />
-			</a>
-		</div>
-	</div>
-	<div class="directory-profile-wrapper" id="directory-profile-wrapper-$id" >
-		<div class="contact-name" id="directory-name-$id">$name</div>
-		<div class="page-type">$page_type</div>
-		{{ if $pdesc }}<div class="directory-profile-title">$profile.pdesc</div>{{ endif }}
-    	<div class="directory-detailcolumns-wrapper" id="directory-detailcolumns-wrapper-$id">
-        	<div class="directory-detailscolumn-wrapper" id="directory-detailscolumn1-wrapper-$id">	
-			{{ if $location }}
-			    <dl class="location"><dt class="location-label">$location</dt>
-				<dd class="adr">
-					{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-					<span class="city-state-zip">
-						<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-						<span class="region">$profile.region</span>
-						<span class="postal-code">$profile.postal_code</span>
-					</span>
-					{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
-				</dd>
-				</dl>
-			{{ endif }}
-
-			{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-			</div>	
-			<div class="directory-detailscolumn-wrapper" id="directory-detailscolumn2-wrapper-$id">	
-				{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-				{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-			</div>
-		</div>
-	  	<div class="directory-copy-wrapper" id="directory-copy-wrapper-$id" >
-			{{ if $about }}<dl class="directory-copy"><dt class="directory-copy-label">$about</dt><dd class="directory-copy-data">$profile.about</dd></dl>{{ endif }}
-  		</div>
-	</div>
-</div>
diff --git a/view/theme/diabook/footer.tpl b/view/theme/diabook/footer.tpl
deleted file mode 100644
index 25058a7ff7..0000000000
--- a/view/theme/diabook/footer.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<div id="footerbox" style="display:none">
-<a style="float:right; color:#333;margin-right:10px;display: table;margin-top: 5px;" href="friendica" title="Site Info / Impressum" >Info / Impressum</a>
-</div>
\ No newline at end of file
diff --git a/view/theme/diabook/generic_links_widget.tpl b/view/theme/diabook/generic_links_widget.tpl
deleted file mode 100644
index 001c1395e6..0000000000
--- a/view/theme/diabook/generic_links_widget.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<div id="widget_$title">
-	{{if $title}}<h3 style="border-bottom: 1px solid #D2D2D2;">$title</h3>{{endif}}
-	{{if $desc}}<div class="desc">$desc</div>{{endif}}
-	
-	<ul  class="rs_tabs">
-		{{ for $items as $item }}
-			<li><a href="$item.url" class="rs_tab button {{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/theme/diabook/group_side.tpl b/view/theme/diabook/group_side.tpl
deleted file mode 100644
index ce4b25fbf7..0000000000
--- a/view/theme/diabook/group_side.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<div id="profile_side" >
-	<div class="">
-		<h3 style="margin-left: 2px;">$title<a href="group/new" title="$createtext" class="icon text_add"></a></h3>
-	</div>
-
-	<div id="sidebar-group-list">
-		<ul class="menu-profile-side">
-			{{ for $groups as $group }}
-			<li class="menu-profile-list">
-				<a href="$group.href" class="menu-profile-list-item">
-					<span class="menu-profile-icon {{ if $group.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>
-					$group.text
-				</a>
-				{{ if $group.edit }}
-					<a href="$group.edit.href" class="action"><span class="icon text_edit" ></span></a>
-				{{ endif }}
-				{{ if $group.cid }}
-					<input type="checkbox" 
-						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
-						onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
-						{{ if $group.ismember }}checked="checked"{{ endif }}
-					/>
-				{{ endif }}
-			</li>
-			{{ endfor }}
-		</ul>
-	</div>
-  {{ if $ungrouped }}
-  <div id="sidebar-ungrouped">
-  <a href="nogroup">$ungrouped</a>
-  </div>
-  {{ endif }}
-</div>	
-
diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl
deleted file mode 100644
index 2c7e521103..0000000000
--- a/view/theme/diabook/jot.tpl
+++ /dev/null
@@ -1,87 +0,0 @@
-
-<div id="profile-jot-wrapper" >
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-	</div>
-	<div id="profile-jot-banner-end"></div>
-
-	<form id="profile-jot-form" action="$action" method="post" >
-		<input type="hidden" name="type" value="$ptyp" />
-		<input type="hidden" name="profile_uid" value="$profile_uid" />
-		<input type="hidden" name="return" value="$return_path" />
-		<input type="hidden" name="location" id="jot-location" value="$defloc" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="$post_id" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
-		{{ if $placeholdercategory }}
-		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
-		{{ endif }}
-		<div id="character-counter" class="grey"></div>		
-		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
-
-
-<div id="profile-jot-submit-wrapper" class="jothidden">
-	
-	<div id="profile-upload-wrapper" style="display: $visitor;" >
-		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="camera" title="$upload"></a></div>
-	</div> 
-	<div id="profile-attach-wrapper" style="display: $visitor;" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="attach" title="$attach"></a></div>
-	</div> 
-
-	<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a id="profile-link" class="weblink" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" style="display: $visitor;" >
-		<a id="profile-video" class="video2" title="$video" onclick="jotVideoURL();return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" style="display: $visitor;" >
-		<a id="profile-audio" class="audio2" title="$audio" onclick="jotAudioURL();return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" style="display: $visitor;" >
-		<a id="profile-location" class="globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" style="/*display: none;*/" >
-		<a id="profile-nolocation" class="noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
-	</div> 
-
-	<input type="submit" id="profile-jot-submit" class="button creation2" name="submit" value="$share" />
-  
-   <span onclick="preview_post();" id="jot-preview-link" class="tab button">$preview</span>
-   
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
-		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
-	</div>
-
-
-	<div id="profile-jot-plugin-wrapper">
-  	$jotplugins
-	</div>
-	
-	<div id="profile-rotator-wrapper" style="display: $visitor;" >
-		<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-	
-	</div>
-   <div id="profile-jot-perms-end"></div>
-	
-	<div id="jot-preview-content" style="display:none;"></div>
-
-	<div style="display: none;">
-		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-			$acl
-			<hr style="clear:both;"/>
-			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-			<div id="profile-jot-email-end"></div>
-			$jotnets
-		</div>
-	</div>
-
-
-
-
-</form>
-</div>
-		{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/diabook/login.tpl b/view/theme/diabook/login.tpl
deleted file mode 100644
index efa7c2d6dd..0000000000
--- a/view/theme/diabook/login.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-
-<form action="$dest_url" method="post" >
-	<input type="hidden" name="auth-params" value="login" />
-
-	<div id="login_standard">
-	{{ inc field_input.tpl with $field=$lname }}{{ endinc }}
-	{{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
-	</div>
-	
-	{{ if $openid }}
-			<div id="login_openid">
-			{{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
-			</div>
-	{{ endif }}
-	
-	<div id="login-submit-wrapper" >
-		<input type="submit" name="submit" id="login-submit-button" value="$login" />
-	</div>
-	
-   <div id="login-extra-links">
-		{{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
-        <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
-	</div>	
-	
-	{{ for $hiddens as $k=>$v }}
-		<input type="hidden" name="$k" value="$v" />
-	{{ endfor }}
-	
-	
-</form>
-
-
-<script type="text/javascript"> $(document).ready(function() { $("#id_$lname.0").focus();} );</script>
diff --git a/view/theme/diabook/mail_conv.tpl b/view/theme/diabook/mail_conv.tpl
deleted file mode 100644
index 989f178781..0000000000
--- a/view/theme/diabook/mail_conv.tpl
+++ /dev/null
@@ -1,60 +0,0 @@
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				<a href="$mail.profile_url" target="redir" title="$mail.from_name" class="contact-photo-link" id="wall-item-photo-link-$mail.id">
-					<img src="$mail.from_photo" class="contact-photo$mail.sparkle" id="wall-item-photo-$mail.id" alt="$mail.from_name" />
-				</a>
-			</div>
-		</div>
-		<div class="wall-item-content">
-			$mail.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-		</div>
-		<div class="wall-item-actions">
-			<div class="wall-item-actions-author">
-				<a href="$mail.from_url" target="redir" class="wall-item-name-link"><span class="wall-item-name$mail.sparkle">$mail.from_name</span></a> <span class="wall-item-ago">$mail.date</span>
-			</div>
-			
-			<div class="wall-item-actions-social">
-			</div>
-			
-			<div class="wall-item-actions-tools">
-				<a href="message/drop/$mail.id" onclick="return confirmDelete();" class="icon delete s16" title="$mail.delete">$mail.delete</a>
-			</div>
-			
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-	</div>
-</div>
-
-
-{#
-
-
-<div class="mail-conv-outside-wrapper">
-	<div class="mail-conv-sender" >
-		<a href="$mail.from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$mail.sparkle" src="$mail.from_photo" heigth="80" width="80" alt="$mail.from_name" /></a>
-	</div>
-	<div class="mail-conv-detail" >
-		<div class="mail-conv-sender-name" >$mail.from_name</div>
-		<div class="mail-conv-date">$mail.date</div>
-		<div class="mail-conv-subject">$mail.subject</div>
-		<div class="mail-conv-body">$mail.body</div>
-	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
-	<div class="mail-conv-outside-wrapper-end"></div>
-</div>
-</div>
-<hr class="mail-conv-break" />
-
-#}
diff --git a/view/theme/diabook/mail_display.tpl b/view/theme/diabook/mail_display.tpl
deleted file mode 100644
index 2b680ae428..0000000000
--- a/view/theme/diabook/mail_display.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="mail-display-subject">
-	<span class="{{if $thread_seen}}seen{{else}}unseen{{endif}}">$thread_subject</span>
-	<a href="message/dropconv/$thread_id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
-</div>
-
-{{ for $mails as $mail }}
-	<div id="tread-wrapper-$mail_item.id" class="tread-wrapper">
-		{{ inc mail_conv.tpl }}{{endinc}}
-	</div>
-{{ endfor }}
-
-{{ inc prv_message.tpl }}{{ endinc }}
diff --git a/view/theme/diabook/mail_list.tpl b/view/theme/diabook/mail_list.tpl
deleted file mode 100644
index 6bc6c84f60..0000000000
--- a/view/theme/diabook/mail_list.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="mail-list-wrapper">
-	<span class="mail-subject {{if $seen}}seen{{else}}unseen{{endif}}"><a href="message/$id" class="mail-link">$subject</a></span>
-	<span class="mail-from">$from_name</span>
-	<span class="mail-date">$date</span>
-	<span class="mail-count">$count</span>
-	
-	<a href="message/dropconv/$id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
-</div>
diff --git a/view/theme/diabook/message_side.tpl b/view/theme/diabook/message_side.tpl
deleted file mode 100644
index 9f15870964..0000000000
--- a/view/theme/diabook/message_side.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="message-sidebar" class="widget">
-	<div id="message-new" class="{{ if $new.sel }}selected{{ endif }}"><a href="$new.url">$new.label</a> </div>
-	
-	<ul class="message-ul">
-		{{ for $tabs as $t }}
-			<li class="tool {{ if $t.sel }}selected{{ endif }}"><a href="$t.url" class="message-link">$t.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl
deleted file mode 100644
index c91a9f56d2..0000000000
--- a/view/theme/diabook/nav.tpl
+++ /dev/null
@@ -1,188 +0,0 @@
-<header>
-	<div id="site-location">$sitelocation</div>
-	<div id="banner">$banner</div>
-</header>
-<nav>
-			
-			
-	<ul>
-			
-			
-			{{ if $nav.network }}
-			<li id="nav-network-link" class="nav-menu-icon">
-				<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >
-				<span class="icon notifications">Benachrichtigungen</span>
-				<span id="net-update" class="nav-notify"></span></a>
-			</li>
-		    {{ endif }}
-	
-			{{ if $nav.contacts }}
-			<li class="nav-menu-icon" id="nav-contacts-linkmenu">
-				<a href="$nav.contacts.0" rel="#nav-contacts-menu" title="$nav.contacts.1">
-				<span class="icon contacts">$nav.contacts.1</span>
-				<span id="intro-update" class="nav-notify"></span></a>
-				<ul id="nav-contacts-menu" class="menu-popup">
-					<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li>
-					<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
-				</ul>
-			</li>	
-
-			{{ endif }}
-			
-			{{ if $nav.messages }}
-			<li  id="nav-messages-linkmenu" class="nav-menu-icon">
-			  <a href="$nav.messages.0" rel="#nav-messages-menu" title="$nav.messages.1">
-			  <span class="icon messages">$nav.messages.1</span>
-				<span id="mail-update" class="nav-notify"></span></a>
-				<ul id="nav-messages-menu" class="menu-popup">
-					<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
-					<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
-				</ul>
-			</li>		
-			{{ endif }}
-		
-      {{ if $nav.notifications }}
-			<li  id="nav-notifications-linkmenu" class="nav-menu-icon">
-			<a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">
-			<span class="icon notify">$nav.notifications.1</span>
-				<span id="notify-update" class="nav-notify"></span></a>
-				<ul id="nav-notifications-menu" class="menu-popup">
-					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-					<li class="empty">$emptynotifications</li>
-				</ul>
-			</li>		
-		{{ endif }}	
-			
-		{{ if $nav.search}}
-		<li id="search-box">
-			<form method="get" action="$nav.search.0">
-				<input id="search-text" class="nav-menu-search" type="text" value="" name="search">
-			</form>
-		</li>		
-		{{ endif }}	
-		
-		<li  style="width: 1%; height: 1px;float: right;"></li>	
-		
-		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
-			<ul id="nav-site-menu" class="menu-popup">
-				{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}				
-					
-				{{ if $nav.help }} <li><a class="$nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}									
-										
-										 <li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
-										
-				{{ if $nav.settings }}<li><a class="menu-sep $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
-				{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
-
-				{{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }}
-
-				
-			</ul>		
-		</li>
-		
-		
-		{{ if $nav.directory }}
-		<li id="nav-directory-link" class="nav-menu $sel.directory">
-			<a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-		</li>
-		{{ endif }}
-		
-		{{ if $nav.apps }}
-			<li id="nav-apps-link" class="nav-menu $sel.apps">
-				<a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a>
-				<ul id="nav-apps-menu" class="menu-popup">
-					{{ for $apps as $ap }}
-					<li>$ap</li>
-					{{ endfor }}
-				</ul>
-			</li>	
-		{{ endif }}		
-		
-      {{ if $nav.home }}
-			<li id="nav-home-link" class="nav-menu $sel.home">
-				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1
-				<span id="home-update" class="nav-notify"></span></a>
-			</li>
-		{{ endif }}		
-		
-		{{ if $userinfo }}
-			<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="$userinfo.icon" alt="$userinfo.name"></a>
-				<ul id="nav-user-menu" class="menu-popup">
-					{{ for $nav.usermenu as $usermenu }}
-						<li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
-					{{ endfor }}
-					
-					{{ if $nav.profiles }}<li><a class="menu-sep $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.3</a></li>{{ endif }}
-					{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
-					{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
-					{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}	
-				</ul>
-			</li>
-		{{ endif }}
-		
-					{{ if $nav.login }}
-					<li id="nav-home-link" class="nav-menu $sel.home">
-						<a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
-					<li>
-					{{ endif }}
-		
-		
-		
-	</ul>	
-
-
-	
-</nav>
-
-
-<div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;z-index: 97;"><a id="down" onclick="scrolldown()" ><img id="scroll_top_bottom" src="view/theme/diabook/icons/scroll_bottom.png" style="display:cursor !important;" alt="back to top" title="Scroll to bottom"></a></div>
-<div style="position: fixed; bottom: 61px; left: 6px;">$langselector</div>
-<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
-
-
-
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img data-src="{1}">{2} <span class="notif-when">{3}</span></a></li>
-</ul>
-
-
-
-{#
-
-{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
-{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-
-<span id="nav-link-wrapper" >
-
-{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-	
-<a id="nav-help-link" class="nav-link $nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
-	
-{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
-<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
-<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
-{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
-{{ if $nav.notifications }}
-<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
-<span id="notify-update" class="nav-ajax-left"></span>
-{{ endif }}
-{{ if $nav.messages }}
-<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
-<span id="mail-update" class="nav-ajax-left"></span>
-{{ endif }}
-
-{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-
-{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
-{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
-
-</span>
-<span id="nav-end"></span>
-<span id="banner">$banner</span>
-#}
diff --git a/view/theme/diabook/nets.tpl b/view/theme/diabook/nets.tpl
deleted file mode 100644
index faccca398e..0000000000
--- a/view/theme/diabook/nets.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<div id="profile_side">
-	<h3 style="margin-left: 2px;">$title</h3>
-	<div id="nets-desc">$desc</div>
-   
-	<ul class="menu-profile-side">
-	<li class="menu-profile-list">
-	<span class="menu-profile-icon {{ if $sel_all }}group_selected{{else}}group_unselected{{ endif }}"></span>	
-	<a style="text-decoration: none;" href="$base?nets=all" class="menu-profile-list-item">$all</a></li>
-	{{ for $nets as $net }}
-	<li class="menu-profile-list">
-	<a href="$base?nets=$net.ref" class="menu-profile-list-item">
-	<span class="menu-profile-icon {{ if $net.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>		
-	$net.name	
-	</a></li>
-	{{ endfor }}
-	</ul>
-</div>
diff --git a/view/theme/diabook/oembed_video.tpl b/view/theme/diabook/oembed_video.tpl
deleted file mode 100644
index 99c65cb290..0000000000
--- a/view/theme/diabook/oembed_video.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<a class="embed_yt" href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); yt_iframe();javascript:$(this).parent().css("height", "450px"); return false;' style='float:left; margin: 1em; position: relative;'>
-	<img width='$tw' height='$th' src='$turl' >
-	<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url(images/icons/48/play.png) no-repeat center center;'></div>
-</a>
diff --git a/view/theme/diabook/photo_item.tpl b/view/theme/diabook/photo_item.tpl
deleted file mode 100644
index 5d65a89b79..0000000000
--- a/view/theme/diabook/photo_item.tpl
+++ /dev/null
@@ -1,65 +0,0 @@
-{{ if $indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-</div>
-{{ endif }}
-
-<div class="wall-item-photo-container $indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper" >
-				<a href="$profile_url" target="redir" title="" class="contact-photo-link" id="wall-item-photo-link-$id">
-					<img src="$thumb" class="contact-photo$sparkle" id="wall-item-photo-$id" alt="$name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$id">
-				$photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$profile_url" target="redir" title="$name" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a> 
-			<span class="wall-item-ago">-
-			{{ if $plink }}<a class="link" title="$plink.title" href="$plink.href" style="color: #999">$ago</a>{{ else }} $ago {{ endif }}
-			{{ if $lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$id);">$lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $title }}<h2><a href="$plink.href">$title</a></h2>{{ endif }}
-			$body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	
-	<div class="wall-item-bottom" style="display: table-row;">
-		<div class="wall-item-actions">
-	   </div>
-		<div class="wall-item-actions">
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $drop.dropping }}
-					<input type="checkbox" title="$drop.select" name="itemselected[]" class="item-select" value="$id" />
-					<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drop" title="$drop.delete">$drop.delete</a>
-				{{ endif }}
-				{{ if $edpost }}
-					<a class="icon pencil" href="$edpost.0" title="$edpost.1"></a>
-				{{ endif }}
-			</div>
-
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-			
-	</div>
-</div>
-
diff --git a/view/theme/diabook/photo_view.tpl b/view/theme/diabook/photo_view.tpl
deleted file mode 100644
index 272b670488..0000000000
--- a/view/theme/diabook/photo_view.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-<div id="live-display"></div>
-<h3><a href="$album.0">$album.1</a></h3>
-
-<div id="photo-edit-link-wrap">
-{{ if $tools }}
-<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
-|
-<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
-{{ endif }}
-{{ if $lock }} | <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo/$id');" /> {{ endif }}
-</div>
-
-{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
-<div id="photo-photo"><a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a></div>
-{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
-<div id="photo-photo-end"></div>
-<div id="photo-caption">$desc</div>
-{{ if $tags }}
-<div id="in-this-photo-text">$tags.0</div>
-<div id="in-this-photo">$tags.1</div>
-{{ endif }}
-{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
-
-{{ if $edit }}$edit{{ endif }}
-
-<div style="margin-top:20px">
-</div>
-<div id="wall-photo-container">
-$comments
-</div>
-
-$paginate
-
diff --git a/view/theme/diabook/profile_side.tpl b/view/theme/diabook/profile_side.tpl
deleted file mode 100644
index 01e80f2388..0000000000
--- a/view/theme/diabook/profile_side.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<div id="profile_side">
-	<div id="ps-usernameicon">
-		<a href="$ps.usermenu.status.0" title="$userinfo.name">
-			<img src="$userinfo.icon" id="ps-usericon" alt="$userinfo.name">
-		</a>
-		<a href="$ps.usermenu.status.0" id="ps-username" title="$userinfo.name">$userinfo.name</a>
-	</div>
-	
-<ul id="profile-side-menu" class="menu-profile-side">
-	<li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1<span class="menu-profile-icon home"></span></a></li>
-	<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1<span class="menu-profile-icon photos"></span></a></li>
-	<li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1<span class="menu-profile-icon pscontacts"></span></a></li>		
-	<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1<span class="menu-profile-icon events"></span></a></li>
-	<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1<span class="menu-profile-icon notes"></span></a></li>
-	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1<span class="menu-profile-icon foren"></span></a></li>
-	<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1<span class="menu-profile-icon com_side"></span></a></li>
-</ul>
-
-</div>
-
-				
diff --git a/view/theme/diabook/profile_vcard.tpl b/view/theme/diabook/profile_vcard.tpl
deleted file mode 100644
index 8251458257..0000000000
--- a/view/theme/diabook/profile_vcard.tpl
+++ /dev/null
@@ -1,64 +0,0 @@
-<div class="vcard">
-
-	<div class="tool">
-		<div class="fn label">$profile.name</div>
-		{{ if $profile.edit }}
-			<div class="action">
-			<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="$profile.edit.3"><span>$profile.edit.1</span></a>
-			<ul id="profiles-menu" class="menu-popup">
-				{{ for $profile.menu.entries as $e }}
-				<li>
-					<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
-				</li>
-				{{ endfor }}
-				<li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
-				<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
-				<li><a href="profiles" >$profile.edit.3</a></li>
-								
-			</ul>
-			</div>
-		{{ endif }}
-	</div>
-				
-	
-
-	<div id="profile-photo-wrapper"><img class="photo" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-
-
-	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt><br> 
-		<dd class="adr">
-			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal_code</span>
-			</span>
-			{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
-		</dd>
-		</dl>
-	{{ endif }}
-
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
-
-	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-
-	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-		</ul>
-	</div>
-</div>
-
-$contact_block
-
-
diff --git a/view/theme/diabook/prv_message.tpl b/view/theme/diabook/prv_message.tpl
deleted file mode 100644
index 7a7413e9d8..0000000000
--- a/view/theme/diabook/prv_message.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-
-<h3>$header</h3>
-
-<div id="prvmail-wrapper" >
-<form id="prvmail-form" action="message" method="post" >
-
-$parent
-
-<div id="prvmail-to-label">$to</div>
-
-{{ if $showinputs }}
-<input type="text" id="recip" style="background: none repeat scroll 0 0 white;border: 1px solid #CCC;border-radius: 5px 5px 5px 5px;height: 20px;margin: 0 0 5px;
-vertical-align: middle;" name="messageto" value="$prefill" maxlength="255" size="64" tabindex="10" />
-<input type="hidden" id="recip-complete" name="messageto" value="$preid">
-{{ else }}
-$select
-{{ endif }}
-
-<div id="prvmail-subject-label">$subject</div>
-<input type="text" size="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-upload-wrapper" >
-		<div id="prvmail-upload" class="icon border camera" title="$upload" ></div>
-	</div> 
-	<div id="prvmail-link-wrapper" >
-		<div id="prvmail-link" class="icon border link" title="$insert" onclick="jotGetLink();" ></div>
-	</div> 
-	<div id="prvmail-rotator-wrapper" >
-		<img id="prvmail-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-</div>
-<div id="prvmail-end"></div>
-</form>
-</div>
diff --git a/view/theme/diabook/right_aside.tpl b/view/theme/diabook/right_aside.tpl
deleted file mode 100644
index 18d5f6fd52..0000000000
--- a/view/theme/diabook/right_aside.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<div id="profile_side">
-	<div id="ps-usernameicon">
-		<a href="$ps.usermenu.status.0" title="$userinfo.name">
-			<img src="$userinfo.icon" id="ps-usericon" alt="$userinfo.name">
-		</a>
-		<a href="$ps.usermenu.status.0" id="ps-username" title="$userinfo.name">$userinfo.name</a>
-	</div>
-	
-<ul id="profile-side-menu" class="menu-profile-side">
-	<li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
-	<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
-	<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
-	<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
-	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="http://dir.friendica.com/directory/forum" target="blanc">Public Groups</a></li>
-	<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
-</ul>
-
-</div>
-
-				
\ No newline at end of file
diff --git a/view/theme/diabook/search_item.tpl b/view/theme/diabook/search_item.tpl
deleted file mode 100644
index d0c83c37a3..0000000000
--- a/view/theme/diabook/search_item.tpl
+++ /dev/null
@@ -1,111 +0,0 @@
-{{ if $item.indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-{{ endif }}
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
-			<span class="wall-item-ago">-
-			{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-			{{ 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-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-actions-social">
-			
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}	
-
-
-			{{ if $item.star }}
-				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
-				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>					  
-			{{ endif }}	
-			
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
-			{{ endif }}				
-			
-			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-			
-					
-					
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.pagedrop }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-				{{ endif }}
-				{{ if $item.drop.dropping }}
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			<div class="wall-item-location">$item.location&nbsp;</div>
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-</div>
-
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
diff --git a/view/theme/diabook/smarty3/admin_users.tpl b/view/theme/diabook/templates/admin_users.tpl
similarity index 100%
rename from view/theme/diabook/smarty3/admin_users.tpl
rename to view/theme/diabook/templates/admin_users.tpl
diff --git a/view/theme/diabook/smarty3/bottom.tpl b/view/theme/diabook/templates/bottom.tpl
similarity index 100%
rename from view/theme/diabook/smarty3/bottom.tpl
rename to view/theme/diabook/templates/bottom.tpl
diff --git a/view/theme/diabook/smarty3/ch_directory_item.tpl b/view/theme/diabook/templates/ch_directory_item.tpl
similarity index 100%
rename from view/theme/diabook/smarty3/ch_directory_item.tpl
rename to view/theme/diabook/templates/ch_directory_item.tpl
diff --git a/view/theme/diabook/smarty3/comment_item.tpl b/view/theme/diabook/templates/comment_item.tpl
similarity index 100%
rename from view/theme/diabook/smarty3/comment_item.tpl
rename to view/theme/diabook/templates/comment_item.tpl
diff --git a/view/theme/diabook/smarty3/communityhome.tpl b/view/theme/diabook/templates/communityhome.tpl
similarity index 100%
rename from view/theme/diabook/smarty3/communityhome.tpl
rename to view/theme/diabook/templates/communityhome.tpl
diff --git a/view/theme/diabook/smarty3/contact_template.tpl b/view/theme/diabook/templates/contact_template.tpl
similarity index 100%
rename from view/theme/diabook/smarty3/contact_template.tpl
rename to view/theme/diabook/templates/contact_template.tpl
diff --git a/view/theme/diabook/smarty3/directory_item.tpl b/view/theme/diabook/templates/directory_item.tpl
similarity index 100%
rename from view/theme/diabook/smarty3/directory_item.tpl
rename to view/theme/diabook/templates/directory_item.tpl
diff --git a/view/theme/diabook/smarty3/footer.tpl b/view/theme/diabook/templates/footer.tpl
similarity index 100%
rename from view/theme/diabook/smarty3/footer.tpl
rename to view/theme/diabook/templates/footer.tpl
diff --git a/view/theme/diabook/smarty3/generic_links_widget.tpl b/view/theme/diabook/templates/generic_links_widget.tpl
similarity index 100%
rename from view/theme/diabook/smarty3/generic_links_widget.tpl
rename to view/theme/diabook/templates/generic_links_widget.tpl
diff --git a/view/theme/diabook/smarty3/group_side.tpl b/view/theme/diabook/templates/group_side.tpl
similarity index 100%
rename from view/theme/diabook/smarty3/group_side.tpl
rename to view/theme/diabook/templates/group_side.tpl
diff --git a/view/theme/diabook/smarty3/jot.tpl b/view/theme/diabook/templates/jot.tpl
similarity index 100%
rename from view/theme/diabook/smarty3/jot.tpl
rename to view/theme/diabook/templates/jot.tpl
diff --git a/view/theme/diabook/smarty3/login.tpl b/view/theme/diabook/templates/login.tpl
similarity index 100%
rename from view/theme/diabook/smarty3/login.tpl
rename to view/theme/diabook/templates/login.tpl
diff --git a/view/theme/diabook/smarty3/mail_conv.tpl b/view/theme/diabook/templates/mail_conv.tpl
similarity index 100%
rename from view/theme/diabook/smarty3/mail_conv.tpl
rename to view/theme/diabook/templates/mail_conv.tpl
diff --git a/view/theme/diabook/smarty3/mail_display.tpl b/view/theme/diabook/templates/mail_display.tpl
similarity index 100%
rename from view/theme/diabook/smarty3/mail_display.tpl
rename to view/theme/diabook/templates/mail_display.tpl
diff --git a/view/theme/diabook/smarty3/mail_list.tpl b/view/theme/diabook/templates/mail_list.tpl
similarity index 100%
rename from view/theme/diabook/smarty3/mail_list.tpl
rename to view/theme/diabook/templates/mail_list.tpl
diff --git a/view/theme/diabook/smarty3/message_side.tpl b/view/theme/diabook/templates/message_side.tpl
similarity index 100%
rename from view/theme/diabook/smarty3/message_side.tpl
rename to view/theme/diabook/templates/message_side.tpl
diff --git a/view/theme/diabook/smarty3/nav.tpl b/view/theme/diabook/templates/nav.tpl
similarity index 100%
rename from view/theme/diabook/smarty3/nav.tpl
rename to view/theme/diabook/templates/nav.tpl
diff --git a/view/theme/diabook/smarty3/nets.tpl b/view/theme/diabook/templates/nets.tpl
similarity index 100%
rename from view/theme/diabook/smarty3/nets.tpl
rename to view/theme/diabook/templates/nets.tpl
diff --git a/view/theme/diabook/smarty3/oembed_video.tpl b/view/theme/diabook/templates/oembed_video.tpl
similarity index 100%
rename from view/theme/diabook/smarty3/oembed_video.tpl
rename to view/theme/diabook/templates/oembed_video.tpl
diff --git a/view/theme/diabook/smarty3/photo_item.tpl b/view/theme/diabook/templates/photo_item.tpl
similarity index 100%
rename from view/theme/diabook/smarty3/photo_item.tpl
rename to view/theme/diabook/templates/photo_item.tpl
diff --git a/view/theme/diabook/smarty3/photo_view.tpl b/view/theme/diabook/templates/photo_view.tpl
similarity index 100%
rename from view/theme/diabook/smarty3/photo_view.tpl
rename to view/theme/diabook/templates/photo_view.tpl
diff --git a/view/theme/diabook/smarty3/profile_side.tpl b/view/theme/diabook/templates/profile_side.tpl
similarity index 100%
rename from view/theme/diabook/smarty3/profile_side.tpl
rename to view/theme/diabook/templates/profile_side.tpl
diff --git a/view/theme/diabook/smarty3/profile_vcard.tpl b/view/theme/diabook/templates/profile_vcard.tpl
similarity index 100%
rename from view/theme/diabook/smarty3/profile_vcard.tpl
rename to view/theme/diabook/templates/profile_vcard.tpl
diff --git a/view/theme/diabook/smarty3/prv_message.tpl b/view/theme/diabook/templates/prv_message.tpl
similarity index 100%
rename from view/theme/diabook/smarty3/prv_message.tpl
rename to view/theme/diabook/templates/prv_message.tpl
diff --git a/view/theme/diabook/smarty3/right_aside.tpl b/view/theme/diabook/templates/right_aside.tpl
similarity index 100%
rename from view/theme/diabook/smarty3/right_aside.tpl
rename to view/theme/diabook/templates/right_aside.tpl
diff --git a/view/theme/diabook/smarty3/search_item.tpl b/view/theme/diabook/templates/search_item.tpl
similarity index 100%
rename from view/theme/diabook/smarty3/search_item.tpl
rename to view/theme/diabook/templates/search_item.tpl
diff --git a/view/theme/diabook/smarty3/theme_settings.tpl b/view/theme/diabook/templates/theme_settings.tpl
similarity index 100%
rename from view/theme/diabook/smarty3/theme_settings.tpl
rename to view/theme/diabook/templates/theme_settings.tpl
diff --git a/view/theme/diabook/smarty3/wall_thread.tpl b/view/theme/diabook/templates/wall_thread.tpl
similarity index 100%
rename from view/theme/diabook/smarty3/wall_thread.tpl
rename to view/theme/diabook/templates/wall_thread.tpl
diff --git a/view/theme/diabook/theme_settings.tpl b/view/theme/diabook/theme_settings.tpl
deleted file mode 100644
index ad024dfe99..0000000000
--- a/view/theme/diabook/theme_settings.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-{{inc field_select.tpl with $field=$color}}{{endinc}}
-
-{{inc field_select.tpl with $field=$font_size}}{{endinc}}
-
-{{inc field_select.tpl with $field=$line_height}}{{endinc}}
-
-{{inc field_select.tpl with $field=$resolution}}{{endinc}}
-
-<div class="settings-submit-wrapper">
-	<input type="submit" value="$submit" class="settings-submit" name="diabook-settings-submit" />
-</div>
-<br>
-<h3>Show/hide boxes at right-hand column</h3>
-{{inc field_select.tpl with $field=$close_pages}}{{endinc}}
-{{inc field_select.tpl with $field=$close_profiles}}{{endinc}}
-{{inc field_select.tpl with $field=$close_helpers}}{{endinc}}
-{{inc field_select.tpl with $field=$close_services}}{{endinc}}
-{{inc field_select.tpl with $field=$close_friends}}{{endinc}}
-{{inc field_select.tpl with $field=$close_lastusers}}{{endinc}}
-{{inc field_select.tpl with $field=$close_lastphotos}}{{endinc}}
-{{inc field_select.tpl with $field=$close_lastlikes}}{{endinc}}
-{{inc field_select.tpl with $field=$close_twitter}}{{endinc}}
-{{inc field_input.tpl with $field=$TSearchTerm}}{{endinc}}
-{{inc field_select.tpl with $field=$close_mapquery}}{{endinc}}
-
-{{inc field_input.tpl with $field=$ELPosX}}{{endinc}}
-
-{{inc field_input.tpl with $field=$ELPosY}}{{endinc}}
-
-{{inc field_input.tpl with $field=$ELZoom}}{{endinc}}
-
-<div class="settings-submit-wrapper">
-	<input type="submit" value="$submit" class="settings-submit" name="diabook-settings-submit" />
-</div>
-
-<br>
-
-<div class="field select">
-<a onClick="restore_boxes()" title="Restore boxorder at right-hand column" style="cursor: pointer;">Restore boxorder at right-hand column</a>
-</div>
-
diff --git a/view/theme/diabook/wall_thread.tpl b/view/theme/diabook/wall_thread.tpl
deleted file mode 100644
index c4c0ac35fe..0000000000
--- a/view/theme/diabook/wall_thread.tpl
+++ /dev/null
@@ -1,141 +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">
-{{ if $item.indent }}{{ else }}
-<div class="wall-item-decor">
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-{{ endif }}
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-		</div>
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
-			<span class="wall-item-ago">-
-			{{ if $item.plink }}<a class="link$item.sparkle" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-			</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-			{{ 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-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-actions-social">
-			
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				{{ if $item.vote.dislike }}
-				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-				{{ endif }}
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}	
-
-
-			{{ if $item.star }}
-				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
-				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
-			{{ endif }}
-
-			{{ if $item.tagger }}
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.tagger.add"></a>					  
-			{{ endif }}	
-			
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
-			{{ endif }}				
-			
-			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-			
-					
-					
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.pagedrop }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-				{{ endif }}
-				{{ if $item.drop.dropping }}
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			<div class="wall-item-location">$item.location&nbsp;</div>
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-</div>
-
-{{ if $item.threaded }}
-{{ if $item.comment }}
-<div class="wall-item-comment-wrapper $item.indent" >
-	$item.comment
-</div>
-{{ endif }}
-{{ endif }}
-
-{{ if $item.flatten }}
-<div class="wall-item-comment-wrapper" >
-	$item.comment
-</div>
-{{ endif }}
-
-
-{{ for $item.children as $child_item }}
-	{{ inc $child_item.template with $item=$child_item }}{{ endinc }}
-{{ endfor }}
-
-</div>
-{{if $item.comment_lastcollapsed}}</div>{{endif}}
diff --git a/view/theme/dispy/bottom.tpl b/view/theme/dispy/bottom.tpl
deleted file mode 100644
index 82f0201703..0000000000
--- a/view/theme/dispy/bottom.tpl
+++ /dev/null
@@ -1,71 +0,0 @@
-<script type="text/javascript" src="$baseurl/view/theme/dispy/js/jquery.autogrow.textarea.js"></script>
-<script type="text/javascript">
-$(document).ready(function() {
-
-});
-function tautogrow(id) {
-	$("textarea#comment-edit-text-" + id).autogrow();
-};
-
-function insertFormatting(comment, BBcode, id) {
-	var tmpStr = $("#comment-edit-text-" + id).val();
-	if(tmpStr == comment) {
-		tmpStr = "";
-		$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-		$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-		openMenu("comment-edit-submit-wrapper-" + id);
-	}
-	textarea = document.getElementById("comment-edit-text-" + id);
-	if (document.selection) {
-		textarea.focus();
-		selected = document.selection.createRange();
-		if (BBcode == "url") {
-			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-		} else {
-			selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-		}
-	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
-		var start = textarea.selectionStart;
-		var end = textarea.selectionEnd;
-		if (BBcode == "url") {
-			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]"
-			+ "http://" + textarea.value.substring(start, end)
-			+ "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-		} else {
-			textarea.value = textarea.value.substring(0, start)
-			+ "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]"
-			+ textarea.value.substring(end, textarea.value.length);
-		}
-	}
-	return true;
-}
-
-function cmtBbOpen(id) {
-	$(".comment-edit-bb-" + id).show();
-}
-function cmtBbClose(id) {
-    $(".comment-edit-bb-" + id).hide();
-}
-
-var doctitle = document.title;
-function checkNotify() {
-	if(document.getElementById("notify-update").innerHTML != "") {
-		document.title = "("+document.getElementById("notify-update").innerHTML+") " + doctitle;
-	} else {
-		document.title = doctitle;
-    };
-    setInterval(function () {checkNotify();}, 10 * 1000);
-}
-
-$(document).ready(function(){
-var doctitle = document.title;
-function checkNotify() {
-if(document.getElementById("notify-update").innerHTML != "")
-document.title = "("+document.getElementById("notify-update").innerHTML+") " + doctitle;
-else
-document.title = doctitle;
-};
-setInterval(function () {checkNotify();}, 10 * 1000);
-})
-
-</script>
diff --git a/view/theme/dispy/comment_item.tpl b/view/theme/dispy/comment_item.tpl
deleted file mode 100644
index e940800323..0000000000
--- a/view/theme/dispy/comment_item.tpl
+++ /dev/null
@@ -1,70 +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" />
-				<input type="hidden" name="post_id_random" value="$rand_num" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-					<a class="comment-edit-photo-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>
-				<ul class="comment-edit-bb-$id">
-					<li><a class="editicon boldbb shadow"
-						style="cursor: pointer;"
-						onclick="insertFormatting('$comment','b', $id);"></a></li>
-					<li><a class="editicon italicbb shadow"
-						style="cursor: pointer;"
-						onclick="insertFormatting('$comment','i', $id);"></a></li>
-					<li><a class="editicon underlinebb shadow"
-						style="cursor: pointer;"
-						onclick="insertFormatting('$comment','u', $id);"></a></li>
-					<li><a class="editicon quotebb shadow"
-						style="cursor: pointer;"
-						onclick="insertFormatting('$comment','quote', $id);"></a></li>
-					<li><a class="editicon codebb shadow"
-						style="cursor: pointer;"
-						onclick="insertFormatting('$comment','code', $id);"></a></li>
-					<li><a class="editicon imagebb shadow"
-						style="cursor: pointer;"
-						onclick="insertFormatting('$comment','img', $id);"></a></li>
-					<li><a class="editicon urlbb shadow"
-						style="cursor: pointer;"
-						onclick="insertFormatting('$comment','url', $id);"></a></li>
-					<li><a class="editicon videobb shadow"
-						style="cursor: pointer;"
-						onclick="insertFormatting('$comment','video', $id);"></a></li>
-				</ul>
-				<div class="comment-edit-bb-end"></div>
-				<textarea id="comment-edit-text-$id"
-					class="comment-edit-text-empty"
-					name="body"
-					onfocus="commentOpen(this,$id);tautogrow($id);cmtBbOpen($id);"
-					onblur="commentClose(this,$id);"
-					placeholder="Comment">$comment</textarea>
-				{{ if $qcomment }}
-                <div class="qcomment-wrapper">
-					<select id="qcomment-select-$id"
-						name="qcomment-$id"
-						class="qcomment"
-						onchange="qCommentInsert(this,$id);">
-					<option value=""></option>
-					{{ for $qcomment as $qc }}
-					<option value="$qc">$qc</option>
-					{{ endfor }}
-					</select>
-				</div>
-				{{ endif }}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;">
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-				<div class="comment-edit-end"></div>
-			</form>
-		</div>
diff --git a/view/theme/dispy/communityhome.tpl b/view/theme/dispy/communityhome.tpl
deleted file mode 100644
index aaa27465b0..0000000000
--- a/view/theme/dispy/communityhome.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-{{ if $page }}
-<div>$page</div>
-{{ endif }}
-
-<h3 id="extra-help-header">Help or '@NewHere'?</h3>
-<div id="extra-help">
-<a href="https://helpers.pyxis.uberspace.de/profile/helpers"
-	title="Friendica Support" target="_blank">Friendica Support</a><br />
-<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk"
-	title="Let's talk" target="_blank">Let's talk</a><br />
-<a href="http://newzot.hydra.uberspace.de/profile/newzot"
-	title="Local Friendica" target="_blank">Local Friendica</a><br />
-<a href="http://kakste.com/profile/newhere" title="@NewHere" target="_blank">NewHere</a>
-</div>
-
-<h3 id="connect-services-header">Connectable Services</h3>
-<ul id="connect-services">
-<li><a href="$url/facebook"><img alt="Facebook"
-	src="view/theme/dispy/icons/facebook.png" title="Facebook" /></a></li>
-<li><a href="$url/settings/connectors"><img
-	alt="StatusNet" src="view/theme/dispy/icons/StatusNet.png" title="StatusNet" /></a></li>
-<li><a href="$url/settings/connectors"><img
-	alt="LiveJournal" src="view/theme/dispy/icons/livejournal.png" title="LiveJournal" /></a></li>
-<li><a href="$url/settings/connectors"><img
-	alt="Posterous" src="view/theme/dispy/icons/posterous.png" title="Posterous" /></a></li>
-<li><a href="$url/settings/connectors"><img
-	alt="Tumblr" src="view/theme/dispy/icons/tumblr.png" title="Tumblr" /></a></li>
-<li><a href="$url/settings/connectors"><img
-	alt="Twitter" src="view/theme/dispy/icons/twitter.png" title="Twitter" /></a></li>
-<li><a href="$url/settings/connectors"><img
-	alt="WordPress" src="view/theme/dispy/icons/wordpress.png" title="WordPress" /></a></li>
-<li><a href="$url/settings/connectors"><img
-	alt="E-Mail" src="view/theme/dispy/icons/email.png" title="E-Mail" /></a></li>
-</ul>
-
diff --git a/view/theme/dispy/contact_template.tpl b/view/theme/dispy/contact_template.tpl
deleted file mode 100644
index e656ea5527..0000000000
--- a/view/theme/dispy/contact_template.tpl
+++ /dev/null
@@ -1,36 +0,0 @@
-
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-	<div class="contact-entry-photo-wrapper">
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
-		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
-		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)">
-
-			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
-
-			{{ if $contact.photo_menu }}
-			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
-                    <ul>
-						{{ for $contact.photo_menu as $c }}
-						{{ if $c.2 }}
-						<li><a target="redir" href="$c.1">$c.0</a></li>
-						{{ else }}
-						<li><a href="$c.1">$c.0</a></li>
-						{{ endif }}
-						{{ endfor }}
-                    </ul>
-                </div>
-			{{ endif }}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
-{{ if $contact.alt_text }}<div class="contact-entry-details" id="contact-entry-rel-$contact.id" >$contact.alt_text</div>{{ endif }}
-	<div class="contact-entry-details" id="contact-entry-url-$contact.id" >
-		<a href="$contact.itemurl" title="$contact.itemurl">Profile URL</a></div>
-	<div class="contact-entry-details" id="contact-entry-network-$contact.id" >$contact.network</div>
-
-	<div class="contact-entry-end" ></div>
-</div>
-
diff --git a/view/theme/dispy/conversation.tpl b/view/theme/dispy/conversation.tpl
deleted file mode 100644
index 8eae2d6d1c..0000000000
--- a/view/theme/dispy/conversation.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-$live_update
-
-{{ for $threads as $thread }}
-<div id="tread-wrapper-$thread.id" class="tread-wrapper">
-	{{ for $thread.items as $item }}
-		{{if $item.comment_firstcollapsed}}
-			<div class="hide-comments-outer">
-			<span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span>
-			</div>
-			<div id="collapsed-comments-$thread.id" class="collapsed-comments" style="display: none;">
-		{{endif}}
-		{{if $item.comment_lastcollapsed}}</div>{{endif}}
-		
-		{{ inc $item.template }}{{ endinc }}
-		
-		
-	{{ endfor }}
-</div>
-{{ endfor }}
-
-<div id="conversation-end"></div>
-
-{{ if $dropping }}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems(); return false;">
-  <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
-  <div id="item-delete-selected-desc" >$dropping</div>
-</div>
-<div id="item-delete-selected-end"></div>
-{{ endif }}
diff --git a/view/theme/dispy/group_side.tpl b/view/theme/dispy/group_side.tpl
deleted file mode 100644
index be8e23de09..0000000000
--- a/view/theme/dispy/group_side.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-<div id="group-sidebar" class="widget">
-<h3 class="label">$title</h3>
-
-<div id="sidebar-group-list">
-	<ul id="sidebar-group-ul">
-		{{ for $groups as $group }}
-			<li class="sidebar-group-li">
-				<a href="$group.href" class="sidebar-group-element {{ if $group.selected }}group-selected{{ else }}group-other{{ endif }}">$group.text</a>
-				{{ if $group.edit }}
-					<a class="groupsideedit"
-                        href="$group.edit.href" title="$group.edit.title"><span class="icon small-pencil"></span></a>
-				{{ endif }}
-				{{ if $group.cid }}
-					<input type="checkbox" 
-						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
-						onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
-						{{ if $group.ismember }}checked="checked"{{ endif }}
-					/>
-				{{ endif }}
-			</li>
-		{{ endfor }}
-	</ul>
-	</div>
-  <div id="sidebar-new-group">
-  <a href="group/new" title="$createtext"><span class="action text add">$createtext</span></a>
-  </div>
-</div>
-
-
diff --git a/view/theme/dispy/header.tpl b/view/theme/dispy/header.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
deleted file mode 100644
index f4712f0bef..0000000000
--- a/view/theme/dispy/jot-header.tpl
+++ /dev/null
@@ -1,345 +0,0 @@
-<script type="text/javascript">
-var editor=false;
-var textlen = 0;
-var plaintext = '$editselect';
-
-function initEditor(cb) {
-	if (editor==false) {
-		$("#profile-jot-text-loading").show();
-		if(plaintext == 'none') {
-			$("#profile-jot-text-loading").hide();
-			$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
-			$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
-			editor = true;
-			$("a#jot-perms-icon").colorbox({
-				'inline' : true,
-				'transition' : 'elastic'
-			});
-			$(".jothidden").show();
-			if (typeof cb!="undefined") cb();
-			return;
-		}
-		tinyMCE.init({
-			theme : "advanced",
-			mode : "specific_textareas",
-			editor_selector: $editselect,
-			auto_focus: "profile-jot-text",
-			plugins : "bbcode,paste,fullscreen,autoresize,inlinepopups,contextmenu,style",
-			theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen,charmap",
-			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 : 'div',
-			convert_urls: false,
-			content_css: "$baseurl/view/custom_tinymce.css",
-			theme_advanced_path : false,
-			file_browser_callback : "fcFileBrowser",
-			setup : function(ed) {
-				cPopup = null;
-				ed.onKeyDown.add(function(ed,e) {
-					if(cPopup !== null)
-						cPopup.onkey(e);
-				});
-
-				ed.onKeyUp.add(function(ed, e) {
-					var txt = tinyMCE.activeEditor.getContent();
-					match = txt.match(/@([^ \n]+)$/);
-					if(match!==null) {
-						if(cPopup === null) {
-							cPopup = new ACPopup(this,baseurl+"/acl");
-						}
-						if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
-						if(! cPopup.ready) cPopup = null;
-					}
-					else {
-						if(cPopup !== null) { cPopup.close(); cPopup = null; }
-					}
-
-					textlen = txt.length;
-					if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
-						$('#profile-jot-desc').html(ispublic);
-					}
-					else {
-						$('#profile-jot-desc').html('&#160;');
-					}	 
-
-				 //Character count
-
-					if(textlen <= 140) {
-						$('#character-counter').removeClass('red');
-						$('#character-counter').removeClass('orange');
-						$('#character-counter').addClass('grey');
-					}
-					if((textlen > 140) && (textlen <= 420)) {
-						$('#character-counter').removeClass('grey');
-						$('#character-counter').removeClass('red');
-						$('#character-counter').addClass('orange');
-					}
-					if(textlen > 420) {
-						$('#character-counter').removeClass('grey');
-						$('#character-counter').removeClass('orange');
-						$('#character-counter').addClass('red');
-					}
-					$('#character-counter').text(textlen);
-				});
-
-				ed.onInit.add(function(ed) {
-					ed.pasteAsPlainText = true;
-					$("#profile-jot-text-loading").hide();
-					$(".jothidden").show();
-					if (typeof cb!="undefined") cb();
-				});
-			}
-		});
-		editor = true;
-		// setup acl popup
-		$("a#jot-perms-icon").colorbox({
-			'inline' : true,
-			'transition' : 'elastic'
-		}); 
-	} else {
-		if (typeof cb!="undefined") cb();
-	}
-}
-
-function enableOnUser(){
-	if (editor) return;
-	$(this).val("");
-	initEditor();
-}
-
-</script>
-<script type="text/javascript" src="$baseurl/js/ajaxupload.js"></script>
-<script type="text/javascript">
-	var ispublic = '$ispublic';
-	var addtitle = '$addtitle';
-
-	$(document).ready(function() {
-		
-		/* enable tinymce on focus and click */
-		$("#profile-jot-text").focus(enableOnUser);
-		$("#profile-jot-text").click(enableOnUser);
-		/* enable character counter */
-		$("#profile-jot-text").focus(charCounter);
-		$("#profile-jot-text").click(charCounter);
-
-		var uploader = new window.AjaxUpload(
-			'wall-image-upload',
-			{ action: 'wall_upload/$nickname',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);
-		var file_uploader = new window.AjaxUpload(
-			'wall-file-upload',
-			{ action: 'wall_attach/$nickname',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);
-	});
-
-	function deleteCheckedItems() {
-		var checkedstr = '';
-
-		$('.item-select').each( function() {
-			if($(this).is(':checked')) {
-				if(checkedstr.length != 0) {
-					checkedstr = checkedstr + ',' + $(this).val();
-				}
-				else {
-					checkedstr = $(this).val();
-				}
-			}	
-		});
-		$.post('item', { dropitems: checkedstr }, function(data) {
-			window.location.reload();
-		});
-	}
-
-	function jotGetLink() {
-		reply = prompt("$linkurl");
-		if(reply && reply.length) {
-			reply = bin2hex(reply);
-			$('#profile-rotator').show();
-			$.get('parse_url?binurl=' + reply, function(data) {
-				addeditortext(data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-	function jotVideoURL() {
-		reply = prompt("$vidurl");
-		if(reply && reply.length) {
-			addeditortext('[video]' + reply + '[/video]');
-		}
-	}
-
-	function jotAudioURL() {
-		reply = prompt("$audurl");
-		if(reply && reply.length) {
-			addeditortext('[audio]' + reply + '[/audio]');
-		}
-	}
-
-
-	function jotGetLocation() {
-		reply = prompt("$whereareu", $('#jot-location').val());
-		if(reply && reply.length) {
-			$('#jot-location').val(reply);
-		}
-	}
-
-	function jotShare(id) {
-		if ($('#jot-popup').length != 0) $('#jot-popup').show();
-
-		$('#like-rotator-' + id).show();
-		$.get('share/' + id, function(data) {
-			if (!editor) $("#profile-jot-text").val("");
-			initEditor(function(){
-				addeditortext(data);
-				$('#like-rotator-' + id).hide();
-				$(window).scrollTop(0);
-			});
-
-		});
-	}
-
-	function linkdropper(event) {
-		var linkFound = event.dataTransfer.types.contains("text/uri-list");
-		if(linkFound)
-			event.preventDefault();
-	}
-
-	function linkdrop(event) {
-		var reply = event.dataTransfer.getData("text/uri-list");
-		event.target.textContent = reply;
-		event.preventDefault();
-		if(reply && reply.length) {
-			reply = bin2hex(reply);
-			$('#profile-rotator').show();
-			$.get('parse_url?binurl=' + reply, function(data) {
-				if (!editor) $("#profile-jot-text").val("");
-				initEditor(function(){
-					addeditortext(data);
-					$('#profile-rotator').hide();
-				});
-			});
-		}
-	}
-
-	function itemTag(id) {
-		reply = prompt("$term");
-		if(reply && reply.length) {
-			reply = reply.replace('#','');
-			if(reply.length) {
-
-				commentBusy = true;
-				$('body').css('cursor', 'wait');
-
-				$.get('tagger/' + id + '?term=' + reply);
-				if(timer) clearTimeout(timer);
-				timer = setTimeout(NavUpdate,3000);
-				liking = 1;
-			}
-		}
-	}
-
-	function itemFiler(id) {
-		
-		var bordercolor = $("input").css("border-color");
-		
-		$.get('filer/', function(data){
-			$.colorbox({html:data});
-			$("#id_term").keypress(function(){
-				$(this).css("border-color",bordercolor);
-			})
-			$("#select_term").change(function(){
-				$("#id_term").css("border-color",bordercolor);
-			})
-			
-			$("#filer_save").click(function(e){
-				e.preventDefault();
-				reply = $("#id_term").val();
-				if(reply && reply.length) {
-					commentBusy = true;
-					$('body').css('cursor', 'wait');
-					$.get('filer/' + id + '?term=' + reply);
-					if(timer) clearTimeout(timer);
-					timer = setTimeout(NavUpdate,3000);
-					liking = 1;
-					$.colorbox.close();
-				} else {
-					$("#id_term").css("border-color","#FF0000");
-				}
-				return false;
-			});
-		});
-		
-	}
-
-	function jotClearLocation() {
-		$('#jot-coord').val('');
-		$('#profile-nolocation-wrapper').hide();
-	}
-
-	function addeditortext(data) {
-		if(plaintext == 'none') {
-			var currentText = $("#profile-jot-text").val();
-			$("#profile-jot-text").val(currentText + data);
-		}
-		else
-			tinyMCE.execCommand('mceInsertRawHTML',false,data);
-	}	
-
-	$geotag
-
-	function charCounter() {
-		// character count part deux
-		//$(this).val().length is not a function Line 282(3)
-		$('#profile-jot-text').keyup(function() {
-			var textlen = 0;
-			var maxLen1 = 140;
-			var maxLen2 = 420;
-
-			$('#character-counter').removeClass('jothidden');
-
-			textLen = $(this).val().length;
-			if(textLen <= maxLen1) {
-				$('#character-counter').removeClass('red');
-				$('#character-counter').removeClass('orange');
-				$('#character-counter').addClass('grey');
-			}
-			if((textLen > maxLen1) && (textlen <= maxLen2)) {
-				$('#character-counter').removeClass('grey');
-				$('#character-counter').removeClass('red');
-				$('#character-counter').addClass('orange');
-			}
-			if(textLen > maxLen2) {
-				$('#character-counter').removeClass('grey');
-				$('#character-counter').removeClass('orange');
-				$('#character-counter').addClass('red');
-			}
-			$('#character-counter').text( textLen );
-		});
-		$('#profile-jot-text').keyup();
-	}
-</script>
diff --git a/view/theme/dispy/jot.tpl b/view/theme/dispy/jot.tpl
deleted file mode 100644
index 193872f182..0000000000
--- a/view/theme/dispy/jot.tpl
+++ /dev/null
@@ -1,79 +0,0 @@
-<form id="profile-jot-form" action="$action" method="post">
-	<div id="jot">
-		<div id="profile-jot-desc" class="jothidden">&#160;</div>
-
-		<input type="hidden" name="type" value="$ptyp" />
-		<input type="hidden" name="profile_uid" value="$profile_uid" />
-		<input type="hidden" name="return" value="$return_path" />
-		<input type="hidden" name="location" id="jot-location" value="$defloc" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="$post_id" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input type="hidden" name="post_id_random" value="$rand_num" />
-		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none" /></div>
-		<div id="character-counter" class="grey jothidden"></div>
-		{{ if $placeholdercategory }}
-		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
-		{{ endif }}
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body">{{ if $content }}$content{{ else }}$share{{ endif }}
-		</textarea>
-
-<div id="profile-jot-submit-wrapper" class="jothidden">
-<div id="jot-tools" class="jothidden" style="display:none">
-	<div id="profile-jot-submit-wrapper" class="jothidden">
-
-	<div id="profile-upload-wrapper" style="display: $visitor;">
-		<div id="wall-image-upload-div"><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div>
-	</div>
-	<div id="profile-attach-wrapper" style="display: $visitor;">
-		<div id="wall-file-upload-div"><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="$attach"></a></div>
-	</div>
-
-	<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);">
-		<a id="profile-link" class="icon link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink"></a>
-	</div>
-	<div id="profile-video-wrapper" style="display: $visitor;">
-		<a id="profile-video" class="icon video" onclick="jotVideoURL();return false;" title="$video"></a>
-	</div>
-	<div id="profile-audio-wrapper" style="display: $visitor;">
-		<a id="profile-audio" class="icon audio" onclick="jotAudioURL();return false;" title="$audio"></a>
-	</div>
-	<div id="profile-location-wrapper" style="display: $visitor;">
-		<a id="profile-location" class="icon globe" onclick="jotGetLocation();return false;" title="$setloc"></a>
-	</div>
-	<div id="profile-nolocation-wrapper" style="display: none;">
-		<a id="profile-nolocation" class="icon noglobe" onclick="jotClearLocation();return false;" title="$noloc"></a>
-	</div>
-
-	<div id="profile-jot-plugin-wrapper">
-  	$jotplugins
-	</div>
-
-	<a class="icon-text-preview pointer"></a><a id="jot-preview-link" class="pointer" onclick="preview_post(); return false;" title="$preview">$preview</a>
-	<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
-	<div id="profile-jot-perms" class="profile-jot-perms">
-		<a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon $lockstate $bang" title="$permset"></a>
-	</div>
-	<span id="profile-rotator" class="loading" style="display: none"><img src="images/rotator.gif" alt="$wait" title="$wait" /></span>
-	</div>
-
-	</div> <!-- /#profile-jot-submit-wrapper -->
-</div> <!-- /#jot-tools -->
-	
-	<div id="jot-preview-content" style="display:none;"></div>
-
-	<div style="display: none;">
-		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-			$acl
-			<hr style="clear:both" />
-			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-			<div id="profile-jot-email-end"></div>
-			$jotnets
-		</div>
-	</div>
-</div>
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
-		{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/dispy/lang_selector.tpl b/view/theme/dispy/lang_selector.tpl
deleted file mode 100644
index e777a0a861..0000000000
--- a/view/theme/dispy/lang_selector.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="lang-select-icon" class="icon s22 language" title="$title" onclick="openClose('language-selector');" ></div>
-<div id="language-selector" style="display: none;" >
-	<form action="#" method="post" >
-		<select name="system_language" onchange="this.form.submit();" >
-			{{ for $langs.0 as $v=>$l }}
-				<option value="$v" {{if $v==$langs.1}}selected="selected"{{endif}}>$l</option>
-			{{ endfor }}
-		</select>
-	</form>
-</div>
diff --git a/view/theme/dispy/mail_head.tpl b/view/theme/dispy/mail_head.tpl
deleted file mode 100644
index d49d7c1af9..0000000000
--- a/view/theme/dispy/mail_head.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<h3>$messages</h3>
-
-<div class="tabs-wrapper">
-$tab_content
-</div>
diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl
deleted file mode 100644
index d0307b60d0..0000000000
--- a/view/theme/dispy/nav.tpl
+++ /dev/null
@@ -1,145 +0,0 @@
-<nav id="pagenav">
-
-<div id="banner">$banner</div>
-<div id="site-location">$sitelocation</div>
-
-<a name="top" id="top"></a>
-<div id="nav-floater">
-    <ul id="nav-buttons">
-    {{ if $nav.login }}
-    <li><a id="nav-login-link" class="nav-login-link $nav.login.2"
-            href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a></li>
-    {{ endif }}
-    {{ if $nav.home }}
-    <li><a id="nav-home-link" class="nav-link $nav.home.2"
-            href="$nav.home.0" title="$nav.home.1">$nav.home.1</a></li>
-    {{ endif }}
-    {{ if $nav.network }}
-    <li><a id="nav-network-link" class="nav-link $nav.network.2"
-            href="$nav.network.0" title="$nav.network.1">$nav.network.1</a></li>
-    {{ endif }}
-    {{ if $nav.notifications }}
-    <li><a id="nav-notifications-linkmenu" class="nav-link $nav.notifications.2"
-            href="$nav.notifications.0"
-            rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a></li>
-        <ul id="nav-notifications-menu" class="menu-popup">
-            <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-            <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-            <li class="empty">$emptynotifications</li>
-        </ul>
-    {{ endif }}
-    {{ if $nav.messages }}
-    <li><a id="nav-messages-link" class="nav-link $nav.messages.2"
-            href="$nav.messages.0" title="$nav.messages.1">$nav.messages.1</a></li>
-    {{ endif }}
-    {{ if $nav.community }}
-    <li><a id="nav-community-link" class="nav-link $nav.community.2"
-            href="$nav.community.0" title="$nav.community.1">$nav.community.1</a></li>
-    {{ endif }}
-    <li><a id="nav-directory-link" class="nav-link $nav.directory.2"
-            href="$nav.directory.0" title="$nav.directory.1">$nav.directory.1</a></li>
-    <li><a id="nav-search-link" class="nav-link $nav.search.2"
-            href="$nav.search.0" title="$nav.search.1">$nav.search.1</a></li>
-    {{ if $nav.apps }}
-    <li><a id="nav-apps-link" class="nav-link $nav.apps.2"
-        href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a></li>
-    {{ endif }}
-    </ul>
-
-    <div id="user-menu">
-        <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false;" href="$nav.home.0"><span class="">User Menu</span></a>
-        <ul id="user-menu-popup"
-            onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')"
-            onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
-
-        {{ if $nav.register }}
-        <li>
-        <a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.1"></a>
-        </li>
-        {{ endif }}
-        {{ if $nav.contacts }}
-        <li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.1">$nav.contacts.1</a></li>
-        {{ endif }}
-        {{ if $nav.profiles }}
-        <li><a id="nav-profiles-link" class="nav-commlink $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.1">$nav.profiles.1</a></li>
-        {{ endif }}
-        {{ if $nav.settings }}
-        <li><a id="nav-settings-link" class="nav-commlink $nav.settings.2" href="$nav.settings.0" title="$nav.settings.1">$nav.settings.1</a></li>
-        {{ endif }}
-        {{ if $nav.login }}
-        <li><a id="nav-login-link" class="nav-commlink $nav.login.2" href="$nav.login.0" title="$nav.login.1">$nav.login.1</a></li>
-        {{ endif }}
-        {{ if $nav.logout }}
-        <li><a id="nav-logout-link" class="nav-commlink $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>
-        {{ endif }}
-        </ul>
-    </div>
-
-    <ul id="nav-buttons-2">
-    {{ if $nav.introductions }}
-    <li><a id="nav-intro-link" class="nav-link $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a></li>
-    {{ endif }}
-    {{ if $nav.admin }}
-    <li><a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.1">$nav.admin.1</a></li>
-    {{ endif }}
-    {{ if $nav.manage }}
-    <li><a id="nav-manage-link" class="nav-link $nav.manage.2" href="$nav.manage.0" title="$nav.manage.1">$nav.manage.1</a></li>
-    {{ endif }}
-    {{ if $nav.help }}
-    <li><a id="nav-help-link" class="nav-link $nav.help.2"
-            href="$nav.help.0" title="$nav.help.1">$nav.help.1</a></li>
-    {{ endif }}
-    </ul>
-
-{{ if $userinfo }}
-        <ul id="nav-user-menu" class="menu-popup">
-            {{ for $nav.usermenu as $usermenu }}
-                <li>
-                    <a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a>
-                </li>
-            {{ endfor }}
-        </ul>
-{{ endif }}
-
-    <div id="notifications">
-        {{ if $nav.home }}
-        <a id="home-update" class="nav-ajax-left" href="$nav.home.0" title="$nav.home.1"></a>
-        {{ endif }}
-        {{ if $nav.network }}
-        <a id="net-update" class="nav-ajax-left" href="$nav.network.0" title="$nav.network.1"></a>
-        {{ endif }}
-        {{ if $nav.notifications }}
-        <a id="notify-update" class="nav-ajax-left" href="$nav.notifications.0" title="$nav.notifications.1"></a>
-        {{ endif }}
-        {{ if $nav.messages }}
-        <a id="mail-update" class="nav-ajax-left" href="$nav.messages.0" title="$nav.messages.1"></a>
-        {{ endif }}
-        {{if $nav.introductions }}
-        <a id="intro-update" class="nav-ajax-left" href="$nav.introductions.0"></a>
-        {{ endif }}
-    </div>
-</div>
-    <a href="#" class="floaterflip"></a>
-</nav>
-
-<div id="lang-sel-wrap">
-$langselector
-</div>
-
-<div id="scrollup">
-<a href="#top"><img src="view/theme/dispy/icons/scroll_top.png"
-    alt="back to top" title="Back to top" /></a>
-</div>
-
-<div class="search-box">
-    <form method="get" action="$nav.search.0">
-        <input id="mini-search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" />
-    </form>
-</div>
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-    <li class="{4}">
-    <a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a>
-    </li>
-</ul>
-
diff --git a/view/theme/dispy/photo_edit.tpl b/view/theme/dispy/photo_edit.tpl
deleted file mode 100644
index ead8bc9207..0000000000
--- a/view/theme/dispy/photo_edit.tpl
+++ /dev/null
@@ -1,53 +0,0 @@
-
-<form action="photos/$nickname/$resource_id" method="post" id="photo_edit_form" >
-
-	<input type="hidden" name="item_id" value="$item_id" />
-
-	<label id="photo-edit-albumname-label" for="photo-edit-albumname">$newalbum</label>
-	<input id="photo-edit-albumname" type="text" name="albname" value="$album" />
-
-	<div id="photo-edit-albumname-end"></div>
-
-	<label id="photo-edit-caption-label" for="photo-edit-caption">$capt_label</label>
-	<input id="photo-edit-caption" type="text" name="desc" value="$caption" />
-
-	<div id="photo-edit-caption-end"></div>
-
-	<label id="photo-edit-tags-label" for="photo-edit-newtag" >$tag_label</label>
-	<input name="newtag" id="photo-edit-newtag" title="$help_tags" type="text" />
-
-	<div id="photo-edit-tags-end"></div>
-	<div id="photo-edit-rotate-wrapper">
-		<div id="photo-edit-rotate-label">$rotate</div>
-		<input type="checkbox" name="rotate" value="1" />
-	</div>
-	<div id="photo-edit-rotate-end"></div>
-
-	<div id="photo-edit-perms" class="photo-edit-perms" >
-		<a href="#photo-edit-perms-select"
-			id="photo-edit-perms-menu"
-			class="button"
-			title="$permissions"/><span id="jot-perms-icon"
-			class="icon $lockstate" ></span>$permissions</a>
-		<div id="photo-edit-perms-menu-end"></div>
-
-		<div style="display: none;">
-			<div id="photo-edit-perms-select" >
-				$aclselect
-			</div>
-		</div>
-	</div>
-	<div id="photo-edit-perms-end"></div>
-
-	<input id="photo-edit-submit-button" type="submit" name="submit" value="$submit" />
-	<input id="photo-edit-delete-button" type="submit" name="delete" value="$delete" onclick="return confirmDelete()"; />
-
-	<div id="photo-edit-end"></div>
-</form>
-
-<script type="text/javascript">
-	$("a#photo-edit-perms-menu").colorbox({
-		'inline' : true,
-		'transition' : 'none'
-	}); 
-</script>
diff --git a/view/theme/dispy/photo_view.tpl b/view/theme/dispy/photo_view.tpl
deleted file mode 100644
index a559583085..0000000000
--- a/view/theme/dispy/photo_view.tpl
+++ /dev/null
@@ -1,36 +0,0 @@
-<div id="live-display"></div>
-<h3><a href="$album.0">$album.1</a></h3>
-
-<div id="photo-edit-link-wrap">
-{{ if $tools }}
-<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
-|
-<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
-{{ endif }}
-{{ if $lock }} | <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo/$id');" /> {{ endif }}
-</div>
-
-{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
-<div id="photo-photo"><a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a></div>
-{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
-<div id="photo-photo-end"></div>
-<div id="photo-caption">$desc</div>
-{{ if $tags }}
-<div id="in-this-photo-text">$tags.0</div>
-<div id="in-this-photo">$tags.1</div>
-{{ endif }}
-{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
-
-{{ if $edit }}$edit{{ endif }}
-
-{{ if $likebuttons }}
-<div id="photo-like-div">
-	$likebuttons $like $dislike
-</div>
-{{ endif }}
-<div id="wall-photo-container">
-$comments
-</div>
-
-$paginate
-
diff --git a/view/theme/dispy/profile_vcard.tpl b/view/theme/dispy/profile_vcard.tpl
deleted file mode 100644
index b7c99edd9d..0000000000
--- a/view/theme/dispy/profile_vcard.tpl
+++ /dev/null
@@ -1,82 +0,0 @@
-<div class="vcard">
-
-	{{ if $profile.edit }}
-	<div class="action">
-	<span class="icon-profile-edit" rel="#profiles-menu"></span>
-	<a href="#" rel="#profiles-menu" class="ttright" id="profiles-menu-trigger" title="$profile.edit.3">$profile.edit.1</a>
-	<ul id="profiles-menu" class="menu-popup">
-		{{ for $profile.menu.entries as $e }}
-		<li>
-			<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
-		</li>
-		{{ endfor }}
-		<li><a href="profile_photo">$profile.menu.chg_photo</a></li>
-		<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
-	</ul>
-	</div>
-	{{ endif }}
-
-	<div class="fn label">$profile.name</div>
-
-	{{ if $pdesc }}
-    <div class="title">$profile.pdesc</div>
-    {{ endif }}
-	<div id="profile-photo-wrapper">
-		<img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" />
-    </div>
-
-	{{ if $location }}
-		<div class="location">
-        <span class="location-label">$location</span>
-		<div class="adr">
-			{{ if $profile.address }}
-            <div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal_code</span>
-			</span>
-			{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
-		</div>
-		</div>
-	{{ endif }}
-
-	{{ if $gender }}
-    <div class="mf">
-        <span class="gender-label">$gender</span>
-        <span class="x-gender">$profile.gender</span>
-    </div>
-    {{ endif }}
-	
-	{{ if $profile.pubkey }}
-    <div class="key" style="display:none;">$profile.pubkey</div>
-    {{ endif }}
-
-	{{ if $marital }}
-    <div class="marital">
-    <span class="marital-label">
-    <span class="heart">&hearts;</span>$marital</span>
-    <span class="marital-text">$profile.marital</span>
-    </div>
-    {{ endif }}
-
-	{{ if $homepage }}
-    <div class="homepage">
-    <span class="homepage-label">$homepage</span>
-    <span class="homepage-url"><a href="$profile.homepage"
-    target="external-link">$profile.homepage</a></span>
-    </div>{{ endif }}
-
-	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-		</ul>
-	</div>
-</div>
-
-$contact_block
-
diff --git a/view/theme/dispy/saved_searches_aside.tpl b/view/theme/dispy/saved_searches_aside.tpl
deleted file mode 100644
index fb822fe5db..0000000000
--- a/view/theme/dispy/saved_searches_aside.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="widget" id="saved-search-list">
-	<h3 id="search">$title</h3>
-	$searchbox
-	
-	<ul id="saved-search-ul">
-		{{ for $saved as $search }}
-		<li class="saved-search-li clear">
-			<a title="$search.delete" onclick="return confirmDelete();" onmouseout="imgdull(this);" onmouseover="imgbright(this);" id="drop-saved-search-term-$search.id" class="icon savedsearchdrop drophide" href="network/?f=&amp;remove=1&amp;search=$search.encodedterm"></a>
-			<a id="saved-search-term-$search.id" class="savedsearchterm" href="network/?f=&amp;search=$search.encodedterm">$search.term</a>
-		</li>
-		{{ endfor }}
-	</ul>
-	<div class="clear"></div>
-</div>
diff --git a/view/theme/dispy/search_item.tpl b/view/theme/dispy/search_item.tpl
deleted file mode 100644
index 5fc8febe9f..0000000000
--- a/view/theme/dispy/search_item.tpl
+++ /dev/null
@@ -1,64 +0,0 @@
-<div class="wall-item-outside-wrapper $item.indent $item.shiny$item.previewing" id="wall-item-outside-wrapper-$item.id" >
-	<div class="wall-item-content-wrapper $item.indent $item.shiny" id="wall-item-content-wrapper-$item.id" >
-		<div class="wall-item-info" id="wall-item-info-$item.id">
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
-				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-					<ul>
-						$item.item_photo_menu
-					</ul>
-				</div>
-			</div>
-			<div class="wall-item-photo-end"></div>	
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
-			</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
-				
-		</div>			
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
-			{{ 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 class="wall-item-tools" id="wall-item-tools-$item.id">
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-			</div>
-				{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
-			<div class="wall-item-delete-end"></div>
-		</div>
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-
-
-	<div class="wall-item-conv" id="wall-item-conv-$item.id" >
-	{{ if $item.conv }}
-			<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
-	{{ endif }}
-	</div>
-
-<div class="wall-item-outside-wrapper-end $item.indent $item.shiny" ></div>
-
-</div>
-
-
diff --git a/view/theme/dispy/smarty3/bottom.tpl b/view/theme/dispy/templates/bottom.tpl
similarity index 100%
rename from view/theme/dispy/smarty3/bottom.tpl
rename to view/theme/dispy/templates/bottom.tpl
diff --git a/view/theme/dispy/smarty3/comment_item.tpl b/view/theme/dispy/templates/comment_item.tpl
similarity index 100%
rename from view/theme/dispy/smarty3/comment_item.tpl
rename to view/theme/dispy/templates/comment_item.tpl
diff --git a/view/theme/dispy/smarty3/communityhome.tpl b/view/theme/dispy/templates/communityhome.tpl
similarity index 100%
rename from view/theme/dispy/smarty3/communityhome.tpl
rename to view/theme/dispy/templates/communityhome.tpl
diff --git a/view/theme/dispy/smarty3/contact_template.tpl b/view/theme/dispy/templates/contact_template.tpl
similarity index 100%
rename from view/theme/dispy/smarty3/contact_template.tpl
rename to view/theme/dispy/templates/contact_template.tpl
diff --git a/view/theme/dispy/smarty3/conversation.tpl b/view/theme/dispy/templates/conversation.tpl
similarity index 100%
rename from view/theme/dispy/smarty3/conversation.tpl
rename to view/theme/dispy/templates/conversation.tpl
diff --git a/view/theme/dispy/smarty3/group_side.tpl b/view/theme/dispy/templates/group_side.tpl
similarity index 100%
rename from view/theme/dispy/smarty3/group_side.tpl
rename to view/theme/dispy/templates/group_side.tpl
diff --git a/view/theme/dispy/smarty3/header.tpl b/view/theme/dispy/templates/header.tpl
similarity index 100%
rename from view/theme/dispy/smarty3/header.tpl
rename to view/theme/dispy/templates/header.tpl
diff --git a/view/theme/dispy/smarty3/jot-header.tpl b/view/theme/dispy/templates/jot-header.tpl
similarity index 100%
rename from view/theme/dispy/smarty3/jot-header.tpl
rename to view/theme/dispy/templates/jot-header.tpl
diff --git a/view/theme/dispy/smarty3/jot.tpl b/view/theme/dispy/templates/jot.tpl
similarity index 100%
rename from view/theme/dispy/smarty3/jot.tpl
rename to view/theme/dispy/templates/jot.tpl
diff --git a/view/theme/dispy/smarty3/lang_selector.tpl b/view/theme/dispy/templates/lang_selector.tpl
similarity index 100%
rename from view/theme/dispy/smarty3/lang_selector.tpl
rename to view/theme/dispy/templates/lang_selector.tpl
diff --git a/view/theme/dispy/smarty3/mail_head.tpl b/view/theme/dispy/templates/mail_head.tpl
similarity index 100%
rename from view/theme/dispy/smarty3/mail_head.tpl
rename to view/theme/dispy/templates/mail_head.tpl
diff --git a/view/theme/dispy/smarty3/nav.tpl b/view/theme/dispy/templates/nav.tpl
similarity index 100%
rename from view/theme/dispy/smarty3/nav.tpl
rename to view/theme/dispy/templates/nav.tpl
diff --git a/view/theme/dispy/smarty3/photo_edit.tpl b/view/theme/dispy/templates/photo_edit.tpl
similarity index 100%
rename from view/theme/dispy/smarty3/photo_edit.tpl
rename to view/theme/dispy/templates/photo_edit.tpl
diff --git a/view/theme/dispy/smarty3/photo_view.tpl b/view/theme/dispy/templates/photo_view.tpl
similarity index 100%
rename from view/theme/dispy/smarty3/photo_view.tpl
rename to view/theme/dispy/templates/photo_view.tpl
diff --git a/view/theme/dispy/smarty3/profile_vcard.tpl b/view/theme/dispy/templates/profile_vcard.tpl
similarity index 100%
rename from view/theme/dispy/smarty3/profile_vcard.tpl
rename to view/theme/dispy/templates/profile_vcard.tpl
diff --git a/view/theme/dispy/smarty3/saved_searches_aside.tpl b/view/theme/dispy/templates/saved_searches_aside.tpl
similarity index 100%
rename from view/theme/dispy/smarty3/saved_searches_aside.tpl
rename to view/theme/dispy/templates/saved_searches_aside.tpl
diff --git a/view/theme/dispy/smarty3/search_item.tpl b/view/theme/dispy/templates/search_item.tpl
similarity index 100%
rename from view/theme/dispy/smarty3/search_item.tpl
rename to view/theme/dispy/templates/search_item.tpl
diff --git a/view/theme/dispy/smarty3/theme_settings.tpl b/view/theme/dispy/templates/theme_settings.tpl
similarity index 100%
rename from view/theme/dispy/smarty3/theme_settings.tpl
rename to view/theme/dispy/templates/theme_settings.tpl
diff --git a/view/theme/dispy/smarty3/threaded_conversation.tpl b/view/theme/dispy/templates/threaded_conversation.tpl
similarity index 100%
rename from view/theme/dispy/smarty3/threaded_conversation.tpl
rename to view/theme/dispy/templates/threaded_conversation.tpl
diff --git a/view/theme/dispy/smarty3/wall_thread.tpl b/view/theme/dispy/templates/wall_thread.tpl
similarity index 100%
rename from view/theme/dispy/smarty3/wall_thread.tpl
rename to view/theme/dispy/templates/wall_thread.tpl
diff --git a/view/theme/dispy/theme_settings.tpl b/view/theme/dispy/theme_settings.tpl
deleted file mode 100644
index 9d250cb3aa..0000000000
--- a/view/theme/dispy/theme_settings.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{inc field_select.tpl with $field=$colour}}{{endinc}}
-
-{{inc field_select.tpl with $field=$font_size}}{{endinc}}
-
-{{inc field_select.tpl with $field=$line_height}}{{endinc}}
-
-<div class="settings-submit-wrapper">
-	<input type="submit" value="$submit" class="settings-submit" name="dispy-settings-submit" />
-</div>
-
diff --git a/view/theme/dispy/threaded_conversation.tpl b/view/theme/dispy/threaded_conversation.tpl
deleted file mode 100644
index 3deb7b9477..0000000000
--- a/view/theme/dispy/threaded_conversation.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-$live_update
-
-{{ for $threads as $thread }}
-{{ inc $thread.template with $item=$thread }}{{ endinc }}
-{{ endfor }}
-
-<div id="conversation-end"></div>
-
-{{ if $dropping }}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems(); return false;">
-  <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
-  <div id="item-delete-selected-desc" >$dropping</div>
-</div>
-<div id="item-delete-selected-end"></div>
-{{ endif }}
diff --git a/view/theme/dispy/wall_thread.tpl b/view/theme/dispy/wall_thread.tpl
deleted file mode 100644
index ae70b8c82b..0000000000
--- a/view/theme/dispy/wall_thread.tpl
+++ /dev/null
@@ -1,139 +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.shiny$item.previewing{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-outside-wrapper-$item.id" >
-	<div class="wall-item-content-wrapper $item.indent $item.shiny" id="wall-item-content-wrapper-$item.id" >
-		<div class="wall-item-info{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-info-$item.id">
-			{{ if $item.owner_url }}
-			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
-				<img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></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" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-                    <ul>
-                        $item.item_photo_menu
-                    </ul>
-                </div>
-
-			</div>
-			<div class="wall-item-photo-end"></div>
-			<div class="wall-item-location" id="wall-item-location-$item.id">
-				{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}
-			</div>
-			<div 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>
-			<div class="wall-item-ago" id="wall-item-ago-$item.id">
-				$item.ago
-			</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			<div class="wall-item-lock-wrapper">
-				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}
-			</div>
-			<ul class="wall-item-subtools1">
-				{{ if $item.star }}
-				<li>
-					<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
-				</li>
-				{{ endif }}
-				{{ if $item.tagger }}
-				<li>
-					<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.tagger.add"></a>
-				</li>
-				{{ endif }}
-				{{ if $item.vote }}
-				<li class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
-					<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
-					{{ if $item.vote.dislike }}
-					<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="#" id="share-$item.id"
-class="icon recycle wall-item-share-buttons"  title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
-					<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-				</li>
-				{{ endif }}
-			</ul><br style="clear:left;" />
-			<ul class="wall-item-subtools2">
-			{{ if $item.filer }}
-				<li class="wall-item-filer-wrapper"><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></li>
-			{{ endif }}
-			{{ if $item.plink }}
-				<li class="wall-item-links-wrapper$item.sparkle"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></li>
-			{{ endif }}
-			{{ if $item.edpost }}
-				<li><a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a></li>
-			{{ endif }}
-
-			<li class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-				{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
-			</li>
-			</ul>
-			<div class="wall-item-delete-end"></div>
-		</div>
-		<div class="wall-item-content" id="wall-item-content-$item.id">
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$item.id">
-				$item.body
-				<div class="body-tag">
-					{{ for $item.tags as $tag }}
-						<span class="tag">$tag</span>
-					{{ endfor }}
-				</div>			
-			{{ 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>	
-	<div class="wall-item-wrapper-end"></div>
-	<div class="wall-item-like $item.indent $item.shiny" id="wall-item-like-$item.id">$item.like</div>
-	<div class="wall-item-dislike $item.indent $item.shiny" id="wall-item-dislike-$item.id">$item.dislike</div>
-	<div class="wall-item-comment-separator"></div>
-
-	{{ if $item.threaded }}
-	{{ if $item.comment }}
-	<div class="wall-item-comment-wrapper $item.indent $item.shiny" >
-		$item.comment
-	</div>
-	{{ endif }}
-	{{ endif }}
-
-	{{ if $item.flatten }}
-	<div class="wall-item-comment-wrapper" >
-		$item.comment
-	</div>
-	{{ endif }}
-
-<div class="wall-item-outside-wrapper-end $item.indent $item.shiny" ></div>
-</div>
-{{ for $item.children as $child }}
-	{{ inc $child.template with $item=$child }}{{ endinc }}
-{{ endfor }}
-
-</div>
-{{if $item.comment_lastcollapsed}}</div>{{endif}}
diff --git a/view/theme/duepuntozero/comment_item.tpl b/view/theme/duepuntozero/comment_item.tpl
deleted file mode 100755
index 24164a0367..0000000000
--- a/view/theme/duepuntozero/comment_item.tpl
+++ /dev/null
@@ -1,66 +0,0 @@
-		{{ if $threaded }}
-		<div class="comment-wwedit-wrapper threaded" id="comment-edit-wrapper-$id" style="display: block;">
-		{{ else }}
-		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
-		{{ endif }}
-			<form class="comment-edit-form" style="display: block;" 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" />
-				<input type="hidden" name="post_id_random" value="$rand_num" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-					<a class="comment-edit-photo-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>
-				<ul class="comment-edit-bb-$id">
-					<li><a class="editicon boldbb shadow"
-						style="cursor: pointer;" title="$edbold"
-						onclick="insertFormatting('$comment','b', $id);"></a></li>
-					<li><a class="editicon italicbb shadow"
-						style="cursor: pointer;" title="$editalic"
-						onclick="insertFormatting('$comment','i', $id);"></a></li>
-					<li><a class="editicon underlinebb shadow"
-						style="cursor: pointer;" title="$eduline"
-						onclick="insertFormatting('$comment','u', $id);"></a></li>
-					<li><a class="editicon quotebb shadow"
-						style="cursor: pointer;" title="$edquote"
-						onclick="insertFormatting('$comment','quote', $id);"></a></li>
-					<li><a class="editicon codebb shadow"
-						style="cursor: pointer;" title="$edcode"
-						onclick="insertFormatting('$comment','code', $id);"></a></li>
-					<li><a class="editicon imagebb shadow"
-						style="cursor: pointer;" title="$edimg"
-						onclick="insertFormatting('$comment','img', $id);"></a></li>
-					<li><a class="editicon urlbb shadow"
-						style="cursor: pointer;" title="$edurl"
-						onclick="insertFormatting('$comment','url', $id);"></a></li>
-					<li><a class="editicon videobb shadow"
-						style="cursor: pointer;" title="$edvideo"
-						onclick="insertFormatting('$comment','video', $id);"></a></li>
-				</ul>	
-				<div class="comment-edit-bb-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen(this, $id);" onBlur="commentClose(this,$id);cmtBbClose(this,$id);" >$comment</textarea>			
-				{{ if $qcomment }}
-					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
-					<option value=""></option>
-				{{ for $qcomment as $qc }}
-					<option value="$qc">$qc</option>				
-				{{ endfor }}
-					</select>
-				{{ endif }}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/duepuntozero/lang_selector.tpl b/view/theme/duepuntozero/lang_selector.tpl
deleted file mode 100644
index e777a0a861..0000000000
--- a/view/theme/duepuntozero/lang_selector.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="lang-select-icon" class="icon s22 language" title="$title" onclick="openClose('language-selector');" ></div>
-<div id="language-selector" style="display: none;" >
-	<form action="#" method="post" >
-		<select name="system_language" onchange="this.form.submit();" >
-			{{ for $langs.0 as $v=>$l }}
-				<option value="$v" {{if $v==$langs.1}}selected="selected"{{endif}}>$l</option>
-			{{ endfor }}
-		</select>
-	</form>
-</div>
diff --git a/view/theme/duepuntozero/moderated_comment.tpl b/view/theme/duepuntozero/moderated_comment.tpl
deleted file mode 100755
index b0451c8c60..0000000000
--- a/view/theme/duepuntozero/moderated_comment.tpl
+++ /dev/null
@@ -1,61 +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>
-				<ul class="comment-edit-bb-$id">
-					<li><a class="editicon boldbb shadow"
-						style="cursor: pointer;" title="$edbold"
-						onclick="insertFormatting('$comment','b', $id);"></a></li>
-					<li><a class="editicon italicbb shadow"
-						style="cursor: pointer;" title="$editalic"
-						onclick="insertFormatting('$comment','i', $id);"></a></li>
-					<li><a class="editicon underlinebb shadow"
-						style="cursor: pointer;" title="$eduline"
-						onclick="insertFormatting('$comment','u', $id);"></a></li>
-					<li><a class="editicon quotebb shadow"
-						style="cursor: pointer;" title="$edquote"
-						onclick="insertFormatting('$comment','quote', $id);"></a></li>
-					<li><a class="editicon codebb shadow"
-						style="cursor: pointer;" title="$edcode"
-						onclick="insertFormatting('$comment','code', $id);"></a></li>
-					<li><a class="editicon imagebb shadow"
-						style="cursor: pointer;" title="$edimg"
-						onclick="insertFormatting('$comment','img', $id);"></a></li>
-					<li><a class="editicon urlbb shadow"
-						style="cursor: pointer;" title="$edurl"
-						onclick="insertFormatting('$comment','url', $id);"></a></li>
-					<li><a class="editicon videobb shadow"
-						style="cursor: pointer;" title="$edvideo"
-						onclick="insertFormatting('$comment','video', $id);"></a></li>
-				</ul>	
-				<div class="comment-edit-bb-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);" >$comment</textarea>			
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/duepuntozero/nav.tpl b/view/theme/duepuntozero/nav.tpl
deleted file mode 100644
index edffcebf49..0000000000
--- a/view/theme/duepuntozero/nav.tpl
+++ /dev/null
@@ -1,70 +0,0 @@
-<nav>
-	$langselector
-
-	<div id="site-location">$sitelocation</div>
-
-	{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
-	{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-
-	<span id="nav-link-wrapper" >
-
-	{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-		
-	{{ if $nav.help }} <a id="nav-help-link" class="nav-link $nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>{{ endif }}
-		
-	{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
-	<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
-	<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
-	{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
-	{{ if $nav.network }}
-	<a id="nav-network-link" class="nav-commlink $nav.network.2 $sel.network" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
-	<span id="net-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	{{ if $nav.home }}
-	<a id="nav-home-link" class="nav-commlink $nav.home.2 $sel.home" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
-	<span id="home-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	{{ if $nav.community }}
-	<a id="nav-community-link" class="nav-commlink $nav.community.2 $sel.community" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
-	{{ endif }}
-	{{ if $nav.introductions }}
-	<a id="nav-notify-link" class="nav-commlink $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a>
-	<span id="intro-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	{{ if $nav.messages }}
-	<a id="nav-messages-link" class="nav-commlink $nav.messages.2 $sel.messages" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
-	<span id="mail-update" class="nav-ajax-left"></span>
-	{{ endif }}
-
-
-
-
-
-		{{ if $nav.notifications }}
-			<a id="nav-notifications-linkmenu" class="nav-commlink" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>
-				<span id="notify-update" class="nav-ajax-left"></span>
-				<ul id="nav-notifications-menu" class="menu-popup">
-					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-					<li class="empty">$emptynotifications</li>
-				</ul>
-		{{ endif }}		
-
-	{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
-	{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
-	{{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
-
-
-	{{ if $nav.manage }}<a id="nav-manage-link" class="nav-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-	</span>
-	<span id="nav-end"></span>
-	<span id="banner">$banner</span>
-</nav>
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
-</ul>
diff --git a/view/theme/duepuntozero/profile_vcard.tpl b/view/theme/duepuntozero/profile_vcard.tpl
deleted file mode 100644
index e91e6125ff..0000000000
--- a/view/theme/duepuntozero/profile_vcard.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-<div class="vcard">
-
-	<div class="fn label">$profile.name</div>
-	
-				
-	
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name"></div>
-
-
-
-	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt> 
-		<dd class="adr">
-			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal_code</span>
-			</span>
-			{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
-		</dd>
-		</dl>
-	{{ endif }}
-
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
-
-	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-
-	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-
-	<div id="profile-vcard-break"></div>	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-			{{ if $wallmessage }}
-				<li><a id="wallmessage-link" href="wallmessage/$profile.nickname">$wallmessage</a></li>
-			{{ endif }}
-		</ul>
-	</div>
-</div>
-
-$contact_block
-
-
diff --git a/view/theme/duepuntozero/prv_message.tpl b/view/theme/duepuntozero/prv_message.tpl
deleted file mode 100644
index 3f0bd937f4..0000000000
--- a/view/theme/duepuntozero/prv_message.tpl
+++ /dev/null
@@ -1,39 +0,0 @@
-
-<h3>$header</h3>
-
-<div id="prvmail-wrapper" >
-<form id="prvmail-form" action="message" method="post" >
-
-$parent
-
-<div id="prvmail-to-label">$to</div>
-
-{{ if $showinputs }}
-<input type="text" id="recip" name="messagerecip" value="$prefill" maxlength="255" size="64" tabindex="10" />
-<input type="hidden" id="recip-complete" name="messageto" value="$preid">
-{{ else }}
-$select
-{{ endif }}
-
-<div id="prvmail-subject-label">$subject</div>
-<input type="text" size="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-upload-wrapper" >
-		<div id="prvmail-upload" class="icon border camera" title="$upload" ></div>
-	</div> 
-	<div id="prvmail-link-wrapper" >
-		<div id="prvmail-link" class="icon border link" title="$insert" onclick="jotGetLink();" ></div>
-	</div> 
-	<div id="prvmail-rotator-wrapper" >
-		<img id="prvmail-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-</div>
-<div id="prvmail-end"></div>
-</form>
-</div>
diff --git a/view/theme/duepuntozero/smarty3/comment_item.tpl b/view/theme/duepuntozero/templates/comment_item.tpl
similarity index 100%
rename from view/theme/duepuntozero/smarty3/comment_item.tpl
rename to view/theme/duepuntozero/templates/comment_item.tpl
diff --git a/view/theme/duepuntozero/smarty3/lang_selector.tpl b/view/theme/duepuntozero/templates/lang_selector.tpl
similarity index 100%
rename from view/theme/duepuntozero/smarty3/lang_selector.tpl
rename to view/theme/duepuntozero/templates/lang_selector.tpl
diff --git a/view/theme/duepuntozero/smarty3/moderated_comment.tpl b/view/theme/duepuntozero/templates/moderated_comment.tpl
similarity index 100%
rename from view/theme/duepuntozero/smarty3/moderated_comment.tpl
rename to view/theme/duepuntozero/templates/moderated_comment.tpl
diff --git a/view/theme/duepuntozero/smarty3/nav.tpl b/view/theme/duepuntozero/templates/nav.tpl
similarity index 100%
rename from view/theme/duepuntozero/smarty3/nav.tpl
rename to view/theme/duepuntozero/templates/nav.tpl
diff --git a/view/theme/duepuntozero/smarty3/profile_vcard.tpl b/view/theme/duepuntozero/templates/profile_vcard.tpl
similarity index 100%
rename from view/theme/duepuntozero/smarty3/profile_vcard.tpl
rename to view/theme/duepuntozero/templates/profile_vcard.tpl
diff --git a/view/theme/duepuntozero/smarty3/prv_message.tpl b/view/theme/duepuntozero/templates/prv_message.tpl
similarity index 100%
rename from view/theme/duepuntozero/smarty3/prv_message.tpl
rename to view/theme/duepuntozero/templates/prv_message.tpl
diff --git a/view/theme/facepark/comment_item.tpl b/view/theme/facepark/comment_item.tpl
deleted file mode 100644
index bb1d4fa79e..0000000000
--- a/view/theme/facepark/comment_item.tpl
+++ /dev/null
@@ -1,33 +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" />
-				<input type="hidden" name="post_id_random" value="$rand_num" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
-				{{ if $qcomment }}
-				{{ for $qcomment as $qc }}				
-					<span class="fakelink qcomment" onclick="commentInsert(this,$id); return false;" >$qc</span>
-					&nbsp;
-				{{ endfor }}
-				{{ endif }}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/facepark/group_side.tpl b/view/theme/facepark/group_side.tpl
deleted file mode 100644
index 0353b1d2cc..0000000000
--- a/view/theme/facepark/group_side.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-<div class="widget" id="group-sidebar">
-<h3>$title</h3>
-
-<div id="sidebar-group-list">
-	<ul id="sidebar-group-ul">
-		{{ for $groups as $group }}
-			<li class="sidebar-group-li">
-				{{ if $group.cid }}
-					<input type="checkbox" 
-						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
-						onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
-						{{ if $group.ismember }}checked="checked"{{ endif }}
-					/>
-				{{ endif }}			
-				{{ if $group.edit }}
-					<a class="groupsideedit" href="$group.edit.href" title="$edittext"><span id="edit-sidebar-group-element-$group.id" class="group-edit-icon iconspacer small-pencil"></span></a>
-				{{ endif }}
-				<a id="sidebar-group-element-$group.id" class="sidebar-group-element {{ if $group.selected }}group-selected{{ endif }}" href="$group.href">$group.text</a>
-			</li>
-		{{ endfor }}
-	</ul>
-	</div>
-  <div id="sidebar-new-group">
-  <a href="group/new">$createtext</a>
-  </div>
-</div>
-
-
diff --git a/view/theme/facepark/jot.tpl b/view/theme/facepark/jot.tpl
deleted file mode 100644
index 6b24045ef3..0000000000
--- a/view/theme/facepark/jot.tpl
+++ /dev/null
@@ -1,85 +0,0 @@
-
-<div id="profile-jot-wrapper" >
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey"></div>
-	</div>
-	<div id="profile-jot-banner-end"></div>
-
-	<form id="profile-jot-form" action="$action" method="post" >
-		<input type="hidden" name="type" value="$ptyp" />
-		<input type="hidden" name="profile_uid" value="$profile_uid" />
-		<input type="hidden" name="return" value="$return_path" />
-		<input type="hidden" name="location" id="jot-location" value="$defloc" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="$post_id" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input type="hidden" name="post_id_random" value="$rand_num" />
-		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div>
-		<div id="jot-text-wrap">
-		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
-		</div>
-
-<div id="profile-jot-submit-wrapper" class="jothidden">
-	<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
-
-	<div id="profile-upload-wrapper" style="display: $visitor;" >
-		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div>
-	</div> 
-	<div id="profile-attach-wrapper" style="display: $visitor;" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="$attach"></a></div>
-	</div> 
-
-	<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a id="profile-link" class="icon link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" style="display: $visitor;" >
-		<a id="profile-video" class="icon video" title="$video" onclick="jotVideoURL();return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" style="display: $visitor;" >
-		<a id="profile-audio" class="icon audio" title="$audio" onclick="jotAudioURL();return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" style="display: $visitor;" >
-		<a id="profile-location" class="icon globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" style="display: none;" >
-		<a id="profile-nolocation" class="icon noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
-	</div> 
-
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
-		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
-	</div>
-
-	<span onclick="preview_post();" id="jot-preview-link" class="fakelink">$preview</span>
-
-	<div id="profile-jot-perms-end"></div>
-
-
-	<div id="profile-jot-plugin-wrapper">
-  	$jotplugins
-	</div>
-
-	<div id="profile-rotator-wrapper" style="display: $visitor;" >
-		<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-	
-	<div id="jot-preview-content" style="display:none;"></div>
-
-	<div style="display: none;">
-		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-			$acl
-			<hr style="clear:both"/>
-			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-			<div id="profile-jot-email-end"></div>
-			$jotnets
-		</div>
-	</div>
-
-
-</div>
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
-		{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/facepark/nav.tpl b/view/theme/facepark/nav.tpl
deleted file mode 100644
index 04c4931fc6..0000000000
--- a/view/theme/facepark/nav.tpl
+++ /dev/null
@@ -1,68 +0,0 @@
-<nav>
-	$langselector
-
-	<div id="site-location">$sitelocation</div>
-
-	{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
-	{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-
-	<span id="nav-link-wrapper" >
-
-	{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-		
-	{{ if $nav.help }} <a id="nav-help-link" class="nav-link $nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>{{ endif }}
-		
-	{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
-	<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
-	<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
-	{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
-	{{ if $nav.network }}
-	<a id="nav-network-link" class="nav-commlink $nav.network.2 $sel.network" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
-	<span id="net-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	{{ if $nav.home }}
-	<a id="nav-home-link" class="nav-commlink $nav.home.2 $sel.home" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
-	<span id="home-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	{{ if $nav.community }}
-	<a id="nav-community-link" class="nav-commlink $nav.community.2 $sel.community" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
-	{{ endif }}
-	{{ if $nav.introductions }}
-	<a id="nav-notify-link" class="nav-commlink $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a>
-	<span id="intro-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	{{ if $nav.messages }}
-	<a id="nav-messages-link" class="nav-commlink $nav.messages.2 $sel.messages" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
-	<span id="mail-update" class="nav-ajax-left"></span>
-	{{ endif }}
-
-
-
-	{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-
-
-		{{ if $nav.notifications }}
-			<a id="nav-notifications-linkmenu" class="nav-commlink" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>
-				<span id="notify-update" class="nav-ajax-left"></span>
-				<ul id="nav-notifications-menu" class="menu-popup">
-					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-					<li class="empty">$emptynotifications</li>
-				</ul>
-		{{ endif }}		
-
-	{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
-	{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
-	{{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
-	</span>
-	<span id="nav-end"></span>
-	<span id="banner">$banner</span>
-</nav>
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
-</ul>
diff --git a/view/theme/facepark/profile_vcard.tpl b/view/theme/facepark/profile_vcard.tpl
deleted file mode 100644
index 07d2df5df3..0000000000
--- a/view/theme/facepark/profile_vcard.tpl
+++ /dev/null
@@ -1,47 +0,0 @@
-<div class="vcard">
-
-	<div class="fn label">$profile.name</div>
-	
-				
-	
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name"></div>
-
-
-
-	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt> 
-		<dd class="adr">
-			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal_code</span>
-			</span>
-			{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
-		</dd>
-		</dl>
-	{{ endif }}
-
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
-
-	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-
-	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-		</ul>
-	</div>
-</div>
-
-$contact_block
-
-
diff --git a/view/theme/facepark/search_item.tpl b/view/theme/facepark/search_item.tpl
deleted file mode 100644
index 737f1649e1..0000000000
--- a/view/theme/facepark/search_item.tpl
+++ /dev/null
@@ -1,54 +0,0 @@
-<div class="wall-item-outside-wrapper $item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
-	<div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
-		<div class="wall-item-info" id="wall-item-info-$item.id">
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
-				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-					<ul>
-						$item.item_photo_menu
-					</ul>
-				</div>
-			</div>
-			<div class="wall-item-photo-end"></div>	
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
-			</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
-				
-		</div>			
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-			</div>
-				{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
-			<div class="wall-item-delete-end"></div>
-		</div>
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-
-
-	<div class="wall-item-conv" id="wall-item-conv-$item.id" >
-	{{ if $item.conv }}
-			<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
-	{{ endif }}
-	</div>
-
-<div class="wall-item-outside-wrapper-end $item.indent" ></div>
-
-</div>
-
-
diff --git a/view/theme/facepark/smarty3/comment_item.tpl b/view/theme/facepark/templates/comment_item.tpl
similarity index 100%
rename from view/theme/facepark/smarty3/comment_item.tpl
rename to view/theme/facepark/templates/comment_item.tpl
diff --git a/view/theme/facepark/smarty3/group_side.tpl b/view/theme/facepark/templates/group_side.tpl
similarity index 100%
rename from view/theme/facepark/smarty3/group_side.tpl
rename to view/theme/facepark/templates/group_side.tpl
diff --git a/view/theme/facepark/smarty3/jot.tpl b/view/theme/facepark/templates/jot.tpl
similarity index 100%
rename from view/theme/facepark/smarty3/jot.tpl
rename to view/theme/facepark/templates/jot.tpl
diff --git a/view/theme/facepark/smarty3/nav.tpl b/view/theme/facepark/templates/nav.tpl
similarity index 100%
rename from view/theme/facepark/smarty3/nav.tpl
rename to view/theme/facepark/templates/nav.tpl
diff --git a/view/theme/facepark/smarty3/profile_vcard.tpl b/view/theme/facepark/templates/profile_vcard.tpl
similarity index 100%
rename from view/theme/facepark/smarty3/profile_vcard.tpl
rename to view/theme/facepark/templates/profile_vcard.tpl
diff --git a/view/theme/facepark/smarty3/search_item.tpl b/view/theme/facepark/templates/search_item.tpl
similarity index 100%
rename from view/theme/facepark/smarty3/search_item.tpl
rename to view/theme/facepark/templates/search_item.tpl
diff --git a/view/theme/frost-mobile/acl_selector.tpl b/view/theme/frost-mobile/acl_selector.tpl
deleted file mode 100644
index df34a1a2ae..0000000000
--- a/view/theme/frost-mobile/acl_selector.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-<div id="acl-wrapper">
-	<input id="acl-search">
-	<a href="#" id="acl-showall">$showall</a>
-	<div id="acl-list">
-		<div id="acl-list-content">
-		</div>
-	</div>
-	<span id="acl-fields"></span>
-</div>
-
-<div class="acl-list-item" rel="acl-template" style="display:none">
-	<img data-src="{0}"><p>{1}</p>
-	<a href="#" class='acl-button-show'>$show</a>
-	<a href="#" class='acl-button-hide'>$hide</a>
-</div>
-
-<script>
-	window.allowCID = $allowcid;
-	window.allowGID = $allowgid;
-	window.denyCID = $denycid;
-	window.denyGID = $denygid;
-	window.aclInit = "true";
-</script>
diff --git a/view/theme/frost-mobile/admin_aside.tpl b/view/theme/frost-mobile/admin_aside.tpl
deleted file mode 100644
index da3ed23a88..0000000000
--- a/view/theme/frost-mobile/admin_aside.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-
-<h4><a href="$admurl">$admtxt</a></h4>
-<ul class='admin linklist'>
-	<li class='admin button $admin.site.2'><a href='$admin.site.0'>$admin.site.1</a></li>
-	<li class='admin button $admin.users.2'><a href='$admin.users.0'>$admin.users.1</a><span id='pending-update' title='$h_pending'></span></li>
-	<li class='admin button $admin.plugins.2'><a href='$admin.plugins.0'>$admin.plugins.1</a></li>
-	<li class='admin button $admin.themes.2'><a href='$admin.themes.0'>$admin.themes.1</a></li>
-	<li class='admin button $admin.dbsync.2'><a href='$admin.dbsync.0'>$admin.dbsync.1</a></li>
-</ul>
-
-{{ if $admin.update }}
-<ul class='admin linklist'>
-	<li class='admin button $admin.update.2'><a href='$admin.update.0'>$admin.update.1</a></li>
-	<li class='admin button $admin.update.2'><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li>
-</ul>
-{{ endif }}
-
-
-{{ if $admin.plugins_admin }}<h4>$plugadmtxt</h4>{{ endif }}
-<ul class='admin linklist'>
-	{{ for $admin.plugins_admin as $l }}
-	<li class='admin button $l.2'><a href='$l.0'>$l.1</a></li>
-	{{ endfor }}
-</ul>
-	
-	
-<h4>$logtxt</h4>
-<ul class='admin linklist'>
-	<li class='admin button $admin.logs.2'><a href='$admin.logs.0'>$admin.logs.1</a></li>
-</ul>
-
diff --git a/view/theme/frost-mobile/admin_site.tpl b/view/theme/frost-mobile/admin_site.tpl
deleted file mode 100644
index 61f52b18dc..0000000000
--- a/view/theme/frost-mobile/admin_site.tpl
+++ /dev/null
@@ -1,67 +0,0 @@
-
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-	<form action="$baseurl/admin/site" method="post">
-    <input type='hidden' name='form_security_token' value='$form_security_token'>
-
-	{{ inc field_input.tpl with $field=$sitename }}{{ endinc }}
-	{{ inc field_textarea.tpl with $field=$banner }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$language }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$theme }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$theme_mobile }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$new_share }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$hide_help }}{{ endinc }} 
-	{{ inc field_select.tpl with $field=$singleuser }}{{ endinc }} 
-	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-	
-	<h3>$registration</h3>
-	{{ inc field_input.tpl with $field=$register_text }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$register_policy }}{{ endinc }}
-	
-	{{ inc field_checkbox.tpl with $field=$no_multi_reg }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_openid }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_regfullname }}{{ endinc }}
-	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-
-	<h3>$upload</h3>
-	{{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$maximagelength }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$jpegimagequality }}{{ endinc }}
-	
-	<h3>$corporate</h3>
-	{{ inc field_input.tpl with $field=$allowed_sites }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$allowed_email }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$block_public }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$force_publish }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_community_page }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$ostatus_poll_interval }}{{ endinc }} 
-	{{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$newuser_private }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$enotify_no_content }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$private_addons }}{{ endinc }}	
-	{{ inc field_checkbox.tpl with $field=$disable_embedded }}{{ endinc }}	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-	
-	<h3>$advanced</h3>
-	{{ inc field_checkbox.tpl with $field=$no_utf }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$verifyssl }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$proxy }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$timeout }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$poll_interval }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$maxloadavg }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
-	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-	
-	</form>
-</div>
diff --git a/view/theme/frost-mobile/admin_users.tpl b/view/theme/frost-mobile/admin_users.tpl
deleted file mode 100644
index a3f6d2416f..0000000000
--- a/view/theme/frost-mobile/admin_users.tpl
+++ /dev/null
@@ -1,98 +0,0 @@
-<script>
-	function confirm_delete(uname){
-		return confirm( "$confirm_delete".format(uname));
-	}
-	function confirm_delete_multi(){
-		return confirm("$confirm_delete_multi");
-	}
-	function selectall(cls){
-		$j("."+cls).attr('checked','checked');
-		return false;
-	}
-</script>
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-	<form action="$baseurl/admin/users" method="post">
-        <input type='hidden' name='form_security_token' value='$form_security_token'>
-		
-		<h3>$h_pending</h3>
-		{{ if $pending }}
-			<table id='pending'>
-				<thead>
-				<tr>
-					{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-			{{ for $pending as $u }}
-				<tr>
-					<td class="created">$u.created</td>
-					<td class="name">$u.name</td>
-					<td class="email">$u.email</td>
-					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
-					<td class="tools">
-						<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='tool like'></span></a>
-						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='tool dislike'></span></a>
-					</td>
-				</tr>
-			{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>			
-		{{ else }}
-			<p>$no_pending</p>
-		{{ endif }}
-	
-	
-		
-	
-		<h3>$h_users</h3>
-		{{ if $users }}
-			<table id='users'>
-				<thead>
-				<tr>
-					<th></th>
-					{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{ for $users as $u }}
-					<tr>
-						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
-						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
-						<td class='email'>$u.email</td>
-						<td class='register_date'>$u.register_date</td>
-						<td class='login_date'>$u.login_date</td>
-						<td class='lastitem_date'>$u.lastitem_date</td>
-						<td class='login_date'>$u.page_flags {{ if $u.is_admin }}($siteadmin){{ endif }} {{ if $u.account_expired }}($accountexpired){{ endif }}</td>
-						<td class="checkbox"> 
-                                    {{ if $u.is_admin }}
-                                        &nbsp;
-                                    {{ else }}
-                                        <input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
-                                    {{ endif }}
-						<td class="tools">
-                                    {{ if $u.is_admin }}
-                                        &nbsp;
-                                    {{ else }}
-                                        <a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
-                                        <a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon drop'></span></a>
-                                    {{ endif }}
-						</td>
-					</tr>
-				{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>						
-		{{ else }}
-			NO USERS?!?
-		{{ endif }}
-	</form>
-</div>
diff --git a/view/theme/frost-mobile/categories_widget.tpl b/view/theme/frost-mobile/categories_widget.tpl
deleted file mode 100644
index ebc62404b8..0000000000
--- a/view/theme/frost-mobile/categories_widget.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-{#<!--<div id="categories-sidebar" class="widget">
-	<h3>$title</h3>
-	<div id="nets-desc">$desc</div>
-	
-	<ul class="categories-ul">
-		<li class="tool"><a href="$base" class="categories-link categories-all{{ if $sel_all }} categories-selected{{ endif }}">$all</a></li>
-		{{ for $terms as $term }}
-			<li class="tool"><a href="$base?f=&category=$term.name" class="categories-link{{ if $term.selected }} categories-selected{{ endif }}">$term.name</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>-->#}
diff --git a/view/theme/frost-mobile/comment_item.tpl b/view/theme/frost-mobile/comment_item.tpl
deleted file mode 100755
index 5410cd4cfb..0000000000
--- a/view/theme/frost-mobile/comment_item.tpl
+++ /dev/null
@@ -1,78 +0,0 @@
-{#<!--		<script>
-		$(document).ready( function () {
-			$(document).mouseup(function(e) {
-				var container = $("#comment-edit-wrapper-$id");
-				if( container.has(e.target).length === 0) {
-					commentClose(document.getElementById('comment-edit-text-$id'),$id);
-					cmtBbClose($id);
-				}
-			});
-		});
-		</script>-->#}
-
-		<div class="comment-wwedit-wrapper $indent" id="comment-edit-wrapper-$id" style="display: block;" >
-			<form class="comment-edit-form $indent" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;" >
-{#<!--			<span id="hide-commentbox-$id" class="hide-commentbox fakelink" onclick="showHideCommentBox($id);">$comment</span>
-			<form class="comment-edit-form" style="display: none;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">-->#}
-				<input type="hidden" name="type" value="$type" />
-				<input type="hidden" name="source" value="$sourceapp" />
-				<input type="hidden" name="profile_uid" value="$profile_uid" />
-				<input type="hidden" name="parent" value="$parent" />
-				{#<!--<input type="hidden" name="return" value="$return_path" />-->#}
-				<input type="hidden" name="jsreload" value="$jsreload" />
-				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
-				<input type="hidden" name="post_id_random" value="$rand_num" />
-
-				{#<!--<div class="comment-edit-photo" id="comment-edit-photo-$id" >-->#}
-					<a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-$id" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				{#<!--</div>-->#}
-				{#<!--<div class="comment-edit-photo-end"></div>-->#}
-				<ul class="comment-edit-bb-$id">
-					<li><a class="editicon boldbb shadow"
-						style="cursor: pointer;" title="$edbold"
-						onclick="insertFormatting('$comment','b', $id);"></a></li>
-					<li><a class="editicon italicbb shadow"
-						style="cursor: pointer;" title="$editalic"
-						onclick="insertFormatting('$comment','i', $id);"></a></li>
-					<li><a class="editicon underlinebb shadow"
-						style="cursor: pointer;" title="$eduline"
-						onclick="insertFormatting('$comment','u', $id);"></a></li>
-					<li><a class="editicon quotebb shadow"
-						style="cursor: pointer;" title="$edquote"
-						onclick="insertFormatting('$comment','quote', $id);"></a></li>
-					<li><a class="editicon codebb shadow"
-						style="cursor: pointer;" title="$edcode"
-						onclick="insertFormatting('$comment','code', $id);"></a></li>
-{#<!--					<li><a class="editicon imagebb shadow"
-						style="cursor: pointer;" title="$edimg"
-						onclick="insertFormatting('$comment','img', $id);"></a></li>
-					<li><a class="editicon urlbb shadow"
-						style="cursor: pointer;" title="$edurl"
-						onclick="insertFormatting('$comment','url', $id);"></a></li>
-					<li><a class="editicon videobb shadow"
-						style="cursor: pointer;" title="$edvideo"
-						onclick="insertFormatting('$comment','video', $id);"></a></li>-->#}
-				</ul>	
-				{#<!--<div class="comment-edit-bb-end"></div>-->#}
-{#<!--				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);cmtBbClose($id);" >$comment</textarea>-->#}
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" >$comment</textarea>
-				{{ if $qcomment }}
-					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
-					<option value=""></option>
-				{{ for $qcomment as $qc }}
-					<option value="$qc">$qc</option>				
-				{{ endfor }}
-					</select>
-				{{ endif }}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					{#<!--<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="preview-link fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>-->#}
-				</div>
-
-				{#<!--<div class="comment-edit-end"></div>-->#}
-			</form>
-
-		</div>
diff --git a/view/theme/frost-mobile/common_tabs.tpl b/view/theme/frost-mobile/common_tabs.tpl
deleted file mode 100644
index 940e5aeb2f..0000000000
--- a/view/theme/frost-mobile/common_tabs.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<ul class="tabs">
-	{{ for $tabs as $tab }}
-		<li id="$tab.id"><a href="$tab.url" class="tab button $tab.sel"{{ if $tab.title }} title="$tab.title"{{ endif }}>$tab.label</a></li>
-	{{ endfor }}
-	<div id="tabs-end"></div>
-</ul>
diff --git a/view/theme/frost-mobile/contact_block.tpl b/view/theme/frost-mobile/contact_block.tpl
deleted file mode 100644
index a8e34fce16..0000000000
--- a/view/theme/frost-mobile/contact_block.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-{#<!--<div id="contact-block">
-<h4 class="contact-block-h4">$contacts</h4>
-{{ if $micropro }}
-		<a class="allcontact-link" href="viewcontacts/$nickname">$viewcontacts</a>
-		<div class='contact-block-content'>
-		{{ for $micropro as $m }}
-			$m
-		{{ endfor }}
-		</div>
-{{ endif }}
-</div>
-<div class="clear"></div>-->#}
diff --git a/view/theme/frost-mobile/contact_edit.tpl b/view/theme/frost-mobile/contact_edit.tpl
deleted file mode 100644
index e5f12950c7..0000000000
--- a/view/theme/frost-mobile/contact_edit.tpl
+++ /dev/null
@@ -1,93 +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 class="vcard">
-		<div class="fn">$name</div>
-		<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="$photo" alt="$name" /></div>
-	</div>
-
-
-	<div id="contact-edit-nav-wrapper" >
-		<div id="contact-edit-links">
-			<ul>
-				<li><div id="contact-edit-rel">$relation_text</div></li>
-				<li><div id="contact-edit-nettype">$nettype</div></li>
-				{{ if $lost_contact }}
-					<li><div id="lost-contact-message">$lost_contact</div></li>
-				{{ endif }}
-				{{ if $insecure }}
-					<li><div id="insecure-message">$insecure</div></li>
-				{{ endif }}
-				{{ if $blocked }}
-					<li><div id="block-message">$blocked</div></li>
-				{{ endif }}
-				{{ if $ignored }}
-					<li><div id="ignore-message">$ignored</div></li>
-				{{ endif }}
-				{{ if $archived }}
-					<li><div id="archive-message">$archived</div></li>
-				{{ endif }}
-
-				<li>&nbsp;</li>
-
-				{{ if $common_text }}
-					<li><div id="contact-edit-common"><a href="$common_link">$common_text</a></div></li>
-				{{ endif }}
-				{{ if $all_friends }}
-					<li><div id="contact-edit-allfriends"><a href="allfriends/$contact_id">$all_friends</a></div></li>
-				{{ endif }}
-
-
-				<li><a href="network/0?nets=all&cid=$contact_id" id="contact-edit-view-recent">$lblrecent</a></li>
-				{{ if $lblsuggest }}
-					<li><a href="fsuggest/$contact_id" id="contact-edit-suggest">$lblsuggest</a></li>
-				{{ endif }}
-
-			</ul>
-		</div>
-	</div>
-	<div id="contact-edit-nav-end"></div>
-
-
-<form action="contacts/$contact_id" method="post" >
-<input type="hidden" name="contact_id" value="$contact_id">
-
-	{{ if $poll_enabled }}
-		<div id="contact-edit-poll-wrapper">
-			<div id="contact-edit-last-update-text">$lastupdtext <span id="contact-edit-last-updated">$last_update</span></div>
-			<span id="contact-edit-poll-text">$updpub $poll_interval</span> <span id="contact-edit-update-now" class="button"><a id="update_now_link" href="contacts/$contact_id/update" >$udnow</a></span>
-		</div>
-	{{ endif }}
-	<div id="contact-edit-end" ></div>
-
-	{{inc field_checkbox.tpl with $field=$hidden }}{{endinc}}
-
-<div id="contact-edit-info-wrapper">
-<h4>$lbl_info1</h4>
-	<textarea id="contact-edit-info" rows="8"{# cols="35"#} name="info">$info</textarea>
-	<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
-</div>
-<div id="contact-edit-info-end"></div>
-
-
-<div id="contact-edit-profile-select-text">
-<h4>$lbl_vis1</h4>
-<p>$lbl_vis2</p> 
-</div>
-$profile_select
-<div id="contact-edit-profile-select-end"></div>
-
-<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
-
-</form>
-</div>
diff --git a/view/theme/frost-mobile/contact_head.tpl b/view/theme/frost-mobile/contact_head.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/theme/frost-mobile/contact_template.tpl b/view/theme/frost-mobile/contact_template.tpl
deleted file mode 100644
index 7c19b3272e..0000000000
--- a/view/theme/frost-mobile/contact_template.tpl
+++ /dev/null
@@ -1,36 +0,0 @@
-
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-	<div class="contact-entry-photo-wrapper" >
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
-		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id);" 
-		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
-
-{#<!--			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>-->#}
-			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">
-			<img src="$contact.thumb" $contact.sparkle alt="$contact.name" />
-			</span>
-
-			{{ if $contact.photo_menu }}
-{#<!--			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>-->#}
-                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
-                    <ul>
-						{{ for $contact.photo_menu as $c }}
-						{{ if $c.2 }}
-						<li><a target="redir" href="$c.1">$c.0</a></li>
-						{{ else }}
-						<li><a href="$c.1">$c.0</a></li>
-						{{ endif }}
-						{{ endfor }}
-                    </ul>
-                </div>
-			{{ endif }}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div><br />
-{{ if $contact.alt_text }}<div class="contact-entry-details" id="contact-entry-rel-$contact.id" >$contact.alt_text</div>{{ endif }}
-	<div class="contact-entry-network" id="contact-entry-network-$contact.id" >$contact.network</div>
-
-	<div class="contact-entry-end" ></div>
-</div>
diff --git a/view/theme/frost-mobile/contacts-end.tpl b/view/theme/frost-mobile/contacts-end.tpl
deleted file mode 100644
index 820b1c6a0f..0000000000
--- a/view/theme/frost-mobile/contacts-end.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-
-<script src="$baseurl/library/jquery_ac/friendica.complete.min.js" ></script>
-
-
diff --git a/view/theme/frost-mobile/contacts-head.tpl b/view/theme/frost-mobile/contacts-head.tpl
deleted file mode 100644
index 5ae97f9f0c..0000000000
--- a/view/theme/frost-mobile/contacts-head.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-
-<script>
-	window.autocompleteType = 'contacts-head';
-</script>
-
diff --git a/view/theme/frost-mobile/contacts-template.tpl b/view/theme/frost-mobile/contacts-template.tpl
deleted file mode 100644
index 76254c1ca8..0000000000
--- a/view/theme/frost-mobile/contacts-template.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-<h1>$header{{ if $total }} ($total){{ endif }}</h1>
-
-{{ if $finding }}<h4>$finding</h4>{{ endif }}
-
-<div id="contacts-search-wrapper">
-<form id="contacts-search-form" action="$cmd" method="get" >
-<span class="contacts-search-desc">$desc</span>
-<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="$search" />
-<input type="submit" name="submit" id="contacts-search-submit" value="$submit" />
-</form>
-</div>
-<div id="contacts-search-end"></div>
-
-$tabs
-
-
-<div id="contacts-display-wrapper">
-{{ for $contacts as $contact }}
-	{{ inc contact_template.tpl }}{{ endinc }}
-{{ endfor }}
-</div>
-<div id="contact-edit-end"></div>
-
-$paginate
-
-
-
-
diff --git a/view/theme/frost-mobile/contacts-widget-sidebar.tpl b/view/theme/frost-mobile/contacts-widget-sidebar.tpl
deleted file mode 100644
index 1c63f9eab2..0000000000
--- a/view/theme/frost-mobile/contacts-widget-sidebar.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-$follow_widget
-
diff --git a/view/theme/frost-mobile/conversation.tpl b/view/theme/frost-mobile/conversation.tpl
deleted file mode 100644
index d39976f39f..0000000000
--- a/view/theme/frost-mobile/conversation.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-$live_update
-
-{{ for $threads as $thread }}
-<div id="tread-wrapper-$thread.id" class="tread-wrapper">
-	{{ for $thread.items as $item }}
-		{{if $item.comment_firstcollapsed}}
-			<div class="hide-comments-outer">
-			<span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span>
-			</div>
-			<div id="collapsed-comments-$thread.id" class="collapsed-comments" style="display: none;">
-		{{endif}}
-		{{if $item.comment_lastcollapsed}}</div>{{endif}}
-		
-		{{ inc $item.template }}{{ endinc }}
-		
-		
-	{{ endfor }}
-</div>
-{{ endfor }}
-
-<div id="conversation-end"></div>
-
-{#<!--{{ if $dropping }}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
-  <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
-  <div id="item-delete-selected-desc" >$dropping</div>
-</div>
-<div id="item-delete-selected-end"></div>
-{{ endif }}-->#}
diff --git a/view/theme/frost-mobile/cropbody.tpl b/view/theme/frost-mobile/cropbody.tpl
deleted file mode 100644
index 3283084cad..0000000000
--- a/view/theme/frost-mobile/cropbody.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-<h1>$title</h1>
-<p id="cropimage-desc">
-$desc
-</p>
-<div id="cropimage-wrapper">
-<img src="$image_url" id="croppa" class="imgCrop" alt="$title" />
-</div>
-<div id="cropimage-preview-wrapper" >
-<div id="previewWrap" ></div>
-</div>
-
-<form action="profile_photo/$resource" id="crop-image-form" method="post" />
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-<input type="hidden" name="cropfinal" value="1" />
-<input type="hidden" name="xstart" id="x1" />
-<input type="hidden" name="ystart" id="y1" />
-<input type="hidden" name="xfinal" id="x2" />
-<input type="hidden" name="yfinal" id="y2" />
-<input type="hidden" name="height" id="height" />
-<input type="hidden" name="width"  id="width" />
-
-<div id="crop-image-submit-wrapper" >
-<input type="submit" name="submit" value="$done" />
-</div>
-
-</form>
diff --git a/view/theme/frost-mobile/cropend.tpl b/view/theme/frost-mobile/cropend.tpl
deleted file mode 100644
index a56c71d92e..0000000000
--- a/view/theme/frost-mobile/cropend.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-      <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
-      <script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
-      <script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>
-      <script type="text/javascript" language="javascript">initCrop();</script>
diff --git a/view/theme/frost-mobile/crophead.tpl b/view/theme/frost-mobile/crophead.tpl
deleted file mode 100644
index 56e941e3ab..0000000000
--- a/view/theme/frost-mobile/crophead.tpl
+++ /dev/null
@@ -1 +0,0 @@
-      <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />
diff --git a/view/theme/frost-mobile/display-head.tpl b/view/theme/frost-mobile/display-head.tpl
deleted file mode 100644
index 1fc82ae779..0000000000
--- a/view/theme/frost-mobile/display-head.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<script>
-	window.autoCompleteType = 'display-head';
-</script>
-
diff --git a/view/theme/frost-mobile/end.tpl b/view/theme/frost-mobile/end.tpl
deleted file mode 100644
index 8bc088421a..0000000000
--- a/view/theme/frost-mobile/end.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--[if IE]>
-<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-<![endif]-->
-{#<!--<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></script>
-<script type="text/javascript">
-  tinyMCE.init({ mode : "none"});
-</script>-->#}
-<script type="text/javascript" src="$baseurl/js/jquery.js" ></script>
-<script type="text/javascript">var $j = jQuery.noConflict();</script>
-<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/jquery.divgrow-1.3.1.f1.min.js" ></script>
-<script type="text/javascript" src="$baseurl/js/jquery.textinputs.js" ></script>
-{#<!--<script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
-<script type="text/javascript" src="$baseurl/library/colorbox/jquery.colorbox-min.js"></script>-->#}
-{#<!--<script type="text/javascript" src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script>-->#}
-<script type="text/javascript" src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script>
-
-<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/fk.autocomplete.min.js" ></script>
-<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/acl.min.js" ></script>
-<script type="text/javascript" src="$baseurl/js/webtoolkit.base64.min.js" ></script>
-<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/main.min.js" ></script>
-<script type="text/javascript" src="$baseurl/view/theme/frost-mobile/js/theme.min.js"></script>
-
diff --git a/view/theme/frost-mobile/event.tpl b/view/theme/frost-mobile/event.tpl
deleted file mode 100644
index 67de85d5c8..0000000000
--- a/view/theme/frost-mobile/event.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{ for $events as $event }}
-	<div class="event">
-	
-	{{ 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" target="external-link" 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 tool s22 pencil"></a>{{ endif }}
-	</div>
-	<div class="clear"></div>
-{{ endfor }}
diff --git a/view/theme/frost-mobile/event_end.tpl b/view/theme/frost-mobile/event_end.tpl
deleted file mode 100644
index fd9e41f944..0000000000
--- a/view/theme/frost-mobile/event_end.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<script language="javascript" type="text/javascript"
-          src="$baseurl/library/fullcalendar/fullcalendar.min.js"></script>
-
-
diff --git a/view/theme/frost-mobile/event_head.tpl b/view/theme/frost-mobile/event_head.tpl
deleted file mode 100644
index c3f16d5428..0000000000
--- a/view/theme/frost-mobile/event_head.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<link rel='stylesheet' type='text/css' href='$baseurl/library/fullcalendar/fullcalendar.css' />
-
-<script language="javascript" type="text/javascript">
-window.aclType = 'event_head';
-</script>
-
diff --git a/view/theme/frost-mobile/field_checkbox.tpl b/view/theme/frost-mobile/field_checkbox.tpl
deleted file mode 100644
index 9fbf84eac9..0000000000
--- a/view/theme/frost-mobile/field_checkbox.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field checkbox' id='div_id_$field.0'>
-		<label id='label_id_$field.0' for='id_$field.0'>$field.1</label>
-		<input type="checkbox" name='$field.0' id='id_$field.0' value="1" {{ if $field.2 }}checked="checked"{{ endif }}><br />
-		<span class='field_help' id='help_id_$field.0'>$field.3</span>
-	</div>
diff --git a/view/theme/frost-mobile/field_input.tpl b/view/theme/frost-mobile/field_input.tpl
deleted file mode 100644
index 58e17406c0..0000000000
--- a/view/theme/frost-mobile/field_input.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field input' id='wrapper_$field.0'>
-		<label for='id_$field.0'>$field.1</label><br />
-		<input name='$field.0' id='id_$field.0' value="$field.2">
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/theme/frost-mobile/field_openid.tpl b/view/theme/frost-mobile/field_openid.tpl
deleted file mode 100644
index 8d330a30a0..0000000000
--- a/view/theme/frost-mobile/field_openid.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field input openid' id='wrapper_$field.0'>
-		<label for='id_$field.0'>$field.1</label><br />
-		<input name='$field.0' id='id_$field.0' value="$field.2">
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/theme/frost-mobile/field_password.tpl b/view/theme/frost-mobile/field_password.tpl
deleted file mode 100644
index 7a0d3fe9f4..0000000000
--- a/view/theme/frost-mobile/field_password.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field password' id='wrapper_$field.0'>
-		<label for='id_$field.0'>$field.1</label><br />
-		<input type='password' name='$field.0' id='id_$field.0' value="$field.2">
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/theme/frost-mobile/field_themeselect.tpl b/view/theme/frost-mobile/field_themeselect.tpl
deleted file mode 100644
index d8ddc2fc74..0000000000
--- a/view/theme/frost-mobile/field_themeselect.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-
-	<div class='field select'>
-		<label for='id_$field.0'>$field.1</label>
-		<select name='$field.0' id='id_$field.0' {{ if $field.5 }}onchange="previewTheme(this);"{{ endif }} >
-			{{ for $field.4 as $opt=>$val }}<option value="$opt" {{ if $opt==$field.2 }}selected="selected"{{ endif }}>$val</option>{{ endfor }}
-		</select>
-		<span class='field_help'>$field.3</span>
-		<div id="theme-preview"></div>
-	</div>
diff --git a/view/theme/frost-mobile/generic_links_widget.tpl b/view/theme/frost-mobile/generic_links_widget.tpl
deleted file mode 100644
index a976d4573c..0000000000
--- a/view/theme/frost-mobile/generic_links_widget.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="widget{{ if $class }} $class{{ endif }}">
-{#<!--	{{if $title}}<h3>$title</h3>{{endif}}-->#}
-	{{if $desc}}<div class="desc">$desc</div>{{endif}}
-	
-	<ul class="tabs links-widget">
-		{{ for $items as $item }}
-			<li class="tool"><a href="$item.url" class="tab {{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
-		{{ endfor }}
-		<div id="tabs-end"></div>
-	</ul>
-	
-</div>
diff --git a/view/theme/frost-mobile/group_drop.tpl b/view/theme/frost-mobile/group_drop.tpl
deleted file mode 100644
index 959b77bb21..0000000000
--- a/view/theme/frost-mobile/group_drop.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="group-delete-wrapper button" id="group-delete-wrapper-$id" >
-	<a href="group/drop/$id?t=$form_security_token" 
-		onclick="return confirmDelete();" 
-		id="group-delete-icon-$id" 
-		class="icon drophide group-delete-icon" 
-		{#onmouseover="imgbright(this);" 
-		onmouseout="imgdull(this);"#} ></a>
-</div>
-<div class="group-delete-end"></div>
diff --git a/view/theme/frost-mobile/head.tpl b/view/theme/frost-mobile/head.tpl
deleted file mode 100644
index a79b2916dd..0000000000
--- a/view/theme/frost-mobile/head.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-{#<!--<meta content='width=device-width, minimum-scale=1 maximum-scale=1' name='viewport'>
-<meta content='True' name='HandheldFriendly'>
-<meta content='320' name='MobileOptimized'>-->#}
-<meta name="viewport" content="width=device-width; initial-scale = 1.0; maximum-scale=1.0; user-scalable=no" />
-{#<!--<meta name="viewport" content="width=100%;  initial-scale=1; maximum-scale=1; minimum-scale=1; user-scalable=no;" />-->#}
-
-<base href="$baseurl/" />
-<meta name="generator" content="$generator" />
-{#<!--<link rel="stylesheet" href="$baseurl/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="$baseurl/library/colorbox/colorbox.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="$baseurl/library/tiptip/tipTip.css" type="text/css" media="screen" />-->#}
-<link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
-
-<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-
-<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
-<link rel="search"
-         href="$baseurl/opensearch" 
-         type="application/opensearchdescription+xml" 
-         title="Search in Friendica" />
-
-<script>
-	window.delItem = "$delitem";
-	window.commentEmptyText = "$comment";
-	window.showMore = "$showmore";
-	window.showFewer = "$showfewer";
-	var updateInterval = $update_interval;
-	var localUser = {{ if $local_user }}$local_user{{ else }}false{{ endif }};
-</script>
-
diff --git a/view/theme/frost-mobile/jot-end.tpl b/view/theme/frost-mobile/jot-end.tpl
deleted file mode 100644
index 41f50160f1..0000000000
--- a/view/theme/frost-mobile/jot-end.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-
-<script type="text/javascript" src="$baseurl/js/ajaxupload.min.js" ></script>
-
-<script>if(typeof window.jotInit != 'undefined') initEditor();</script>
-
diff --git a/view/theme/frost-mobile/jot-header.tpl b/view/theme/frost-mobile/jot-header.tpl
deleted file mode 100644
index 5d8cfa4548..0000000000
--- a/view/theme/frost-mobile/jot-header.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-
-<script>
-	var none = "none"; // ugly hack: $editselect shouldn't be a string if TinyMCE is enabled, but should if it isn't
-	window.editSelect = $editselect;
-	window.isPublic = "$ispublic";
-	window.nickname = "$nickname";
-	window.linkURL = "$linkurl";
-	window.vidURL = "$vidurl";
-	window.audURL = "$audurl";
-	window.whereAreU = "$whereareu";
-	window.term = "$term";
-	window.baseURL = "$baseurl";
-	window.geoTag = function () { $geotag }
-	window.jotId = "#profile-jot-text";
-	window.imageUploadButton = 'wall-image-upload';
-</script>
-
-
diff --git a/view/theme/frost-mobile/jot.tpl b/view/theme/frost-mobile/jot.tpl
deleted file mode 100644
index b345152792..0000000000
--- a/view/theme/frost-mobile/jot.tpl
+++ /dev/null
@@ -1,91 +0,0 @@
-
-<div id="profile-jot-wrapper" >
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey"></div>
-	</div>
-	<div id="profile-jot-banner-end"></div>
-
-	<form id="profile-jot-form" action="$action" method="post" >
-		<input type="hidden" name="type" value="$ptyp" />
-		<input type="hidden" name="profile_uid" value="$profile_uid" />
-		<input type="hidden" name="return" value="$return_path" />
-		<input type="hidden" name="location" id="jot-location" value="$defloc" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="$post_id" />
-		<input type="hidden" name="source" value="$sourceapp" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input type="hidden" name="post_id_random" value="$rand_num" />
-		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div>
-		{{ if $placeholdercategory }}
-		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
-		{{ endif }}
-		<div id="jot-text-wrap">
-		{#<!--<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />-->#}
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
-		</div>
-
-<div id="profile-jot-submit-wrapper" class="jothidden">
-	<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
-
-	<div id="profile-rotator-wrapper" style="display: $visitor;" >
-		<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-	
-	<div id="profile-upload-wrapper" style="display: $visitor;" >
-		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div>
-	</div> 
-	<div id="profile-attach-wrapper" style="display: $visitor;" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="$attach"></a></div>
-	</div> 
-
-	{#<!--<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a id="profile-link" class="icon link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>-->#}
-	<div id="profile-link-wrapper" style="display: $visitor;" >
-		<a id="profile-link" class="icon link" title="$weblink" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" style="display: $visitor;" >
-		<a id="profile-video" class="icon video" title="$video" onclick="jotVideoURL();return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" style="display: $visitor;" >
-		<a id="profile-audio" class="icon audio" title="$audio" onclick="jotAudioURL();return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" style="display: $visitor;" >
-		<a id="profile-location" class="icon globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" style="display: none;" >
-		<a id="profile-nolocation" class="icon noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
-	</div> 
-
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
-		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
-	</div>
-
-	<span onclick="preview_post();" id="jot-preview-link" class="fakelink">$preview</span>
-
-	<div id="profile-jot-perms-end"></div>
-
-
-	<div id="profile-jot-plugin-wrapper">
-  	$jotplugins
-	</div>
-
-	<div id="jot-preview-content" style="display:none;"></div>
-
-	<div style="display: none;">
-		<div id="profile-jot-acl-wrapper">
-			$acl
-			<hr/>
-			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-			$jotnets
-			<div id="profile-jot-networks-end"></div>
-		</div>
-	</div>
-
-
-</div>
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
-		{{ if $content }}<script>window.jotInit = true;</script>{{ endif }}
diff --git a/view/theme/frost-mobile/jot_geotag.tpl b/view/theme/frost-mobile/jot_geotag.tpl
deleted file mode 100644
index 3f8bee91a7..0000000000
--- a/view/theme/frost-mobile/jot_geotag.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-
-	if(navigator.geolocation) {
-		navigator.geolocation.getCurrentPosition(function(position) {
-			var lat = position.coords.latitude.toFixed(4);
-			var lon = position.coords.longitude.toFixed(4);
-
-			$j('#jot-coord').val(lat + ', ' + lon);
-			$j('#profile-nolocation-wrapper').show();
-		});
-	}
-
diff --git a/view/theme/frost-mobile/lang_selector.tpl b/view/theme/frost-mobile/lang_selector.tpl
deleted file mode 100644
index e777a0a861..0000000000
--- a/view/theme/frost-mobile/lang_selector.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="lang-select-icon" class="icon s22 language" title="$title" onclick="openClose('language-selector');" ></div>
-<div id="language-selector" style="display: none;" >
-	<form action="#" method="post" >
-		<select name="system_language" onchange="this.form.submit();" >
-			{{ for $langs.0 as $v=>$l }}
-				<option value="$v" {{if $v==$langs.1}}selected="selected"{{endif}}>$l</option>
-			{{ endfor }}
-		</select>
-	</form>
-</div>
diff --git a/view/theme/frost-mobile/like_noshare.tpl b/view/theme/frost-mobile/like_noshare.tpl
deleted file mode 100644
index 5bf94f7df7..0000000000
--- a/view/theme/frost-mobile/like_noshare.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
-	<a href="#" class="tool like" title="$likethis" onclick="dolike($id,'like'); return false"></a>
-	{{ if $nolike }}
-	<a href="#" class="tool dislike" title="$nolike" onclick="dolike($id,'dislike'); return false"></a>
-	{{ endif }}
-	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-</div>
diff --git a/view/theme/frost-mobile/login.tpl b/view/theme/frost-mobile/login.tpl
deleted file mode 100644
index 05ae364c00..0000000000
--- a/view/theme/frost-mobile/login.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-
-<div class="login-form">
-<form action="$dest_url" method="post" >
-	<input type="hidden" name="auth-params" value="login" />
-
-	<div id="login_standard">
-	{{ inc field_input.tpl with $field=$lname }}{{ endinc }}
-	{{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
-	</div>
-	
-	{{ if $openid }}
-			<div id="login_openid">
-			{{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
-			</div>
-	{{ endif }}
-
-	<br />
-	<div id='login-footer'>
-<!--	<div class="login-extra-links">
-	By signing in you agree to the latest <a href="tos.html" title="$tostitle" id="terms-of-service-link" >$toslink</a> and <a href="privacy.html" title="$privacytitle" id="privacy-link" >$privacylink</a>
-	</div>-->
-
-	<br />
-	{{ inc field_checkbox.tpl with $field=$lremember }}{{ endinc }}
-
-	<div id="login-submit-wrapper" >
-		<input type="submit" name="submit" id="login-submit-button" value="$login" />
-	</div>
-
-	<br /><br />
-	<div class="login-extra-links">
-		{{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
-        <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
-	</div>
-	</div>
-	
-	{{ for $hiddens as $k=>$v }}
-		<input type="hidden" name="$k" value="$v" />
-	{{ endfor }}
-	
-	
-</form>
-</div>
-
-<script type="text/javascript">window.loginName = "$lname.0";</script>
diff --git a/view/theme/frost-mobile/login_head.tpl b/view/theme/frost-mobile/login_head.tpl
deleted file mode 100644
index 14734821ce..0000000000
--- a/view/theme/frost-mobile/login_head.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-{#<!--<link rel="stylesheet" href="$baseurl/view/theme/frost-mobile/login-style.css" type="text/css" media="all" />-->#}
-
diff --git a/view/theme/frost-mobile/lostpass.tpl b/view/theme/frost-mobile/lostpass.tpl
deleted file mode 100644
index 583e3dbaff..0000000000
--- a/view/theme/frost-mobile/lostpass.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="lostpass-form">
-<h2>$title</h2>
-<br /><br /><br />
-
-<form action="lostpass" method="post" >
-<div id="login-name-wrapper" class="field input">
-        <label for="login-name" id="label-login-name">$name</label><br />
-        <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
-</div>
-<div id="login-extra-end"></div>
-<p id="lostpass-desc">
-$desc
-</p>
-<br />
-
-<div id="login-submit-wrapper" >
-        <input type="submit" name="submit" id="lostpass-submit-button" value="$submit" />
-</div>
-<div id="login-submit-end"></div>
-</form>
-</div>
diff --git a/view/theme/frost-mobile/mail_conv.tpl b/view/theme/frost-mobile/mail_conv.tpl
deleted file mode 100644
index ed32dac5a9..0000000000
--- a/view/theme/frost-mobile/mail_conv.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="mail-conv-outside-wrapper">
-	<div class="mail-conv-sender" >
-		<a href="$mail.from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$mail.sparkle" src="$mail.from_photo" heigth="80" width="80" alt="$mail.from_name" /></a>
-	</div>
-	<div class="mail-conv-detail" >
-		<div class="mail-conv-sender-name" >$mail.from_name</div>
-		<div class="mail-conv-date">$mail.date</div>
-		<div class="mail-conv-subject">$mail.subject</div>
-	</div>
-	<div class="mail-conv-body">$mail.body</div>
-</div>
-<div class="mail-conv-outside-wrapper-end"></div>
-
-
-<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);"#} ></a></div>
-<div class="mail-conv-delete-end"></div>
-
-<hr class="mail-conv-break" />
diff --git a/view/theme/frost-mobile/mail_list.tpl b/view/theme/frost-mobile/mail_list.tpl
deleted file mode 100644
index 5be7f38623..0000000000
--- a/view/theme/frost-mobile/mail_list.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="mail-list-outside-wrapper">
-	<div class="mail-list-sender" >
-		<a href="$from_url" class="mail-list-sender-url" ><img class="mail-list-sender-photo$sparkle" src="$from_photo" height="80" width="80" alt="$from_name" /></a>
-	</div>
-	<div class="mail-list-detail">
-		<div class="mail-list-sender-name" >$from_name</div>
-		<div class="mail-list-date">$date</div>
-		<div class="mail-list-subject"><a href="message/$id" class="mail-list-link">$subject</a></div>
-	<div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-$id" >
-		<a href="message/dropconv/$id" onclick="return confirmDelete();"  title="$delete" class="icon drophide mail-list-delete	delete-icon" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);"#} ></a>
-	</div>
-</div>
-</div>
-<div class="mail-list-delete-end"></div>
-
-<div class="mail-list-outside-wrapper-end"></div>
diff --git a/view/theme/frost-mobile/message-end.tpl b/view/theme/frost-mobile/message-end.tpl
deleted file mode 100644
index 820b1c6a0f..0000000000
--- a/view/theme/frost-mobile/message-end.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-
-<script src="$baseurl/library/jquery_ac/friendica.complete.min.js" ></script>
-
-
diff --git a/view/theme/frost-mobile/message-head.tpl b/view/theme/frost-mobile/message-head.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/theme/frost-mobile/moderated_comment.tpl b/view/theme/frost-mobile/moderated_comment.tpl
deleted file mode 100755
index b0451c8c60..0000000000
--- a/view/theme/frost-mobile/moderated_comment.tpl
+++ /dev/null
@@ -1,61 +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>
-				<ul class="comment-edit-bb-$id">
-					<li><a class="editicon boldbb shadow"
-						style="cursor: pointer;" title="$edbold"
-						onclick="insertFormatting('$comment','b', $id);"></a></li>
-					<li><a class="editicon italicbb shadow"
-						style="cursor: pointer;" title="$editalic"
-						onclick="insertFormatting('$comment','i', $id);"></a></li>
-					<li><a class="editicon underlinebb shadow"
-						style="cursor: pointer;" title="$eduline"
-						onclick="insertFormatting('$comment','u', $id);"></a></li>
-					<li><a class="editicon quotebb shadow"
-						style="cursor: pointer;" title="$edquote"
-						onclick="insertFormatting('$comment','quote', $id);"></a></li>
-					<li><a class="editicon codebb shadow"
-						style="cursor: pointer;" title="$edcode"
-						onclick="insertFormatting('$comment','code', $id);"></a></li>
-					<li><a class="editicon imagebb shadow"
-						style="cursor: pointer;" title="$edimg"
-						onclick="insertFormatting('$comment','img', $id);"></a></li>
-					<li><a class="editicon urlbb shadow"
-						style="cursor: pointer;" title="$edurl"
-						onclick="insertFormatting('$comment','url', $id);"></a></li>
-					<li><a class="editicon videobb shadow"
-						style="cursor: pointer;" title="$edvideo"
-						onclick="insertFormatting('$comment','video', $id);"></a></li>
-				</ul>	
-				<div class="comment-edit-bb-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);" >$comment</textarea>			
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/frost-mobile/msg-end.tpl b/view/theme/frost-mobile/msg-end.tpl
deleted file mode 100644
index 6074133798..0000000000
--- a/view/theme/frost-mobile/msg-end.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<script type="text/javascript" src="$baseurl/js/ajaxupload.min.js" ></script>
-
diff --git a/view/theme/frost-mobile/msg-header.tpl b/view/theme/frost-mobile/msg-header.tpl
deleted file mode 100644
index fb6e0684b7..0000000000
--- a/view/theme/frost-mobile/msg-header.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-
-<script language="javascript" type="text/javascript">
-	window.nickname = "$nickname";
-	window.linkURL = "$linkurl";
-	var plaintext = "none";
-	window.jotId = "#prvmail-text";
-	window.imageUploadButton = 'prvmail-upload';
-	window.autocompleteType = 'msg-header';
-</script>
-
diff --git a/view/theme/frost-mobile/nav.tpl b/view/theme/frost-mobile/nav.tpl
deleted file mode 100644
index c03ea05d90..0000000000
--- a/view/theme/frost-mobile/nav.tpl
+++ /dev/null
@@ -1,146 +0,0 @@
-<nav>
-{#<!--	$langselector -->#}
-
-{#<!--	<div id="site-location">$sitelocation</div> -->#}
-
-	<span id="nav-link-wrapper" >
-
-{#<!--	<a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>-->#}
-	<div class="nav-button-container">
-{#<!--	<a class="system-menu-link nav-link" href="#system-menu" title="Menu">-->#}
-	<img rel="#system-menu-list" class="nav-link" src="$baseurl/view/theme/frost-mobile/images/menu.png">
-{#<!--	</a>-->#}
-	<ul id="system-menu-list" class="nav-menu-list">
-		{{ if $nav.login }}
-		<a id="nav-login-link" class="nav-load-page-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
-		{{ endif }}
-
-		{{ if $nav.register }}
-		<a id="nav-register-link" class="nav-load-page-link $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>
-		{{ endif }}
-
-		{{ if $nav.settings }}
-		<li><a id="nav-settings-link" class="$nav.settings.2 nav-load-page-link" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>
-		{{ endif }}
-
-		{{ if $nav.manage }}
-		<li>
-		<a id="nav-manage-link" class="nav-load-page-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>
-		</li>
-		{{ endif }}
-
-		{{ if $nav.profiles }}
-		<li><a id="nav-profiles-link" class="$nav.profiles.2 nav-load-page-link" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a></li>
-		{{ endif }}
-
-		{{ if $nav.admin }}
-		<li><a id="nav-admin-link" class="$nav.admin.2 nav-load-page-link" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>
-		{{ endif }}
-
-		<li><a id="nav-search-link" class="$nav.search.2 nav-load-page-link" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a></li>
-
-		{{ if $nav.apps }}
-		<li><a id="nav-apps-link" class="$nav.apps.2 nav-load-page-link" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a></li>
-		{{ endif }}
-
-		{{ if $nav.help }}
-		<li><a id="nav-help-link" class="$nav.help.2 nav-load-page-link" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>
-		{{ endif }}
-		
-		{{ if $nav.logout }}
-		<li><a id="nav-logout-link" class="$nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>
-		{{ endif }}
-	</ul>
-	</div>
-
-	{{ if $nav.notifications }}
-{#<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>-->#}
-	<div class="nav-button-container">
-{#<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">-->#}
-	<img rel="#nav-notifications-menu" class="nav-link" src="$baseurl/view/theme/frost-mobile/images/notifications.png">
-{#<!--	</a>-->#}
-	<span id="notify-update" class="nav-ajax-left"></span>
-	<ul id="nav-notifications-menu" class="notifications-menu-popup">
-		<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-		<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-		<li class="empty">$emptynotifications</li>
-	</ul>
-	</div>
-	{{ endif }}		
-
-{#<!--	<a id="contacts-menu-link" class="nav-link" href="#contacts-menu" title="Contacts">Contacts</a>-->#}
-	<div class="nav-button-container">
-{#<!--	<a class="contacts-menu-link nav-link" href="#contacts-menu" title="Contacts">-->#}
-	<img rel="#contacts-menu-list"  class="nav-link" src="$baseurl/view/theme/frost-mobile/images/contacts.png">
-	{#<!--</a>-->#}
-	{{ if $nav.introductions }}
-	<span id="intro-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	<ul id="contacts-menu-list" class="nav-menu-list">
-		{{ if $nav.contacts }}
-		<li><a id="nav-contacts-link" class="$nav.contacts.2 nav-load-page-link" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a><li>
-		{{ endif }}
-
-		<li><a id="nav-directory-link" class="$nav.directory.2 nav-load-page-link" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a><li>
-
-		{{ if $nav.introductions }}
-		<li>
-		<a id="nav-notify-link" class="$nav.introductions.2 $sel.introductions nav-load-page-link" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a>
-		</li>
-		{{ endif }}
-	</ul>
-	</div>
-
-	{{ if $nav.messages }}
-{#<!--	<a id="nav-messages-link" class="nav-link $nav.messages.2 $sel.messages nav-load-page-link" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>-->#}
-	<div class="nav-button-container">
-	<a id="nav-messages-link" class="$nav.messages.2 $sel.messages nav-load-page-link" href="$nav.messages.0" title="$nav.messages.3" >
-	<img src="$baseurl/view/theme/frost-mobile/images/message.png" class="nav-link">
-	</a>
-	<span id="mail-update" class="nav-ajax-left"></span>
-	</div>
-	{{ endif }}
-
-{#<!--	<a id="network-menu-link" class="nav-link" href="#network-menu" title="Network">Network</a>-->#}
-	<div class="nav-button-container">
-{#<!--	<a class="network-menu-link nav-link" href="#network-menu" title="Network">-->#}
-	<img rel="#network-menu-list" class="nav-link" src="$baseurl/view/theme/frost-mobile/images/network.png">
-{#<!--	</a>-->#}
-	{{ if $nav.network }}
-	<span id="net-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	<ul id="network-menu-list" class="nav-menu-list">
-		{{ if $nav.network }}
-		<li>
-		<a id="nav-network-link" class="$nav.network.2 $sel.network nav-load-page-link" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
-		</li>
-		{#<!--<span id="net-update" class="nav-ajax-left"></span>-->#}
-		{{ endif }}
-
-		{{ if $nav.network }}
-		<li>
-		<a class="nav-menu-icon network-reset-link nav-link" href="$nav.net_reset.0" title="$nav.net_reset.3">$nav.net_reset.1</a>
-		</li>
-		{{ endif }}
-
-		{{ if $nav.home }}
-		<li><a id="nav-home-link" class="$nav.home.2 $sel.home nav-load-page-link" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a></li>
-		{#<!--<span id="home-update" class="nav-ajax-left"></span>-->#}
-		{{ endif }}
-
-		{{ if $nav.community }}
-		<li>
-		<a id="nav-community-link" class="$nav.community.2 $sel.community nav-load-page-link" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
-		</li>
-		{{ endif }}
-	</ul>
-	</div>
-
-	</span>
-	{#<!--<span id="nav-end"></span>-->#}
-	<span id="banner">$banner</span>
-</nav>
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
-</ul>
diff --git a/view/theme/frost-mobile/photo_drop.tpl b/view/theme/frost-mobile/photo_drop.tpl
deleted file mode 100644
index d004fce977..0000000000
--- a/view/theme/frost-mobile/photo_drop.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
-	<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$delete" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);" #}></a>
-</div>
-<div class="wall-item-delete-end"></div>
diff --git a/view/theme/frost-mobile/photo_edit.tpl b/view/theme/frost-mobile/photo_edit.tpl
deleted file mode 100644
index 4265f8c98c..0000000000
--- a/view/theme/frost-mobile/photo_edit.tpl
+++ /dev/null
@@ -1,58 +0,0 @@
-
-<form action="photos/$nickname/$resource_id" method="post" id="photo_edit_form" >
-
-	<input type="hidden" name="item_id" value="$item_id" />
-
-	<div class="photo-edit-input-text">
-	<label id="photo-edit-albumname-label" for="photo-edit-albumname">$newalbum</label>
-	<input id="photo-edit-albumname" type="text" size="32" name="albname" value="$album" />
-	</div>
-
-	<div id="photo-edit-albumname-end"></div>
-
-	<div class="photo-edit-input-text">
-	<label id="photo-edit-caption-label" for="photo-edit-caption">$capt_label</label>
-	<input id="photo-edit-caption" type="text" size="32" name="desc" value="$caption" />
-	</div>
-
-	<div id="photo-edit-caption-end"></div>
-
-	<div class="photo-edit-input-text">
-	<label id="photo-edit-tags-label" for="photo-edit-newtag" >$tag_label</label>
-	<input name="newtag" id="photo-edit-newtag" size="32" title="$help_tags" type="text" />
-	</div>
-
-	<div id="photo-edit-tags-end"></div>
-
-	<div class="photo-edit-rotate-choice">
-	<label id="photo-edit-rotate-cw-label" for="photo-edit-rotate-cw">$rotatecw</label>
-	<input id="photo-edit-rotate-cw" class="photo-edit-rotate" type="radio" name="rotate" value="1" /><br />
-	</div>
-
-	<div class="photo-edit-rotate-choice">
-	<label id="photo-edit-rotate-ccw-label" for="photo-edit-rotate-ccw">$rotateccw</label>
-	<input id="photo-edit-rotate-ccw" class="photo-edit-rotate" type="radio" name="rotate" value="2" />
-	</div>
-	<div id="photo-edit-rotate-end"></div>
-
-	<div id="photo-edit-perms" class="photo-edit-perms" >
-		<a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="popupbox button" title="$permissions"/>
-			<span id="jot-perms-icon" class="icon $lockstate photo-perms-icon" ></span><div class="photo-jot-perms-text">$permissions</div>
-		</a>
-		<div id="photo-edit-perms-menu-end"></div>
-		
-		<div style="display: none;">
-			<div id="photo-edit-perms-select" >
-				$aclselect
-			</div>
-		</div>
-	</div>
-	<div id="photo-edit-perms-end"></div>
-
-	<input id="photo-edit-submit-button" type="submit" name="submit" value="$submit" />
-	<input id="photo-edit-delete-button" type="submit" name="delete" value="$delete" onclick="return confirmDelete()"; />
-
-	<div id="photo-edit-end"></div>
-</form>
-
-
diff --git a/view/theme/frost-mobile/photo_edit_head.tpl b/view/theme/frost-mobile/photo_edit_head.tpl
deleted file mode 100644
index 4536dd5dfd..0000000000
--- a/view/theme/frost-mobile/photo_edit_head.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-
-<script>
-	window.prevLink = "$prevlink";
-	window.nextLink = "$nextlink";
-	window.photoEdit = true;
-
-</script>
diff --git a/view/theme/frost-mobile/photo_view.tpl b/view/theme/frost-mobile/photo_view.tpl
deleted file mode 100644
index 92e115487a..0000000000
--- a/view/theme/frost-mobile/photo_view.tpl
+++ /dev/null
@@ -1,42 +0,0 @@
-<div id="live-display"></div>
-<h3><a href="$album.0">$album.1</a></h3>
-
-<div id="photo-edit-link-wrap">
-{{ if $tools }}
-<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
-|
-<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
-{{ endif }}
-{{ if $lock }} | <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo/$id');" /> {{ endif }}
-</div>
-
-<div id="photo-nav">
-	{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0"><img src="view/theme/frost-mobile/images/arrow-left.png"></a></div>{{ endif }}
-	{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0"><img src="view/theme/frost-mobile/images/arrow-right.png"></a></div>{{ endif }}
-</div>
-<div id="photo-photo"><a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a></div>
-<div id="photo-photo-end"></div>
-<div id="photo-caption">$desc</div>
-{{ if $tags }}
-<div id="in-this-photo-text">$tags.0</div>
-<div id="in-this-photo">$tags.1</div>
-{{ endif }}
-{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
-
-{{ if $edit }}
-$edit
-{{ else }}
-
-{{ if $likebuttons }}
-<div id="photo-like-div">
-	$likebuttons
-	$like
-	$dislike	
-</div>
-{{ endif }}
-
-$comments
-
-$paginate
-{{ endif }}
-
diff --git a/view/theme/frost-mobile/photos_head.tpl b/view/theme/frost-mobile/photos_head.tpl
deleted file mode 100644
index 8cd22d5b6d..0000000000
--- a/view/theme/frost-mobile/photos_head.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-
-<script>
-	window.isPublic = "$ispublic";
-</script>
-
diff --git a/view/theme/frost-mobile/photos_upload.tpl b/view/theme/frost-mobile/photos_upload.tpl
deleted file mode 100644
index 43dbcaad7b..0000000000
--- a/view/theme/frost-mobile/photos_upload.tpl
+++ /dev/null
@@ -1,50 +0,0 @@
-<h3>$pagename</h3>
-
-<div id="photos-usage-message">$usage</div>
-
-<form action="photos/$nickname" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" >
-	<div id="photos-upload-new-wrapper" >
-		<div id="photos-upload-newalbum-div">
-			<label id="photos-upload-newalbum-text" for="photos-upload-newalbum" >$newalbum</label>
-		</div>
-		<input id="photos-upload-newalbum" type="text" name="newalbum" />
-	</div>
-	<div id="photos-upload-new-end"></div>
-	<div id="photos-upload-exist-wrapper">
-		<div id="photos-upload-existing-album-text">$existalbumtext</div>
-		<select id="photos-upload-album-select" name="album">
-		$albumselect
-		</select>
-	</div>
-	<div id="photos-upload-exist-end"></div>
-
-	$default_upload_box
-
-	<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
-		<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" checked />
-		<label id="photos-upload-noshare-text" for="photos-upload-noshare" >$nosharetext</label>
-	</div>
-
-
-	<div id="photos-upload-perms" class="photos-upload-perms" >
-		<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button popupbox" />
-		<span id="jot-perms-icon" class="icon $lockstate" ></span>$permissions
-		</a>
-	</div>
-	<div id="photos-upload-perms-end"></div>
-
-	<div style="display: none;">
-		<div id="photos-upload-permissions-wrapper">
-			$aclselect
-		</div>
-	</div>
-
-	<div id="photos-upload-spacer"></div>
-
-	$alt_uploader
-
-	$default_upload_submit
-
-	<div class="photos-upload-end" ></div>
-</form>
-
diff --git a/view/theme/frost-mobile/profed_end.tpl b/view/theme/frost-mobile/profed_end.tpl
deleted file mode 100644
index bf9b2a57a1..0000000000
--- a/view/theme/frost-mobile/profed_end.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-
-<script type="text/javascript" src="js/country.min.js" ></script>
-
-<script language="javascript" type="text/javascript">
-	Fill_Country('$country_name');
-	Fill_States('$region');
-</script>
-
diff --git a/view/theme/frost-mobile/profed_head.tpl b/view/theme/frost-mobile/profed_head.tpl
deleted file mode 100644
index 83d22d1745..0000000000
--- a/view/theme/frost-mobile/profed_head.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-
-<script language="javascript" type="text/javascript">
-	window.editSelect = "none";
-</script>
-
diff --git a/view/theme/frost-mobile/profile_edit.tpl b/view/theme/frost-mobile/profile_edit.tpl
deleted file mode 100644
index 64dc2a2f27..0000000000
--- a/view/theme/frost-mobile/profile_edit.tpl
+++ /dev/null
@@ -1,322 +0,0 @@
-$default
-
-<h1>$banner</h1>
-
-<div id="profile-edit-links">
-<ul>
-<li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="$viewprof">$viewprof</a></li>
-<li><a href="$profile_clone_link" id="profile-edit-clone-link" title="$cr_prof">$cl_prof</a></li>
-<li></li>
-<li><a href="$profile_drop_link" id="profile-edit-drop-link" title="$del_prof" $disabled >$del_prof</a></li>
-
-</ul>
-</div>
-
-<div id="profile-edit-links-end"></div>
-
-
-<div id="profile-edit-wrapper" >
-<form id="profile-edit-form" name="form1" action="profiles/$profile_id" method="post" >
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-<div id="profile-edit-profile-name-wrapper" >
-<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >$lbl_profname </label>
-<input type="text" size="28" name="profile_name" id="profile-edit-profile-name" value="$profile_name" /><div class="required">*</div>
-</div>
-<div id="profile-edit-profile-name-end"></div>
-
-<div id="profile-edit-name-wrapper" >
-<label id="profile-edit-name-label" for="profile-edit-name" >$lbl_fullname </label>
-<input type="text" size="28" name="name" id="profile-edit-name" value="$name" />
-</div>
-<div id="profile-edit-name-end"></div>
-
-<div id="profile-edit-pdesc-wrapper" >
-<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >$lbl_title </label>
-<input type="text" size="28" name="pdesc" id="profile-edit-pdesc" value="$pdesc" />
-</div>
-<div id="profile-edit-pdesc-end"></div>
-
-
-<div id="profile-edit-gender-wrapper" >
-<label id="profile-edit-gender-label" for="gender-select" >$lbl_gender </label>
-$gender
-</div>
-<div id="profile-edit-gender-end"></div>
-
-<div id="profile-edit-dob-wrapper" >
-<label id="profile-edit-dob-label" for="dob-select" >$lbl_bd </label>
-<div id="profile-edit-dob" >
-$dob $age
-</div>
-</div>
-<div id="profile-edit-dob-end"></div>
-
-$hide_friends
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="profile-edit-address-wrapper" >
-<label id="profile-edit-address-label" for="profile-edit-address" >$lbl_address </label>
-<input type="text" size="28" name="address" id="profile-edit-address" value="$address" />
-</div>
-<div id="profile-edit-address-end"></div>
-
-<div id="profile-edit-locality-wrapper" >
-<label id="profile-edit-locality-label" for="profile-edit-locality" >$lbl_city </label>
-<input type="text" size="28" name="locality" id="profile-edit-locality" value="$locality" />
-</div>
-<div id="profile-edit-locality-end"></div>
-
-
-<div id="profile-edit-postal-code-wrapper" >
-<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >$lbl_zip </label>
-<input type="text" size="28" name="postal_code" id="profile-edit-postal-code" value="$postal_code" />
-</div>
-<div id="profile-edit-postal-code-end"></div>
-
-<div id="profile-edit-country-name-wrapper" >
-<label id="profile-edit-country-name-label" for="profile-edit-country-name" >$lbl_country </label>
-<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('$region');">
-<option selected="selected" >$country_name</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-country-name-end"></div>
-
-<div id="profile-edit-region-wrapper" >
-<label id="profile-edit-region-label" for="profile-edit-region" >$lbl_region </label>
-<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
-<option selected="selected" >$region</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-region-end"></div>
-
-<div id="profile-edit-hometown-wrapper" >
-<label id="profile-edit-hometown-label" for="profile-edit-hometown" >$lbl_hometown </label>
-<input type="text" size="28" name="hometown" id="profile-edit-hometown" value="$hometown" />
-</div>
-<div id="profile-edit-hometown-end"></div>
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="profile-edit-marital-wrapper" >
-<label id="profile-edit-marital-label" for="profile-edit-marital" >$lbl_marital </label>
-$marital
-</div>
-<label id="profile-edit-with-label" for="profile-edit-with" > $lbl_with </label>
-<input type="text" size="28" name="with" id="profile-edit-with" title="$lbl_ex1" value="$with" />
-<label id="profile-edit-howlong-label" for="profile-edit-howlong" > $lbl_howlong </label>
-<input type="text" size="28" name="howlong" id="profile-edit-howlong" title="$lbl_howlong" value="$howlong" />
-
-<div id="profile-edit-marital-end"></div>
-
-<div id="profile-edit-sexual-wrapper" >
-<label id="profile-edit-sexual-label" for="sexual-select" >$lbl_sexual </label>
-$sexual
-</div>
-<div id="profile-edit-sexual-end"></div>
-
-
-
-<div id="profile-edit-homepage-wrapper" >
-<label id="profile-edit-homepage-label" for="profile-edit-homepage" >$lbl_homepage </label>
-<input type="text" size="28" name="homepage" id="profile-edit-homepage" value="$homepage" />
-</div>
-<div id="profile-edit-homepage-end"></div>
-
-<div id="profile-edit-politic-wrapper" >
-<label id="profile-edit-politic-label" for="profile-edit-politic" >$lbl_politic </label>
-<input type="text" size="28" name="politic" id="profile-edit-politic" value="$politic" />
-</div>
-<div id="profile-edit-politic-end"></div>
-
-<div id="profile-edit-religion-wrapper" >
-<label id="profile-edit-religion-label" for="profile-edit-religion" >$lbl_religion </label>
-<input type="text" size="28" name="religion" id="profile-edit-religion" value="$religion" />
-</div>
-<div id="profile-edit-religion-end"></div>
-
-<div id="profile-edit-pubkeywords-wrapper" >
-<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >$lbl_pubkey </label>
-<input type="text" size="28" name="pub_keywords" id="profile-edit-pubkeywords" title="$lbl_ex2" value="$pub_keywords" />
-</div><div id="profile-edit-pubkeywords-desc">$lbl_pubdsc</div>
-<div id="profile-edit-pubkeywords-end"></div>
-
-<div id="profile-edit-prvkeywords-wrapper" >
-<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >$lbl_prvkey </label>
-<input type="text" size="28" name="prv_keywords" id="profile-edit-prvkeywords" title="$lbl_ex2" value="$prv_keywords" />
-</div><div id="profile-edit-prvkeywords-desc">$lbl_prvdsc</div>
-<div id="profile-edit-prvkeywords-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="about-jot-wrapper" class="profile-jot-box">
-<p id="about-jot-desc" >
-$lbl_about
-</p>
-
-<textarea rows="10" cols="30" id="profile-about-text" class="profile-edit-textarea" name="about" >$about</textarea>
-
-</div>
-<div id="about-jot-end"></div>
-
-
-<div id="interest-jot-wrapper" class="profile-jot-box" >
-<p id="interest-jot-desc" >
-$lbl_hobbies
-</p>
-
-<textarea rows="10" cols="30" id="interest-jot-text" class="profile-edit-textarea" name="interest" >$interest</textarea>
-
-</div>
-<div id="interest-jot-end"></div>
-
-
-<div id="likes-jot-wrapper" class="profile-jot-box" >
-<p id="likes-jot-desc" >
-$lbl_likes
-</p>
-
-<textarea rows="10" cols="30" id="likes-jot-text" class="profile-edit-textarea" name="likes" >$likes</textarea>
-
-</div>
-<div id="likes-jot-end"></div>
-
-
-<div id="dislikes-jot-wrapper" class="profile-jot-box" >
-<p id="dislikes-jot-desc" >
-$lbl_dislikes
-</p>
-
-<textarea rows="10" cols="30" id="dislikes-jot-text" class="profile-edit-textarea" name="dislikes" >$dislikes</textarea>
-
-</div>
-<div id="dislikes-jot-end"></div>
-
-
-<div id="contact-jot-wrapper" class="profile-jot-box" >
-<p id="contact-jot-desc" >
-$lbl_social
-</p>
-
-<textarea rows="10" cols="30" id="contact-jot-text" class="profile-edit-textarea" name="contact" >$contact</textarea>
-
-</div>
-<div id="contact-jot-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="music-jot-wrapper" class="profile-jot-box" >
-<p id="music-jot-desc" >
-$lbl_music
-</p>
-
-<textarea rows="10" cols="30" id="music-jot-text" class="profile-edit-textarea" name="music" >$music</textarea>
-
-</div>
-<div id="music-jot-end"></div>
-
-<div id="book-jot-wrapper" class="profile-jot-box" >
-<p id="book-jot-desc" >
-$lbl_book
-</p>
-
-<textarea rows="10" cols="30" id="book-jot-text" class="profile-edit-textarea" name="book" >$book</textarea>
-
-</div>
-<div id="book-jot-end"></div>
-
-
-
-<div id="tv-jot-wrapper" class="profile-jot-box" >
-<p id="tv-jot-desc" >
-$lbl_tv 
-</p>
-
-<textarea rows="10" cols="30" id="tv-jot-text" class="profile-edit-textarea" name="tv" >$tv</textarea>
-
-</div>
-<div id="tv-jot-end"></div>
-
-
-
-<div id="film-jot-wrapper" class="profile-jot-box" >
-<p id="film-jot-desc" >
-$lbl_film
-</p>
-
-<textarea rows="10" cols="30" id="film-jot-text" class="profile-edit-textarea" name="film" >$film</textarea>
-
-</div>
-<div id="film-jot-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="romance-jot-wrapper" class="profile-jot-box" >
-<p id="romance-jot-desc" >
-$lbl_love
-</p>
-
-<textarea rows="10" cols="30" id="romance-jot-text" class="profile-edit-textarea" name="romance" >$romance</textarea>
-
-</div>
-<div id="romance-jot-end"></div>
-
-
-
-<div id="work-jot-wrapper" class="profile-jot-box" >
-<p id="work-jot-desc" >
-$lbl_work
-</p>
-
-<textarea rows="10" cols="30" id="work-jot-text" class="profile-edit-textarea" name="work" >$work</textarea>
-
-</div>
-<div id="work-jot-end"></div>
-
-
-
-<div id="education-jot-wrapper" class="profile-jot-box" >
-<p id="education-jot-desc" >
-$lbl_school 
-</p>
-
-<textarea rows="10" cols="30" id="education-jot-text" class="profile-edit-textarea" name="education" >$education</textarea>
-
-</div>
-<div id="education-jot-end"></div>
-
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-</form>
-</div>
-
diff --git a/view/theme/frost-mobile/profile_photo.tpl b/view/theme/frost-mobile/profile_photo.tpl
deleted file mode 100644
index 42fc139f8f..0000000000
--- a/view/theme/frost-mobile/profile_photo.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-<h1>$title</h1>
-
-<form enctype="multipart/form-data" action="profile_photo" method="post">
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-<div id="profile-photo-upload-wrapper">
-<label id="profile-photo-upload-label" for="profile-photo-upload">$lbl_upfile </label>
-<input name="userfile" type="file" id="profile-photo-upload" size="25" />
-</div>
-
-<div id="profile-photo-submit-wrapper">
-<input type="submit" name="submit" id="profile-photo-submit" value="$submit">
-</div>
-
-</form>
-
-<div id="profile-photo-link-select-wrapper">
-$select
-</div>
diff --git a/view/theme/frost-mobile/profile_vcard.tpl b/view/theme/frost-mobile/profile_vcard.tpl
deleted file mode 100644
index e91e6125ff..0000000000
--- a/view/theme/frost-mobile/profile_vcard.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-<div class="vcard">
-
-	<div class="fn label">$profile.name</div>
-	
-				
-	
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name"></div>
-
-
-
-	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt> 
-		<dd class="adr">
-			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal_code</span>
-			</span>
-			{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
-		</dd>
-		</dl>
-	{{ endif }}
-
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
-
-	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-
-	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-
-	<div id="profile-vcard-break"></div>	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-			{{ if $wallmessage }}
-				<li><a id="wallmessage-link" href="wallmessage/$profile.nickname">$wallmessage</a></li>
-			{{ endif }}
-		</ul>
-	</div>
-</div>
-
-$contact_block
-
-
diff --git a/view/theme/frost-mobile/prv_message.tpl b/view/theme/frost-mobile/prv_message.tpl
deleted file mode 100644
index 27b2f39507..0000000000
--- a/view/theme/frost-mobile/prv_message.tpl
+++ /dev/null
@@ -1,39 +0,0 @@
-
-<h3>$header</h3>
-
-<div id="prvmail-wrapper" >
-<form id="prvmail-form" action="message" method="post" >
-
-$parent
-
-<div id="prvmail-to-label">$to</div>
-
-{{ if $showinputs }}
-<input type="text" id="recip" name="messageto" value="$prefill" maxlength="255" size="64" tabindex="10" />
-<input type="hidden" id="recip-complete" name="messageto" value="$preid">
-{{ else }}
-$select
-{{ endif }}
-
-<div id="prvmail-subject-label">$subject</div>
-<input type="text" size="28" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly tabindex="11" />
-
-<div id="prvmail-message-label">$yourmessage</div>
-<textarea rows="8" cols="32" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">$text</textarea>
-
-
-<div id="prvmail-submit-wrapper" >
-	<input type="submit" id="prvmail-submit" name="submit" value="$submit" tabindex="13" />
-	<div id="prvmail-upload-wrapper" >
-		<div id="prvmail-upload" class="icon border camera" title="$upload" ></div>
-	</div> 
-	<div id="prvmail-link-wrapper" >
-		<div id="prvmail-link" class="icon border link" title="$insert" onclick="jotGetLink();" ></div>
-	</div> 
-	<div id="prvmail-rotator-wrapper" >
-		<img id="prvmail-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-</div>
-<div id="prvmail-end"></div>
-</form>
-</div>
diff --git a/view/theme/frost-mobile/register.tpl b/view/theme/frost-mobile/register.tpl
deleted file mode 100644
index 041be5e96e..0000000000
--- a/view/theme/frost-mobile/register.tpl
+++ /dev/null
@@ -1,80 +0,0 @@
-<div class='register-form'>
-<h2>$regtitle</h2>
-<br />
-
-<form action="register" method="post" id="register-form">
-
-	<input type="hidden" name="photo" value="$photo" />
-
-	$registertext
-
-	<p id="register-realpeople">$realpeople</p>
-
-	<br />
-{{ if $oidlabel }}
-	<div id="register-openid-wrapper" >
-    	<label for="register-openid" id="label-register-openid" >$oidlabel</label><input 	type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="$openid" >
-	</div>
-	<div id="register-openid-end" ></div>
-{{ endif }}
-
-	<div class="register-explain-wrapper">
-	<p id="register-fill-desc">$fillwith $fillext</p>
-	</div>
-
-	<br /><br />
-
-{{ if $invitations }}
-
-	<p id="register-invite-desc">$invite_desc</p>
-	<div id="register-invite-wrapper" >
-		<label for="register-invite" id="label-register-invite" >$invite_label</label>
-		<input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" value="$invite_id" >
-	</div>
-	<div id="register-name-end" ></div>
-
-{{ endif }}
-
-
-	<div id="register-name-wrapper" class="field input" >
-		<label for="register-name" id="label-register-name" >$namelabel</label><br />
-		<input type="text" maxlength="60" size="32" name="username" id="register-name" value="$username" >
-	</div>
-	<div id="register-name-end" ></div>
-
-
-	<div id="register-email-wrapper"  class="field input" >
-		<label for="register-email" id="label-register-email" >$addrlabel</label><br />
-		<input type="text" maxlength="60" size="32" name="email" id="register-email" value="$email" >
-	</div>
-	<div id="register-email-end" ></div>
-
-	<div id="register-nickname-wrapper" class="field input" >
-		<label for="register-nickname" id="label-register-nickname" >$nicklabel</label><br />
-		<input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" value="$nickname" >
-	</div>
-	<div id="register-nickname-end" ></div>
-
-	<div class="register-explain-wrapper">
-	<p id="register-nickname-desc" >$nickdesc</p>
-	</div>
-
-	$publish
-
-	<div id="register-footer">
-<!--	<div class="agreement">
-	By clicking '$regbutt' you are agreeing to the latest <a href="tos.html" title="$tostitle" id="terms-of-service-link" >$toslink</a> and <a href="privacy.html" title="$privacytitle" id="privacy-link" >$privacylink</a>
-	</div>-->
-	<br />
-
-	<div id="register-submit-wrapper">
-		<input type="submit" name="submit" id="register-submit-button" value="$regbutt" />
-	</div>
-	<div id="register-submit-end" ></div>
-	</div>
-</form>
-<br /><br /><br />
-
-$license
-
-</div>
diff --git a/view/theme/frost-mobile/search_item.tpl b/view/theme/frost-mobile/search_item.tpl
deleted file mode 100644
index cec365dc80..0000000000
--- a/view/theme/frost-mobile/search_item.tpl
+++ /dev/null
@@ -1,64 +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$item.previewing" id="wall-item-content-wrapper-$item.id" >
-		<div class="wall-item-info" id="wall-item-info-$item.id">
-			{#<!--<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
-				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">-->#}
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-				{#<!--<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-					<ul>
-						$item.item_photo_menu
-					</ul>
-				</div>
-			</div>-->#}
-			{#<!--<div class="wall-item-photo-end"></div>	-->#}
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-				{{ if $item.lock }}{#<!--<div class="wall-item-lock">-->#}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="$item.lock" onclick="lockview(event,$item.id);" />{#<!--</div>-->#}
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
-			</div>
-		</div>
-		{#<!--<div class="wall-item-author">-->#}
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div>
-				
-		{#<!--</div>			-->#}
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			{#<!--<div class="wall-item-title-end"></div>-->#}
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
-			{{ if $item.has_cats }}
-			<div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name{{ if $cat.removeurl }} <a href="$cat.removeurl" title="$remove">[$remove]</a>{{ endif }} {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-
-			{{ if $item.has_folders }}
-			<div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name{{ if $cat.removeurl }} <a href="$cat.removeurl" title="$remove">[$remove]</a>{{ endif }}{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			{#<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >-->#}
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" 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-conv" id="wall-item-conv-$item.id" >
-	{{ if $item.conv }}
-			<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
-	{{ endif }}
-	</div>
-
-{#<!--<div class="wall-item-outside-wrapper-end $item.indent" ></div>
-
-</div>
-
--->#}
diff --git a/view/theme/frost-mobile/settings-head.tpl b/view/theme/frost-mobile/settings-head.tpl
deleted file mode 100644
index 8cd22d5b6d..0000000000
--- a/view/theme/frost-mobile/settings-head.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-
-<script>
-	window.isPublic = "$ispublic";
-</script>
-
diff --git a/view/theme/frost-mobile/settings.tpl b/view/theme/frost-mobile/settings.tpl
deleted file mode 100644
index 8e5aff019b..0000000000
--- a/view/theme/frost-mobile/settings.tpl
+++ /dev/null
@@ -1,147 +0,0 @@
-<h1>$ptitle</h1>
-
-$nickname_block
-
-<form action="settings" id="settings-form" method="post" autocomplete="off" >
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-<h3 class="settings-heading">$h_pass</h3>
-
-{{inc field_password.tpl with $field=$password1 }}{{endinc}}
-{{inc field_password.tpl with $field=$password2 }}{{endinc}}
-{{inc field_password.tpl with $field=$password3 }}{{endinc}}
-
-{{ if $oid_enable }}
-{{inc field_input.tpl with $field=$openid }}{{endinc}}
-{{ endif }}
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
-<h3 class="settings-heading">$h_basic</h3>
-
-{{inc field_input.tpl with $field=$username }}{{endinc}}
-{{inc field_input.tpl with $field=$email }}{{endinc}}
-{{inc field_password.tpl with $field=$password4 }}{{endinc}}
-{{inc field_custom.tpl with $field=$timezone }}{{endinc}}
-{{inc field_input.tpl with $field=$defloc }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}}
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
-<h3 class="settings-heading">$h_prv</h3>
-
-
-<input type="hidden" name="visibility" value="$visibility" />
-
-{{inc field_input.tpl with $field=$maxreq }}{{endinc}}
-
-$profile_in_dir
-
-$profile_in_net_dir
-
-$hide_friends
-
-$hide_wall
-
-$blockwall
-
-$blocktags
-
-$suggestme
-
-$unkmail
-
-
-{{inc field_input.tpl with $field=$cntunkmail }}{{endinc}}
-
-{{inc field_input.tpl with $field=$expire.days }}{{endinc}}
-
-
-<div class="field input">
-	<span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span>
-	<div style="display: none;">
-		<div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
-			<h3>$expire.advanced</h3>
-			{{ inc field_yesno.tpl with $field=$expire.items }}{{endinc}}
-			{{ inc field_yesno.tpl with $field=$expire.notes }}{{endinc}}
-			{{ inc field_yesno.tpl with $field=$expire.starred }}{{endinc}}
-			{{ inc field_yesno.tpl with $field=$expire.network_only }}{{endinc}}
-		</div>
-	</div>
-
-</div>
-
-
-<div id="settings-default-perms" class="settings-default-perms" >
-	<a href="#settings-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>$permissions $permdesc</a>
-	<div id="settings-default-perms-menu-end"></div>
-
-{#<!--	<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >-->#}
-	
-	<div style="display: none;">
-		<div id="settings-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;margin-bottom: 20px">
-			$aclselect
-		</div>
-	</div>
-
-{#<!--	</div>-->#}
-</div>
-<br/>
-<div id="settings-default-perms-end"></div>
-
-$group_select
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
-
-<h3 class="settings-heading">$h_not</h3>
-<div id="settings-notifications">
-
-<div id="settings-activity-desc">$activity_options</div>
-
-{{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$post_joingroup }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}}
-
-
-<div id="settings-notify-desc">$lbl_not</div>
-
-<div class="group">
-{{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify2 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify3 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify4 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify6 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}}
-{{inc field_intcheckbox.tpl with $field=$notify8 }}{{endinc}}
-</div>
-
-</div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
-<h3 class="settings-heading">$h_advn</h3>
-<div id="settings-pagetype-desc">$h_descadvn</div>
-
-$pagetype
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
-</div>
-
-
diff --git a/view/theme/frost-mobile/settings_display_end.tpl b/view/theme/frost-mobile/settings_display_end.tpl
deleted file mode 100644
index 739c43b35a..0000000000
--- a/view/theme/frost-mobile/settings_display_end.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-	<script>$j(function(){ previewTheme($j("#id_$theme.0")[0]); });</script>
-
diff --git a/view/theme/frost-mobile/suggest_friends.tpl b/view/theme/frost-mobile/suggest_friends.tpl
deleted file mode 100644
index e0d1c29441..0000000000
--- a/view/theme/frost-mobile/suggest_friends.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="profile-match-wrapper">
-	<div class="profile-match-photo">
-		<a href="$url">
-			<img src="$photo" alt="$name" width="80" height="80" title="$name [$url]" onError="this.src='../../../images/person-48.jpg';" />
-		</a>
-	</div>
-	<div class="profile-match-break"></div>
-	<div class="profile-match-name">
-		<a href="$url" title="$name">$name</a>
-	</div>
-	<div class="profile-match-end"></div>
-	{{ if $connlnk }}
-	<div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div>
-	{{ endif }}
-	<a href="$ignlnk" title="$ignore" class="icon drophide profile-match-ignore" {#onmouseout="imgdull(this);" onmouseover="imgbright(this);" #}onclick="return confirmDelete();" ></a>
-</div>
diff --git a/view/theme/frost-mobile/smarty3/acl_selector.tpl b/view/theme/frost-mobile/templates/acl_selector.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/acl_selector.tpl
rename to view/theme/frost-mobile/templates/acl_selector.tpl
diff --git a/view/theme/frost-mobile/smarty3/admin_aside.tpl b/view/theme/frost-mobile/templates/admin_aside.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/admin_aside.tpl
rename to view/theme/frost-mobile/templates/admin_aside.tpl
diff --git a/view/theme/frost-mobile/smarty3/admin_site.tpl b/view/theme/frost-mobile/templates/admin_site.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/admin_site.tpl
rename to view/theme/frost-mobile/templates/admin_site.tpl
diff --git a/view/theme/frost-mobile/smarty3/admin_users.tpl b/view/theme/frost-mobile/templates/admin_users.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/admin_users.tpl
rename to view/theme/frost-mobile/templates/admin_users.tpl
diff --git a/view/theme/frost-mobile/smarty3/categories_widget.tpl b/view/theme/frost-mobile/templates/categories_widget.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/categories_widget.tpl
rename to view/theme/frost-mobile/templates/categories_widget.tpl
diff --git a/view/theme/frost-mobile/smarty3/comment_item.tpl b/view/theme/frost-mobile/templates/comment_item.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/comment_item.tpl
rename to view/theme/frost-mobile/templates/comment_item.tpl
diff --git a/view/theme/frost-mobile/smarty3/common_tabs.tpl b/view/theme/frost-mobile/templates/common_tabs.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/common_tabs.tpl
rename to view/theme/frost-mobile/templates/common_tabs.tpl
diff --git a/view/theme/frost-mobile/smarty3/contact_block.tpl b/view/theme/frost-mobile/templates/contact_block.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/contact_block.tpl
rename to view/theme/frost-mobile/templates/contact_block.tpl
diff --git a/view/theme/frost-mobile/smarty3/contact_edit.tpl b/view/theme/frost-mobile/templates/contact_edit.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/contact_edit.tpl
rename to view/theme/frost-mobile/templates/contact_edit.tpl
diff --git a/view/theme/frost-mobile/smarty3/contact_head.tpl b/view/theme/frost-mobile/templates/contact_head.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/contact_head.tpl
rename to view/theme/frost-mobile/templates/contact_head.tpl
diff --git a/view/theme/frost-mobile/smarty3/contact_template.tpl b/view/theme/frost-mobile/templates/contact_template.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/contact_template.tpl
rename to view/theme/frost-mobile/templates/contact_template.tpl
diff --git a/view/theme/frost-mobile/smarty3/contacts-end.tpl b/view/theme/frost-mobile/templates/contacts-end.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/contacts-end.tpl
rename to view/theme/frost-mobile/templates/contacts-end.tpl
diff --git a/view/theme/frost-mobile/smarty3/contacts-head.tpl b/view/theme/frost-mobile/templates/contacts-head.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/contacts-head.tpl
rename to view/theme/frost-mobile/templates/contacts-head.tpl
diff --git a/view/theme/frost-mobile/smarty3/contacts-template.tpl b/view/theme/frost-mobile/templates/contacts-template.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/contacts-template.tpl
rename to view/theme/frost-mobile/templates/contacts-template.tpl
diff --git a/view/theme/frost-mobile/smarty3/contacts-widget-sidebar.tpl b/view/theme/frost-mobile/templates/contacts-widget-sidebar.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/contacts-widget-sidebar.tpl
rename to view/theme/frost-mobile/templates/contacts-widget-sidebar.tpl
diff --git a/view/theme/frost-mobile/smarty3/conversation.tpl b/view/theme/frost-mobile/templates/conversation.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/conversation.tpl
rename to view/theme/frost-mobile/templates/conversation.tpl
diff --git a/view/theme/frost-mobile/smarty3/cropbody.tpl b/view/theme/frost-mobile/templates/cropbody.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/cropbody.tpl
rename to view/theme/frost-mobile/templates/cropbody.tpl
diff --git a/view/theme/frost-mobile/smarty3/cropend.tpl b/view/theme/frost-mobile/templates/cropend.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/cropend.tpl
rename to view/theme/frost-mobile/templates/cropend.tpl
diff --git a/view/theme/frost-mobile/smarty3/crophead.tpl b/view/theme/frost-mobile/templates/crophead.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/crophead.tpl
rename to view/theme/frost-mobile/templates/crophead.tpl
diff --git a/view/theme/frost-mobile/smarty3/display-head.tpl b/view/theme/frost-mobile/templates/display-head.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/display-head.tpl
rename to view/theme/frost-mobile/templates/display-head.tpl
diff --git a/view/theme/frost-mobile/smarty3/end.tpl b/view/theme/frost-mobile/templates/end.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/end.tpl
rename to view/theme/frost-mobile/templates/end.tpl
diff --git a/view/theme/frost-mobile/smarty3/event.tpl b/view/theme/frost-mobile/templates/event.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/event.tpl
rename to view/theme/frost-mobile/templates/event.tpl
diff --git a/view/theme/frost-mobile/smarty3/event_end.tpl b/view/theme/frost-mobile/templates/event_end.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/event_end.tpl
rename to view/theme/frost-mobile/templates/event_end.tpl
diff --git a/view/theme/frost-mobile/smarty3/event_head.tpl b/view/theme/frost-mobile/templates/event_head.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/event_head.tpl
rename to view/theme/frost-mobile/templates/event_head.tpl
diff --git a/view/theme/frost-mobile/smarty3/field_checkbox.tpl b/view/theme/frost-mobile/templates/field_checkbox.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/field_checkbox.tpl
rename to view/theme/frost-mobile/templates/field_checkbox.tpl
diff --git a/view/theme/frost-mobile/smarty3/field_input.tpl b/view/theme/frost-mobile/templates/field_input.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/field_input.tpl
rename to view/theme/frost-mobile/templates/field_input.tpl
diff --git a/view/theme/frost-mobile/smarty3/field_openid.tpl b/view/theme/frost-mobile/templates/field_openid.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/field_openid.tpl
rename to view/theme/frost-mobile/templates/field_openid.tpl
diff --git a/view/theme/frost-mobile/smarty3/field_password.tpl b/view/theme/frost-mobile/templates/field_password.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/field_password.tpl
rename to view/theme/frost-mobile/templates/field_password.tpl
diff --git a/view/theme/frost-mobile/smarty3/field_themeselect.tpl b/view/theme/frost-mobile/templates/field_themeselect.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/field_themeselect.tpl
rename to view/theme/frost-mobile/templates/field_themeselect.tpl
diff --git a/view/theme/frost-mobile/smarty3/generic_links_widget.tpl b/view/theme/frost-mobile/templates/generic_links_widget.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/generic_links_widget.tpl
rename to view/theme/frost-mobile/templates/generic_links_widget.tpl
diff --git a/view/theme/frost-mobile/smarty3/group_drop.tpl b/view/theme/frost-mobile/templates/group_drop.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/group_drop.tpl
rename to view/theme/frost-mobile/templates/group_drop.tpl
diff --git a/view/theme/frost-mobile/smarty3/head.tpl b/view/theme/frost-mobile/templates/head.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/head.tpl
rename to view/theme/frost-mobile/templates/head.tpl
diff --git a/view/theme/frost-mobile/smarty3/jot-end.tpl b/view/theme/frost-mobile/templates/jot-end.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/jot-end.tpl
rename to view/theme/frost-mobile/templates/jot-end.tpl
diff --git a/view/theme/frost-mobile/smarty3/jot-header.tpl b/view/theme/frost-mobile/templates/jot-header.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/jot-header.tpl
rename to view/theme/frost-mobile/templates/jot-header.tpl
diff --git a/view/theme/frost-mobile/smarty3/jot.tpl b/view/theme/frost-mobile/templates/jot.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/jot.tpl
rename to view/theme/frost-mobile/templates/jot.tpl
diff --git a/view/theme/frost-mobile/smarty3/jot_geotag.tpl b/view/theme/frost-mobile/templates/jot_geotag.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/jot_geotag.tpl
rename to view/theme/frost-mobile/templates/jot_geotag.tpl
diff --git a/view/theme/frost-mobile/smarty3/lang_selector.tpl b/view/theme/frost-mobile/templates/lang_selector.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/lang_selector.tpl
rename to view/theme/frost-mobile/templates/lang_selector.tpl
diff --git a/view/theme/frost-mobile/smarty3/like_noshare.tpl b/view/theme/frost-mobile/templates/like_noshare.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/like_noshare.tpl
rename to view/theme/frost-mobile/templates/like_noshare.tpl
diff --git a/view/theme/frost-mobile/smarty3/login.tpl b/view/theme/frost-mobile/templates/login.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/login.tpl
rename to view/theme/frost-mobile/templates/login.tpl
diff --git a/view/theme/frost-mobile/smarty3/login_head.tpl b/view/theme/frost-mobile/templates/login_head.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/login_head.tpl
rename to view/theme/frost-mobile/templates/login_head.tpl
diff --git a/view/theme/frost-mobile/smarty3/lostpass.tpl b/view/theme/frost-mobile/templates/lostpass.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/lostpass.tpl
rename to view/theme/frost-mobile/templates/lostpass.tpl
diff --git a/view/theme/frost-mobile/smarty3/mail_conv.tpl b/view/theme/frost-mobile/templates/mail_conv.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/mail_conv.tpl
rename to view/theme/frost-mobile/templates/mail_conv.tpl
diff --git a/view/theme/frost-mobile/smarty3/mail_list.tpl b/view/theme/frost-mobile/templates/mail_list.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/mail_list.tpl
rename to view/theme/frost-mobile/templates/mail_list.tpl
diff --git a/view/theme/frost-mobile/smarty3/message-end.tpl b/view/theme/frost-mobile/templates/message-end.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/message-end.tpl
rename to view/theme/frost-mobile/templates/message-end.tpl
diff --git a/view/theme/frost-mobile/smarty3/message-head.tpl b/view/theme/frost-mobile/templates/message-head.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/message-head.tpl
rename to view/theme/frost-mobile/templates/message-head.tpl
diff --git a/view/theme/frost-mobile/smarty3/moderated_comment.tpl b/view/theme/frost-mobile/templates/moderated_comment.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/moderated_comment.tpl
rename to view/theme/frost-mobile/templates/moderated_comment.tpl
diff --git a/view/theme/frost-mobile/smarty3/msg-end.tpl b/view/theme/frost-mobile/templates/msg-end.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/msg-end.tpl
rename to view/theme/frost-mobile/templates/msg-end.tpl
diff --git a/view/theme/frost-mobile/smarty3/msg-header.tpl b/view/theme/frost-mobile/templates/msg-header.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/msg-header.tpl
rename to view/theme/frost-mobile/templates/msg-header.tpl
diff --git a/view/theme/frost-mobile/smarty3/nav.tpl b/view/theme/frost-mobile/templates/nav.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/nav.tpl
rename to view/theme/frost-mobile/templates/nav.tpl
diff --git a/view/theme/frost-mobile/smarty3/photo_drop.tpl b/view/theme/frost-mobile/templates/photo_drop.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/photo_drop.tpl
rename to view/theme/frost-mobile/templates/photo_drop.tpl
diff --git a/view/theme/frost-mobile/smarty3/photo_edit.tpl b/view/theme/frost-mobile/templates/photo_edit.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/photo_edit.tpl
rename to view/theme/frost-mobile/templates/photo_edit.tpl
diff --git a/view/theme/frost-mobile/smarty3/photo_edit_head.tpl b/view/theme/frost-mobile/templates/photo_edit_head.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/photo_edit_head.tpl
rename to view/theme/frost-mobile/templates/photo_edit_head.tpl
diff --git a/view/theme/frost-mobile/smarty3/photo_view.tpl b/view/theme/frost-mobile/templates/photo_view.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/photo_view.tpl
rename to view/theme/frost-mobile/templates/photo_view.tpl
diff --git a/view/theme/frost-mobile/smarty3/photos_head.tpl b/view/theme/frost-mobile/templates/photos_head.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/photos_head.tpl
rename to view/theme/frost-mobile/templates/photos_head.tpl
diff --git a/view/theme/frost-mobile/smarty3/photos_upload.tpl b/view/theme/frost-mobile/templates/photos_upload.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/photos_upload.tpl
rename to view/theme/frost-mobile/templates/photos_upload.tpl
diff --git a/view/theme/frost-mobile/smarty3/profed_end.tpl b/view/theme/frost-mobile/templates/profed_end.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/profed_end.tpl
rename to view/theme/frost-mobile/templates/profed_end.tpl
diff --git a/view/theme/frost-mobile/smarty3/profed_head.tpl b/view/theme/frost-mobile/templates/profed_head.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/profed_head.tpl
rename to view/theme/frost-mobile/templates/profed_head.tpl
diff --git a/view/theme/frost-mobile/smarty3/profile_edit.tpl b/view/theme/frost-mobile/templates/profile_edit.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/profile_edit.tpl
rename to view/theme/frost-mobile/templates/profile_edit.tpl
diff --git a/view/theme/frost-mobile/smarty3/profile_photo.tpl b/view/theme/frost-mobile/templates/profile_photo.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/profile_photo.tpl
rename to view/theme/frost-mobile/templates/profile_photo.tpl
diff --git a/view/theme/frost-mobile/smarty3/profile_vcard.tpl b/view/theme/frost-mobile/templates/profile_vcard.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/profile_vcard.tpl
rename to view/theme/frost-mobile/templates/profile_vcard.tpl
diff --git a/view/theme/frost-mobile/smarty3/prv_message.tpl b/view/theme/frost-mobile/templates/prv_message.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/prv_message.tpl
rename to view/theme/frost-mobile/templates/prv_message.tpl
diff --git a/view/theme/frost-mobile/smarty3/register.tpl b/view/theme/frost-mobile/templates/register.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/register.tpl
rename to view/theme/frost-mobile/templates/register.tpl
diff --git a/view/theme/frost-mobile/smarty3/search_item.tpl b/view/theme/frost-mobile/templates/search_item.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/search_item.tpl
rename to view/theme/frost-mobile/templates/search_item.tpl
diff --git a/view/theme/frost-mobile/smarty3/settings-head.tpl b/view/theme/frost-mobile/templates/settings-head.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/settings-head.tpl
rename to view/theme/frost-mobile/templates/settings-head.tpl
diff --git a/view/theme/frost-mobile/smarty3/settings.tpl b/view/theme/frost-mobile/templates/settings.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/settings.tpl
rename to view/theme/frost-mobile/templates/settings.tpl
diff --git a/view/theme/frost-mobile/smarty3/settings_display_end.tpl b/view/theme/frost-mobile/templates/settings_display_end.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/settings_display_end.tpl
rename to view/theme/frost-mobile/templates/settings_display_end.tpl
diff --git a/view/theme/frost-mobile/smarty3/suggest_friends.tpl b/view/theme/frost-mobile/templates/suggest_friends.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/suggest_friends.tpl
rename to view/theme/frost-mobile/templates/suggest_friends.tpl
diff --git a/view/theme/frost-mobile/smarty3/threaded_conversation.tpl b/view/theme/frost-mobile/templates/threaded_conversation.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/threaded_conversation.tpl
rename to view/theme/frost-mobile/templates/threaded_conversation.tpl
diff --git a/view/theme/frost-mobile/smarty3/voting_fakelink.tpl b/view/theme/frost-mobile/templates/voting_fakelink.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/voting_fakelink.tpl
rename to view/theme/frost-mobile/templates/voting_fakelink.tpl
diff --git a/view/theme/frost-mobile/smarty3/wall_thread.tpl b/view/theme/frost-mobile/templates/wall_thread.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/wall_thread.tpl
rename to view/theme/frost-mobile/templates/wall_thread.tpl
diff --git a/view/theme/frost-mobile/smarty3/wallmsg-end.tpl b/view/theme/frost-mobile/templates/wallmsg-end.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/wallmsg-end.tpl
rename to view/theme/frost-mobile/templates/wallmsg-end.tpl
diff --git a/view/theme/frost-mobile/smarty3/wallmsg-header.tpl b/view/theme/frost-mobile/templates/wallmsg-header.tpl
similarity index 100%
rename from view/theme/frost-mobile/smarty3/wallmsg-header.tpl
rename to view/theme/frost-mobile/templates/wallmsg-header.tpl
diff --git a/view/theme/frost-mobile/threaded_conversation.tpl b/view/theme/frost-mobile/threaded_conversation.tpl
deleted file mode 100644
index 9d7f5c325c..0000000000
--- a/view/theme/frost-mobile/threaded_conversation.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-$live_update
-
-{{ for $threads as $thread }}
-{{ inc $thread.template with $item=$thread }}{{ endinc }}
-{{ endfor }}
-
-<div id="conversation-end"></div>
-
-{#<!--{{ if $dropping }}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
-  <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
-  <div id="item-delete-selected-desc" >$dropping</div>
-</div>
-<div id="item-delete-selected-end"></div>
-{{ endif }}-->#}
diff --git a/view/theme/frost-mobile/voting_fakelink.tpl b/view/theme/frost-mobile/voting_fakelink.tpl
deleted file mode 100644
index b66302cc27..0000000000
--- a/view/theme/frost-mobile/voting_fakelink.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<span class="fakelink-wrapper"  id="$[type]list-$id-wrapper">$phrase</span>
diff --git a/view/theme/frost-mobile/wall_thread.tpl b/view/theme/frost-mobile/wall_thread.tpl
deleted file mode 100644
index 6d34602a79..0000000000
--- a/view/theme/frost-mobile/wall_thread.tpl
+++ /dev/null
@@ -1,126 +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{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-info-$item.id">
-			{{ if $item.owner_url }}
-			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
-				<img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" onError="this.src='../../../images/person-48.jpg';" />
-				</a>
-			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
-			{{ endif }}
-			{#<!--<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id" 
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
-                onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">-->#}
-			{#<!--<div class="wall-item-photo-wrapper{{ if $item.owner_url }} wwfrom{{ endif }}" id="wall-item-photo-wrapper-$item.id">-->#}
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" onError="this.src='../../../images/person-48.jpg';" />
-				</a>
-				{#<!--<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-                    <ul class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-                        $item.item_photo_menu
-                    </ul>
-                </div>-->#}
-
-			{#<!--</div>-->#}
-			{#<!--<div class="wall-item-photo-end"></div>-->#}
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-				{{ if $item.lock }}{#<!--<div class="wall-item-lock">-->#}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="$item.lock" onclick="lockview(event,$item.id);" />{#<!--</div>-->#}
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
-			</div>
-		</div>
-		{#<!--<div class="wall-item-author">-->#}
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>{{ if $item.owner_url }} $item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall{{ endif }}<br />
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>				
-		{#<!--</div>-->#}
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			{#<!--<div class="wall-item-title-end"></div>-->#}
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
-					{#<!--<div class="body-tag">-->#}
-						{{ for $item.tags as $tag }}
-							<span class='body-tag tag'>$tag</span>
-						{{ endfor }}
-					{#<!--</div>-->#}
-			{{ if $item.has_cats }}
-			<div class="categorytags">$item.txt_cats {{ for $item.categories as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-
-			{{ if $item.has_folders }}
-			<div class="filesavetags">$item.txt_folders {{ for $item.folders as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-			</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			{{ if $item.vote }}
-			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
-				<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
-				{{ if $item.vote.dislike }}
-				<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 }}
-				<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-			</div>
-			{{ endif }}
-			{{ if $item.plink }}
-				{#<!--<div class="wall-item-links-wrapper">-->#}<a href="$item.plink.href" title="$item.plink.title" target="external-link" class="wall-item-links-wrapper icon remote-link$item.sparkle"></a>{#<!--</div>-->#}
-			{{ endif }}
-			{{ if $item.edpost }}
-				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-			{{ endif }}
-			 
-			{{ if $item.star }}
-			<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
-			{{ endif }}
-			{{ if $item.tagger }}
-			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.tagger.add"></a>
-			{{ endif }}
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
-			{{ endif }}			
-			
-			{#<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >-->#}
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="wall-item-delete-wrapper icon drophide" title="$item.drop.delete" id="wall-item-delete-wrapper-$item.id" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);" #}></a>{{ endif }}
-			{#<!--</div>-->#}
-				{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
-			{#<!--<div class="wall-item-delete-end"></div>-->#}
-		</div>
-	</div>	
-	{#<!--<div class="wall-item-wrapper-end"></div>-->#}
-	<div class="wall-item-like $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/theme/frost-mobile/wallmsg-end.tpl b/view/theme/frost-mobile/wallmsg-end.tpl
deleted file mode 100644
index 6074133798..0000000000
--- a/view/theme/frost-mobile/wallmsg-end.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<script type="text/javascript" src="$baseurl/js/ajaxupload.min.js" ></script>
-
diff --git a/view/theme/frost-mobile/wallmsg-header.tpl b/view/theme/frost-mobile/wallmsg-header.tpl
deleted file mode 100644
index 8ed5ea130d..0000000000
--- a/view/theme/frost-mobile/wallmsg-header.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-
-<script language="javascript" type="text/javascript">
-window.editSelect = "none";
-window.jotId = "#prvmail-text";
-window.imageUploadButton = 'prvmail-upload';
-</script>
-
diff --git a/view/theme/frost/acl_selector.tpl b/view/theme/frost/acl_selector.tpl
deleted file mode 100644
index df34a1a2ae..0000000000
--- a/view/theme/frost/acl_selector.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-<div id="acl-wrapper">
-	<input id="acl-search">
-	<a href="#" id="acl-showall">$showall</a>
-	<div id="acl-list">
-		<div id="acl-list-content">
-		</div>
-	</div>
-	<span id="acl-fields"></span>
-</div>
-
-<div class="acl-list-item" rel="acl-template" style="display:none">
-	<img data-src="{0}"><p>{1}</p>
-	<a href="#" class='acl-button-show'>$show</a>
-	<a href="#" class='acl-button-hide'>$hide</a>
-</div>
-
-<script>
-	window.allowCID = $allowcid;
-	window.allowGID = $allowgid;
-	window.denyCID = $denycid;
-	window.denyGID = $denygid;
-	window.aclInit = "true";
-</script>
diff --git a/view/theme/frost/admin_aside.tpl b/view/theme/frost/admin_aside.tpl
deleted file mode 100644
index da3ed23a88..0000000000
--- a/view/theme/frost/admin_aside.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-
-<h4><a href="$admurl">$admtxt</a></h4>
-<ul class='admin linklist'>
-	<li class='admin button $admin.site.2'><a href='$admin.site.0'>$admin.site.1</a></li>
-	<li class='admin button $admin.users.2'><a href='$admin.users.0'>$admin.users.1</a><span id='pending-update' title='$h_pending'></span></li>
-	<li class='admin button $admin.plugins.2'><a href='$admin.plugins.0'>$admin.plugins.1</a></li>
-	<li class='admin button $admin.themes.2'><a href='$admin.themes.0'>$admin.themes.1</a></li>
-	<li class='admin button $admin.dbsync.2'><a href='$admin.dbsync.0'>$admin.dbsync.1</a></li>
-</ul>
-
-{{ if $admin.update }}
-<ul class='admin linklist'>
-	<li class='admin button $admin.update.2'><a href='$admin.update.0'>$admin.update.1</a></li>
-	<li class='admin button $admin.update.2'><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li>
-</ul>
-{{ endif }}
-
-
-{{ if $admin.plugins_admin }}<h4>$plugadmtxt</h4>{{ endif }}
-<ul class='admin linklist'>
-	{{ for $admin.plugins_admin as $l }}
-	<li class='admin button $l.2'><a href='$l.0'>$l.1</a></li>
-	{{ endfor }}
-</ul>
-	
-	
-<h4>$logtxt</h4>
-<ul class='admin linklist'>
-	<li class='admin button $admin.logs.2'><a href='$admin.logs.0'>$admin.logs.1</a></li>
-</ul>
-
diff --git a/view/theme/frost/admin_site.tpl b/view/theme/frost/admin_site.tpl
deleted file mode 100644
index 07a76a827d..0000000000
--- a/view/theme/frost/admin_site.tpl
+++ /dev/null
@@ -1,76 +0,0 @@
-
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-	<form action="$baseurl/admin/site" method="post">
-    <input type='hidden' name='form_security_token' value='$form_security_token'>
-
-	{{ inc field_input.tpl with $field=$sitename }}{{ endinc }}
-	{{ inc field_textarea.tpl with $field=$banner }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$language }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$theme }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$theme_mobile }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$new_share }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$hide_help }}{{ endinc }} 
-	{{ inc field_select.tpl with $field=$singleuser }}{{ endinc }}
-	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-	
-	<h3>$registration</h3>
-	{{ inc field_input.tpl with $field=$register_text }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$register_policy }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$daily_registrations }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_multi_reg }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_openid }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_regfullname }}{{ endinc }}
-	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-
-	<h3>$upload</h3>
-	{{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$maximagelength }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$jpegimagequality }}{{ endinc }}
-	
-	<h3>$corporate</h3>
-	{{ inc field_input.tpl with $field=$allowed_sites }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$allowed_email }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$block_public }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$force_publish }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_community_page }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$ostatus_poll_interval }}{{ endinc }} 
-	{{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$newuser_private }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$enotify_no_content }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$private_addons }}{{ endinc }}	
-	{{ inc field_checkbox.tpl with $field=$disable_embedded }}{{ endinc }}	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-	
-	<h3>$advanced</h3>
-	{{ inc field_checkbox.tpl with $field=$no_utf }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$verifyssl }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$proxy }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$timeout }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$poll_interval }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$maxloadavg }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$lockpath }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$temppath }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$basepath }}{{ endinc }}
-
-	<h3>$performance</h3>
-	{{ inc field_checkbox.tpl with $field=$use_fulltext_engine }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$itemcache }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$itemcache_duration }}{{ endinc }}
-
-	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-	
-	</form>
-</div>
diff --git a/view/theme/frost/admin_users.tpl b/view/theme/frost/admin_users.tpl
deleted file mode 100644
index a3f6d2416f..0000000000
--- a/view/theme/frost/admin_users.tpl
+++ /dev/null
@@ -1,98 +0,0 @@
-<script>
-	function confirm_delete(uname){
-		return confirm( "$confirm_delete".format(uname));
-	}
-	function confirm_delete_multi(){
-		return confirm("$confirm_delete_multi");
-	}
-	function selectall(cls){
-		$j("."+cls).attr('checked','checked');
-		return false;
-	}
-</script>
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-	<form action="$baseurl/admin/users" method="post">
-        <input type='hidden' name='form_security_token' value='$form_security_token'>
-		
-		<h3>$h_pending</h3>
-		{{ if $pending }}
-			<table id='pending'>
-				<thead>
-				<tr>
-					{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-			{{ for $pending as $u }}
-				<tr>
-					<td class="created">$u.created</td>
-					<td class="name">$u.name</td>
-					<td class="email">$u.email</td>
-					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
-					<td class="tools">
-						<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='tool like'></span></a>
-						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='tool dislike'></span></a>
-					</td>
-				</tr>
-			{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>			
-		{{ else }}
-			<p>$no_pending</p>
-		{{ endif }}
-	
-	
-		
-	
-		<h3>$h_users</h3>
-		{{ if $users }}
-			<table id='users'>
-				<thead>
-				<tr>
-					<th></th>
-					{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{ for $users as $u }}
-					<tr>
-						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
-						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
-						<td class='email'>$u.email</td>
-						<td class='register_date'>$u.register_date</td>
-						<td class='login_date'>$u.login_date</td>
-						<td class='lastitem_date'>$u.lastitem_date</td>
-						<td class='login_date'>$u.page_flags {{ if $u.is_admin }}($siteadmin){{ endif }} {{ if $u.account_expired }}($accountexpired){{ endif }}</td>
-						<td class="checkbox"> 
-                                    {{ if $u.is_admin }}
-                                        &nbsp;
-                                    {{ else }}
-                                        <input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
-                                    {{ endif }}
-						<td class="tools">
-                                    {{ if $u.is_admin }}
-                                        &nbsp;
-                                    {{ else }}
-                                        <a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
-                                        <a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon drop'></span></a>
-                                    {{ endif }}
-						</td>
-					</tr>
-				{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>						
-		{{ else }}
-			NO USERS?!?
-		{{ endif }}
-	</form>
-</div>
diff --git a/view/theme/frost/comment_item.tpl b/view/theme/frost/comment_item.tpl
deleted file mode 100755
index 5e0919c30f..0000000000
--- a/view/theme/frost/comment_item.tpl
+++ /dev/null
@@ -1,77 +0,0 @@
-{#<!--		<script>
-		$(document).ready( function () {
-			$(document).mouseup(function(e) {
-				var container = $("#comment-edit-wrapper-$id");
-				if( container.has(e.target).length === 0) {
-					commentClose(document.getElementById('comment-edit-text-$id'),$id);
-					cmtBbClose($id);
-				}
-			});
-		});
-		</script>-->#}
-
-		<div class="comment-wwedit-wrapper $indent" id="comment-edit-wrapper-$id" style="display: block;">
-			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
-{#<!--			<span id="hide-commentbox-$id" class="hide-commentbox fakelink" onclick="showHideCommentBox($id);">$comment</span>
-			<form class="comment-edit-form" style="display: none;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">-->#}
-				<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" />
-				<input type="hidden" name="post_id_random" value="$rand_num" />
-
-{#<!--				<div class="comment-edit-photo" id="comment-edit-photo-$id" >-->#}
-					<a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-$id" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-{#<!--				</div>-->#}
-				{#<!--<div class="comment-edit-photo-end"></div>-->#}
-				<ul class="comment-edit-bb" id="comment-edit-bb-$id">
-					<li><a class="editicon boldbb shadow"
-						style="cursor: pointer;" title="$edbold"
-						onclick="insertFormatting('$comment','b', $id);"></a></li>
-					<li><a class="editicon italicbb shadow"
-						style="cursor: pointer;" title="$editalic"
-						onclick="insertFormatting('$comment','i', $id);"></a></li>
-					<li><a class="editicon underlinebb shadow"
-						style="cursor: pointer;" title="$eduline"
-						onclick="insertFormatting('$comment','u', $id);"></a></li>
-					<li><a class="editicon quotebb shadow"
-						style="cursor: pointer;" title="$edquote"
-						onclick="insertFormatting('$comment','quote', $id);"></a></li>
-					<li><a class="editicon codebb shadow"
-						style="cursor: pointer;" title="$edcode"
-						onclick="insertFormatting('$comment','code', $id);"></a></li>
-					<li><a class="editicon imagebb shadow"
-						style="cursor: pointer;" title="$edimg"
-						onclick="insertFormatting('$comment','img', $id);"></a></li>
-					<li><a class="editicon urlbb shadow"
-						style="cursor: pointer;" title="$edurl"
-						onclick="insertFormatting('$comment','url', $id);"></a></li>
-					<li><a class="editicon videobb shadow"
-						style="cursor: pointer;" title="$edvideo"
-						onclick="insertFormatting('$comment','video', $id);"></a></li>
-				</ul>	
-{#<!--				<div class="comment-edit-bb-end"></div>-->#}
-{#<!--				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);cmtBbClose($id);" >$comment</textarea>-->#}
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" >$comment</textarea>
-				{{ if $qcomment }}
-					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
-					<option value=""></option>
-				{{ for $qcomment as $qc }}
-					<option value="$qc">$qc</option>				
-				{{ endfor }}
-					</select>
-				{{ endif }}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				{#<!--<div class="comment-edit-end"></div>-->#}
-			</form>
-
-		</div>
diff --git a/view/theme/frost/contact_edit.tpl b/view/theme/frost/contact_edit.tpl
deleted file mode 100644
index f5710063a2..0000000000
--- a/view/theme/frost/contact_edit.tpl
+++ /dev/null
@@ -1,88 +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">
-
-	{{ 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/theme/frost/contact_end.tpl b/view/theme/frost/contact_end.tpl
deleted file mode 100644
index 95c78ba7da..0000000000
--- a/view/theme/frost/contact_end.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<script language="javascript" type="text/javascript">contactInitEditor();</script>
-
diff --git a/view/theme/frost/contact_head.tpl b/view/theme/frost/contact_head.tpl
deleted file mode 100644
index 7b89a20e71..0000000000
--- a/view/theme/frost/contact_head.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<script language="javascript" type="text/javascript">
-window.editSelect = "$editselect";
-</script>
-
diff --git a/view/theme/frost/contact_template.tpl b/view/theme/frost/contact_template.tpl
deleted file mode 100644
index dd3dbf7945..0000000000
--- a/view/theme/frost/contact_template.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-	<div class="contact-entry-photo-wrapper" >
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
-		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
-		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
-
-			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
-
-			{{ if $contact.photo_menu }}
-			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
-                    <ul>
-						{{ for $contact.photo_menu as $c }}
-						{{ if $c.2 }}
-						<li><a target="redir" href="$c.1">$c.0</a></li>
-						{{ else }}
-						<li><a href="$c.1">$c.0</a></li>
-						{{ endif }}
-						{{ endfor }}
-                    </ul>
-                </div>
-			{{ endif }}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div><br />
-{{ if $contact.alt_text }}<div class="contact-entry-details" id="contact-entry-rel-$contact.id" >$contact.alt_text</div>{{ endif }}
-	<div class="contact-entry-network" id="contact-entry-network-$contact.id" >$contact.network</div>
-
-	<div class="contact-entry-end" ></div>
-</div>
diff --git a/view/theme/frost/contacts-end.tpl b/view/theme/frost/contacts-end.tpl
deleted file mode 100644
index 820b1c6a0f..0000000000
--- a/view/theme/frost/contacts-end.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-
-<script src="$baseurl/library/jquery_ac/friendica.complete.min.js" ></script>
-
-
diff --git a/view/theme/frost/contacts-head.tpl b/view/theme/frost/contacts-head.tpl
deleted file mode 100644
index 5ae97f9f0c..0000000000
--- a/view/theme/frost/contacts-head.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-
-<script>
-	window.autocompleteType = 'contacts-head';
-</script>
-
diff --git a/view/theme/frost/contacts-template.tpl b/view/theme/frost/contacts-template.tpl
deleted file mode 100644
index de89b5371e..0000000000
--- a/view/theme/frost/contacts-template.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-<h1>$header{{ if $total }} ($total){{ endif }}</h1>
-
-{{ if $finding }}<h4>$finding</h4>{{ endif }}
-
-$tabs
-
-<div id="contacts-search-wrapper">
-<form id="contacts-search-form" action="$cmd" method="get" >
-<span class="contacts-search-desc">$desc</span>
-<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="$search" />
-<input type="submit" name="submit" id="contacts-search-submit" value="$submit" />
-</form>
-</div>
-<div id="contacts-search-end"></div>
-
-
-<div id="contacts-display-wrapper">
-{{ for $contacts as $contact }}
-	{{ inc contact_template.tpl }}{{ endinc }}
-{{ endfor }}
-</div>
-<div id="contact-edit-end"></div>
-
-$paginate
-
-
-
-
diff --git a/view/theme/frost/cropbody.tpl b/view/theme/frost/cropbody.tpl
deleted file mode 100644
index 3283084cad..0000000000
--- a/view/theme/frost/cropbody.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-<h1>$title</h1>
-<p id="cropimage-desc">
-$desc
-</p>
-<div id="cropimage-wrapper">
-<img src="$image_url" id="croppa" class="imgCrop" alt="$title" />
-</div>
-<div id="cropimage-preview-wrapper" >
-<div id="previewWrap" ></div>
-</div>
-
-<form action="profile_photo/$resource" id="crop-image-form" method="post" />
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-<input type="hidden" name="cropfinal" value="1" />
-<input type="hidden" name="xstart" id="x1" />
-<input type="hidden" name="ystart" id="y1" />
-<input type="hidden" name="xfinal" id="x2" />
-<input type="hidden" name="yfinal" id="y2" />
-<input type="hidden" name="height" id="height" />
-<input type="hidden" name="width"  id="width" />
-
-<div id="crop-image-submit-wrapper" >
-<input type="submit" name="submit" value="$done" />
-</div>
-
-</form>
diff --git a/view/theme/frost/cropend.tpl b/view/theme/frost/cropend.tpl
deleted file mode 100644
index a56c71d92e..0000000000
--- a/view/theme/frost/cropend.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-      <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
-      <script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
-      <script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>
-      <script type="text/javascript" language="javascript">initCrop();</script>
diff --git a/view/theme/frost/crophead.tpl b/view/theme/frost/crophead.tpl
deleted file mode 100644
index 56e941e3ab..0000000000
--- a/view/theme/frost/crophead.tpl
+++ /dev/null
@@ -1 +0,0 @@
-      <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />
diff --git a/view/theme/frost/display-head.tpl b/view/theme/frost/display-head.tpl
deleted file mode 100644
index 1fc82ae779..0000000000
--- a/view/theme/frost/display-head.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<script>
-	window.autoCompleteType = 'display-head';
-</script>
-
diff --git a/view/theme/frost/end.tpl b/view/theme/frost/end.tpl
deleted file mode 100644
index c88426bbf4..0000000000
--- a/view/theme/frost/end.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--[if IE]>
-<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-<![endif]-->
-{#<!--<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></script>-->#}
-{#<!--<script type="text/javascript">
-  tinyMCE.init({ mode : "none"});
-</script>-->#}
-
-<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></script>
-
-<script type="text/javascript" src="$baseurl/js/jquery.js" ></script>
-<script type="text/javascript" src="$baseurl/view/theme/frost/js/jquery.divgrow-1.3.1.f1.min.js" ></script>
-<script type="text/javascript" src="$baseurl/js/jquery.textinputs.js" ></script>
-<script type="text/javascript" src="$baseurl/library/colorbox/jquery.colorbox-min.js"></script>
-{#<!--<script type="text/javascript" src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script>-->#}
-<script type="text/javascript" src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script>
-
-<script type="text/javascript">var $j = jQuery.noConflict();</script>
-
-<script type="text/javascript" src="$baseurl/view/theme/frost/js/acl.min.js" ></script>
-<script type="text/javascript" src="$baseurl/js/webtoolkit.base64.min.js" ></script>
-<script type="text/javascript" src="$baseurl/view/theme/frost/js/fk.autocomplete.min.js" ></script>
-<script type="text/javascript" src="$baseurl/view/theme/frost/js/main.min.js" ></script>
-<script type="text/javascript" src="$baseurl/view/theme/frost/js/theme.min.js"></script>
-
diff --git a/view/theme/frost/event.tpl b/view/theme/frost/event.tpl
deleted file mode 100644
index 67de85d5c8..0000000000
--- a/view/theme/frost/event.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{ for $events as $event }}
-	<div class="event">
-	
-	{{ 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" target="external-link" 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 tool s22 pencil"></a>{{ endif }}
-	</div>
-	<div class="clear"></div>
-{{ endfor }}
diff --git a/view/theme/frost/event_end.tpl b/view/theme/frost/event_end.tpl
deleted file mode 100644
index 8e8dcd33ab..0000000000
--- a/view/theme/frost/event_end.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<script language="javascript" type="text/javascript"
-          src="$baseurl/library/fullcalendar/fullcalendar.min.js"></script>
-
-<script language="javascript" type="text/javascript">eventInitEditor();</script>
-
diff --git a/view/theme/frost/event_form.tpl b/view/theme/frost/event_form.tpl
deleted file mode 100644
index 36a22a8b2d..0000000000
--- a/view/theme/frost/event_form.tpl
+++ /dev/null
@@ -1,50 +0,0 @@
-<h3>$title</h3>
-
-<p>
-$desc
-</p>
-
-<form action="$post" method="post" >
-
-<input type="hidden" name="event_id" value="$eid" />
-<input type="hidden" name="cid" value="$cid" />
-<input type="hidden" name="uri" value="$uri" />
-
-<div id="event-start-text">$s_text</div>
-$s_dsel $s_tsel
-
-<div id="event-finish-text">$f_text</div>
-$f_dsel $f_tsel
-
-<div id="event-datetime-break"></div>
-
-<input type="checkbox" name="nofinish" value="1" id="event-nofinish-checkbox" $n_checked /> <div id="event-nofinish-text">$n_text</div>
-
-<div id="event-nofinish-break"></div>
-
-<input type="checkbox" name="adjust" value="1" id="event-adjust-checkbox" $a_checked /> <div id="event-adjust-text">$a_text</div>
-
-<div id="event-adjust-break"></div>
-
-<div id="event-summary-text">$t_text</div>
-<input type="text" id="event-summary" name="summary" value="$t_orig" />
-
-
-<div id="event-desc-text">$d_text</div>
-<textarea id="event-desc-textarea" rows="10" cols="70" name="desc">$d_orig</textarea>
-
-
-<div id="event-location-text">$l_text</div>
-<textarea id="event-location-textarea" rows="10" cols="70" name="location">$l_orig</textarea>
-<br />
-
-<input type="checkbox" name="share" value="1" id="event-share-checkbox" $sh_checked /> <div id="event-share-text">$sh_text</div>
-<div id="event-share-break"></div>
-
-$acl
-
-<div class="clear"></div>
-<input id="event-submit" type="submit" name="submit" value="$submit" />
-</form>
-
-
diff --git a/view/theme/frost/event_head.tpl b/view/theme/frost/event_head.tpl
deleted file mode 100644
index 44c6090fc1..0000000000
--- a/view/theme/frost/event_head.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<link rel='stylesheet' type='text/css' href='$baseurl/library/fullcalendar/fullcalendar.css' />
-
-<script language="javascript" type="text/javascript">
-window.aclType = 'event_head';
-window.editSelect = "$editselect";
-</script>
-
diff --git a/view/theme/frost/field_combobox.tpl b/view/theme/frost/field_combobox.tpl
deleted file mode 100644
index c454352d01..0000000000
--- a/view/theme/frost/field_combobox.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-	
-	<div class='field combobox'>
-		<label for='id_$field.0' id='id_$field.0_label'>$field.1</label>
-		{# html5 don't work on Chrome, Safari and IE9
-		<input id="id_$field.0" type="text" list="data_$field.0" >
-		<datalist id="data_$field.0" >
-		   {{ for $field.4 as $opt=>$val }}<option value="$val">{{ endfor }}
-		</datalist> #}
-		
-		<input id="id_$field.0" type="text" value="$field.2">
-		<select id="select_$field.0" onChange="$j('#id_$field.0').val($j(this).val())">
-			<option value="">$field.5</option>
-			{{ for $field.4 as $opt=>$val }}<option value="$val">$val</option>{{ endfor }}
-		</select>
-		
-		<span class='field_help'>$field.3</span>
-	</div>
-
diff --git a/view/theme/frost/field_input.tpl b/view/theme/frost/field_input.tpl
deleted file mode 100644
index 3c2149517f..0000000000
--- a/view/theme/frost/field_input.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field input' id='wrapper_$field.0'>
-		<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/theme/frost/field_openid.tpl b/view/theme/frost/field_openid.tpl
deleted file mode 100644
index a9f6cacad5..0000000000
--- a/view/theme/frost/field_openid.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field input openid' id='wrapper_$field.0'>
-		<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/theme/frost/field_password.tpl b/view/theme/frost/field_password.tpl
deleted file mode 100644
index a329b11029..0000000000
--- a/view/theme/frost/field_password.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-	
-	<div class='field password' id='wrapper_$field.0'>
-		<label for='id_$field.0'>$field.1</label>
-		<input type='password' name='$field.0' id='id_$field.0' value="$field.2">
-		<span class='field_help'>$field.3</span>
-	</div>
diff --git a/view/theme/frost/field_themeselect.tpl b/view/theme/frost/field_themeselect.tpl
deleted file mode 100644
index d8ddc2fc74..0000000000
--- a/view/theme/frost/field_themeselect.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-
-	<div class='field select'>
-		<label for='id_$field.0'>$field.1</label>
-		<select name='$field.0' id='id_$field.0' {{ if $field.5 }}onchange="previewTheme(this);"{{ endif }} >
-			{{ for $field.4 as $opt=>$val }}<option value="$opt" {{ if $opt==$field.2 }}selected="selected"{{ endif }}>$val</option>{{ endfor }}
-		</select>
-		<span class='field_help'>$field.3</span>
-		<div id="theme-preview"></div>
-	</div>
diff --git a/view/theme/frost/filebrowser.tpl b/view/theme/frost/filebrowser.tpl
deleted file mode 100644
index 9fe3c04ffe..0000000000
--- a/view/theme/frost/filebrowser.tpl
+++ /dev/null
@@ -1,84 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-	<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_popup.js"></script>
-	<style>
-		.panel_wrapper div.current{.overflow: auto; height: auto!important; }
-		.filebrowser.path { font-family: fixed; font-size: 10px; background-color: #f0f0ee; height:auto; overflow:auto;}
-		.filebrowser.path a { border-left: 1px solid #C0C0AA; background-color: #E0E0DD; display: block; float:left; padding: 0.3em 1em;}
-		.filebrowser ul{ list-style-type: none; padding:0px; }
-		.filebrowser.folders a { display: block; padding: 0.3em }
-		.filebrowser.folders a:hover { background-color: #f0f0ee; }
-		.filebrowser.files.image { overflow: auto; height: auto; }
-		.filebrowser.files.image img { height:100px;}
-		.filebrowser.files.image li { display: block; padding: 5px; float: left; }
-		.filebrowser.files.image span { display: none;}
-		.filebrowser.files.file img { height:16px; vertical-align: bottom;}
-		.filebrowser.files a { display: block;  padding: 0.3em}
-		.filebrowser.files a:hover { background-color: #f0f0ee; }
-		.filebrowser a { text-decoration: none; }
-	</style>
-	<script>
-		var FileBrowserDialogue = {
-			init : function () {
-				// Here goes your code for setting your custom things onLoad.
-			},
-			mySubmit : function (URL) {
-				//var URL = document.my_form.my_field.value;
-				var win = tinyMCEPopup.getWindowArg("window");
-
-				// insert information now
-				win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = URL;
-
-				// are we an image browser
-				if (typeof(win.ImageDialog) != "undefined") {
-					// we are, so update image dimensions...
-					if (win.ImageDialog.getImageData)
-						win.ImageDialog.getImageData();
-
-					// ... and preview if necessary
-					if (win.ImageDialog.showPreviewImage)
-						win.ImageDialog.showPreviewImage(URL);
-				}
-
-				// close popup window
-				tinyMCEPopup.close();
-			}
-		}
-
-		tinyMCEPopup.onInit.add(FileBrowserDialogue.init, FileBrowserDialogue);
-	</script>
-	</head>
-	<body>
-	
-	<div class="tabs">
-		<ul >
-			<li class="current"><span>FileBrowser</span></li>
-		</ul>
-	</div>
-	<div class="panel_wrapper">
-
-		<div id="general_panel" class="panel current">
-			<div class="filebrowser path">
-				{{ for $path as $p }}<a href="$p.0">$p.1</a>{{ endfor }}
-			</div>
-			<div class="filebrowser folders">
-				<ul>
-					{{ for $folders as $f }}<li><a href="$f.0/">$f.1</a></li>{{ endfor }}
-				</ul>
-			</div>
-			<div class="filebrowser files $type">
-				<ul>
-				{{ for $files as $f }}
-					<li><a href="#" onclick="FileBrowserDialogue.mySubmit('$f.0'); return false;"><img src="$f.2"><span>$f.1</span></a></li>
-				{{ endfor }}
-				</ul>
-			</div>
-		</div>
-	</div>
-	<div class="mceActionPanel">
-		<input type="button" id="cancel" name="cancel" value="$cancel" onclick="tinyMCEPopup.close();" />
-	</div>	
-	</body>
-	
-</html>
diff --git a/view/theme/frost/group_drop.tpl b/view/theme/frost/group_drop.tpl
deleted file mode 100644
index 959b77bb21..0000000000
--- a/view/theme/frost/group_drop.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="group-delete-wrapper button" id="group-delete-wrapper-$id" >
-	<a href="group/drop/$id?t=$form_security_token" 
-		onclick="return confirmDelete();" 
-		id="group-delete-icon-$id" 
-		class="icon drophide group-delete-icon" 
-		{#onmouseover="imgbright(this);" 
-		onmouseout="imgdull(this);"#} ></a>
-</div>
-<div class="group-delete-end"></div>
diff --git a/view/theme/frost/head.tpl b/view/theme/frost/head.tpl
deleted file mode 100644
index 3c25da46d0..0000000000
--- a/view/theme/frost/head.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<base href="$baseurl/" />
-<meta name="generator" content="$generator" />
-<link rel="stylesheet" href="$baseurl/library/colorbox/colorbox.css" type="text/css" media="screen" />
-{#<!--<link rel="stylesheet" href="$baseurl/library/tiptip/tipTip.css" type="text/css" media="screen" />-->#}
-<link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
-
-<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-
-<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
-<link rel="search"
-         href="$baseurl/opensearch" 
-         type="application/opensearchdescription+xml" 
-         title="Search in Friendica" />
-
-<script>
-	window.delItem = "$delitem";
-	window.commentEmptyText = "$comment";
-	window.showMore = "$showmore";
-	window.showFewer = "$showfewer";
-	var updateInterval = $update_interval;
-	var localUser = {{ if $local_user }}$local_user{{ else }}false{{ endif }};
-</script>
diff --git a/view/theme/frost/jot-end.tpl b/view/theme/frost/jot-end.tpl
deleted file mode 100644
index 0ed2a3af6b..0000000000
--- a/view/theme/frost/jot-end.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<script type="text/javascript" src="$baseurl/js/ajaxupload.min.js" ></script>
-
-<script language="javascript" type="text/javascript">if(typeof window.jotInit != 'undefined') initEditor();</script>
diff --git a/view/theme/frost/jot-header.tpl b/view/theme/frost/jot-header.tpl
deleted file mode 100644
index 5291907072..0000000000
--- a/view/theme/frost/jot-header.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-
-<script>
-	window.editSelect = "$editselect";
-	window.isPublic = "$ispublic";
-	window.nickname = "$nickname";
-	window.linkURL = "$linkurl";
-	window.vidURL = "$vidurl";
-	window.audURL = "$audurl";
-	window.whereAreU = "$whereareu";
-	window.term = "$term";
-	window.baseURL = "$baseurl";
-	window.geoTag = function () { $geotag }
-	window.jotId = "#profile-jot-text";
-	window.imageUploadButton = 'wall-image-upload';
-	window.delItems = '$delitems';
-</script>
-
diff --git a/view/theme/frost/jot.tpl b/view/theme/frost/jot.tpl
deleted file mode 100644
index 96abeecba7..0000000000
--- a/view/theme/frost/jot.tpl
+++ /dev/null
@@ -1,91 +0,0 @@
-
-<div id="profile-jot-wrapper" >
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey"></div>
-	</div>
-	<div id="profile-jot-banner-end"></div>
-
-	<form id="profile-jot-form" action="$action" method="post" >
-		<input type="hidden" name="type" value="$ptyp" />
-		<input type="hidden" name="profile_uid" value="$profile_uid" />
-		<input type="hidden" name="return" value="$return_path" />
-		<input type="hidden" name="location" id="jot-location" value="$defloc" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="$post_id" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input type="hidden" name="post_id_random" value="$rand_num" />
-		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div>
-		{{ if $placeholdercategory }}
-		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
-		{{ endif }}
-		<div id="jot-text-wrap">
-		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
-		</div>
-
-<div id="profile-jot-submit-wrapper" class="jothidden">
-	<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
-
-	<div id="profile-rotator-wrapper" style="display: $visitor;" >
-		<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-	
-	<div id="profile-upload-wrapper" style="display: $visitor;" >
-		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div>
-	</div> 
-	<div id="profile-attach-wrapper" style="display: $visitor;" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="$attach"></a></div>
-	</div> 
-
-	{#<!--<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >-->#}
-	<div id="profile-link-wrapper" style="display: $visitor;" >
-		<a id="profile-link" class="icon link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" style="display: $visitor;" >
-		<a id="profile-video" class="icon video" title="$video" onclick="jotVideoURL();return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" style="display: $visitor;" >
-		<a id="profile-audio" class="icon audio" title="$audio" onclick="jotAudioURL();return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" style="display: $visitor;" >
-		<a id="profile-location" class="icon globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" style="display: none;" >
-		<a id="profile-nolocation" class="icon noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
-	</div> 
-
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
-		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
-	</div>
-
-	<span onclick="preview_post();" id="jot-preview-link" class="fakelink">$preview</span>
-
-	<div id="profile-jot-perms-end"></div>
-
-
-	<div id="profile-jot-plugin-wrapper">
-  	$jotplugins
-	</div>
-
-{#<!--	<span id="jot-display-location" style="display: none;"></span>-->#}
-
-	<div id="jot-preview-content" style="display:none;"></div>
-
-	<div style="display: none;">
-		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-			$acl
-			<hr style="clear:both"/>
-			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-			<div id="profile-jot-email-end"></div>
-			$jotnets
-		</div>
-	</div>
-
-
-</div>
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
-		{{ if $content }}<script>window.jotInit = true;</script>{{ endif }}
diff --git a/view/theme/frost/jot_geotag.tpl b/view/theme/frost/jot_geotag.tpl
deleted file mode 100644
index 3f8bee91a7..0000000000
--- a/view/theme/frost/jot_geotag.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-
-	if(navigator.geolocation) {
-		navigator.geolocation.getCurrentPosition(function(position) {
-			var lat = position.coords.latitude.toFixed(4);
-			var lon = position.coords.longitude.toFixed(4);
-
-			$j('#jot-coord').val(lat + ', ' + lon);
-			$j('#profile-nolocation-wrapper').show();
-		});
-	}
-
diff --git a/view/theme/frost/lang_selector.tpl b/view/theme/frost/lang_selector.tpl
deleted file mode 100644
index e777a0a861..0000000000
--- a/view/theme/frost/lang_selector.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="lang-select-icon" class="icon s22 language" title="$title" onclick="openClose('language-selector');" ></div>
-<div id="language-selector" style="display: none;" >
-	<form action="#" method="post" >
-		<select name="system_language" onchange="this.form.submit();" >
-			{{ for $langs.0 as $v=>$l }}
-				<option value="$v" {{if $v==$langs.1}}selected="selected"{{endif}}>$l</option>
-			{{ endfor }}
-		</select>
-	</form>
-</div>
diff --git a/view/theme/frost/like_noshare.tpl b/view/theme/frost/like_noshare.tpl
deleted file mode 100644
index 5bf94f7df7..0000000000
--- a/view/theme/frost/like_noshare.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
-	<a href="#" class="tool like" title="$likethis" onclick="dolike($id,'like'); return false"></a>
-	{{ if $nolike }}
-	<a href="#" class="tool dislike" title="$nolike" onclick="dolike($id,'dislike'); return false"></a>
-	{{ endif }}
-	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-</div>
diff --git a/view/theme/frost/login.tpl b/view/theme/frost/login.tpl
deleted file mode 100644
index af315ac5e5..0000000000
--- a/view/theme/frost/login.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-
-<div class="login-form">
-<form action="$dest_url" method="post" >
-	<input type="hidden" name="auth-params" value="login" />
-
-	<div id="login_standard">
-	{{ inc field_input.tpl with $field=$lname }}{{ endinc }}
-	{{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
-	</div>
-	
-	{{ if $openid }}
-			<br /><br />
-			<div id="login_openid">
-			{{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
-			</div>
-	{{ endif }}
-
-<!--	<br /><br />
-	<div class="login-extra-links">
-	By signing in you agree to the latest <a href="tos.html" title="$tostitle" id="terms-of-service-link" >$toslink</a> and <a href="privacy.html" title="$privacytitle" id="privacy-link" >$privacylink</a>
-	</div>-->
-
-	<br /><br />
-	{{ inc field_checkbox.tpl with $field=$lremember }}{{ endinc }}
-
-	<div id="login-submit-wrapper" >
-		<input type="submit" name="submit" id="login-submit-button" value="$login" />
-	</div>
-
-	<br /><br />
-
-	<div class="login-extra-links">
-		{{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
-        <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
-	</div>
-	
-	{{ for $hiddens as $k=>$v }}
-		<input type="hidden" name="$k" value="$v" />
-	{{ endfor }}
-	
-	
-</form>
-</div>
-
-<script type="text/javascript">window.loginName = "$lname.0";</script>
diff --git a/view/theme/frost/login_head.tpl b/view/theme/frost/login_head.tpl
deleted file mode 100644
index 25339c327d..0000000000
--- a/view/theme/frost/login_head.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-{#<!--<link rel="stylesheet" href="$baseurl/view/theme/frost/login-style.css" type="text/css" media="all" />-->#}
-
diff --git a/view/theme/frost/lostpass.tpl b/view/theme/frost/lostpass.tpl
deleted file mode 100644
index f2a802494e..0000000000
--- a/view/theme/frost/lostpass.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="lostpass-form">
-<h2>$title</h2>
-<br /><br /><br />
-
-<form action="lostpass" method="post" >
-<div id="login-name-wrapper" class="field input">
-        <label for="login-name" id="label-login-name">$name</label>
-        <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
-</div>
-<div id="login-extra-end"></div>
-<p id="lostpass-desc">
-$desc
-</p>
-<br />
-
-<div id="login-submit-wrapper" >
-        <input type="submit" name="submit" id="lostpass-submit-button" value="$submit" />
-</div>
-<div id="login-submit-end"></div>
-</form>
-</div>
diff --git a/view/theme/frost/mail_conv.tpl b/view/theme/frost/mail_conv.tpl
deleted file mode 100644
index 97e814e1fb..0000000000
--- a/view/theme/frost/mail_conv.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="mail-conv-outside-wrapper">
-	<div class="mail-conv-sender" >
-		<a href="$mail.from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$mail.sparkle" src="$mail.from_photo" heigth="80" width="80" alt="$mail.from_name" /></a>
-	</div>
-	<div class="mail-conv-detail" >
-		<div class="mail-conv-sender-name" >$mail.from_name</div>
-		<div class="mail-conv-date">$mail.date</div>
-		<div class="mail-conv-subject">$mail.subject</div>
-		<div class="mail-conv-body">$mail.body</div>
-	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);"#} ></a></div><div class="mail-conv-delete-end"></div>
-	<div class="mail-conv-outside-wrapper-end"></div>
-</div>
-</div>
-<hr class="mail-conv-break" />
diff --git a/view/theme/frost/mail_list.tpl b/view/theme/frost/mail_list.tpl
deleted file mode 100644
index 5be7f38623..0000000000
--- a/view/theme/frost/mail_list.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="mail-list-outside-wrapper">
-	<div class="mail-list-sender" >
-		<a href="$from_url" class="mail-list-sender-url" ><img class="mail-list-sender-photo$sparkle" src="$from_photo" height="80" width="80" alt="$from_name" /></a>
-	</div>
-	<div class="mail-list-detail">
-		<div class="mail-list-sender-name" >$from_name</div>
-		<div class="mail-list-date">$date</div>
-		<div class="mail-list-subject"><a href="message/$id" class="mail-list-link">$subject</a></div>
-	<div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-$id" >
-		<a href="message/dropconv/$id" onclick="return confirmDelete();"  title="$delete" class="icon drophide mail-list-delete	delete-icon" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);"#} ></a>
-	</div>
-</div>
-</div>
-<div class="mail-list-delete-end"></div>
-
-<div class="mail-list-outside-wrapper-end"></div>
diff --git a/view/theme/frost/message-end.tpl b/view/theme/frost/message-end.tpl
deleted file mode 100644
index 820b1c6a0f..0000000000
--- a/view/theme/frost/message-end.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-
-<script src="$baseurl/library/jquery_ac/friendica.complete.min.js" ></script>
-
-
diff --git a/view/theme/frost/message-head.tpl b/view/theme/frost/message-head.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/theme/frost/moderated_comment.tpl b/view/theme/frost/moderated_comment.tpl
deleted file mode 100755
index b0451c8c60..0000000000
--- a/view/theme/frost/moderated_comment.tpl
+++ /dev/null
@@ -1,61 +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>
-				<ul class="comment-edit-bb-$id">
-					<li><a class="editicon boldbb shadow"
-						style="cursor: pointer;" title="$edbold"
-						onclick="insertFormatting('$comment','b', $id);"></a></li>
-					<li><a class="editicon italicbb shadow"
-						style="cursor: pointer;" title="$editalic"
-						onclick="insertFormatting('$comment','i', $id);"></a></li>
-					<li><a class="editicon underlinebb shadow"
-						style="cursor: pointer;" title="$eduline"
-						onclick="insertFormatting('$comment','u', $id);"></a></li>
-					<li><a class="editicon quotebb shadow"
-						style="cursor: pointer;" title="$edquote"
-						onclick="insertFormatting('$comment','quote', $id);"></a></li>
-					<li><a class="editicon codebb shadow"
-						style="cursor: pointer;" title="$edcode"
-						onclick="insertFormatting('$comment','code', $id);"></a></li>
-					<li><a class="editicon imagebb shadow"
-						style="cursor: pointer;" title="$edimg"
-						onclick="insertFormatting('$comment','img', $id);"></a></li>
-					<li><a class="editicon urlbb shadow"
-						style="cursor: pointer;" title="$edurl"
-						onclick="insertFormatting('$comment','url', $id);"></a></li>
-					<li><a class="editicon videobb shadow"
-						style="cursor: pointer;" title="$edvideo"
-						onclick="insertFormatting('$comment','video', $id);"></a></li>
-				</ul>	
-				<div class="comment-edit-bb-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);" >$comment</textarea>			
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/frost/msg-end.tpl b/view/theme/frost/msg-end.tpl
deleted file mode 100644
index 84448efd53..0000000000
--- a/view/theme/frost/msg-end.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<script type="text/javascript" src="$baseurl/js/ajaxupload.min.js" ></script>
-
-<script language="javascript" type="text/javascript">msgInitEditor();</script>
diff --git a/view/theme/frost/msg-header.tpl b/view/theme/frost/msg-header.tpl
deleted file mode 100644
index c1eabcec74..0000000000
--- a/view/theme/frost/msg-header.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-
-<script language="javascript" type="text/javascript">
-	window.nickname = "$nickname";
-	window.linkURL = "$linkurl";
-	window.editSelect = "$editselect";
-	window.jotId = "#prvmail-text";
-	window.imageUploadButton = 'prvmail-upload';
-	window.autocompleteType = 'msg-header';
-</script>
-
diff --git a/view/theme/frost/nav.tpl b/view/theme/frost/nav.tpl
deleted file mode 100644
index 3c9a4102fb..0000000000
--- a/view/theme/frost/nav.tpl
+++ /dev/null
@@ -1,150 +0,0 @@
-<nav>
-	$langselector
-
-	<div id="site-location">$sitelocation</div>
-
-	<span id="nav-link-wrapper" >
-
-{#<!--	<a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>-->#}
-	<div class="nav-button-container nav-menu-link" rel="#system-menu-list">
-	<a class="system-menu-link nav-link nav-menu-icon" href="$nav.settings.0" title="Main Menu" point="#system-menu-list">
-	<img class="system-menu-link" src="$baseurl/view/theme/frost/images/menu.png">
-	</a>
-	<ul id="system-menu-list" class="nav-menu-list" point="#system-menu-list">
-		{{ if $nav.login }}
-		<a id="nav-login-link" class="nav-load-page-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
-		{{ endif }}
-
-		{{ if $nav.register }}
-		<a id="nav-register-link" class="nav-load-page-link $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>
-		{{ endif }}
-
-		{{ if $nav.settings }}
-		<li><a id="nav-settings-link" class="$nav.settings.2 nav-load-page-link" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>
-		{{ endif }}
-
-		{{ if $nav.manage }}
-		<li>
-		<a id="nav-manage-link" class="nav-load-page-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>
-		</li>
-		{{ endif }}
-
-		{{ if $nav.profiles }}
-		<li><a id="nav-profiles-link" class="$nav.profiles.2 nav-load-page-link" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a></li>
-		{{ endif }}
-
-		{{ if $nav.admin }}
-		<li><a id="nav-admin-link" class="$nav.admin.2 nav-load-page-link" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>
-		{{ endif }}
-
-		<li><a id="nav-search-link" class="$nav.search.2 nav-load-page-link" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a></li>
-
-		{{ if $nav.apps }}
-		<li><a id="nav-apps-link" class="$nav.apps.2 nav-load-page-link" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a></li>
-		{{ endif }}
-
-		{{ if $nav.help }}
-		<li><a id="nav-help-link" class="$nav.help.2 nav-load-page-link" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>
-		{{ endif }}
-		
-		{{ if $nav.logout }}
-		<li><a id="nav-logout-link" class="$nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>
-		{{ endif }}
-	</ul>
-	</div>
-
-	{{ if $nav.notifications }}
-{#<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>-->#}
-	<div class="nav-button-container">
-	<a id="nav-notifications-linkmenu" class="nav-link" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">
-	<img rel="#nav-notifications-menu" src="$baseurl/view/theme/frost/images/notifications.png">
-	</a>
-	<span id="notify-update" class="nav-ajax-left" rel="#nav-network-notifications-popup"></span>
-	<ul id="nav-notifications-menu" class="notifications-menu-popup">
-		<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-		<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-		<li class="empty">$emptynotifications</li>
-	</ul>
-	</div>
-	{{ endif }}		
-
-{#<!--	<a id="contacts-menu-link" class="nav-link" href="#contacts-menu" title="Contacts">Contacts</a>-->#}
-	<div class="nav-button-container nav-menu-link" rel="#contacts-menu-list">
-	<a class="contacts-menu-link nav-link nav-menu-icon" href="$nav.contacts.0" title="Contacts" point="#contacts-menu-list">
-	<img class="contacts-menu-link" src="$baseurl/view/theme/frost/images/contacts.png">
-	</a>
-	{{ if $nav.introductions }}
-	<a id="nav-notify-link" class="$nav.introductions.2 $sel.introductions nav-load-page-link" href="$nav.introductions.0" title="$nav.introductions.3" >
-	<span id="intro-update" class="nav-ajax-left"></span>
-	</a>
-	{{ endif }}
-	<ul id="contacts-menu-list" class="nav-menu-list" point="#contacts-menu-list">
-		{{ if $nav.contacts }}
-		<li><a id="nav-contacts-link" class="$nav.contacts.2 nav-load-page-link" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a><li>
-		{{ endif }}
-
-		<li><a id="nav-directory-link" class="$nav.directory.2 nav-load-page-link" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a><li>
-
-		{{ if $nav.introductions }}
-		<li>
-		<a id="nav-notify-link" class="$nav.introductions.2 $sel.introductions nav-load-page-link" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a>
-		</li>
-		{{ endif }}
-	</ul>
-	</div>
-
-	{{ if $nav.messages }}
-{#<!--	<a id="nav-messages-link" class="nav-link $nav.messages.2 $sel.messages nav-load-page-link" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>-->#}
-	<div class="nav-button-container">
-	<a id="nav-messages-link" class="nav-link $nav.messages.2 $sel.messages nav-load-page-link" href="$nav.messages.0" title="$nav.messages.3" >
-	<img src="$baseurl/view/theme/frost/images/message.png">
-	</a>
-	<span id="mail-update" class="nav-ajax-left"></span>
-	</div>
-	{{ endif }}
-
-{#<!--	<a id="network-menu-link" class="nav-link" href="#network-menu" title="Network">Network</a>-->#}
-	<div class="nav-button-container nav-menu-link" rel="#network-menu-list">
-	<a class="nav-menu-icon network-menu-link nav-link" href="$nav.network.0" title="Network" point="#network-menu-list">
-	<img class="network-menu-link" src="$baseurl/view/theme/frost/images/network.png">
-	</a>
-	{{ if $nav.network }}
-	<span id="net-update" class="nav-ajax-left"></span>
-	{{ endif }}
-	<ul id="network-menu-list" class="nav-menu-list" point="#network-menu-list">
-		{{ if $nav.network }}
-		<li>
-		<a id="nav-network-link" class="$nav.network.2 $sel.network nav-load-page-link" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
-		</li>
-		{#<!--<span id="net-update" class="nav-ajax-left"></span>-->#}
-		{{ endif }}
-
-		{{ if $nav.home }}
-		<li><a id="nav-home-link" class="$nav.home.2 $sel.home nav-load-page-link" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a></li>
-		{#<!--<span id="home-update" class="nav-ajax-left"></span>-->#}
-		{{ endif }}
-
-		{{ if $nav.community }}
-		<li>
-		<a id="nav-community-link" class="$nav.community.2 $sel.community nav-load-page-link" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
-		</li>
-		{{ endif }}
-	</ul>
-	</div>
-
-	{{ if $nav.network }}
-	<div class="nav-button-container nav-menu-link" rel="#network-reset-button">
-	<a class="nav-menu-icon network-reset-link nav-link" href="$nav.net_reset.0" title="$nav.net_reset.3">
-	<img class="network-reset-link" src="$baseurl/view/theme/frost/images/net-reset.png">
-	</a>
-	</div>
-	{{ endif }}
-		
-	</span>
-	{#<!--<span id="nav-end"></span>-->#}
-	<span id="banner">$banner</span>
-</nav>
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
-</ul>
diff --git a/view/theme/frost/photo_drop.tpl b/view/theme/frost/photo_drop.tpl
deleted file mode 100644
index f55e62344a..0000000000
--- a/view/theme/frost/photo_drop.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$id" >
-	<a href="item/drop/$id" onclick="return confirmDelete();" class="icon drophide" title="$delete" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);"#} ></a>
-</div>
-<div class="wall-item-delete-end"></div>
diff --git a/view/theme/frost/photo_edit.tpl b/view/theme/frost/photo_edit.tpl
deleted file mode 100644
index 5ed3c1d036..0000000000
--- a/view/theme/frost/photo_edit.tpl
+++ /dev/null
@@ -1,58 +0,0 @@
-
-<form action="photos/$nickname/$resource_id" method="post" id="photo_edit_form" >
-
-	<input type="hidden" name="item_id" value="$item_id" />
-
-	<label id="photo-edit-albumname-label" for="photo-edit-albumname">$newalbum</label>
-	<input id="photo-edit-albumname" type="text" size="32" name="albname" value="$album" />
-
-	<div id="photo-edit-albumname-end"></div>
-
-	<label id="photo-edit-caption-label" for="photo-edit-caption">$capt_label</label>
-	<input id="photo-edit-caption" type="text" size="32" name="desc" value="$caption" />
-
-	<div id="photo-edit-caption-end"></div>
-
-	<label id="photo-edit-tags-label" for="photo-edit-newtag" >$tag_label</label>
-	<input name="newtag" id="photo-edit-newtag" size="32" title="$help_tags" type="text" />
-
-	<div id="photo-edit-tags-end"></div>
-	<div id="photo-edit-rotate-wrapper">
-		<div class="photo-edit-rotate-label">
-			$rotatecw
-		</div>
-		<input class="photo-edit-rotate" type="radio" name="rotate" value="1" /><br />
-
-		<div class="photo-edit-rotate-label">
-			$rotateccw
-		</div>
-		<input class="photo-edit-rotate" type="radio" name="rotate" value="2" />
-	</div>
-	<div id="photo-edit-rotate-end"></div>
-
-	<div id="photo-edit-perms" class="photo-edit-perms" >
-		<a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="popupbox button" title="$permissions"/>
-			<span id="jot-perms-icon" class="icon $lockstate photo-perms-icon" ></span><div class="photo-jot-perms-text">$permissions</div>
-		</a>
-		<div id="photo-edit-perms-menu-end"></div>
-		
-		<div style="display: none;">
-			<div id="photo-edit-perms-select" >
-				$aclselect
-			</div>
-		</div>
-	</div>
-	<div id="photo-edit-perms-end"></div>
-
-	<input id="photo-edit-submit-button" type="submit" name="submit" value="$submit" />
-	<input id="photo-edit-delete-button" type="submit" name="delete" value="$delete" onclick="return confirmDelete()"; />
-
-	<div id="photo-edit-end"></div>
-</form>
-
-{#<!--<script>
-	$("a#photo-edit-perms-menu").colorbox({
-		'inline' : true,
-		'transition' : 'none'
-	}); 
-</script>-->#}
diff --git a/view/theme/frost/photo_edit_head.tpl b/view/theme/frost/photo_edit_head.tpl
deleted file mode 100644
index 4536dd5dfd..0000000000
--- a/view/theme/frost/photo_edit_head.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-
-<script>
-	window.prevLink = "$prevlink";
-	window.nextLink = "$nextlink";
-	window.photoEdit = true;
-
-</script>
diff --git a/view/theme/frost/photo_view.tpl b/view/theme/frost/photo_view.tpl
deleted file mode 100644
index 92e115487a..0000000000
--- a/view/theme/frost/photo_view.tpl
+++ /dev/null
@@ -1,42 +0,0 @@
-<div id="live-display"></div>
-<h3><a href="$album.0">$album.1</a></h3>
-
-<div id="photo-edit-link-wrap">
-{{ if $tools }}
-<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
-|
-<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
-{{ endif }}
-{{ if $lock }} | <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo/$id');" /> {{ endif }}
-</div>
-
-<div id="photo-nav">
-	{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0"><img src="view/theme/frost-mobile/images/arrow-left.png"></a></div>{{ endif }}
-	{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0"><img src="view/theme/frost-mobile/images/arrow-right.png"></a></div>{{ endif }}
-</div>
-<div id="photo-photo"><a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a></div>
-<div id="photo-photo-end"></div>
-<div id="photo-caption">$desc</div>
-{{ if $tags }}
-<div id="in-this-photo-text">$tags.0</div>
-<div id="in-this-photo">$tags.1</div>
-{{ endif }}
-{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
-
-{{ if $edit }}
-$edit
-{{ else }}
-
-{{ if $likebuttons }}
-<div id="photo-like-div">
-	$likebuttons
-	$like
-	$dislike	
-</div>
-{{ endif }}
-
-$comments
-
-$paginate
-{{ endif }}
-
diff --git a/view/theme/frost/photos_head.tpl b/view/theme/frost/photos_head.tpl
deleted file mode 100644
index 8cd22d5b6d..0000000000
--- a/view/theme/frost/photos_head.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-
-<script>
-	window.isPublic = "$ispublic";
-</script>
-
diff --git a/view/theme/frost/photos_upload.tpl b/view/theme/frost/photos_upload.tpl
deleted file mode 100644
index 1a41fcbdb0..0000000000
--- a/view/theme/frost/photos_upload.tpl
+++ /dev/null
@@ -1,52 +0,0 @@
-<h3>$pagename</h3>
-
-<div id="photos-usage-message">$usage</div>
-
-<form action="photos/$nickname" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" >
-	<div id="photos-upload-new-wrapper" >
-		<div id="photos-upload-newalbum-div">
-			<label id="photos-upload-newalbum-text" for="photos-upload-newalbum" >$newalbum</label>
-		</div>
-		<input id="photos-upload-newalbum" type="text" name="newalbum" />
-	</div>
-	<div id="photos-upload-new-end"></div>
-	<div id="photos-upload-exist-wrapper">
-		<div id="photos-upload-existing-album-text">$existalbumtext</div>
-		<select id="photos-upload-album-select" name="album" size="4">
-		$albumselect
-		</select>
-	</div>
-	<div id="photos-upload-exist-end"></div>
-
-	<div id="photos-upload-choosefile-outer-wrapper">
-	$default_upload_box
-	<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
-		<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" checked />
-		<div id="photos-upload-noshare-label">
-		<label id="photos-upload-noshare-text" for="photos-upload-noshare" >$nosharetext</label>
-		</div>
-	</div>
-
-	<div id="photos-upload-perms" class="photos-upload-perms" >
-		<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="popupbox button" />
-		<span id="jot-perms-icon" class="icon $lockstate  photo-perms-icon" ></span><div class="photo-jot-perms-text">$permissions</div>
-		</a>
-	</div>
-	<div id="photos-upload-perms-end"></div>
-
-	<div style="display: none;">
-		<div id="photos-upload-permissions-wrapper">
-			$aclselect
-		</div>
-	</div>
-
-	<div id="photos-upload-spacer"></div>
-
-	$alt_uploader
-
-	$default_upload_submit
-
-	<div class="photos-upload-end" ></div>
-	</div>
-</form>
-
diff --git a/view/theme/frost/posted_date_widget.tpl b/view/theme/frost/posted_date_widget.tpl
deleted file mode 100644
index ce70b74255..0000000000
--- a/view/theme/frost/posted_date_widget.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<div id="datebrowse-sidebar" class="widget">
-	<h3>$title</h3>
-<script>function dateSubmit(dateurl) { window.location.href = dateurl; } </script>
-<select id="posted-date-selector" name="posted-date-select" onchange="dateSubmit($j(this).val());" size="$size">
-{{ for $dates as $d }}
-<option value="$url/$d.1/$d.2" >$d.0</option>
-{{ endfor }}
-</select>
-</div>
diff --git a/view/theme/frost/profed_end.tpl b/view/theme/frost/profed_end.tpl
deleted file mode 100644
index 73a08c1328..0000000000
--- a/view/theme/frost/profed_end.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<script type="text/javascript" src="js/country.min.js" ></script>
-
-<script language="javascript" type="text/javascript">
-profInitEditor();
-Fill_Country('$country_name');
-Fill_States('$region');
-</script>
-
diff --git a/view/theme/frost/profed_head.tpl b/view/theme/frost/profed_head.tpl
deleted file mode 100644
index 55fd5f4a76..0000000000
--- a/view/theme/frost/profed_head.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-
-<script language="javascript" type="text/javascript">
-	window.editSelect = "$editselect";
-</script>
-
diff --git a/view/theme/frost/profile_edit.tpl b/view/theme/frost/profile_edit.tpl
deleted file mode 100644
index 11b2a5b3a8..0000000000
--- a/view/theme/frost/profile_edit.tpl
+++ /dev/null
@@ -1,322 +0,0 @@
-$default
-
-<h1>$banner</h1>
-
-<div id="profile-edit-links">
-<ul>
-<li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="$viewprof">$viewprof</a></li>
-<li><a href="$profile_clone_link" id="profile-edit-clone-link" title="$cr_prof">$cl_prof</a></li>
-<li></li>
-<li><a href="$profile_drop_link" id="profile-edit-drop-link" title="$del_prof" $disabled >$del_prof</a></li>
-
-</ul>
-</div>
-
-<div id="profile-edit-links-end"></div>
-
-
-<div id="profile-edit-wrapper" >
-<form id="profile-edit-form" name="form1" action="profiles/$profile_id" method="post" >
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-
-<div id="profile-edit-profile-name-wrapper" >
-<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >$lbl_profname </label>
-<input type="text" size="28" name="profile_name" id="profile-edit-profile-name" value="$profile_name" /><div class="required">*</div>
-</div>
-<div id="profile-edit-profile-name-end"></div>
-
-<div id="profile-edit-name-wrapper" >
-<label id="profile-edit-name-label" for="profile-edit-name" >$lbl_fullname </label>
-<input type="text" size="28" name="name" id="profile-edit-name" value="$name" />
-</div>
-<div id="profile-edit-name-end"></div>
-
-<div id="profile-edit-pdesc-wrapper" >
-<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >$lbl_title </label>
-<input type="text" size="28" name="pdesc" id="profile-edit-pdesc" value="$pdesc" />
-</div>
-<div id="profile-edit-pdesc-end"></div>
-
-
-<div id="profile-edit-gender-wrapper" >
-<label id="profile-edit-gender-label" for="gender-select" >$lbl_gender </label>
-$gender
-</div>
-<div id="profile-edit-gender-end"></div>
-
-<div id="profile-edit-dob-wrapper" >
-<label id="profile-edit-dob-label" for="dob-select" >$lbl_bd </label>
-<div id="profile-edit-dob" >
-$dob $age
-</div>
-</div>
-<div id="profile-edit-dob-end"></div>
-
-$hide_friends
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="profile-edit-address-wrapper" >
-<label id="profile-edit-address-label" for="profile-edit-address" >$lbl_address </label>
-<input type="text" size="28" name="address" id="profile-edit-address" value="$address" />
-</div>
-<div id="profile-edit-address-end"></div>
-
-<div id="profile-edit-locality-wrapper" >
-<label id="profile-edit-locality-label" for="profile-edit-locality" >$lbl_city </label>
-<input type="text" size="28" name="locality" id="profile-edit-locality" value="$locality" />
-</div>
-<div id="profile-edit-locality-end"></div>
-
-
-<div id="profile-edit-postal-code-wrapper" >
-<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >$lbl_zip </label>
-<input type="text" size="28" name="postal_code" id="profile-edit-postal-code" value="$postal_code" />
-</div>
-<div id="profile-edit-postal-code-end"></div>
-
-<div id="profile-edit-country-name-wrapper" >
-<label id="profile-edit-country-name-label" for="profile-edit-country-name" >$lbl_country </label>
-<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('$region');">
-<option selected="selected" >$country_name</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-country-name-end"></div>
-
-<div id="profile-edit-region-wrapper" >
-<label id="profile-edit-region-label" for="profile-edit-region" >$lbl_region </label>
-<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
-<option selected="selected" >$region</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-region-end"></div>
-
-<div id="profile-edit-hometown-wrapper" >
-<label id="profile-edit-hometown-label" for="profile-edit-hometown" >$lbl_hometown </label>
-<input type="text" size="28" name="hometown" id="profile-edit-hometown" value="$hometown" />
-</div>
-<div id="profile-edit-hometown-end"></div>
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="profile-edit-marital-wrapper" >
-<label id="profile-edit-marital-label" for="profile-edit-marital" >$lbl_marital </label>
-$marital
-</div>
-<label id="profile-edit-with-label" for="profile-edit-with" > $lbl_with </label>
-<input type="text" size="28" name="with" id="profile-edit-with" title="$lbl_ex1" value="$with" />
-<label id="profile-edit-howlong-label" for="profile-edit-howlong" > $lbl_howlong </label>
-<input type="text" size="28" name="howlong" id="profile-edit-howlong" title="$lbl_howlong" value="$howlong" />
-
-<div id="profile-edit-marital-end"></div>
-
-<div id="profile-edit-sexual-wrapper" >
-<label id="profile-edit-sexual-label" for="sexual-select" >$lbl_sexual </label>
-$sexual
-</div>
-<div id="profile-edit-sexual-end"></div>
-
-
-
-<div id="profile-edit-homepage-wrapper" >
-<label id="profile-edit-homepage-label" for="profile-edit-homepage" >$lbl_homepage </label>
-<input type="text" size="28" name="homepage" id="profile-edit-homepage" value="$homepage" />
-</div>
-<div id="profile-edit-homepage-end"></div>
-
-<div id="profile-edit-politic-wrapper" >
-<label id="profile-edit-politic-label" for="profile-edit-politic" >$lbl_politic </label>
-<input type="text" size="28" name="politic" id="profile-edit-politic" value="$politic" />
-</div>
-<div id="profile-edit-politic-end"></div>
-
-<div id="profile-edit-religion-wrapper" >
-<label id="profile-edit-religion-label" for="profile-edit-religion" >$lbl_religion </label>
-<input type="text" size="28" name="religion" id="profile-edit-religion" value="$religion" />
-</div>
-<div id="profile-edit-religion-end"></div>
-
-<div id="profile-edit-pubkeywords-wrapper" >
-<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >$lbl_pubkey </label>
-<input type="text" size="28" name="pub_keywords" id="profile-edit-pubkeywords" title="$lbl_ex2" value="$pub_keywords" />
-</div><div id="profile-edit-pubkeywords-desc">$lbl_pubdsc</div>
-<div id="profile-edit-pubkeywords-end"></div>
-
-<div id="profile-edit-prvkeywords-wrapper" >
-<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >$lbl_prvkey </label>
-<input type="text" size="28" name="prv_keywords" id="profile-edit-prvkeywords" title="$lbl_ex2" value="$prv_keywords" />
-</div><div id="profile-edit-prvkeywords-desc">$lbl_prvdsc</div>
-<div id="profile-edit-prvkeywords-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="about-jot-wrapper" class="profile-jot-box">
-<p id="about-jot-desc" >
-$lbl_about
-</p>
-
-<textarea rows="10" cols="70" id="profile-about-text" class="profile-edit-textarea" name="about" >$about</textarea>
-
-</div>
-<div id="about-jot-end"></div>
-
-
-<div id="interest-jot-wrapper" class="profile-jot-box" >
-<p id="interest-jot-desc" >
-$lbl_hobbies
-</p>
-
-<textarea rows="10" cols="70" id="interest-jot-text" class="profile-edit-textarea" name="interest" >$interest</textarea>
-
-</div>
-<div id="interest-jot-end"></div>
-
-
-<div id="likes-jot-wrapper" class="profile-jot-box" >
-<p id="likes-jot-desc" >
-$lbl_likes
-</p>
-
-<textarea rows="10" cols="70" id="likes-jot-text" class="profile-edit-textarea" name="likes" >$likes</textarea>
-
-</div>
-<div id="likes-jot-end"></div>
-
-
-<div id="dislikes-jot-wrapper" class="profile-jot-box" >
-<p id="dislikes-jot-desc" >
-$lbl_dislikes
-</p>
-
-<textarea rows="10" cols="70" id="dislikes-jot-text" class="profile-edit-textarea" name="dislikes" >$dislikes</textarea>
-
-</div>
-<div id="dislikes-jot-end"></div>
-
-
-<div id="contact-jot-wrapper" class="profile-jot-box" >
-<p id="contact-jot-desc" >
-$lbl_social
-</p>
-
-<textarea rows="10" cols="70" id="contact-jot-text" class="profile-edit-textarea" name="contact" >$contact</textarea>
-
-</div>
-<div id="contact-jot-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="music-jot-wrapper" class="profile-jot-box" >
-<p id="music-jot-desc" >
-$lbl_music
-</p>
-
-<textarea rows="10" cols="70" id="music-jot-text" class="profile-edit-textarea" name="music" >$music</textarea>
-
-</div>
-<div id="music-jot-end"></div>
-
-<div id="book-jot-wrapper" class="profile-jot-box" >
-<p id="book-jot-desc" >
-$lbl_book
-</p>
-
-<textarea rows="10" cols="70" id="book-jot-text" class="profile-edit-textarea" name="book" >$book</textarea>
-
-</div>
-<div id="book-jot-end"></div>
-
-
-
-<div id="tv-jot-wrapper" class="profile-jot-box" >
-<p id="tv-jot-desc" >
-$lbl_tv 
-</p>
-
-<textarea rows="10" cols="70" id="tv-jot-text" class="profile-edit-textarea" name="tv" >$tv</textarea>
-
-</div>
-<div id="tv-jot-end"></div>
-
-
-
-<div id="film-jot-wrapper" class="profile-jot-box" >
-<p id="film-jot-desc" >
-$lbl_film
-</p>
-
-<textarea rows="10" cols="70" id="film-jot-text" class="profile-edit-textarea" name="film" >$film</textarea>
-
-</div>
-<div id="film-jot-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="romance-jot-wrapper" class="profile-jot-box" >
-<p id="romance-jot-desc" >
-$lbl_love
-</p>
-
-<textarea rows="10" cols="70" id="romance-jot-text" class="profile-edit-textarea" name="romance" >$romance</textarea>
-
-</div>
-<div id="romance-jot-end"></div>
-
-
-
-<div id="work-jot-wrapper" class="profile-jot-box" >
-<p id="work-jot-desc" >
-$lbl_work
-</p>
-
-<textarea rows="10" cols="70" id="work-jot-text" class="profile-edit-textarea" name="work" >$work</textarea>
-
-</div>
-<div id="work-jot-end"></div>
-
-
-
-<div id="education-jot-wrapper" class="profile-jot-box" >
-<p id="education-jot-desc" >
-$lbl_school 
-</p>
-
-<textarea rows="10" cols="70" id="education-jot-text" class="profile-edit-textarea" name="education" >$education</textarea>
-
-</div>
-<div id="education-jot-end"></div>
-
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-</form>
-</div>
-
diff --git a/view/theme/frost/profile_vcard.tpl b/view/theme/frost/profile_vcard.tpl
deleted file mode 100644
index e91e6125ff..0000000000
--- a/view/theme/frost/profile_vcard.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-<div class="vcard">
-
-	<div class="fn label">$profile.name</div>
-	
-				
-	
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name"></div>
-
-
-
-	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt> 
-		<dd class="adr">
-			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal_code</span>
-			</span>
-			{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
-		</dd>
-		</dl>
-	{{ endif }}
-
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
-
-	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-
-	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-
-	<div id="profile-vcard-break"></div>	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-			{{ if $wallmessage }}
-				<li><a id="wallmessage-link" href="wallmessage/$profile.nickname">$wallmessage</a></li>
-			{{ endif }}
-		</ul>
-	</div>
-</div>
-
-$contact_block
-
-
diff --git a/view/theme/frost/prv_message.tpl b/view/theme/frost/prv_message.tpl
deleted file mode 100644
index 25d7e1116c..0000000000
--- a/view/theme/frost/prv_message.tpl
+++ /dev/null
@@ -1,39 +0,0 @@
-
-<h3>$header</h3>
-
-<div id="prvmail-wrapper" >
-<form id="prvmail-form" action="message" method="post" >
-
-$parent
-
-<div id="prvmail-to-label">$to</div>
-
-{{ if $showinputs }}
-<input type="text" id="recip" name="messageto" value="$prefill" maxlength="255" size="64" tabindex="10" />
-<input type="hidden" id="recip-complete" name="messageto" value="$preid">
-{{ else }}
-$select
-{{ endif }}
-
-<div id="prvmail-subject-label">$subject</div>
-<input type="text" size="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-upload-wrapper" >
-		<div id="prvmail-upload" class="icon border camera" title="$upload" ></div>
-	</div> 
-	<div id="prvmail-link-wrapper" >
-		<div id="prvmail-link" class="icon border link" title="$insert" onclick="jotGetLink();" ></div>
-	</div> 
-	<div id="prvmail-rotator-wrapper" >
-		<img id="prvmail-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-</div>
-<div id="prvmail-end"></div>
-</form>
-</div>
diff --git a/view/theme/frost/register.tpl b/view/theme/frost/register.tpl
deleted file mode 100644
index 15ce5040e2..0000000000
--- a/view/theme/frost/register.tpl
+++ /dev/null
@@ -1,80 +0,0 @@
-<div class='register-form'>
-<h2>$regtitle</h2>
-<br /><br />
-
-<form action="register" method="post" id="register-form">
-
-	<input type="hidden" name="photo" value="$photo" />
-
-	$registertext
-
-	<p id="register-realpeople">$realpeople</p>
-
-	<br />
-{{ if $oidlabel }}
-	<div id="register-openid-wrapper" >
-    	<label for="register-openid" id="label-register-openid" >$oidlabel</label><input 	type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="$openid" >
-	</div>
-	<div id="register-openid-end" ></div>
-{{ endif }}
-
-	<div class="register-explain-wrapper">
-	<p id="register-fill-desc">$fillwith $fillext</p>
-	</div>
-
-	<br /><br />
-
-{{ if $invitations }}
-
-	<p id="register-invite-desc">$invite_desc</p>
-	<div id="register-invite-wrapper" >
-		<label for="register-invite" id="label-register-invite" >$invite_label</label>
-		<input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" value="$invite_id" >
-	</div>
-	<div id="register-name-end" ></div>
-
-{{ endif }}
-
-
-	<div id="register-name-wrapper" class="field input" >
-		<label for="register-name" id="label-register-name" >$namelabel</label>
-		<input type="text" maxlength="60" size="32" name="username" id="register-name" value="$username" >
-	</div>
-	<div id="register-name-end" ></div>
-
-
-	<div id="register-email-wrapper"  class="field input" >
-		<label for="register-email" id="label-register-email" >$addrlabel</label>
-		<input type="text" maxlength="60" size="32" name="email" id="register-email" value="$email" >
-	</div>
-	<div id="register-email-end" ></div>
-	<br /><br />
-
-	<div id="register-nickname-wrapper" class="field input" >
-		<label for="register-nickname" id="label-register-nickname" >$nicklabel</label>
-		<input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" value="$nickname" >
-	</div>
-	<div id="register-nickname-end" ></div>
-
-	<div class="register-explain-wrapper">
-	<p id="register-nickname-desc" >$nickdesc</p>
-	</div>
-
-	$publish
-
-	<br />
-<!--	<br><br>
-	<div class="agreement">
-	By clicking '$regbutt' you are agreeing to the latest <a href="tos.html" title="$tostitle" id="terms-of-service-link" >$toslink</a> and <a href="privacy.html" title="$privacytitle" id="privacy-link" >$privacylink</a>
-	</div>-->
-	<br><br>
-
-	<div id="register-submit-wrapper">
-		<input type="submit" name="submit" id="register-submit-button" value="$regbutt" />
-	</div>
-	<div id="register-submit-end" ></div>
-</form>
-
-$license
-
-</div>
diff --git a/view/theme/frost/search_item.tpl b/view/theme/frost/search_item.tpl
deleted file mode 100644
index b78f05d661..0000000000
--- a/view/theme/frost/search_item.tpl
+++ /dev/null
@@ -1,64 +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$item.previewing" id="wall-item-content-wrapper-$item.id" >
-		<div class="wall-item-info" id="wall-item-info-$item.id">
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
-				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-				{#<!--<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">-->#}
-					<ul class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-						$item.item_photo_menu
-					</ul>
-				{#<!--</div>-->#}
-			</div>
-			{#<!--<div class="wall-item-photo-end"></div>	-->#}
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-				{{ if $item.lock }}{#<!--<div class="wall-item-lock">-->#}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="$item.lock" onclick="lockview(event,$item.id);" />{#<!--</div>-->#}
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
-			</div>
-		</div>
-		{#<!--<div class="wall-item-author">-->#}
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div>
-				
-		{#<!--</div>			-->#}
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			{#<!--<div class="wall-item-title-end"></div>-->#}
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
-			{{ if $item.has_cats }}
-			<div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name{{ if $cat.removeurl }} <a href="$cat.removeurl" title="$remove">[$remove]</a>{{ endif }} {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-
-			{{ if $item.has_folders }}
-			<div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name{{ if $cat.removeurl }} <a href="$cat.removeurl" title="$remove">[$remove]</a>{{ endif }}{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			{#<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >-->#}
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" 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-conv" id="wall-item-conv-$item.id" >
-	{{ if $item.conv }}
-			<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
-	{{ endif }}
-	</div>
-
-{#<!--<div class="wall-item-outside-wrapper-end $item.indent" ></div>
-
-</div>
-
--->#}
diff --git a/view/theme/frost/settings-head.tpl b/view/theme/frost/settings-head.tpl
deleted file mode 100644
index 8cd22d5b6d..0000000000
--- a/view/theme/frost/settings-head.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-
-<script>
-	window.isPublic = "$ispublic";
-</script>
-
diff --git a/view/theme/frost/settings_display_end.tpl b/view/theme/frost/settings_display_end.tpl
deleted file mode 100644
index 739c43b35a..0000000000
--- a/view/theme/frost/settings_display_end.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-	<script>$j(function(){ previewTheme($j("#id_$theme.0")[0]); });</script>
-
diff --git a/view/theme/frost/suggest_friends.tpl b/view/theme/frost/suggest_friends.tpl
deleted file mode 100644
index e0d1c29441..0000000000
--- a/view/theme/frost/suggest_friends.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="profile-match-wrapper">
-	<div class="profile-match-photo">
-		<a href="$url">
-			<img src="$photo" alt="$name" width="80" height="80" title="$name [$url]" onError="this.src='../../../images/person-48.jpg';" />
-		</a>
-	</div>
-	<div class="profile-match-break"></div>
-	<div class="profile-match-name">
-		<a href="$url" title="$name">$name</a>
-	</div>
-	<div class="profile-match-end"></div>
-	{{ if $connlnk }}
-	<div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div>
-	{{ endif }}
-	<a href="$ignlnk" title="$ignore" class="icon drophide profile-match-ignore" {#onmouseout="imgdull(this);" onmouseover="imgbright(this);" #}onclick="return confirmDelete();" ></a>
-</div>
diff --git a/view/theme/frost/smarty3/acl_selector.tpl b/view/theme/frost/templates/acl_selector.tpl
similarity index 100%
rename from view/theme/frost/smarty3/acl_selector.tpl
rename to view/theme/frost/templates/acl_selector.tpl
diff --git a/view/theme/frost/smarty3/admin_aside.tpl b/view/theme/frost/templates/admin_aside.tpl
similarity index 100%
rename from view/theme/frost/smarty3/admin_aside.tpl
rename to view/theme/frost/templates/admin_aside.tpl
diff --git a/view/theme/frost/smarty3/admin_site.tpl b/view/theme/frost/templates/admin_site.tpl
similarity index 100%
rename from view/theme/frost/smarty3/admin_site.tpl
rename to view/theme/frost/templates/admin_site.tpl
diff --git a/view/theme/frost/smarty3/admin_users.tpl b/view/theme/frost/templates/admin_users.tpl
similarity index 100%
rename from view/theme/frost/smarty3/admin_users.tpl
rename to view/theme/frost/templates/admin_users.tpl
diff --git a/view/theme/frost/smarty3/comment_item.tpl b/view/theme/frost/templates/comment_item.tpl
similarity index 100%
rename from view/theme/frost/smarty3/comment_item.tpl
rename to view/theme/frost/templates/comment_item.tpl
diff --git a/view/theme/frost/smarty3/contact_edit.tpl b/view/theme/frost/templates/contact_edit.tpl
similarity index 100%
rename from view/theme/frost/smarty3/contact_edit.tpl
rename to view/theme/frost/templates/contact_edit.tpl
diff --git a/view/theme/frost/smarty3/contact_end.tpl b/view/theme/frost/templates/contact_end.tpl
similarity index 100%
rename from view/theme/frost/smarty3/contact_end.tpl
rename to view/theme/frost/templates/contact_end.tpl
diff --git a/view/theme/frost/smarty3/contact_head.tpl b/view/theme/frost/templates/contact_head.tpl
similarity index 100%
rename from view/theme/frost/smarty3/contact_head.tpl
rename to view/theme/frost/templates/contact_head.tpl
diff --git a/view/theme/frost/smarty3/contact_template.tpl b/view/theme/frost/templates/contact_template.tpl
similarity index 100%
rename from view/theme/frost/smarty3/contact_template.tpl
rename to view/theme/frost/templates/contact_template.tpl
diff --git a/view/theme/frost/smarty3/contacts-end.tpl b/view/theme/frost/templates/contacts-end.tpl
similarity index 100%
rename from view/theme/frost/smarty3/contacts-end.tpl
rename to view/theme/frost/templates/contacts-end.tpl
diff --git a/view/theme/frost/smarty3/contacts-head.tpl b/view/theme/frost/templates/contacts-head.tpl
similarity index 100%
rename from view/theme/frost/smarty3/contacts-head.tpl
rename to view/theme/frost/templates/contacts-head.tpl
diff --git a/view/theme/frost/smarty3/contacts-template.tpl b/view/theme/frost/templates/contacts-template.tpl
similarity index 100%
rename from view/theme/frost/smarty3/contacts-template.tpl
rename to view/theme/frost/templates/contacts-template.tpl
diff --git a/view/theme/frost/smarty3/cropbody.tpl b/view/theme/frost/templates/cropbody.tpl
similarity index 100%
rename from view/theme/frost/smarty3/cropbody.tpl
rename to view/theme/frost/templates/cropbody.tpl
diff --git a/view/theme/frost/smarty3/cropend.tpl b/view/theme/frost/templates/cropend.tpl
similarity index 100%
rename from view/theme/frost/smarty3/cropend.tpl
rename to view/theme/frost/templates/cropend.tpl
diff --git a/view/theme/frost/smarty3/crophead.tpl b/view/theme/frost/templates/crophead.tpl
similarity index 100%
rename from view/theme/frost/smarty3/crophead.tpl
rename to view/theme/frost/templates/crophead.tpl
diff --git a/view/theme/frost/smarty3/display-head.tpl b/view/theme/frost/templates/display-head.tpl
similarity index 100%
rename from view/theme/frost/smarty3/display-head.tpl
rename to view/theme/frost/templates/display-head.tpl
diff --git a/view/theme/frost/smarty3/end.tpl b/view/theme/frost/templates/end.tpl
similarity index 100%
rename from view/theme/frost/smarty3/end.tpl
rename to view/theme/frost/templates/end.tpl
diff --git a/view/theme/frost/smarty3/event.tpl b/view/theme/frost/templates/event.tpl
similarity index 100%
rename from view/theme/frost/smarty3/event.tpl
rename to view/theme/frost/templates/event.tpl
diff --git a/view/theme/frost/smarty3/event_end.tpl b/view/theme/frost/templates/event_end.tpl
similarity index 100%
rename from view/theme/frost/smarty3/event_end.tpl
rename to view/theme/frost/templates/event_end.tpl
diff --git a/view/theme/frost/smarty3/event_form.tpl b/view/theme/frost/templates/event_form.tpl
similarity index 100%
rename from view/theme/frost/smarty3/event_form.tpl
rename to view/theme/frost/templates/event_form.tpl
diff --git a/view/theme/frost/smarty3/event_head.tpl b/view/theme/frost/templates/event_head.tpl
similarity index 100%
rename from view/theme/frost/smarty3/event_head.tpl
rename to view/theme/frost/templates/event_head.tpl
diff --git a/view/theme/frost/smarty3/field_combobox.tpl b/view/theme/frost/templates/field_combobox.tpl
similarity index 100%
rename from view/theme/frost/smarty3/field_combobox.tpl
rename to view/theme/frost/templates/field_combobox.tpl
diff --git a/view/theme/frost/smarty3/field_input.tpl b/view/theme/frost/templates/field_input.tpl
similarity index 100%
rename from view/theme/frost/smarty3/field_input.tpl
rename to view/theme/frost/templates/field_input.tpl
diff --git a/view/theme/frost/smarty3/field_openid.tpl b/view/theme/frost/templates/field_openid.tpl
similarity index 100%
rename from view/theme/frost/smarty3/field_openid.tpl
rename to view/theme/frost/templates/field_openid.tpl
diff --git a/view/theme/frost/smarty3/field_password.tpl b/view/theme/frost/templates/field_password.tpl
similarity index 100%
rename from view/theme/frost/smarty3/field_password.tpl
rename to view/theme/frost/templates/field_password.tpl
diff --git a/view/theme/frost/smarty3/field_themeselect.tpl b/view/theme/frost/templates/field_themeselect.tpl
similarity index 100%
rename from view/theme/frost/smarty3/field_themeselect.tpl
rename to view/theme/frost/templates/field_themeselect.tpl
diff --git a/view/theme/frost/smarty3/filebrowser.tpl b/view/theme/frost/templates/filebrowser.tpl
similarity index 100%
rename from view/theme/frost/smarty3/filebrowser.tpl
rename to view/theme/frost/templates/filebrowser.tpl
diff --git a/view/theme/frost/smarty3/group_drop.tpl b/view/theme/frost/templates/group_drop.tpl
similarity index 100%
rename from view/theme/frost/smarty3/group_drop.tpl
rename to view/theme/frost/templates/group_drop.tpl
diff --git a/view/theme/frost/smarty3/head.tpl b/view/theme/frost/templates/head.tpl
similarity index 100%
rename from view/theme/frost/smarty3/head.tpl
rename to view/theme/frost/templates/head.tpl
diff --git a/view/theme/frost/smarty3/jot-end.tpl b/view/theme/frost/templates/jot-end.tpl
similarity index 100%
rename from view/theme/frost/smarty3/jot-end.tpl
rename to view/theme/frost/templates/jot-end.tpl
diff --git a/view/theme/frost/smarty3/jot-header.tpl b/view/theme/frost/templates/jot-header.tpl
similarity index 100%
rename from view/theme/frost/smarty3/jot-header.tpl
rename to view/theme/frost/templates/jot-header.tpl
diff --git a/view/theme/frost/smarty3/jot.tpl b/view/theme/frost/templates/jot.tpl
similarity index 100%
rename from view/theme/frost/smarty3/jot.tpl
rename to view/theme/frost/templates/jot.tpl
diff --git a/view/theme/frost/smarty3/jot_geotag.tpl b/view/theme/frost/templates/jot_geotag.tpl
similarity index 100%
rename from view/theme/frost/smarty3/jot_geotag.tpl
rename to view/theme/frost/templates/jot_geotag.tpl
diff --git a/view/theme/frost/smarty3/lang_selector.tpl b/view/theme/frost/templates/lang_selector.tpl
similarity index 100%
rename from view/theme/frost/smarty3/lang_selector.tpl
rename to view/theme/frost/templates/lang_selector.tpl
diff --git a/view/theme/frost/smarty3/like_noshare.tpl b/view/theme/frost/templates/like_noshare.tpl
similarity index 100%
rename from view/theme/frost/smarty3/like_noshare.tpl
rename to view/theme/frost/templates/like_noshare.tpl
diff --git a/view/theme/frost/smarty3/login.tpl b/view/theme/frost/templates/login.tpl
similarity index 100%
rename from view/theme/frost/smarty3/login.tpl
rename to view/theme/frost/templates/login.tpl
diff --git a/view/theme/frost/smarty3/login_head.tpl b/view/theme/frost/templates/login_head.tpl
similarity index 100%
rename from view/theme/frost/smarty3/login_head.tpl
rename to view/theme/frost/templates/login_head.tpl
diff --git a/view/theme/frost/smarty3/lostpass.tpl b/view/theme/frost/templates/lostpass.tpl
similarity index 100%
rename from view/theme/frost/smarty3/lostpass.tpl
rename to view/theme/frost/templates/lostpass.tpl
diff --git a/view/theme/frost/smarty3/mail_conv.tpl b/view/theme/frost/templates/mail_conv.tpl
similarity index 100%
rename from view/theme/frost/smarty3/mail_conv.tpl
rename to view/theme/frost/templates/mail_conv.tpl
diff --git a/view/theme/frost/smarty3/mail_list.tpl b/view/theme/frost/templates/mail_list.tpl
similarity index 100%
rename from view/theme/frost/smarty3/mail_list.tpl
rename to view/theme/frost/templates/mail_list.tpl
diff --git a/view/theme/frost/smarty3/message-end.tpl b/view/theme/frost/templates/message-end.tpl
similarity index 100%
rename from view/theme/frost/smarty3/message-end.tpl
rename to view/theme/frost/templates/message-end.tpl
diff --git a/view/theme/frost/smarty3/message-head.tpl b/view/theme/frost/templates/message-head.tpl
similarity index 100%
rename from view/theme/frost/smarty3/message-head.tpl
rename to view/theme/frost/templates/message-head.tpl
diff --git a/view/theme/frost/smarty3/moderated_comment.tpl b/view/theme/frost/templates/moderated_comment.tpl
similarity index 100%
rename from view/theme/frost/smarty3/moderated_comment.tpl
rename to view/theme/frost/templates/moderated_comment.tpl
diff --git a/view/theme/frost/smarty3/msg-end.tpl b/view/theme/frost/templates/msg-end.tpl
similarity index 100%
rename from view/theme/frost/smarty3/msg-end.tpl
rename to view/theme/frost/templates/msg-end.tpl
diff --git a/view/theme/frost/smarty3/msg-header.tpl b/view/theme/frost/templates/msg-header.tpl
similarity index 100%
rename from view/theme/frost/smarty3/msg-header.tpl
rename to view/theme/frost/templates/msg-header.tpl
diff --git a/view/theme/frost/smarty3/nav.tpl b/view/theme/frost/templates/nav.tpl
similarity index 100%
rename from view/theme/frost/smarty3/nav.tpl
rename to view/theme/frost/templates/nav.tpl
diff --git a/view/theme/frost/smarty3/photo_drop.tpl b/view/theme/frost/templates/photo_drop.tpl
similarity index 100%
rename from view/theme/frost/smarty3/photo_drop.tpl
rename to view/theme/frost/templates/photo_drop.tpl
diff --git a/view/theme/frost/smarty3/photo_edit.tpl b/view/theme/frost/templates/photo_edit.tpl
similarity index 100%
rename from view/theme/frost/smarty3/photo_edit.tpl
rename to view/theme/frost/templates/photo_edit.tpl
diff --git a/view/theme/frost/smarty3/photo_edit_head.tpl b/view/theme/frost/templates/photo_edit_head.tpl
similarity index 100%
rename from view/theme/frost/smarty3/photo_edit_head.tpl
rename to view/theme/frost/templates/photo_edit_head.tpl
diff --git a/view/theme/frost/smarty3/photo_view.tpl b/view/theme/frost/templates/photo_view.tpl
similarity index 100%
rename from view/theme/frost/smarty3/photo_view.tpl
rename to view/theme/frost/templates/photo_view.tpl
diff --git a/view/theme/frost/smarty3/photos_head.tpl b/view/theme/frost/templates/photos_head.tpl
similarity index 100%
rename from view/theme/frost/smarty3/photos_head.tpl
rename to view/theme/frost/templates/photos_head.tpl
diff --git a/view/theme/frost/smarty3/photos_upload.tpl b/view/theme/frost/templates/photos_upload.tpl
similarity index 100%
rename from view/theme/frost/smarty3/photos_upload.tpl
rename to view/theme/frost/templates/photos_upload.tpl
diff --git a/view/theme/frost/smarty3/posted_date_widget.tpl b/view/theme/frost/templates/posted_date_widget.tpl
similarity index 100%
rename from view/theme/frost/smarty3/posted_date_widget.tpl
rename to view/theme/frost/templates/posted_date_widget.tpl
diff --git a/view/theme/frost/smarty3/profed_end.tpl b/view/theme/frost/templates/profed_end.tpl
similarity index 100%
rename from view/theme/frost/smarty3/profed_end.tpl
rename to view/theme/frost/templates/profed_end.tpl
diff --git a/view/theme/frost/smarty3/profed_head.tpl b/view/theme/frost/templates/profed_head.tpl
similarity index 100%
rename from view/theme/frost/smarty3/profed_head.tpl
rename to view/theme/frost/templates/profed_head.tpl
diff --git a/view/theme/frost/smarty3/profile_edit.tpl b/view/theme/frost/templates/profile_edit.tpl
similarity index 100%
rename from view/theme/frost/smarty3/profile_edit.tpl
rename to view/theme/frost/templates/profile_edit.tpl
diff --git a/view/theme/frost/smarty3/profile_vcard.tpl b/view/theme/frost/templates/profile_vcard.tpl
similarity index 100%
rename from view/theme/frost/smarty3/profile_vcard.tpl
rename to view/theme/frost/templates/profile_vcard.tpl
diff --git a/view/theme/frost/smarty3/prv_message.tpl b/view/theme/frost/templates/prv_message.tpl
similarity index 100%
rename from view/theme/frost/smarty3/prv_message.tpl
rename to view/theme/frost/templates/prv_message.tpl
diff --git a/view/theme/frost/smarty3/register.tpl b/view/theme/frost/templates/register.tpl
similarity index 100%
rename from view/theme/frost/smarty3/register.tpl
rename to view/theme/frost/templates/register.tpl
diff --git a/view/theme/frost/smarty3/search_item.tpl b/view/theme/frost/templates/search_item.tpl
similarity index 100%
rename from view/theme/frost/smarty3/search_item.tpl
rename to view/theme/frost/templates/search_item.tpl
diff --git a/view/theme/frost/smarty3/settings-head.tpl b/view/theme/frost/templates/settings-head.tpl
similarity index 100%
rename from view/theme/frost/smarty3/settings-head.tpl
rename to view/theme/frost/templates/settings-head.tpl
diff --git a/view/theme/frost/smarty3/settings_display_end.tpl b/view/theme/frost/templates/settings_display_end.tpl
similarity index 100%
rename from view/theme/frost/smarty3/settings_display_end.tpl
rename to view/theme/frost/templates/settings_display_end.tpl
diff --git a/view/theme/frost/smarty3/suggest_friends.tpl b/view/theme/frost/templates/suggest_friends.tpl
similarity index 100%
rename from view/theme/frost/smarty3/suggest_friends.tpl
rename to view/theme/frost/templates/suggest_friends.tpl
diff --git a/view/theme/frost/smarty3/threaded_conversation.tpl b/view/theme/frost/templates/threaded_conversation.tpl
similarity index 100%
rename from view/theme/frost/smarty3/threaded_conversation.tpl
rename to view/theme/frost/templates/threaded_conversation.tpl
diff --git a/view/theme/frost/smarty3/voting_fakelink.tpl b/view/theme/frost/templates/voting_fakelink.tpl
similarity index 100%
rename from view/theme/frost/smarty3/voting_fakelink.tpl
rename to view/theme/frost/templates/voting_fakelink.tpl
diff --git a/view/theme/frost/smarty3/wall_thread.tpl b/view/theme/frost/templates/wall_thread.tpl
similarity index 100%
rename from view/theme/frost/smarty3/wall_thread.tpl
rename to view/theme/frost/templates/wall_thread.tpl
diff --git a/view/theme/frost/smarty3/wallmsg-end.tpl b/view/theme/frost/templates/wallmsg-end.tpl
similarity index 100%
rename from view/theme/frost/smarty3/wallmsg-end.tpl
rename to view/theme/frost/templates/wallmsg-end.tpl
diff --git a/view/theme/frost/smarty3/wallmsg-header.tpl b/view/theme/frost/templates/wallmsg-header.tpl
similarity index 100%
rename from view/theme/frost/smarty3/wallmsg-header.tpl
rename to view/theme/frost/templates/wallmsg-header.tpl
diff --git a/view/theme/frost/threaded_conversation.tpl b/view/theme/frost/threaded_conversation.tpl
deleted file mode 100644
index a987541831..0000000000
--- a/view/theme/frost/threaded_conversation.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-{{ if $dropping }}
-<div id="item-delete-selected-top" class="fakelink" onclick="deleteCheckedItems('#item-delete-selected-top');">
-  <div id="item-delete-selected-top-icon" class="icon drophide" title="$dropping" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);" #}></div>
-  <div id="item-delete-selected-top-desc" >$dropping</div>
-</div>
-<img id="item-delete-selected-top-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
-{{ else }}
-{{ if $mode==display }}
-<div id="display-top-padding"></div>
-{{ endif }}
-{{ endif }}
-
-$live_update
-
-{{ for $threads as $thread }}
-{{ inc $thread.template with $item=$thread }}{{ endinc }}
-{{ endfor }}
-
-<div id="conversation-end"></div>
-
-{{ if $dropping }}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems('#item-delete-selected');">
-  <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);" #}></div>
-  <div id="item-delete-selected-desc" >$dropping</div>
-</div>
-<img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
-<div id="item-delete-selected-end"></div>
-{{ endif }}
diff --git a/view/theme/frost/voting_fakelink.tpl b/view/theme/frost/voting_fakelink.tpl
deleted file mode 100644
index b66302cc27..0000000000
--- a/view/theme/frost/voting_fakelink.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<span class="fakelink-wrapper"  id="$[type]list-$id-wrapper">$phrase</span>
diff --git a/view/theme/frost/wall_thread.tpl b/view/theme/frost/wall_thread.tpl
deleted file mode 100644
index 9c63bef227..0000000000
--- a/view/theme/frost/wall_thread.tpl
+++ /dev/null
@@ -1,125 +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 $item.previewing{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-content-wrapper-$item.id" >
-		<div class="wall-item-info{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-info-$item.id">
-			{{ if $item.owner_url }}
-			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
-				<img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" onError="this.src='../../../images/person-48.jpg';" />
-				</a>
-			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
-			{{ endif }}
-			<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id" 
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
-                onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" onError="this.src='../../../images/person-48.jpg';" />
-				</a>
-				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-{#<!--                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">-->#}
-                    <ul class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-                        $item.item_photo_menu
-                    </ul>
-{#<!--                </div>-->#}
-
-			</div>
-			{#<!--<div class="wall-item-photo-end"></div>-->#}
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-				{{ if $item.lock }}{#<!--<div class="wall-item-lock">-->#}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="$item.lock" onclick="lockview(event,$item.id);" />{#<!--</div>-->#}
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
-			</div>
-		</div>
-		{#<!--<div class="wall-item-author">-->#}
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>{{ if $item.owner_url }} $item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall{{ endif }}<br />
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id" title="$item.localtime" ><a href="display/$user.nickname/$item.id">$item.ago</a></div>
-		{#<!--</div>-->#}
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			{#<!--<div class="wall-item-title-end"></div>-->#}
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
-					{#<!--<div class="body-tag">-->#}
-						{{ for $item.tags as $tag }}
-							<span class='body-tag tag'>$tag</span>
-						{{ endfor }}
-					{#<!--</div>-->#}
-			{{ if $item.has_cats }}
-			<div class="categorytags">$item.txt_cats {{ for $item.categories as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-
-			{{ if $item.has_folders }}
-			<div class="filesavetags">$item.txt_folders {{ for $item.folders as $cat }}$cat.name <a href="$cat.removeurl" title="$remove">[$remove]</a> {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-			</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			{{ if $item.vote }}
-			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
-				<a href="#" class="tool like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
-				{{ if $item.vote.dislike }}
-				<a href="#" class="tool dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-				{{ endif }}
-				{{ if $item.vote.share }}<a href="#" class="tool recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
-				<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-			</div>
-			{{ endif }}
-			{{ if $item.plink }}
-				{#<!--<div class="wall-item-links-wrapper">-->#}<a href="$item.plink.href" title="$item.plink.title" target="external-link" class="wall-item-links-wrapper icon remote-link$item.sparkle"></a>{#<!--</div>-->#}
-			{{ endif }}
-			{{ if $item.edpost }}
-				<a class="editpost tool 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 tool $item.isstarred" title="$item.star.toggle"></a>
-			{{ endif }}
-			{{ if $item.tagger }}
-			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item tool tagged" title="$item.tagger.add"></a>
-			{{ endif }}
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
-			{{ endif }}			
-			
-			{#<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >-->#}
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="wall-item-delete-wrapper icon drophide" title="$item.drop.delete" id="wall-item-delete-wrapper-$item.id" {#onmouseover="imgbright(this);" onmouseout="imgdull(this);" #}></a>{{ endif }}
-			{#<!--</div>-->#}
-				{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
-			{#<!--<div class="wall-item-delete-end"></div>-->#}
-		</div>
-	</div>	
-	{#<!--<div class="wall-item-wrapper-end"></div>-->#}
-	<div class="wall-item-like $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/theme/frost/wallmsg-end.tpl b/view/theme/frost/wallmsg-end.tpl
deleted file mode 100644
index 6baa6e7dc1..0000000000
--- a/view/theme/frost/wallmsg-end.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<script type="text/javascript" src="$baseurl/js/ajaxupload.min.js" ></script>
-
-<script language="javascript" type="text/javascript">msgInitEditor();</script>
-
diff --git a/view/theme/frost/wallmsg-header.tpl b/view/theme/frost/wallmsg-header.tpl
deleted file mode 100644
index 7523539483..0000000000
--- a/view/theme/frost/wallmsg-header.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-
-<script language="javascript" type="text/javascript">
-window.editSelect = "$editselect";
-window.jotId = "#prvmail-text";
-window.imageUploadButton = 'prvmail-upload';
-</script>
-
diff --git a/view/theme/quattro/birthdays_reminder.tpl b/view/theme/quattro/birthdays_reminder.tpl
deleted file mode 100644
index 8b13789179..0000000000
--- a/view/theme/quattro/birthdays_reminder.tpl
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/view/theme/quattro/comment_item.tpl b/view/theme/quattro/comment_item.tpl
deleted file mode 100644
index 293f93f948..0000000000
--- a/view/theme/quattro/comment_item.tpl
+++ /dev/null
@@ -1,63 +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" />
-				<input type="hidden" name="post_id_random" value="$rand_num" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				</div>
-				<ul id="comment-edit-bb-$id"
-					class="comment-edit-bb">
-					<li><a class="editicon boldbb shadow"
-						style="cursor: pointer;" title="$edbold"
-						onclick="insertFormatting('$comment','b', $id);"></a></li>
-					<li><a class="editicon italicbb shadow"
-						style="cursor: pointer;" title="$editalic"
-						onclick="insertFormatting('$comment','i', $id);"></a></li>
-					<li><a class="editicon underlinebb shadow"
-						style="cursor: pointer;" title="$eduline"
-						onclick="insertFormatting('$comment','u', $id);"></a></li>
-					<li><a class="editicon quotebb shadow"
-						style="cursor: pointer;" title="$edquote"
-						onclick="insertFormatting('$comment','quote', $id);"></a></li>
-					<li><a class="editicon codebb shadow"
-						style="cursor: pointer;" title="$edcode"
-						onclick="insertFormatting('$comment','code', $id);"></a></li>
-					<li><a class="editicon imagebb shadow"
-						style="cursor: pointer;" title="$edimg"
-						onclick="insertFormatting('$comment','img', $id);"></a></li>
-					<li><a class="editicon urlbb shadow"
-						style="cursor: pointer;" title="$edurl"
-						onclick="insertFormatting('$comment','url', $id);"></a></li>
-					<li><a class="editicon videobb shadow"
-						style="cursor: pointer;" title="$edvideo"
-						onclick="insertFormatting('$comment','video', $id);"></a></li>
-				</ul>	
-				<textarea id="comment-edit-text-$id" 
-					class="comment-edit-text-empty" 
-					name="body" 
-					onFocus="commentOpen(this,$id) && cmtBbOpen($id);" 
-					onBlur="commentClose(this,$id) && cmtBbClose($id);" >$comment</textarea>
-				{{ if $qcomment }}
-					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
-					<option value=""></option>
-				{{ for $qcomment as $qc }}
-					<option value="$qc">$qc</option>				
-				{{ endfor }}
-					</select>
-				{{ endif }}
-
-				<div class="comment-edit-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>
-
-			</form>
-
-		</div>
diff --git a/view/theme/quattro/contact_template.tpl b/view/theme/quattro/contact_template.tpl
deleted file mode 100644
index 485ee6cac0..0000000000
--- a/view/theme/quattro/contact_template.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-
-<div class="contact-wrapper" id="contact-entry-wrapper-$id" >
-	<div class="contact-photo-wrapper" >
-		<div class="contact-photo mframe" id="contact-entry-photo-$contact.id"
-		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
-		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
-
-			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
-
-			{{ if $contact.photo_menu }}
-			<a href="#" rel="#contact-photo-menu-$contact.id" class="contact-photo-menu-button icon s16 menu" id="contact-photo-menu-button-$contact.id">menu</a>
-			<ul class="contact-photo-menu menu-popup" id="contact-photo-menu-$contact.id">
-				{{ for $contact.photo_menu as $c }}
-				{{ if $c.2 }}
-				<li><a target="redir" href="$c.1">$c.0</a></li>
-				{{ else }}
-				<li><a href="$c.1">$c.0</a></li>
-				{{ endif }}
-				{{ endfor }}
-			</ul>
-			{{ endif }}
-		</div>
-			
-	</div>
-	<div class="contact-name" id="contact-entry-name-$contact.id" >$contact.name</div>
-	{{ if $contact.alt_text }}<div class="contact-details" id="contact-entry-rel-$contact.id" >$contact.alt_text</div>{{ endif }}
-	<div class="contact-details" id="contact-entry-url-$contact.id" >$contact.itemurl</div>
-	<div class="contact-details" id="contact-entry-network-$contact.id" >$contact.network</div>
-
-
-</div>
-
diff --git a/view/theme/quattro/conversation.tpl b/view/theme/quattro/conversation.tpl
deleted file mode 100644
index 36afc392eb..0000000000
--- a/view/theme/quattro/conversation.tpl
+++ /dev/null
@@ -1,49 +0,0 @@
-$live_update
-
-{{ for $threads as $thread }}
-<div id="tread-wrapper-$thread.id" class="tread-wrapper">
-	{{ for $thread.items as $item }}
-        {{if $mode == display}}
-        {{ else }}
-		{{if $item.comment_firstcollapsed}}
-			<div class="hide-comments-outer">
-			<span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span>
-			</div>
-			<div id="collapsed-comments-$thread.id" class="collapsed-comments" style="display: none;">
-		{{endif}}
-		{{if $item.comment_lastcollapsed}}</div>{{endif}}
-        {{ endif }}
-        
-		{{ if $item.type == tag }}
-			{{ inc wall_item_tag.tpl }}{{ endinc }}
-		{{ else }}
-			{{ inc $item.template }}{{ endinc }}
-		{{ endif }}
-		
-	{{ endfor }}
-</div>
-{{ endfor }}
-
-<div id="conversation-end"></div>
-
-{{ if $dropping }}
-<a href="#" onclick="deleteCheckedItems();return false;">
-	<span class="icon s22 delete text">$dropping</span>
-</a>
-{{ endif }}
-
-<script>
-// jquery color plugin from https://raw.github.com/gist/1891361/17747b50ad87f7a59a14b4e0f38d8f3fb6a18b27/gistfile1.js
-    (function(d){d.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor","borderTopColor","color","outlineColor"],function(f,e){d.fx.step[e]=function(g){if(!g.colorInit){g.start=c(g.elem,e);g.end=b(g.end);g.colorInit=true}g.elem.style[e]="rgb("+[Math.max(Math.min(parseInt((g.pos*(g.end[0]-g.start[0]))+g.start[0]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[1]-g.start[1]))+g.start[1]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[2]-g.start[2]))+g.start[2]),255),0)].join(",")+")"}});function b(f){var e;if(f&&f.constructor==Array&&f.length==3){return f}if(e=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(f)){return[parseInt(e[1]),parseInt(e[2]),parseInt(e[3])]}if(e=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(f)){return[parseFloat(e[1])*2.55,parseFloat(e[2])*2.55,parseFloat(e[3])*2.55]}if(e=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(f)){return[parseInt(e[1],16),parseInt(e[2],16),parseInt(e[3],16)]}if(e=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(f)){return[parseInt(e[1]+e[1],16),parseInt(e[2]+e[2],16),parseInt(e[3]+e[3],16)]}if(e=/rgba\(0, 0, 0, 0\)/.exec(f)){return a.transparent}return a[d.trim(f).toLowerCase()]}function c(g,e){var f;do{f=d.curCSS(g,e);if(f!=""&&f!="transparent"||d.nodeName(g,"body")){break}e="backgroundColor"}while(g=g.parentNode);return b(f)}var a={transparent:[255,255,255]}})(jQuery);
-    var colWhite = {backgroundColor:'#EFF0F1'};
-    var colShiny = {backgroundColor:'#FCE94F'};
-</script>
-
-{{ if $mode == display }}
-<script>
-    var id = window.location.pathname.split("/").pop();
-    $(window).scrollTop($('#item-'+id).position().top);
-    $('#item-'+id).animate(colWhite, 1000).animate(colShiny).animate(colWhite, 2000);   
-</script>
-{{ endif }}
-
diff --git a/view/theme/quattro/events_reminder.tpl b/view/theme/quattro/events_reminder.tpl
deleted file mode 100644
index 28b6a6675f..0000000000
--- a/view/theme/quattro/events_reminder.tpl
+++ /dev/null
@@ -1,39 +0,0 @@
-<link rel='stylesheet' type='text/css' href='$baseurl/library/fullcalendar/fullcalendar.css' />
-<script language="javascript" type="text/javascript"
-          src="$baseurl/library/fullcalendar/fullcalendar.min.js"></script>
-<script>
-	// start calendar from yesterday
-	var yesterday= new Date()
-	yesterday.setDate(yesterday.getDate()-1)
-	
-	function showEvent(eventid) {
-		$.get(
-			'$baseurl/events/?id='+eventid,
-			function(data){
-				$.colorbox({html:data});
-			}
-		);			
-	}
-	$(document).ready(function() {
-		$('#events-reminder').fullCalendar({
-			firstDay: yesterday.getDay(),
-			year: yesterday.getFullYear(),
-			month: yesterday.getMonth(),
-			date: yesterday.getDate(),
-			events: '$baseurl/events/json/',
-			header: {
-				left: '',
-				center: '',
-				right: ''
-			},			
-			timeFormat: 'H(:mm)',
-			defaultView: 'basicWeek',
-			height: 50,
-			eventClick: function(calEvent, jsEvent, view) {
-				showEvent(calEvent.id);
-			}
-		});
-	});
-</script>
-<div id="events-reminder"></div>
-<br>
diff --git a/view/theme/quattro/fileas_widget.tpl b/view/theme/quattro/fileas_widget.tpl
deleted file mode 100644
index 1e5a760449..0000000000
--- a/view/theme/quattro/fileas_widget.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="fileas-sidebar" class="widget">
-	<h3>$title</h3>
-	<div id="nets-desc">$desc</div>
-	
-	<ul class="fileas-ul">
-		<li class="tool {{ if $sel_all }}selected{{ endif }}"><a href="$base" class="fileas-link fileas-all">$all</a></li>
-		{{ for $terms as $term }}
-			<li class="tool {{ if $term.selected }}selected{{ endif }}"><a href="$base?f=&file=$term.name" class="fileas-link">$term.name</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/theme/quattro/generic_links_widget.tpl b/view/theme/quattro/generic_links_widget.tpl
deleted file mode 100644
index 29580bbc71..0000000000
--- a/view/theme/quattro/generic_links_widget.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="widget">
-	{{if $title}}<h3>$title</h3>{{endif}}
-	{{if $desc}}<div class="desc">$desc</div>{{endif}}
-	
-	<ul>
-		{{ for $items as $item }}
-			<li class="tool {{ if $item.selected }}selected{{ endif }}"><a href="$item.url" class="link">$item.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/theme/quattro/group_side.tpl b/view/theme/quattro/group_side.tpl
deleted file mode 100644
index 596a8d13fd..0000000000
--- a/view/theme/quattro/group_side.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-<div id="group-sidebar" class="widget">
-	<div class="title tool">
-		<h3 class="label">$title</h3>
-		<a href="group/new" title="$createtext" class="action"><span class="icon text s16 add"> $add</span></a>
-	</div>
-
-	<div id="sidebar-group-list">
-		<ul>
-			{{ for $groups as $group }}
-			<li class="tool  {{ if $group.selected }}selected{{ endif }}">
-				<a href="$group.href" class="label">
-					$group.text
-				</a>
-				{{ if $group.edit }}
-					<a href="$group.edit.href" class="action"><span class="icon text s10 edit">$group.edit.title</span></a>
-				{{ endif }}
-				{{ if $group.cid }}
-					<input type="checkbox" 
-						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
-						onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
-						{{ if $group.ismember }}checked="checked"{{ endif }}
-					/>
-				{{ endif }}
-			</li>
-			{{ endfor }}
-		</ul>
-	</div>
-</div>	
-
diff --git a/view/theme/quattro/jot.tpl b/view/theme/quattro/jot.tpl
deleted file mode 100644
index 55de92d08f..0000000000
--- a/view/theme/quattro/jot.tpl
+++ /dev/null
@@ -1,56 +0,0 @@
-<form id="profile-jot-form" action="$action" method="post">
-	<div id="jot">
-		<div id="profile-jot-desc" class="jothidden">&nbsp;</div>
-		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" title="$placeholdertitle" value="$title" class="jothidden" style="display:none" />
-		{{ if $placeholdercategory }}
-		<input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" title="$placeholdercategory" value="$category" class="jothidden" style="display:none" />
-		{{ endif }}
-		<div id="character-counter" class="grey jothidden"></div>
-		
-
-
-		<input type="hidden" name="type" value="$ptyp" />
-		<input type="hidden" name="profile_uid" value="$profile_uid" />
-		<input type="hidden" name="return" value="$return_path" />
-		<input type="hidden" name="location" id="jot-location" value="$defloc" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="$post_id" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input type="hidden" name="post_id_random" value="$rand_num" />
-
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
-
-		<ul id="jot-tools" class="jothidden" style="display:none">
-			<li><a href="#" onclick="return false;" id="wall-image-upload" title="$upload">$shortupload</a></a></li>
-			<li><a href="#" onclick="return false;" id="wall-file-upload"  title="$attach">$shortattach</a></li>
-			<li><a id="profile-link"  ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink">$shortweblink</a></li>
-			<li><a id="profile-video" onclick="jotVideoURL();return false;" title="$video">$shortvideo</a></li>
-			<li><a id="profile-audio" onclick="jotAudioURL();return false;" title="$audio">$shortaudio</a></li>
-			<!-- TODO: waiting for a better placement 
-			<li><a id="profile-location" onclick="jotGetLocation();return false;" title="$setloc">$shortsetloc</a></li>
-			<li><a id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc">$shortnoloc</a></li>
-			-->
-			<li><a id="jot-preview-link" onclick="preview_post(); return false;" title="$preview">$preview</a></li>
-			$jotplugins
-
-			<li class="perms"><a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon s22 $lockstate $bang"  title="$permset" ></a></li>
-			<li class="submit"><input type="submit" id="profile-jot-submit" name="submit" value="$share" /></li>
-			<li id="profile-rotator" class="loading" style="display: none"><img src="images/rotator.gif" alt="$wait" title="$wait"  /></li>
-		</ul>
-	</div>
-	
-	<div id="jot-preview-content" style="display:none;"></div>
-
-	<div style="display: none;">
-		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-			$acl
-			<hr style="clear:both"/>
-			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-			<div id="profile-jot-email-end"></div>
-			$jotnets
-		</div>
-	</div>
-
-</form>
-
-{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/quattro/mail_conv.tpl b/view/theme/quattro/mail_conv.tpl
deleted file mode 100644
index 0d673236b7..0000000000
--- a/view/theme/quattro/mail_conv.tpl
+++ /dev/null
@@ -1,63 +0,0 @@
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				<a href="$mail.profile_url" target="redir" title="$mail.from_name" class="contact-photo-link" id="wall-item-photo-link-$mail.id">
-					<img src="$mail.from_photo" class="contact-photo$mail.sparkle" id="wall-item-photo-$mail.id" alt="$mail.from_name" />
-				</a>
-			</div>
-		</div>
-		<div class="wall-item-content">
-			$mail.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-		</div>
-		<div class="wall-item-actions">
-			<div class="wall-item-actions-author">
-				<a href="$mail.from_url" target="redir"
-                                class="wall-item-name-link"><span
-                                class="wall-item-name$mail.sparkle">$mail.from_name</span></a>
-                                <span class="wall-item-ago" title="$mail.date">$mail.ago</span>
-			</div>
-			
-			<div class="wall-item-actions-social">
-			</div>
-			
-			<div class="wall-item-actions-tools">
-				<a href="message/drop/$mail.id" onclick="return confirmDelete();" class="icon delete s16" title="$mail.delete">$mail.delete</a>
-			</div>
-			
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-	</div>
-</div>
-
-
-{#
-
-
-<div class="mail-conv-outside-wrapper">
-	<div class="mail-conv-sender" >
-		<a href="$mail.from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$mail.sparkle" src="$mail.from_photo" heigth="80" width="80" alt="$mail.from_name" /></a>
-	</div>
-	<div class="mail-conv-detail" >
-		<div class="mail-conv-sender-name" >$mail.from_name</div>
-		<div class="mail-conv-date">$mail.date</div>
-		<div class="mail-conv-subject">$mail.subject</div>
-		<div class="mail-conv-body">$mail.body</div>
-	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
-	<div class="mail-conv-outside-wrapper-end"></div>
-</div>
-</div>
-<hr class="mail-conv-break" />
-
-#}
diff --git a/view/theme/quattro/mail_display.tpl b/view/theme/quattro/mail_display.tpl
deleted file mode 100644
index 2b680ae428..0000000000
--- a/view/theme/quattro/mail_display.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="mail-display-subject">
-	<span class="{{if $thread_seen}}seen{{else}}unseen{{endif}}">$thread_subject</span>
-	<a href="message/dropconv/$thread_id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
-</div>
-
-{{ for $mails as $mail }}
-	<div id="tread-wrapper-$mail_item.id" class="tread-wrapper">
-		{{ inc mail_conv.tpl }}{{endinc}}
-	</div>
-{{ endfor }}
-
-{{ inc prv_message.tpl }}{{ endinc }}
diff --git a/view/theme/quattro/mail_list.tpl b/view/theme/quattro/mail_list.tpl
deleted file mode 100644
index 4f0fe673a0..0000000000
--- a/view/theme/quattro/mail_list.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="mail-list-wrapper">
-	<span class="mail-subject {{if $seen}}seen{{else}}unseen{{endif}}"><a href="message/$id" class="mail-link">$subject</a></span>
-	<span class="mail-from">$from_name</span>
-	<span class="mail-date" title="$date">$ago</span>
-	<span class="mail-count">$count</span>
-	
-	<a href="message/dropconv/$id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
-</div>
diff --git a/view/theme/quattro/message_side.tpl b/view/theme/quattro/message_side.tpl
deleted file mode 100644
index 9f15870964..0000000000
--- a/view/theme/quattro/message_side.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="message-sidebar" class="widget">
-	<div id="message-new" class="{{ if $new.sel }}selected{{ endif }}"><a href="$new.url">$new.label</a> </div>
-	
-	<ul class="message-ul">
-		{{ for $tabs as $t }}
-			<li class="tool {{ if $t.sel }}selected{{ endif }}"><a href="$t.url" class="message-link">$t.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/theme/quattro/nav.tpl b/view/theme/quattro/nav.tpl
deleted file mode 100644
index ca84e7db54..0000000000
--- a/view/theme/quattro/nav.tpl
+++ /dev/null
@@ -1,95 +0,0 @@
-<header>
-	{# $langselector #}
-
-	<div id="site-location">$sitelocation</div>
-	<div id="banner">$banner</div>
-</header>
-<nav>
-	<ul>
-		{{ if $userinfo }}
-			<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="$userinfo.icon" alt="$userinfo.name"></a>
-				<ul id="nav-user-menu" class="menu-popup">
-					{{ for $nav.usermenu as $usermenu }}
-						<li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
-					{{ endfor }}
-					
-					{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
-					{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
-					{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}	
-				</ul>
-			</li>
-		{{ endif }}
-		
-		{{ if $nav.community }}
-			<li id="nav-community-link" class="nav-menu $sel.community">
-				<a class="$nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
-			</li>
-		{{ endif }}
-		
-		{{ if $nav.network }}
-			<li id="nav-network-link" class="nav-menu $sel.network">
-				<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
-				<span id="net-update" class="nav-notify"></span>
-			</li>
-		{{ endif }}
-		{{ if $nav.home }}
-			<li id="nav-home-link" class="nav-menu $sel.home">
-				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
-				<span id="home-update" class="nav-notify"></span>
-			</li>
-		{{ endif }}
-		
-		{{ if $nav.notifications }}
-			<li  id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon s22 notify">$nav.notifications.1</span></a>
-				<span id="notify-update" class="nav-notify"></span>
-				<ul id="nav-notifications-menu" class="menu-popup">
-					<!-- TODO: better icons! -->
-					<li id="nav-notifications-mark-all" class="toolbar"><a href="#" onclick="notifyMarkAll(); return false;" title="$nav.notifications.mark.1"><span class="icon s10 edit"></span></a></a><a href="$nav.notifications.all.0" title="$nav.notifications.all.1"><span class="icon s10 plugin"></span></a></li>
-					<li class="empty">$emptynotifications</li>
-				</ul>
-			</li>		
-		{{ endif }}		
-		
-		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
-			<ul id="nav-site-menu" class="menu-popup">
-				{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}				
-
-				{{ if $nav.settings }}<li><a class="$nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
-				{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
-
-				{{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }}
-				{{ if $nav.login }}<li><a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a><li>{{ endif }}
-			</ul>		
-		</li>
-		
-		{{ if $nav.help }} 
-		<li id="nav-help-link" class="nav-menu $sel.help">
-			<a class="$nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
-		</li>
-		{{ endif }}
-
-		<li id="nav-search-link" class="nav-menu $sel.search">
-			<a class="$nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
-		</li>
-		<li id="nav-directory-link" class="nav-menu $sel.directory">
-			<a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-		</li>
-		
-		{{ if $nav.apps }}
-			<li id="nav-apps-link" class="nav-menu $sel.apps">
-				<a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a>
-				<ul id="nav-apps-menu" class="menu-popup">
-					{{ for $apps as $ap }}
-					<li>$ap</li>
-					{{ endfor }}
-				</ul>
-			</li>
-		{{ endif }}
-	</ul>
-
-</nav>
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li><a href="{0}"><img data-src="{1}">{2} <span class="notif-when">{3}</span></a></li>
-</ul>
-
-<div style="position: fixed; top: 3px; left: 5px; z-index:9999">$langselector</div>
diff --git a/view/theme/quattro/nets.tpl b/view/theme/quattro/nets.tpl
deleted file mode 100644
index f596df8209..0000000000
--- a/view/theme/quattro/nets.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="nets-sidebar" class="widget">
-	<h3>$title</h3>
-	<div id="nets-desc">$desc</div>
-	
-	<ul class="nets-ul">
-		<li class="tool {{ if $sel_all }}selected{{ endif }}"><a href="$base?nets=all" class="nets-link nets-all">$all</a>
-		{{ for $nets as $net }}
-			<li class="tool {{ if $net.selected }}selected{{ endif }}"><a href="$base?f=&nets=$net.ref" class="nets-link">$net.name</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
diff --git a/view/theme/quattro/photo_view.tpl b/view/theme/quattro/photo_view.tpl
deleted file mode 100644
index 3b7a662716..0000000000
--- a/view/theme/quattro/photo_view.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-<div id="live-display"></div>
-<h3 id="photo-album-title"><a href="$album.0">$album.1</a></h3>
-
-<div id="photo-edit-link-wrap">
-{{ if $tools }}
-<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
-|
-<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
-{{ endif }}
-{{ if $lock }} | <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo/$id');" /> {{ endif }}
-</div>
-
-<div id="photo-photo"><a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a></div>
-{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
-{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
-<div id="photo-caption">$desc</div>
-{{ if $tags }}
-<div id="in-this-photo-text">$tags.0</div>
-<div id="in-this-photo">$tags.1</div>
-{{ endif }}
-{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
-
-{{ if $edit }}$edit{{ endif }}
-
-{{ if $likebuttons }}
-<div id="photo-like-div">
-	$likebuttons
-	$like
-	$dislike	
-</div>
-{{ endif }}
-<div class="wall-item-comment-wrapper">
-    $comments
-</div>
-
-$paginate
-
diff --git a/view/theme/quattro/profile_vcard.tpl b/view/theme/quattro/profile_vcard.tpl
deleted file mode 100644
index 13037c8a21..0000000000
--- a/view/theme/quattro/profile_vcard.tpl
+++ /dev/null
@@ -1,68 +0,0 @@
-<div class="vcard">
-
-	<div class="tool">
-		<div class="fn label">$profile.name</div>
-		{{ if $profile.edit }}
-			<div class="action">
-			<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="$profile.edit.3"><span>$profile.edit.1</span></a>
-			<ul id="profiles-menu" class="menu-popup">
-				{{ for $profile.menu.entries as $e }}
-				<li>
-					<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
-				</li>
-				{{ endfor }}
-				<li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
-				<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
-				
-			</ul>
-			</div>
-		{{ endif }}
-	</div>
-
-
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
-
-
-
-	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt> 
-		<dd class="adr">
-			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal_code</span>
-			</span>
-			{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
-		</dd>
-		</dl>
-	{{ endif }}
-
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
-
-	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-	{{ if $homepage }}<dl class="homepage"><dt
-        class="homepage-label">$homepage</dt><dd class="homepage-url"><a
-        href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-
-	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-			{{ if $wallmessage }}
-				<li><a id="wallmessage-link" href="wallmessage/$profile.nickname">$wallmessage</a></li>
-			{{ endif }}
-		</ul>
-	</div>
-</div>
-
-$contact_block
-
-
diff --git a/view/theme/quattro/prv_message.tpl b/view/theme/quattro/prv_message.tpl
deleted file mode 100644
index 9db4fc0176..0000000000
--- a/view/theme/quattro/prv_message.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-
-<h3>$header</h3>
-
-<div id="prvmail-wrapper" >
-<form id="prvmail-form" action="message" method="post" >
-
-$parent
-
-<div id="prvmail-to-label">$to</div>
-{{ if $showinputs }}
-<input type="text" id="recip" name="messagerecip" value="$prefill" maxlength="255" size="64" tabindex="10" />
-<input type="hidden" id="recip-complete" name="messageto" value="$preid">
-{{ else }}
-$select
-{{ endif }}
-
-<div id="prvmail-subject-label">$subject</div>
-<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly tabindex="11" />
-
-<div id="prvmail-message-label">$yourmessage</div>
-<textarea rows="20" 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-upload-wrapper" >
-		<div id="prvmail-upload" class="icon border camera" title="$upload" ></div>
-	</div> 
-	<div id="prvmail-link-wrapper" >
-		<div id="prvmail-link" class="icon border link" title="$insert" onclick="jotGetLink();" ></div>
-	</div> 
-	<div id="prvmail-rotator-wrapper" >
-		<img id="prvmail-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-	</div> 
-</div>
-<div id="prvmail-end"></div>
-</form>
-</div>
diff --git a/view/theme/quattro/saved_searches_aside.tpl b/view/theme/quattro/saved_searches_aside.tpl
deleted file mode 100644
index 9c10a26dec..0000000000
--- a/view/theme/quattro/saved_searches_aside.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-<div id="saved-search-list" class="widget">
-	<h3 class="title">$title</h3>
-
-	<ul id="saved-search-ul">
-		{{ for $saved as $search }}
-			<li class="tool {{if $search.selected}}selected{{endif}}">
-					<a href="network/?f=&search=$search.encodedterm" class="label" >$search.term</a>
-					<a href="network/?f=&remove=1&search=$search.encodedterm" class="action icon s10 delete" title="$search.delete" onclick="return confirmDelete();"></a>
-			</li>
-		{{ endfor }}
-	</ul>
-	
-	$searchbox
-	
-</div>
diff --git a/view/theme/quattro/search_item.tpl b/view/theme/quattro/search_item.tpl
deleted file mode 100644
index 55868e5483..0000000000
--- a/view/theme/quattro/search_item.tpl
+++ /dev/null
@@ -1,93 +0,0 @@
-
-<div class="wall-item-decor">
-	<span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
-	{{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}	
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-
-<div class="wall-item-container $item.indent">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="wall-item-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-			<div class="wall-item-location">$item.location</div>	
-		</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-			{{ if $item.plink }}<a class="icon s16 link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-		</div>
-		<div class="wall-item-actions">
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago" title="$item.localtime">$item.ago</span>
-			</div>
-			
-			<div class="wall-item-actions-social">
-			{{ if $item.star }}
-				<a href="#" id="star-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classdo"  title="$item.star.do">$item.star.do</a>
-				<a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo">$item.star.undo</a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
-			{{ endif }}
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false">$item.vote.dislike.1</a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false">$item.vote.share.1</a>
-			{{ endif }}			
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.pagedrop }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-				{{ endif }}
-				{{ if $item.drop.dropping }}
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon edit s16" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
-		{{ if $item.conv }}
-		<div class="wall-item-conv" id="wall-item-conv-$item.id" >
-			<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
-		{{ endif }}
-		</div>
-	</div>
-	
-	
-</div>
-
diff --git a/view/theme/quattro/smarty3/birthdays_reminder.tpl b/view/theme/quattro/templates/birthdays_reminder.tpl
similarity index 100%
rename from view/theme/quattro/smarty3/birthdays_reminder.tpl
rename to view/theme/quattro/templates/birthdays_reminder.tpl
diff --git a/view/theme/quattro/smarty3/comment_item.tpl b/view/theme/quattro/templates/comment_item.tpl
similarity index 100%
rename from view/theme/quattro/smarty3/comment_item.tpl
rename to view/theme/quattro/templates/comment_item.tpl
diff --git a/view/theme/quattro/smarty3/contact_template.tpl b/view/theme/quattro/templates/contact_template.tpl
similarity index 100%
rename from view/theme/quattro/smarty3/contact_template.tpl
rename to view/theme/quattro/templates/contact_template.tpl
diff --git a/view/theme/quattro/smarty3/conversation.tpl b/view/theme/quattro/templates/conversation.tpl
similarity index 100%
rename from view/theme/quattro/smarty3/conversation.tpl
rename to view/theme/quattro/templates/conversation.tpl
diff --git a/view/theme/quattro/smarty3/events_reminder.tpl b/view/theme/quattro/templates/events_reminder.tpl
similarity index 100%
rename from view/theme/quattro/smarty3/events_reminder.tpl
rename to view/theme/quattro/templates/events_reminder.tpl
diff --git a/view/theme/quattro/smarty3/fileas_widget.tpl b/view/theme/quattro/templates/fileas_widget.tpl
similarity index 100%
rename from view/theme/quattro/smarty3/fileas_widget.tpl
rename to view/theme/quattro/templates/fileas_widget.tpl
diff --git a/view/theme/quattro/smarty3/generic_links_widget.tpl b/view/theme/quattro/templates/generic_links_widget.tpl
similarity index 100%
rename from view/theme/quattro/smarty3/generic_links_widget.tpl
rename to view/theme/quattro/templates/generic_links_widget.tpl
diff --git a/view/theme/quattro/smarty3/group_side.tpl b/view/theme/quattro/templates/group_side.tpl
similarity index 100%
rename from view/theme/quattro/smarty3/group_side.tpl
rename to view/theme/quattro/templates/group_side.tpl
diff --git a/view/theme/quattro/smarty3/jot.tpl b/view/theme/quattro/templates/jot.tpl
similarity index 100%
rename from view/theme/quattro/smarty3/jot.tpl
rename to view/theme/quattro/templates/jot.tpl
diff --git a/view/theme/quattro/smarty3/mail_conv.tpl b/view/theme/quattro/templates/mail_conv.tpl
similarity index 100%
rename from view/theme/quattro/smarty3/mail_conv.tpl
rename to view/theme/quattro/templates/mail_conv.tpl
diff --git a/view/theme/quattro/smarty3/mail_display.tpl b/view/theme/quattro/templates/mail_display.tpl
similarity index 100%
rename from view/theme/quattro/smarty3/mail_display.tpl
rename to view/theme/quattro/templates/mail_display.tpl
diff --git a/view/theme/quattro/smarty3/mail_list.tpl b/view/theme/quattro/templates/mail_list.tpl
similarity index 100%
rename from view/theme/quattro/smarty3/mail_list.tpl
rename to view/theme/quattro/templates/mail_list.tpl
diff --git a/view/theme/quattro/smarty3/message_side.tpl b/view/theme/quattro/templates/message_side.tpl
similarity index 100%
rename from view/theme/quattro/smarty3/message_side.tpl
rename to view/theme/quattro/templates/message_side.tpl
diff --git a/view/theme/quattro/smarty3/nav.tpl b/view/theme/quattro/templates/nav.tpl
similarity index 100%
rename from view/theme/quattro/smarty3/nav.tpl
rename to view/theme/quattro/templates/nav.tpl
diff --git a/view/theme/quattro/smarty3/nets.tpl b/view/theme/quattro/templates/nets.tpl
similarity index 100%
rename from view/theme/quattro/smarty3/nets.tpl
rename to view/theme/quattro/templates/nets.tpl
diff --git a/view/theme/quattro/smarty3/photo_view.tpl b/view/theme/quattro/templates/photo_view.tpl
similarity index 100%
rename from view/theme/quattro/smarty3/photo_view.tpl
rename to view/theme/quattro/templates/photo_view.tpl
diff --git a/view/theme/quattro/smarty3/profile_vcard.tpl b/view/theme/quattro/templates/profile_vcard.tpl
similarity index 100%
rename from view/theme/quattro/smarty3/profile_vcard.tpl
rename to view/theme/quattro/templates/profile_vcard.tpl
diff --git a/view/theme/quattro/smarty3/prv_message.tpl b/view/theme/quattro/templates/prv_message.tpl
similarity index 100%
rename from view/theme/quattro/smarty3/prv_message.tpl
rename to view/theme/quattro/templates/prv_message.tpl
diff --git a/view/theme/quattro/smarty3/saved_searches_aside.tpl b/view/theme/quattro/templates/saved_searches_aside.tpl
similarity index 100%
rename from view/theme/quattro/smarty3/saved_searches_aside.tpl
rename to view/theme/quattro/templates/saved_searches_aside.tpl
diff --git a/view/theme/quattro/smarty3/search_item.tpl b/view/theme/quattro/templates/search_item.tpl
similarity index 100%
rename from view/theme/quattro/smarty3/search_item.tpl
rename to view/theme/quattro/templates/search_item.tpl
diff --git a/view/theme/quattro/smarty3/theme_settings.tpl b/view/theme/quattro/templates/theme_settings.tpl
similarity index 100%
rename from view/theme/quattro/smarty3/theme_settings.tpl
rename to view/theme/quattro/templates/theme_settings.tpl
diff --git a/view/theme/quattro/smarty3/threaded_conversation.tpl b/view/theme/quattro/templates/threaded_conversation.tpl
similarity index 100%
rename from view/theme/quattro/smarty3/threaded_conversation.tpl
rename to view/theme/quattro/templates/threaded_conversation.tpl
diff --git a/view/theme/quattro/smarty3/wall_item_tag.tpl b/view/theme/quattro/templates/wall_item_tag.tpl
similarity index 100%
rename from view/theme/quattro/smarty3/wall_item_tag.tpl
rename to view/theme/quattro/templates/wall_item_tag.tpl
diff --git a/view/theme/quattro/smarty3/wall_thread.tpl b/view/theme/quattro/templates/wall_thread.tpl
similarity index 100%
rename from view/theme/quattro/smarty3/wall_thread.tpl
rename to view/theme/quattro/templates/wall_thread.tpl
diff --git a/view/theme/quattro/theme_settings.tpl b/view/theme/quattro/theme_settings.tpl
deleted file mode 100644
index b957532cf5..0000000000
--- a/view/theme/quattro/theme_settings.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
- <script src="$baseurl/view/theme/quattro/jquery.tools.min.js"></script>
- 
-{{inc field_select.tpl with $field=$color}}{{endinc}}
-
-{{inc field_select.tpl with $field=$align}}{{endinc}}
-
-
-<div class="field">
-    <label for="id_$pfs.0">$pfs.1</label>
-    <input type="range" class="inputRange" id="id_$pfs.0" name="$pfs.0" value="$pfs.2" min="10" max="22" step="1"  />
-    <span class="field_help"></span>
-</div>
-
-
-<div class="field">
-    <label for="id_$tfs.0">$tfs.1</label>
-    <input type="range" class="inputRange" id="id_$tfs.0" name="$tfs.0" value="$tfs.2" min="10" max="22" step="1"  />
-    <span class="field_help"></span>
-</div>
-
-
-
-
-
-<div class="settings-submit-wrapper">
-	<input type="submit" value="$submit" class="settings-submit" name="quattro-settings-submit" />
-</div>
-
-<script>
-    
-    $(".inputRange").rangeinput();
-</script>
diff --git a/view/theme/quattro/threaded_conversation.tpl b/view/theme/quattro/threaded_conversation.tpl
deleted file mode 100644
index 82e071134e..0000000000
--- a/view/theme/quattro/threaded_conversation.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-$live_update
-
-{{ for $threads as $thread }}
-
-<div id="tread-wrapper-$thread.id" class="tread-wrapper {{ if $thread.threaded }}threaded{{ endif }}  $thread.toplevel">
-       
-       
-		{{ if $thread.type == tag }}
-			{{ inc wall_item_tag.tpl with $item=$thread }}{{ endinc }}
-		{{ else }}
-			{{ inc $thread.template with $item=$thread }}{{ endinc }}
-		{{ endif }}
-		
-</div>
-{{ endfor }}
-
-<div id="conversation-end"></div>
-
-{{ if $dropping }}
-<a id="item-delete-selected" href="#" onclick="deleteCheckedItems();return false;">
-	<span class="icon s22 delete text">$dropping</span>
-</a>
-<img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
-{{ endif }}
-
-<script>
-// jquery color plugin from https://raw.github.com/gist/1891361/17747b50ad87f7a59a14b4e0f38d8f3fb6a18b27/gistfile1.js
-    (function(d){d.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor","borderTopColor","color","outlineColor"],function(f,e){d.fx.step[e]=function(g){if(!g.colorInit){g.start=c(g.elem,e);g.end=b(g.end);g.colorInit=true}g.elem.style[e]="rgb("+[Math.max(Math.min(parseInt((g.pos*(g.end[0]-g.start[0]))+g.start[0]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[1]-g.start[1]))+g.start[1]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[2]-g.start[2]))+g.start[2]),255),0)].join(",")+")"}});function b(f){var e;if(f&&f.constructor==Array&&f.length==3){return f}if(e=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(f)){return[parseInt(e[1]),parseInt(e[2]),parseInt(e[3])]}if(e=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(f)){return[parseFloat(e[1])*2.55,parseFloat(e[2])*2.55,parseFloat(e[3])*2.55]}if(e=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(f)){return[parseInt(e[1],16),parseInt(e[2],16),parseInt(e[3],16)]}if(e=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(f)){return[parseInt(e[1]+e[1],16),parseInt(e[2]+e[2],16),parseInt(e[3]+e[3],16)]}if(e=/rgba\(0, 0, 0, 0\)/.exec(f)){return a.transparent}return a[d.trim(f).toLowerCase()]}function c(g,e){var f;do{f=d.curCSS(g,e);if(f!=""&&f!="transparent"||d.nodeName(g,"body")){break}e="backgroundColor"}while(g=g.parentNode);return b(f)}var a={transparent:[255,255,255]}})(jQuery);
-    var colWhite = {backgroundColor:'#EFF0F1'};
-    var colShiny = {backgroundColor:'#FCE94F'};
-</script>
-
-{{ if $mode == display }}
-<script>
-    var id = window.location.pathname.split("/").pop();
-    $(window).scrollTop($('#item-'+id).position().top);
-    $('#item-'+id).animate(colWhite, 1000).animate(colShiny).animate(colWhite, 2000);   
-</script>
-{{ endif }}
-
diff --git a/view/theme/quattro/wall_item_tag.tpl b/view/theme/quattro/wall_item_tag.tpl
deleted file mode 100644
index 63373ab163..0000000000
--- a/view/theme/quattro/wall_item_tag.tpl
+++ /dev/null
@@ -1,67 +0,0 @@
-{{if $mode == display}}
-{{ else }}
-{{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>
-			{{ if $item.thread_level==3 }} - 
-			<span id="hide-thread-$item-id"
-				class="fakelink"
-				onclick="showThread($item.id);">expand</span> /
-			<span id="hide-thread-$item-id"
-				class="fakelink"
-				onclick="hideThread($item.id);">collapse</span> thread{{ endif }}
-	</div>
-	<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
-{{endif}}
-{{ endif }}
-
-{{ if $item.thread_level!=1 }}<div class="children">{{ endif }}
-
-
-<div class="wall-item-container item-tag $item.indent $item.shiny">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-			<div class="wall-item-location">$item.location</div>	
-		</div>
-		<div class="wall-item-content">
-			$item.ago $item.body 
-		</div>
-			<div class="wall-item-tools">
-				{{ if $item.drop.pagedrop }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-				{{ endif }}
-				{{ if $item.drop.dropping }}
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-			</div>
-	</div>
-</div>
-
-{{ if $item.thread_level!=1 }}</div>{{ endif }}
-
-{{if $mode == display}}
-{{ else }}
-{{if $item.comment_lastcollapsed}}</div>{{endif}}
-{{ endif }}
-
-{# top thread comment box #}
-{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
-<div class="wall-item-comment-wrapper" >$item.comment</div>
-{{ endif }}{{ endif }}{{ endif }}
-
-{{ if $item.flatten }}
-<div class="wall-item-comment-wrapper" >$item.comment</div>
-{{ endif }}
diff --git a/view/theme/quattro/wall_thread.tpl b/view/theme/quattro/wall_thread.tpl
deleted file mode 100644
index eee27776be..0000000000
--- a/view/theme/quattro/wall_thread.tpl
+++ /dev/null
@@ -1,172 +0,0 @@
-{{if $mode == display}}
-{{ else }}
-{{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>
-			{{ if $item.thread_level==3 }} - 
-			<span id="hide-thread-$item-id"
-				class="fakelink"
-				onclick="showThread($item.id);">expand</span> /
-			<span id="hide-thread-$item-id"
-				class="fakelink"
-				onclick="hideThread($item.id);">collapse</span> thread{{ endif }}
-	</div>
-	<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
-{{endif}}
-{{ endif }}
-
-{{ if $item.thread_level!=1 }}<div class="children">{{ endif }}
-
-<div class="wall-item-decor">
-	<span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
-	{{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}	
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-
-<div class="wall-item-container $item.indent $item.shiny" id="item-$item.id">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper mframe{{ if $item.owner_url }} wwfrom{{ endif }}"
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo $item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>	
-			{{ if $item.owner_url }}
-			<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$item.id">
-					<img src="$item.owner_photo" class="contact-photo $item.osparkle" id="wall-item-ownerphoto-$item.id" alt="$item.owner_name" />
-				</a>
-			</div>
-			{{ endif }}			
-			<div class="wall-item-location">$item.location</div>	
-		</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href" class="$item.sparkle">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.hashtags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-  			{{ for $item.mentions as $tag }}
-				<span class='mention'>$tag</span>
-			{{ endfor }}
-               {{ for $item.folders as $cat }}
-                    <span class='folder'>$cat.name</a>{{if $cat.removeurl}} (<a href="$cat.removeurl" title="$remove">x</a>) {{endif}} </span>
-               {{ endfor }}
-                {{ for $item.categories as $cat }}
-                    <span class='category'>$cat.name</a>{{if $cat.removeurl}} (<a href="$cat.removeurl" title="$remove">x</a>) {{endif}} </span>
-                {{ endfor }}
-		</div>
-	</div>	
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-			{{ if $item.plink }}<a class="icon s16 link$item.sparkle" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
-		</div>
-		<div class="wall-item-actions">
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir"
-                                title="$item.linktitle"
-                                class="wall-item-name-link"><span
-                                class="wall-item-name$item.sparkle">$item.name</span></a>
-                                <span class="wall-item-ago" title="$item.localtime">$item.ago</span>
-				 {{ if $item.owner_url }}<br/>$item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall
-				 {{ endif }}
-			</div>
-			
-			<div class="wall-item-actions-social">
-			{{ if $item.star }}
-				<a href="#" id="star-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classdo"  title="$item.star.do">$item.star.do</a>
-				<a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo">$item.star.undo</a>
-			{{ endif }}
-			{{ if $item.tagger }}
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.tagger.class" title="$item.tagger.add">$item.tagger.add</a>
-			{{ endif }}
-			{{ if $item.filer }}
-                                <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer">$item.filer</a>
-			{{ endif }}			
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				{{ if $item.vote.dislike }}
-				<a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false">$item.vote.dislike.1</a>
-				{{ endif }}
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false">$item.vote.share.1</a>
-			{{ endif }}			
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.pagedrop }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-				{{ endif }}
-				{{ if $item.drop.dropping }}
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon edit s16" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-	
-	{{ if $item.threaded }}{{ if $item.comment }}{{ if $item.indent==comment }}
-	<div class="wall-item-bottom commentbox">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-comment-wrapper">
-					$item.comment
-		</div>
-	</div>
-	{{ endif }}{{ endif }}{{ endif }}
-</div>
-
-
-{{ for $item.children as $child }}
-	{{ if $child.type == tag }}
-		{{ inc wall_item_tag.tpl with $item=$child }}{{ endinc }}
-	{{ else }}
-		{{ inc $item.template with $item=$child }}{{ endinc }}
-	{{ endif }}
-{{ endfor }}
-
-{{ if $item.thread_level!=1 }}</div>{{ endif }}
-
-
-{{if $mode == display}}
-{{ else }}
-{{if $item.comment_lastcollapsed}}</div>{{endif}}
-{{ endif }}
-
-{# top thread comment box #}
-{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
-<div class="wall-item-comment-wrapper" >$item.comment</div>
-{{ endif }}{{ endif }}{{ endif }}
-
-
-{{ if $item.flatten }}
-<div class="wall-item-comment-wrapper" >$item.comment</div>
-{{ endif }}
diff --git a/view/theme/slackr/birthdays_reminder.tpl b/view/theme/slackr/birthdays_reminder.tpl
deleted file mode 100644
index 1dc65295a9..0000000000
--- a/view/theme/slackr/birthdays_reminder.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-{{ if $classtoday }}
-<script>
-	$(document).ready(function() $lbr
-		$('#events-reminder').addClass($.trim('$classtoday'));
-	$rbr);
-</script>
-{{ endif }}
-
diff --git a/view/theme/slackr/events_reminder.tpl b/view/theme/slackr/events_reminder.tpl
deleted file mode 100644
index 93c493432a..0000000000
--- a/view/theme/slackr/events_reminder.tpl
+++ /dev/null
@@ -1,39 +0,0 @@
-<link rel='stylesheet' type='text/css' href='$baseurl/library/fullcalendar/fullcalendar.css' />
-<script language="javascript" type="text/javascript"
-          src="$baseurl/library/fullcalendar/fullcalendar.min.js"></script>
-<script>
-	// start calendar from yesterday
-	var yesterday= new Date()
-	yesterday.setDate(yesterday.getDate()-1)
-	
-	function showEvent(eventid) {
-		$.get(
-			'$baseurl/events/?id='+eventid,
-			function(data){
-				$.colorbox({html:data});
-			}
-		);			
-	}
-	$(document).ready(function() {
-		$('#events-reminder').fullCalendar({
-			firstDay: yesterday.getDay(),
-			year: yesterday.getFullYear(),
-			month: yesterday.getMonth(),
-			date: yesterday.getDate(),
-			events: '$baseurl/events/json/',
-			header: {
-				left: '',
-				center: '',
-				right: ''
-			},			
-			timeFormat: 'HH(:mm)',
-			defaultView: 'basicWeek',
-			height: 50,
-			eventClick: function(calEvent, jsEvent, view) {
-				showEvent(calEvent.id);
-			}
-		});
-	});
-</script>
-<div id="events-reminder" class="$classtoday"></div>
-<br>
diff --git a/view/theme/slackr/smarty3/birthdays_reminder.tpl b/view/theme/slackr/templates/birthdays_reminder.tpl
similarity index 100%
rename from view/theme/slackr/smarty3/birthdays_reminder.tpl
rename to view/theme/slackr/templates/birthdays_reminder.tpl
diff --git a/view/theme/slackr/smarty3/events_reminder.tpl b/view/theme/slackr/templates/events_reminder.tpl
similarity index 100%
rename from view/theme/slackr/smarty3/events_reminder.tpl
rename to view/theme/slackr/templates/events_reminder.tpl
diff --git a/view/theme/smoothly/bottom.tpl b/view/theme/smoothly/bottom.tpl
deleted file mode 100644
index 347d87094b..0000000000
--- a/view/theme/smoothly/bottom.tpl
+++ /dev/null
@@ -1,52 +0,0 @@
-<script type="text/javascript" src="$baseurl/view/theme/smoothly/js/jquery.autogrow.textarea.js"></script>
-<script type="text/javascript">
-$(document).ready(function() {
-
-});
-function tautogrow(id) {
-$("textarea#comment-edit-text-" + id).autogrow();
-};
-
-function insertFormatting(comment, BBcode, id) {
-var tmpStr = $("#comment-edit-text-" + id).val();
-if(tmpStr == comment) {
-tmpStr = "";
-$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
-$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
-openMenu("comment-edit-submit-wrapper-" + id);
-}
-textarea = document.getElementById("comment-edit-text-" + id);
-if (document.selection) {
-textarea.focus();
-selected = document.selection.createRange();
-if (BBcode == "url") {
-selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]";
-} else {
-selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-}
-} else if (textarea.selectionStart || textarea.selectionStart == "0") {
-var start = textarea.selectionStart;
-var end = textarea.selectionEnd;
-if (BBcode == "url") {
-textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]"
-+ "http://" + textarea.value.substring(start, end)
-+ "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-} else {
-textarea.value = textarea.value.substring(0, start)
-+ "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]"
-+ textarea.value.substring(end, textarea.value.length);
-}
-}
-return true;
-}
-
-function cmtBbOpen(id) {
-$(".comment-edit-bb-" + id).show();
-}
-function cmtBbClose(id) {
-    $(".comment-edit-bb-" + id).hide();
-}
-
-
-
-</script>
diff --git a/view/theme/smoothly/follow.tpl b/view/theme/smoothly/follow.tpl
deleted file mode 100644
index 09258b9c30..0000000000
--- a/view/theme/smoothly/follow.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div id="follow-sidebar" class="widget">
-	<h3>$connect</h3>
-	<div id="connect-desc">$desc</div>
-	<form action="follow" method="post" >
-		<input id="side-follow-url" type="text-sidebar" name="url" size="24" title="$hint" /><input id="side-follow-submit" type="submit" name="submit" value="$follow" />
-	</form>
-</div>
-
diff --git a/view/theme/smoothly/jot-header.tpl b/view/theme/smoothly/jot-header.tpl
deleted file mode 100644
index 79d8799a5f..0000000000
--- a/view/theme/smoothly/jot-header.tpl
+++ /dev/null
@@ -1,374 +0,0 @@
-
-<script language="javascript" type="text/javascript">
-
-var editor=false;
-var textlen = 0;
-var plaintext = '$editselect';
-
-function initEditor(cb){
-	if (editor==false){
-		$("#profile-jot-text-loading").show();
-		if(plaintext == 'none') {
-			$("#profile-jot-text-loading").hide();
-            		$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
-			$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
-            		$(".jothidden").show();
-            		editor = true;
-            		$("a#jot-perms-icon").colorbox({
-						'inline' : true,
-						'transition' : 'elastic'
-            		});
-	                            $("#profile-jot-submit-wrapper").show();
-								{{ if $newpost }}
-    	                            $("#profile-upload-wrapper").show();
-        	                        $("#profile-attach-wrapper").show();
-            	                    $("#profile-link-wrapper").show();
-                	                $("#profile-video-wrapper").show();
-                    	            $("#profile-audio-wrapper").show();
-                        	        $("#profile-location-wrapper").show();
-                            	    $("#profile-nolocation-wrapper").show();
-                                	$("#profile-title-wrapper").show();
-	                                $("#profile-jot-plugin-wrapper").show();
-	                                $("#jot-preview-link").show();
-								{{ endif }}   
-
-
-			if (typeof cb!="undefined") cb();
-			return;
-        }
-        tinyMCE.init({
-                theme : "advanced",
-                mode : "specific_textareas",
-                editor_selector: /(profile-jot-text|prvmail-text)/,
-                plugins : "bbcode,paste,fullscreen,autoresize",
-                theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen",
-                theme_advanced_buttons2 : "",
-                theme_advanced_buttons3 : "",
-                theme_advanced_toolbar_location : "top",
-                theme_advanced_toolbar_align : "center",
-                theme_advanced_blockformats : "blockquote,code",
-                //theme_advanced_resizing : true,
-                //theme_advanced_statusbar_location : "bottom",
-                paste_text_sticky : true,
-                entity_encoding : "raw",
-                add_unload_trigger : false,
-                remove_linebreaks : false,
-                //force_p_newlines : false,
-                //force_br_newlines : true,
-                forced_root_block : 'div',
-                convert_urls: false,
-                content_css: "$baseurl/view/custom_tinymce.css",
-                theme_advanced_path : false,
-                setup : function(ed) {
-					cPopup = null;
-					ed.onKeyDown.add(function(ed,e) {
-						if(cPopup !== null)
-							cPopup.onkey(e);
-					});
-
-
-
-					ed.onKeyUp.add(function(ed, e) {
-						var txt = tinyMCE.activeEditor.getContent();
-						match = txt.match(/@([^ \n]+)$/);
-						if(match!==null) {
-							if(cPopup === null) {
-								cPopup = new ACPopup(this,baseurl+"/acl");
-							}
-							if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
-							if(! cPopup.ready) cPopup = null;
-						}
-						else {
-							if(cPopup !== null) { cPopup.close(); cPopup = null; }
-						}
-
-						textlen = txt.length;
-						if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
-							$('#profile-jot-desc').html(ispublic);
-						}
-                        else {
-                            $('#profile-jot-desc').html('&nbsp;');
-                        }
-
-				//Character count
-
-                                if(textlen <= 140) {
-                                        $('#character-counter').removeClass('red');
-                                        $('#character-counter').removeClass('orange');
-                                        $('#character-counter').addClass('grey');
-                                }
-                                if((textlen > 140) && (textlen <= 420)) {
-                                        $('#character-counter').removeClass('grey');
-                                        $('#character-counter').removeClass('red');
-                                        $('#character-counter').addClass('orange');
-                                }
-                                if(textlen > 420) {
-                                        $('#character-counter').removeClass('grey');
-                                        $('#character-counter').removeClass('orange');
-                                        $('#character-counter').addClass('red');
-                                }
-                                $('#character-counter').text(textlen);
-                        });
-                        ed.onInit.add(function(ed) {
-                                ed.pasteAsPlainText = true;
-								$("#profile-jot-text-loading").hide();
-								$(".jothidden").show();
-	                            $("#profile-jot-submit-wrapper").show();
-								{{ if $newpost }}
-    	                            $("#profile-upload-wrapper").show();
-        	                        $("#profile-attach-wrapper").show();
-            	                    $("#profile-link-wrapper").show();
-                	                $("#profile-video-wrapper").show();
-                    	            $("#profile-audio-wrapper").show();
-                        	        $("#profile-location-wrapper").show();
-                            	    $("#profile-nolocation-wrapper").show();
-                                	$("#profile-title-wrapper").show();
-	                                $("#profile-jot-plugin-wrapper").show();
-	                                $("#jot-preview-link").show();
-								{{ endif }}   
-                             $("#character-counter").show();
-                                if (typeof cb!="undefined") cb();
-                        });
-                }
-        });
-        editor = true;
-        // setup acl popup
-        $("a#jot-perms-icon").colorbox({
-			'inline' : true,
-			'transition' : 'elastic'
-        }); 
-    } else {
-        if (typeof cb!="undefined") cb();
-    }
-} // initEditor
-
-function enableOnUser(){
-	if (editor) return;
-	$(this).val("");
-	initEditor();
-}
-
-</script>
-
-<script type="text/javascript" src="js/ajaxupload.js" >
-</script>
-
-<script>
-	var ispublic = '$ispublic';
-
-	$(document).ready(function() {
-		
-		/* enable tinymce on focus and click */
-		$("#profile-jot-text").focus(enableOnUser);
-		$("#profile-jot-text").click(enableOnUser);
-
-		var uploader = new window.AjaxUpload(
-			'wall-image-upload',
-			{ action: 'wall_upload/$nickname',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);
-
-		var file_uploader = new window.AjaxUpload(
-			'wall-file-upload',
-			{ action: 'wall_attach/$nickname',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);		
-		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
-			var selstr;
-			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
-				selstr = $(this).text();
-				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
-				$('#jot-public').hide();
-				$('.profile-jot-net input').attr('disabled', 'disabled');
-			});
-			if(selstr == null) { 
-				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
-				$('#jot-public').show();
-				$('.profile-jot-net input').attr('disabled', false);
-			}
-
-		}).trigger('change');
-
-	});
-
-	function deleteCheckedItems() {
-		if(confirm('$delitems')) {
-			var checkedstr = '';
-
-			$("#item-delete-selected").hide();
-			$('#item-delete-selected-rotator').show();
-
-			$('.item-select').each( function() {
-				if($(this).is(':checked')) {
-					if(checkedstr.length != 0) {
-						checkedstr = checkedstr + ',' + $(this).val();
-					}
-					else {
-						checkedstr = $(this).val();
-					}
-				}	
-			});
-			$.post('item', { dropitems: checkedstr }, function(data) {
-				window.location.reload();
-			});
-		}
-	}
-
-	function jotGetLink() {
-		reply = prompt("$linkurl");
-		if(reply && reply.length) {
-			reply = bin2hex(reply);
-			$('#profile-rotator').show();
-			$.get('parse_url?binurl=' + reply, function(data) {
-				addeditortext(data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-	function jotVideoURL() {
-		reply = prompt("$vidurl");
-		if(reply && reply.length) {
-			addeditortext('[video]' + reply + '[/video]');
-		}
-	}
-
-	function jotAudioURL() {
-		reply = prompt("$audurl");
-		if(reply && reply.length) {
-			addeditortext('[audio]' + reply + '[/audio]');
-		}
-	}
-
-
-	function jotGetLocation() {
-		reply = prompt("$whereareu", $('#jot-location').val());
-		if(reply && reply.length) {
-			$('#jot-location').val(reply);
-		}
-	}
-
-	function jotTitle() {
-		reply = prompt("$title", $('#jot-title').val());
-		if(reply && reply.length) {
-			$('#jot-title').val(reply);
-		}
-	}
-
-	function jotShare(id) {
-		$('#like-rotator-' + id).show();
-		$.get('share/' + id, function(data) {
-				if (!editor) $("#profile-jot-text").val("");
-				initEditor(function(){
-					addeditortext(data);
-					$('#like-rotator-' + id).hide();
-					$(window).scrollTop(0);
-				});
-		});
-	}
-
-	function linkdropper(event) {
-		var linkFound = event.dataTransfer.types.contains("text/uri-list");
-		if(linkFound)
-			event.preventDefault();
-	}
-
-	function linkdrop(event) {
-		var reply = event.dataTransfer.getData("text/uri-list");
-		event.target.textContent = reply;
-		event.preventDefault();
-		if(reply && reply.length) {
-			reply = bin2hex(reply);
-			$('#profile-rotator').show();
-			$.get('parse_url?binurl=' + reply, function(data) {
-				if (!editor) $("#profile-jot-text").val("");
-				initEditor(function(){
-					addeditortext(data);
-					$('#profile-rotator').hide();
-				});
-			});
-		}
-	}
-
-	function itemTag(id) {
-		reply = prompt("$term");
-		if(reply && reply.length) {
-			reply = reply.replace('#','');
-			if(reply.length) {
-
-				commentBusy = true;
-				$('body').css('cursor', 'wait');
-
-				$.get('tagger/' + id + '?term=' + reply);
-				if(timer) clearTimeout(timer);
-				timer = setTimeout(NavUpdate,3000);
-				liking = 1;
-			}
-		}
-	}
-	
-	function itemFiler(id) {
-		
-		var bordercolor = $("input").css("border-color");
-		
-		$.get('filer/', function(data){
-			$.colorbox({html:data});
-			$("#id_term").keypress(function(){
-				$(this).css("border-color",bordercolor);
-			})
-			$("#select_term").change(function(){
-				$("#id_term").css("border-color",bordercolor);
-			})
-			
-			$("#filer_save").click(function(e){
-				e.preventDefault();
-				reply = $("#id_term").val();
-				if(reply && reply.length) {
-					commentBusy = true;
-					$('body').css('cursor', 'wait');
-					$.get('filer/' + id + '?term=' + reply, NavUpdate);
-//					if(timer) clearTimeout(timer);
-//					timer = setTimeout(NavUpdate,3000);
-					liking = 1;
-					$.colorbox.close();
-				} else {
-					$("#id_term").css("border-color","#FF0000");
-				}
-				return false;
-			});
-		});
-		
-	}
-
-	
-
-	function jotClearLocation() {
-		$('#jot-coord').val('');
-		$('#profile-nolocation-wrapper').hide();
-	}
-
-  function addeditortext(data) {
-        if(plaintext == 'none') {
-            var currentText = $("#profile-jot-text").val();
-            $("#profile-jot-text").val(currentText + data);
-        }
-        else
-            tinyMCE.execCommand('mceInsertRawHTML',false,data);
-    }
-
-
-	$geotag
-
-</script>
diff --git a/view/theme/smoothly/jot.tpl b/view/theme/smoothly/jot.tpl
deleted file mode 100644
index 12792fa0b4..0000000000
--- a/view/theme/smoothly/jot.tpl
+++ /dev/null
@@ -1,84 +0,0 @@
-
-<div id="profile-jot-wrapper" > 
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey" style="display: none;">0</div>
-	</div>
-	<div id="profile-jot-banner-end"></div>
-
-	<form id="profile-jot-form" action="$action" method="post" >
-		<input type="hidden" name="type" value="$ptyp" />
-		<input type="hidden" name="profile_uid" value="$profile_uid" />
-		<input type="hidden" name="return" value="$return_path" />
-		<input type="hidden" name="location" id="jot-location" value="$defloc" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="$post_id" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input type="hidden" name="post_id_random" value="$rand_num" />
-		<div id="jot-title-wrap">
-			<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
-		</div>
-		{{ if $placeholdercategory }}
-		<div id="jot-category-wrap">
-			<input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" />
-		</div>
-		{{ endif }}
-		<div id="jot-text-wrap">
-                	<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" /><br>
-                	<textarea rows="5" cols="80" class="profile-jot-text" id="profile-jot-text" name="body" >
-			{{ if $content }}$content{{ else }}$share
-			{{ endif }}
-			</textarea>
-		</div>
-
-	<div id="profile-upload-wrapper" class="jot-tool" style="display: none;" >
-		<div id="wall-image-upload-div" ><a onclick="return false;" id="wall-image-upload" class="icon border camera" title="$upload"></a></div>
-	</div>
-	<div id="profile-attach-wrapper" class="jot-tool" style="display: none;" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon border attach" title="$attach"></a></div>
-	</div>  
-	<div id="profile-link-wrapper" class="jot-tool" style="display: none;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a href="#" id="profile-link" class="icon border  link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" class="jot-tool" style="display: none;" >
-		<a href="#" id="profile-video" class="icon border  video" title="$video" onclick="jotVideoURL(); return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" class="jot-tool" style="display: none;" >
-		<a href="#" id="profile-audio" class="icon border  audio" title="$audio" onclick="jotAudioURL(); return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" class="jot-tool" style="display: none;" >
-		<a href="#" id="profile-location" class="icon border  globe" title="$setloc" onclick="jotGetLocation(); return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" class="jot-tool" style="display: none;" >
-		<a href="#" id="profile-nolocation" class="icon border  noglobe" title="$noloc" onclick="jotClearLocation(); return false;"></a>
-	</div> 
-
-	<span onclick="preview_post();" id="jot-preview-link" class="fakelink" style="display: none;" >$preview</span>
-
-	<div id="profile-jot-submit-wrapper" style="display:none;padding-left: 400px;">
-		<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
-		<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
-            <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate sharePerms" title="$permset"></a>$bang</div>
-	</div>
-
-	<div id="profile-jot-plugin-wrapper" style="display: none;">
-  	$jotplugins
-	</div>
-	<div id="profile-jot-tools-end"></div>
-	
-	<div id="jot-preview-content" style="display:none;"></div>
-
-        <div style="display: none;">
-            <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-                $acl
-                <hr style="clear:both"/>
-                <div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-                <div id="profile-jot-email-end"></div>
-                $jotnets
-            </div>
-        </div>
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
-                {{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/smoothly/lang_selector.tpl b/view/theme/smoothly/lang_selector.tpl
deleted file mode 100644
index e777a0a861..0000000000
--- a/view/theme/smoothly/lang_selector.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="lang-select-icon" class="icon s22 language" title="$title" onclick="openClose('language-selector');" ></div>
-<div id="language-selector" style="display: none;" >
-	<form action="#" method="post" >
-		<select name="system_language" onchange="this.form.submit();" >
-			{{ for $langs.0 as $v=>$l }}
-				<option value="$v" {{if $v==$langs.1}}selected="selected"{{endif}}>$l</option>
-			{{ endfor }}
-		</select>
-	</form>
-</div>
diff --git a/view/theme/smoothly/nav.tpl b/view/theme/smoothly/nav.tpl
deleted file mode 100644
index b923718da0..0000000000
--- a/view/theme/smoothly/nav.tpl
+++ /dev/null
@@ -1,81 +0,0 @@
-<nav>
-	<span id="banner">$banner</span>
-
-	<div id="notifications">	
-		{{ if $nav.network }}<a id="net-update" class="nav-ajax-update" href="$nav.network.0" title="$nav.network.1"></a>{{ endif }}
-		{{ if $nav.home }}<a id="home-update" class="nav-ajax-update" href="$nav.home.0" title="$nav.home.1"></a>{{ endif }}
-<!--		{{ if $nav.notifications }}<a id="intro-update" class="nav-ajax-update" href="$nav.notifications.0" title="$nav.notifications.1"></a>{{ endif }} -->
-		{{ if $nav.introductions }}<a id="intro-update" class="nav-ajax-update" href="$nav.introductions.0" title="$nav.introductions.1"></a>{{ endif }}
-		{{ if $nav.messages }}<a id="mail-update" class="nav-ajax-update" href="$nav.messages.0" title="$nav.messages.1"></a>{{ endif }}
-		{{ if $nav.notifications }}<a rel="#nav-notifications-menu" id="notify-update" class="nav-ajax-update" href="$nav.notifications.0"  title="$nav.notifications.1"></a>{{ endif }}
-
-		<ul id="nav-notifications-menu" class="menu-popup">
-			<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-			<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-			<li class="empty">$emptynotifications</li>
-		</ul>
-	</div>
-	
-	<div id="user-menu" >
-		<a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
-		
-		<ul id="user-menu-popup" 
-			 onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')" 
-			 onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
-
-			{{ if $nav.register }}<li><a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0">$nav.register.1</a></li>{{ endif }}
-			
-			{{ if $nav.home }}<li><a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0">$nav.home.1</a></li>{{ endif }}
-		
-			{{ if $nav.network }}<li><a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0">$nav.network.1</a></li>{{ endif }}
-		
-				{{ if $nav.community }}
-				<li><a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0">$nav.community.1</a></li>
-				{{ endif }}
-
-			<li><a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0">$nav.search.1</a></li>
-			<li><a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0">$nav.directory.1</a></li>
-			{{ if $nav.apps }}<li><a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0">$nav.apps.1</a></li>{{ endif }}
-			
-			{{ if $nav.notifications }}<li><a id="nav-notify-link" class="nav-commlink nav-sep $nav.notifications.2" href="$nav.notifications.0">$nav.notifications.1</a></li>{{ endif }}
-			{{ if $nav.messages }}<li><a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0">$nav.messages.1</a></li>{{ endif }}
-			{{ if $nav.contacts }}<li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0">$nav.contacts.1</a></li>{{ endif }}
-		
-			{{ if $nav.profiles }}<li><a id="nav-profiles-link" class="nav-commlink nav-sep $nav.profiles.2" href="$nav.profiles.0">$nav.profiles.1</a></li>{{ endif }}
-			{{ if $nav.settings }}<li><a id="nav-settings-link" class="nav-commlink $nav.settings.2" href="$nav.settings.0">$nav.settings.1</a></li>{{ endif }}
-			
-			{{ if $nav.manage }}<li><a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0">$nav.manage.1</a></li>{{ endif }}
-		
-			{{ if $nav.admin }}<li><a id="nav-admin-link" class="nav-commlink $nav.admin.2" href="$nav.admin.0">$nav.admin.1</a></li>{{ endif }}
-			
-			{{ if $nav.help }}<li><a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0">$nav.help.1</a></li>{{ endif }}
-
-			{{ if $nav.login }}<li><a id="nav-login-link" class="nav-link $nav.login.2" href="$nav.login.0">$nav.login.1</a></li> {{ endif }}
-			{{ if $nav.logout }}<li><a id="nav-logout-link" class="nav-commlink nav-sep $nav.logout.2" href="$nav.logout.0">$nav.logout.1</a></li> {{ endif }}
-		</ul>
-	</div>
-</nav>
-
-<div id="scrollup" >
-<a href="javascript:scrollTo(0,0)"><img src="view/theme/smoothly/images/totop.png" alt="to top" title="to top" /></a><br />
-<a href="javascript:ScrollToBottom()"><img src="view/theme/smoothly/images/tobottom.png" alt="to bottom" title="to bottom" /></a>
-</div>
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
-</ul>
-
-<div style="position: fixed; top: 3px; left: 5px; z-index:9999">$langselector</div>
-
-<script>
-var pagetitle = null;
-$("nav").bind('nav-update', function(e,data){
-if (pagetitle==null) pagetitle = document.title;
-var count = $(data).find('notif').attr('count');
-if (count>0) {
-document.title = "("+count+") "+pagetitle;
-} else {
-document.title = pagetitle;
-}
-});
-</script>
diff --git a/view/theme/smoothly/search_item.tpl b/view/theme/smoothly/search_item.tpl
deleted file mode 100644
index 9c90fd0402..0000000000
--- a/view/theme/smoothly/search_item.tpl
+++ /dev/null
@@ -1,53 +0,0 @@
-<div class="wall-item-outside-wrapper $item.indent $item.shiny$item.previewing" id="wall-item-outside-wrapper-$item.id" >
-	<div class="wall-item-content-wrapper $item.indent $item.shiny" id="wall-item-content-wrapper-$item.id" >
-		<div class="wall-item-info" id="wall-item-info-$item.id">
-			<div class="wall-item-photo-wrapper mframe" id="wall-item-photo-wrapper-$item.id" 
-				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-					<ul>
-						$item.item_photo_menu
-					</ul>
-				</div>
-			</div>
-			<div class="wall-item-photo-end"></div>	
-			<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
-		</div>
-		<div class="wall-item-lock-wrapper">
-				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}			
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			<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 class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
-				
-		</div>			
-		
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-
-
-	<div class="wall-item-conv" id="wall-item-conv-$item.id" >
-	{{ if $item.conv }}
-			<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
-	{{ endif }}
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-</div>
-
-<div class="wall-item-outside-wrapper-end $item.indent $item.shiny" ></div>
diff --git a/view/theme/smoothly/smarty3/bottom.tpl b/view/theme/smoothly/templates/bottom.tpl
similarity index 100%
rename from view/theme/smoothly/smarty3/bottom.tpl
rename to view/theme/smoothly/templates/bottom.tpl
diff --git a/view/theme/smoothly/smarty3/follow.tpl b/view/theme/smoothly/templates/follow.tpl
similarity index 100%
rename from view/theme/smoothly/smarty3/follow.tpl
rename to view/theme/smoothly/templates/follow.tpl
diff --git a/view/theme/smoothly/smarty3/jot-header.tpl b/view/theme/smoothly/templates/jot-header.tpl
similarity index 100%
rename from view/theme/smoothly/smarty3/jot-header.tpl
rename to view/theme/smoothly/templates/jot-header.tpl
diff --git a/view/theme/smoothly/smarty3/jot.tpl b/view/theme/smoothly/templates/jot.tpl
similarity index 100%
rename from view/theme/smoothly/smarty3/jot.tpl
rename to view/theme/smoothly/templates/jot.tpl
diff --git a/view/theme/smoothly/smarty3/lang_selector.tpl b/view/theme/smoothly/templates/lang_selector.tpl
similarity index 100%
rename from view/theme/smoothly/smarty3/lang_selector.tpl
rename to view/theme/smoothly/templates/lang_selector.tpl
diff --git a/view/theme/smoothly/smarty3/nav.tpl b/view/theme/smoothly/templates/nav.tpl
similarity index 100%
rename from view/theme/smoothly/smarty3/nav.tpl
rename to view/theme/smoothly/templates/nav.tpl
diff --git a/view/theme/smoothly/smarty3/search_item.tpl b/view/theme/smoothly/templates/search_item.tpl
similarity index 100%
rename from view/theme/smoothly/smarty3/search_item.tpl
rename to view/theme/smoothly/templates/search_item.tpl
diff --git a/view/theme/smoothly/smarty3/wall_thread.tpl b/view/theme/smoothly/templates/wall_thread.tpl
similarity index 100%
rename from view/theme/smoothly/smarty3/wall_thread.tpl
rename to view/theme/smoothly/templates/wall_thread.tpl
diff --git a/view/theme/smoothly/wall_thread.tpl b/view/theme/smoothly/wall_thread.tpl
deleted file mode 100644
index 6d1e947754..0000000000
--- a/view/theme/smoothly/wall_thread.tpl
+++ /dev/null
@@ -1,160 +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">
-<div class="wall-item-outside-wrapper $item.indent $item.shiny wallwall" id="wall-item-outside-wrapper-$item.id" >
-<div class="wall-item-content-wrapper $item.indent $item.shiny" 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 mframe 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="view/theme/smoothly/images/larrow.gif" alt="$item.wall" /></div>
-			{{ endif }}
-			<div class="wall-item-photo-wrapper mframe{{ 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-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
-		</div>
-		<div class="wall-item-lock-wrapper">
-			{{ if $item.lock }}
-			<div class="wall-item-lock">
-			<img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" />
-			</div>
-			{{ else }}
-			<div class="wall-item-lock"></div>
-			{{ endif }}
-		</div>
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-		<div class="wall-item-author">
-			<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link">
-			<span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span>
-			</a>
-			<div class="wall-item-ago">&bull;</div>
-			<div class="wall-item-ago" id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div>
-		</div>	
-
-		<div>
-		<hr class="line-dots">
-		</div>
-			<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-social" id="wall-item-social-$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.vote.dislike }}
-				<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 }}
-				<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-			</div>
-			{{ endif }}
-
-			{{ if $item.plink }}
-			<div class="wall-item-links-wrapper">
-				<a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a>
-			</div>
-			{{ endif }}
-		 
-			{{ if $item.star }}
-			<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
-			{{ endif }}
-			{{ if $item.tagger }}
-			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.tagger.add"></a>
-			{{ endif }}
-
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
-			{{ endif }}
-	
-		</div>
-
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			{{ if $item.edpost }}
-			<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-			{{ endif }}
-
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-				{{ if $item.drop.dropping }}
-				<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
-				{{ endif }}
-			</div>
-
-			{{ 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" id="wall-item-like-$item.id">$item.like</div>
-	<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
-
-	{{ if $item.threaded }}
-	{{ if $item.comment }}
-        <div class="wall-item-comment-wrapper $item.indent $item.shiny" >
-		$item.comment
-	</div>
-	{{ endif }}
-	{{ endif }}
-</div>
-
-<div class="wall-item-outside-wrapper-end $item.indent $item.shiny" ></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/theme/testbubble/comment_item.tpl b/view/theme/testbubble/comment_item.tpl
deleted file mode 100644
index f7fe22dd77..0000000000
--- a/view/theme/testbubble/comment_item.tpl
+++ /dev/null
@@ -1,33 +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" />
-				<input type="hidden" name="post_id_random" value="$rand_num" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
-				{{ if $qcomment }}
-				{{ for $qcomment as $qc }}				
-					<span class="fakelink qcomment" onclick="commentInsert(this,$id); return false;" >$qc</span>
-					&nbsp;
-				{{ endfor }}
-				{{ endif }}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
-		<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
diff --git a/view/theme/testbubble/group_drop.tpl b/view/theme/testbubble/group_drop.tpl
deleted file mode 100644
index f088fc06ff..0000000000
--- a/view/theme/testbubble/group_drop.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="group-delete-wrapper" id="group-delete-wrapper-$id" >
-	<a href="group/drop/$id" 
-		onclick="return confirmDelete();" 
-		title="$delete" 
-		id="group-delete-icon-$id" 
-		class="drophide group-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" >Delete Group</a>
-</div>
-<div class="group-delete-end"></div>
diff --git a/view/theme/testbubble/group_edit.tpl b/view/theme/testbubble/group_edit.tpl
deleted file mode 100644
index a8b3f92a07..0000000000
--- a/view/theme/testbubble/group_edit.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<h2>$title</h2>
-
-
-<div id="group-edit-wrapper" >
-	<form action="group/$gid" id="group-edit-form" method="post" >
-		<div id="group-edit-name-wrapper" >
-			<label id="group-edit-name-label" for="group-edit-name" >$gname</label>
-			<input type="text" id="group-edit-name" name="groupname" value="$name" />
-			<input type="submit" name="submit" value="$submit">
-			$drop
-		</div>
-		<div id="group-edit-name-end"></div>
-		<div id="group-edit-desc">$desc</div>
-		<div id="group-edit-select-end" ></div>
-	</form>
-</div>
diff --git a/view/theme/testbubble/group_side.tpl b/view/theme/testbubble/group_side.tpl
deleted file mode 100644
index a1fc70a22e..0000000000
--- a/view/theme/testbubble/group_side.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-<div class="widget" id="group-sidebar">
-<h3>$title</h3>
-
-<div id="sidebar-group-list">
-	<ul id="sidebar-group-ul">
-		{{ for $groups as $group }}
-			<li class="sidebar-group-li">
-				{{ if $group.cid }}
-					<input type="checkbox" 
-						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
-						onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
-						{{ if $group.ismember }}checked="checked"{{ endif }}
-					/>
-				{{ endif }}			
-				{{ if $group.edit }}
-					<a class="groupsideedit" href="$group.edit.href"><span class="icon small-pencil"></span></a>
-				{{ endif }}
-				<a class="sidebar-group-element {{ if $group.selected }}group-selected{{ endif }}" href="$group.href">$group.text</a>
-			</li>
-		{{ endfor }}
-	</ul>
-	</div>
-  <div id="sidebar-new-group">
-  <a href="group/new">$createtext</a>
-  </div>
-</div>
-
-
diff --git a/view/theme/testbubble/jot-header.tpl b/view/theme/testbubble/jot-header.tpl
deleted file mode 100644
index 9c0037f7f2..0000000000
--- a/view/theme/testbubble/jot-header.tpl
+++ /dev/null
@@ -1,366 +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 editor=false;
-var textlen = 0;
-var plaintext = '$editselect';
-
-function initEditor(cb) {
-    if (editor==false) {
-        $("#profile-jot-text-loading").show();
- if(plaintext == 'none') {
-            $("#profile-jot-text-loading").hide();
-            $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
-            $(".jothidden").show();
-            editor = true;
-            $("a#jot-perms-icon").colorbox({
-				'inline' : true,
-				'transition' : 'elastic'
-            });
-	                            $("#profile-jot-submit-wrapper").show();
-								{{ if $newpost }}
-    	                            $("#profile-upload-wrapper").show();
-        	                        $("#profile-attach-wrapper").show();
-            	                    $("#profile-link-wrapper").show();
-                	                $("#profile-video-wrapper").show();
-                    	            $("#profile-audio-wrapper").show();
-                        	        $("#profile-location-wrapper").show();
-                            	    $("#profile-nolocation-wrapper").show();
-                                	$("#profile-title-wrapper").show();
-	                                $("#profile-jot-plugin-wrapper").show();
-	                                $("#jot-preview-link").show();
-								{{ endif }}   
-
-
-            if (typeof cb!="undefined") cb();
-            return;
-        }
-        tinyMCE.init({
-                theme : "advanced",
-                mode : "specific_textareas",
-                editor_selector: /(profile-jot-text|prvmail-text)/,
-                plugins : "bbcode,paste,fullscreen,autoresize",
-                theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen",
-                theme_advanced_buttons2 : "",
-                theme_advanced_buttons3 : "",
-                theme_advanced_toolbar_location : "top",
-                theme_advanced_toolbar_align : "center",
-                theme_advanced_blockformats : "blockquote,code",
-                //theme_advanced_resizing : true,
-                //theme_advanced_statusbar_location : "bottom",
-                paste_text_sticky : true,
-                entity_encoding : "raw",
-                add_unload_trigger : false,
-                remove_linebreaks : false,
-                //force_p_newlines : false,
-                //force_br_newlines : true,
-                forced_root_block : 'div',
-                convert_urls: false,
-                content_css: "$baseurl/view/custom_tinymce.css",
-                theme_advanced_path : false,
-                setup : function(ed) {
-					cPopup = null;
-					ed.onKeyDown.add(function(ed,e) {
-						if(cPopup !== null)
-							cPopup.onkey(e);
-					});
-
-
-
-					ed.onKeyUp.add(function(ed, e) {
-						var txt = tinyMCE.activeEditor.getContent();
-						match = txt.match(/@([^ \n]+)$/);
-						if(match!==null) {
-							if(cPopup === null) {
-								cPopup = new ACPopup(this,baseurl+"/acl");
-							}
-							if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
-							if(! cPopup.ready) cPopup = null;
-						}
-						else {
-							if(cPopup !== null) { cPopup.close(); cPopup = null; }
-						}
-
-						textlen = txt.length;
-						if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
-							$('#profile-jot-desc').html(ispublic);
-						}
-                        else {
-                            $('#profile-jot-desc').html('&nbsp;');
-                        }
-
-								//Character count
-
-                                if(textlen <= 140) {
-                                        $('#character-counter').removeClass('red');
-                                        $('#character-counter').removeClass('orange');
-                                        $('#character-counter').addClass('grey');
-                                }
-                                if((textlen > 140) && (textlen <= 420)) {
-                                        $('#character-counter').removeClass('grey');
-                                        $('#character-counter').removeClass('red');
-                                        $('#character-counter').addClass('orange');
-                                }
-                                if(textlen > 420) {
-                                        $('#character-counter').removeClass('grey');
-                                        $('#character-counter').removeClass('orange');
-                                        $('#character-counter').addClass('red');
-                                }
-                                $('#character-counter').text(textlen);
-                        });
-                        ed.onInit.add(function(ed) {
-                                ed.pasteAsPlainText = true;
-								$("#profile-jot-text-loading").hide();
-								$(".jothidden").show();
-	                            $("#profile-jot-submit-wrapper").show();
-								{{ if $newpost }}
-    	                            $("#profile-upload-wrapper").show();
-        	                        $("#profile-attach-wrapper").show();
-            	                    $("#profile-link-wrapper").show();
-                	                $("#profile-video-wrapper").show();
-                    	            $("#profile-audio-wrapper").show();
-                        	        $("#profile-location-wrapper").show();
-                            	    $("#profile-nolocation-wrapper").show();
-                                	$("#profile-title-wrapper").show();
-	                                $("#profile-jot-plugin-wrapper").show();
-	                                $("#jot-preview-link").show();
-								{{ endif }}   
-                             $("#character-counter").show();
-                                if (typeof cb!="undefined") cb();
-                        });
-                }
-        });
-        editor = true;
-        // setup acl popup
-        $("a#jot-perms-icon").colorbox({
-			'inline' : true,
-			'transition' : 'elastic'
-        }); 
-    } else {
-        if (typeof cb!="undefined") cb();
-    }
-} // initEditor
-</script>
-<script type="text/javascript" src="js/ajaxupload.js" ></script>
-<script>
-    var ispublic = '$ispublic';
-	$(document).ready(function() {
-                /* enable tinymce on focus */
-                $("#profile-jot-text").focus(function(){
-                    if (editor) return;
-                    $(this).val("");
-                    initEditor();
-                }); 
-
-
-		var uploader = new window.AjaxUpload(
-			'wall-image-upload',
-			{ action: 'wall_upload/$nickname',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);
-		var file_uploader = new window.AjaxUpload(
-			'wall-file-upload',
-			{ action: 'wall_attach/$nickname',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					addeditortext(response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);		
-		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
-			var selstr;
-			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
-				selstr = $(this).text();
-				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
-				$('#jot-public').hide();
-				$('.profile-jot-net input').attr('disabled', 'disabled');
-			});
-			if(selstr == null) { 
-				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
-				$('#jot-public').show();
-				$('.profile-jot-net input').attr('disabled', false);
-			}
-
-		}).trigger('change');
-
-	});
-
-	function deleteCheckedItems() {
-		if(confirm('$delitems')) {
-			var checkedstr = '';
-
-			$("#item-delete-selected").hide();
-			$('#item-delete-selected-rotator').show();
-
-			$('.item-select').each( function() {
-				if($(this).is(':checked')) {
-					if(checkedstr.length != 0) {
-						checkedstr = checkedstr + ',' + $(this).val();
-					}
-					else {
-						checkedstr = $(this).val();
-					}
-				}	
-			});
-			$.post('item', { dropitems: checkedstr }, function(data) {
-				window.location.reload();
-			});
-		}
-	}
-
-	function jotGetLink() {
-		reply = prompt("$linkurl");
-		if(reply && reply.length) {
-			reply = bin2hex(reply);
-			$('#profile-rotator').show();
-			$.get('parse_url?binurl=' + reply, function(data) {
-				addeditortext(data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-	function jotVideoURL() {
-		reply = prompt("$vidurl");
-		if(reply && reply.length) {
-			addeditortext('[video]' + reply + '[/video]');
-		}
-	}
-
-	function jotAudioURL() {
-		reply = prompt("$audurl");
-		if(reply && reply.length) {
-			addeditortext('[audio]' + reply + '[/audio]');
-		}
-	}
-
-
-	function jotGetLocation() {
-		reply = prompt("$whereareu", $('#jot-location').val());
-		if(reply && reply.length) {
-			$('#jot-location').val(reply);
-		}
-	}
-
-	function jotTitle() {
-		reply = prompt("$title", $('#jot-title').val());
-		if(reply && reply.length) {
-			$('#jot-title').val(reply);
-		}
-	}
-
-	function jotShare(id) {
-		$('#like-rotator-' + id).show();
-		$.get('share/' + id, function(data) {
-				if (!editor) $("#profile-jot-text").val("");
-				initEditor(function(){
-					addeditortext(data);
-					$('#like-rotator-' + id).hide();
-					$(window).scrollTop(0);
-				});
-		});
-	}
-
-	function linkdropper(event) {
-		var linkFound = event.dataTransfer.types.contains("text/uri-list");
-		if(linkFound)
-			event.preventDefault();
-	}
-
-	function linkdrop(event) {
-		var reply = event.dataTransfer.getData("text/uri-list");
-		event.target.textContent = reply;
-		event.preventDefault();
-		if(reply && reply.length) {
-			reply = bin2hex(reply);
-			$('#profile-rotator').show();
-			$.get('parse_url?binurl=' + reply, function(data) {
-				if (!editor) $("#profile-jot-text").val("");
-				initEditor(function(){
-					addeditortext(data);
-					$('#profile-rotator').hide();
-				});
-			});
-		}
-	}
-
-	function itemTag(id) {
-		reply = prompt("$term");
-		if(reply && reply.length) {
-			reply = reply.replace('#','');
-			if(reply.length) {
-
-				commentBusy = true;
-				$('body').css('cursor', 'wait');
-
-				$.get('tagger/' + id + '?term=' + reply);
-				if(timer) clearTimeout(timer);
-				timer = setTimeout(NavUpdate,3000);
-				liking = 1;
-			}
-		}
-	}
-	
-	function itemFiler(id) {
-		
-		var bordercolor = $("input").css("border-color");
-		
-		$.get('filer/', function(data){
-			$.colorbox({html:data});
-			$("#id_term").keypress(function(){
-				$(this).css("border-color",bordercolor);
-			})
-			$("#select_term").change(function(){
-				$("#id_term").css("border-color",bordercolor);
-			})
-			
-			$("#filer_save").click(function(e){
-				e.preventDefault();
-				reply = $("#id_term").val();
-				if(reply && reply.length) {
-					commentBusy = true;
-					$('body').css('cursor', 'wait');
-					$.get('filer/' + id + '?term=' + reply);
-					if(timer) clearTimeout(timer);
-					timer = setTimeout(NavUpdate,3000);
-					liking = 1;
-					$.colorbox.close();
-				} else {
-					$("#id_term").css("border-color","#FF0000");
-				}
-				return false;
-			});
-		});
-		
-	}
-
-	
-
-	function jotClearLocation() {
-		$('#jot-coord').val('');
-		$('#profile-nolocation-wrapper').hide();
-	}
-
-  function addeditortext(data) {
-        if(plaintext == 'none') {
-            var currentText = $("#profile-jot-text").val();
-            $("#profile-jot-text").val(currentText + data);
-        }
-        else
-            tinyMCE.execCommand('mceInsertRawHTML',false,data);
-    }
-
-
-	$geotag
-
-</script>
-
diff --git a/view/theme/testbubble/jot.tpl b/view/theme/testbubble/jot.tpl
deleted file mode 100644
index 12f60b29c0..0000000000
--- a/view/theme/testbubble/jot.tpl
+++ /dev/null
@@ -1,75 +0,0 @@
-
-<div id="profile-jot-wrapper" > 
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey" style="display: none;">0</div>
-		<div id="profile-rotator-wrapper" style="display: $visitor;" >
-			<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display:none;"  />
-		</div> 		
-	</div>
-
-	<form id="profile-jot-form" action="$action" method="post" >
-		<input type="hidden" name="type" value="$ptyp" />
-		<input type="hidden" name="profile_uid" value="$profile_uid" />
-		<input type="hidden" name="return" value="$return_path" />
-		<input type="hidden" name="location" id="jot-location" value="$defloc" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-		<input type="hidden" name="post_id" value="$post_id" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<input type="hidden" name="post_id_random" value="$rand_num" />
-		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div>
-		<div id="jot-text-wrap">
-                <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-                <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
-		</div>
-	<div id="profile-upload-wrapper" class="jot-tool" style="display: none;" >
-		<div id="wall-image-upload-div" ><a onclick="return false;" id="wall-image-upload" class="icon border camera" title="$upload"></a></div>
-	</div>
-	<div id="profile-attach-wrapper" class="jot-tool" style="display: none;" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon border attach" title="$attach"></a></div>
-	</div>  
-	<div id="profile-link-wrapper" class="jot-tool" style="display: none;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<a id="profile-link" class="icon border  link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-	</div> 
-	<div id="profile-video-wrapper" class="jot-tool" style="display: none;" >
-		<a id="profile-video" class="icon border  video" title="$video" onclick="jotVideoURL(); return false;"></a>
-	</div> 
-	<div id="profile-audio-wrapper" class="jot-tool" style="display: none;" >
-		<a id="profile-audio" class="icon border  audio" title="$audio" onclick="jotAudioURL(); return false;"></a>
-	</div> 
-	<div id="profile-location-wrapper" class="jot-tool" style="display: none;" >
-		<a id="profile-location" class="icon border  globe" title="$setloc" onclick="jotGetLocation(); return false;"></a>
-	</div> 
-	<div id="profile-nolocation-wrapper" class="jot-tool" style="display: none;" >
-		<a id="profile-nolocation" class="icon border  noglobe" title="$noloc" onclick="jotClearLocation(); return false;"></a>
-	</div> 
-
-	<span onclick="preview_post();" id="jot-preview-link" class="fakelink" style="display: none;" >$preview</span>
-
-	<div id="profile-jot-submit-wrapper" style="display:none;padding-left: 400px;">
-		<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
-		<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
-            <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate sharePerms" title="$permset"></a>$bang</div>
-	</div>
-
-	<div id="profile-jot-plugin-wrapper" style="display: none;">
-  	$jotplugins
-	</div>
-	<div id="profile-jot-tools-end"></div>
-	
-	<div id="jot-preview-content" style="display:none;"></div>
-
-        <div style="display: none;">
-            <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-                $acl
-                <hr style="clear:both"/>
-                <div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-                <div id="profile-jot-email-end"></div>
-                $jotnets
-            </div>
-        </div>
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
-                {{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/testbubble/match.tpl b/view/theme/testbubble/match.tpl
deleted file mode 100644
index 244b243ece..0000000000
--- a/view/theme/testbubble/match.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class="profile-match-wrapper">
-	<div class="profile-match-photo">
-		<a href="$url">
-			<img src="$photo" alt="$name" />
-		</a>
-	</div>
-	<span><a href="$url">$name</a>$inttxt<br />$tags</span>
-	<div class="profile-match-break"></div>
-	{{ if $connlnk }}
-	<div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div>
-	{{ endif }}
-	<div class="profile-match-end"></div>
-</div>
\ No newline at end of file
diff --git a/view/theme/testbubble/nav.tpl b/view/theme/testbubble/nav.tpl
deleted file mode 100644
index f4c504d365..0000000000
--- a/view/theme/testbubble/nav.tpl
+++ /dev/null
@@ -1,66 +0,0 @@
-<nav>
-	$langselector
-
-	<span id="banner">$banner</span>
-
-	<div id="notifications">	
-		{{ if $nav.network }}<a id="net-update" class="nav-ajax-update" href="$nav.network.0" title="$nav.network.1"></a>{{ endif }}
-		{{ if $nav.home }}<a id="home-update" class="nav-ajax-update" href="$nav.home.0" title="$nav.home.1"></a>{{ endif }}
-<!--		{{ if $nav.notifications }}<a id="intro-update" class="nav-ajax-update" href="$nav.notifications.0" title="$nav.notifications.1"></a>{{ endif }} -->
-		{{ if $nav.introductions }}<a id="intro-update" class="nav-ajax-update" href="$nav.introductions.0" title="$nav.introductions.1"></a>{{ endif }}
-		{{ if $nav.messages }}<a id="mail-update" class="nav-ajax-update" href="$nav.messages.0" title="$nav.messages.1"></a>{{ endif }}
-		{{ if $nav.notifications }}<a rel="#nav-notifications-menu" id="notify-update" class="nav-ajax-update" href="$nav.notifications.0"  title="$nav.notifications.1"></a>{{ endif }}
-
-		<ul id="nav-notifications-menu" class="menu-popup">
-			<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-			<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-			<li class="empty">$emptynotifications</li>
-		</ul>
-	</div>
-	
-	<div id="user-menu" >
-		<a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
-		
-		<ul id="user-menu-popup" 
-			 onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')" 
-			 onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
-
-			{{ if $nav.register }}<li><a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0">$nav.register.1</a></li>{{ endif }}
-			
-			{{ if $nav.home }}<li><a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0">$nav.home.1</a></li>{{ endif }}
-		
-			{{ if $nav.network }}<li><a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0">$nav.network.1</a></li>{{ endif }}
-		
-				{{ if $nav.community }}
-				<li><a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0">$nav.community.1</a></li>
-				{{ endif }}
-
-			<li><a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0">$nav.search.1</a></li>
-			<li><a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0">$nav.directory.1</a></li>
-			{{ if $nav.apps }}<li><a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0">$nav.apps.1</a></li>{{ endif }}
-			
-			{{ if $nav.notifications }}<li><a id="nav-notify-link" class="nav-commlink nav-sep $nav.notifications.2" href="$nav.notifications.0">$nav.notifications.1</a></li>{{ endif }}
-			{{ if $nav.messages }}<li><a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0">$nav.messages.1</a></li>{{ endif }}
-			{{ if $nav.contacts }}<li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0">$nav.contacts.1</a></li>{{ endif }}
-		
-			{{ if $nav.profiles }}<li><a id="nav-profiles-link" class="nav-commlink nav-sep $nav.profiles.2" href="$nav.profiles.0">$nav.profiles.1</a></li>{{ endif }}
-			{{ if $nav.settings }}<li><a id="nav-settings-link" class="nav-commlink $nav.settings.2" href="$nav.settings.0">$nav.settings.1</a></li>{{ endif }}
-			
-			{{ if $nav.manage }}<li><a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0">$nav.manage.1</a></li>{{ endif }}
-		
-			{{ if $nav.admin }}<li><a id="nav-admin-link" class="nav-commlink $nav.admin.2" href="$nav.admin.0">$nav.admin.1</a></li>{{ endif }}
-			
-			{{ if $nav.help }}<li><a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0">$nav.help.1</a></li>{{ endif }}
-
-			{{ if $nav.login }}<li><a id="nav-login-link" class="nav-link $nav.login.2" href="$nav.login.0">$nav.login.1</a></li> {{ endif }}
-			{{ if $nav.logout }}<li><a id="nav-logout-link" class="nav-commlink nav-sep $nav.logout.2" href="$nav.logout.0">$nav.logout.1</a></li> {{ endif }}
-		</ul>
-	</div>
-</nav>
-
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
-</ul>
-
-
diff --git a/view/theme/testbubble/photo_album.tpl b/view/theme/testbubble/photo_album.tpl
deleted file mode 100644
index a0e3f46c49..0000000000
--- a/view/theme/testbubble/photo_album.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="photo-album-image-wrapper" id="photo-album-image-wrapper-$id">
-	<a href="$photolink" class="photo-album-photo-link" id="photo-album-photo-link-$id" title="$phototitle">
-		<img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-album-photo lframe  resize" id="photo-album-photo-$id" />
-	</div>
-		<p class='caption'>$desc</p>		
-	</a>
-	</div>
-<div class="photo-album-image-wrapper-end"></div>
diff --git a/view/theme/testbubble/photo_top.tpl b/view/theme/testbubble/photo_top.tpl
deleted file mode 100644
index 48a546a16e..0000000000
--- a/view/theme/testbubble/photo_top.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-
-<div class="photo-top-image-wrapper lframe" id="photo-top-image-wrapper-$id">
-	<div id="photo-album-wrapper-inner">
-	<a href="$photo.link" class="photo-top-photo-link" id="photo-top-photo-link-$id" title="$photo.title"><img src="$photo.src" alt="$phoyo.alt" title="$photo.title" class="photo-top-photo" id="photo-top-photo-$id" /></a>
-	</div>
-	<div class="photo-top-album-name"><a href="$photo.album.link" class="photo-top-album-link" title="$photo.album.alt" >$photo.album.name</a></div>
-</div>
-<div class="photo-top-image-wrapper-end"></div>
diff --git a/view/theme/testbubble/photo_view.tpl b/view/theme/testbubble/photo_view.tpl
deleted file mode 100644
index 4c754f5978..0000000000
--- a/view/theme/testbubble/photo_view.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-<div id="live-display"></div>
-<h3><a href="$album.0">$album.1</a></h3>
-
-<div id="photo-edit-link-wrap">
-{{ if $tools }}
-<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
--
-<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
-{{ endif }}
-{{ if $lock }} - <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo$id');" /> {{ endif }}
-</div>
-
-<div id="photo-photo" class="lframe">
-	{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
-	<a href="$photo.href" title="$photo.title"><img src="$photo.src" /></a>
-	{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
-</div>
-
-<div id="photo-photo-end"></div>
-<div id="photo-caption" >$desc</div>
-{{ if $tags }}
-<div id="in-this-photo-text">$tags.0</div>
-<div id="in-this-photo">$tags.1</div>
-{{ endif }}
-{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
-
-{{ if $edit }}$edit{{ endif }}
-
-{{ if $likebuttons }}
-<div id="photo-like-div">
-	$likebuttons
-	$like
-	$dislike	
-</div>
-{{ endif }}
-
-$comments
-
-$paginate
-
diff --git a/view/theme/testbubble/profile_entry.tpl b/view/theme/testbubble/profile_entry.tpl
deleted file mode 100644
index 5bea298ac5..0000000000
--- a/view/theme/testbubble/profile_entry.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-
-<div class="profile-listing" >
-<div class="profile-listing-photo-wrapper" >
-<a href="profiles/$id" class="profile-listing-edit-link"><img class="profile-listing-photo mframe" id="profile-listing-photo-$id" src="$photo" alt="$alt" /></a>
-</div>
-<div class="profile-listing-photo-end"></div>
-<div class="profile-listing-name" id="profile-listing-name-$id"><a href="profiles/$id" class="profile-listing-edit-link" >$profile_name</a></div>
-<div class='profile-visible'>$visible</div>
-</div>
-<div class="profile-listing-end"></div>
-
diff --git a/view/theme/testbubble/profile_vcard.tpl b/view/theme/testbubble/profile_vcard.tpl
deleted file mode 100644
index 1686706995..0000000000
--- a/view/theme/testbubble/profile_vcard.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-<div class="vcard">
-	<div class="fn label">$profile.name</div>
-				
-	
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo" alt="$profile.name"></div>
-
-
-
-	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt> 
-		<dd class="adr">
-			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal_code</span>
-			</span>
-			{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
-		</dd>
-		</dl>
-	{{ endif }}
-
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
-
-	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-
-	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-		</ul>
-	</div>
-</div>
-
-$contact_block
-
-
diff --git a/view/theme/testbubble/saved_searches_aside.tpl b/view/theme/testbubble/saved_searches_aside.tpl
deleted file mode 100644
index e2aae1e77c..0000000000
--- a/view/theme/testbubble/saved_searches_aside.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="widget" id="saved-search-list">
-	<h3 id="search">$title</h3>
-	$searchbox
-	
-	<ul id="saved-search-ul">
-		{{ for $saved as $search }}
-		<li class="saved-search-li clear">
-			<a onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" class="icon savedsearchdrop drophide" href="network/?f=&amp;remove=1&amp;search=$search.encodedterm"></a>
-			<a class="savedsearchterm" href="network/?f=&amp;search=$search.encodedterm">$search.term</a>
-		</li>
-		{{ endfor }}
-	</ul>
-	<div class="clear"></div>
-</div>
diff --git a/view/theme/testbubble/search_item.tpl b/view/theme/testbubble/search_item.tpl
deleted file mode 100644
index 9c90fd0402..0000000000
--- a/view/theme/testbubble/search_item.tpl
+++ /dev/null
@@ -1,53 +0,0 @@
-<div class="wall-item-outside-wrapper $item.indent $item.shiny$item.previewing" id="wall-item-outside-wrapper-$item.id" >
-	<div class="wall-item-content-wrapper $item.indent $item.shiny" id="wall-item-content-wrapper-$item.id" >
-		<div class="wall-item-info" id="wall-item-info-$item.id">
-			<div class="wall-item-photo-wrapper mframe" id="wall-item-photo-wrapper-$item.id" 
-				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-					<ul>
-						$item.item_photo_menu
-					</ul>
-				</div>
-			</div>
-			<div class="wall-item-photo-end"></div>	
-			<div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
-		</div>
-		<div class="wall-item-lock-wrapper">
-				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}			
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			<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 class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
-				
-		</div>			
-		
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-
-
-	<div class="wall-item-conv" id="wall-item-conv-$item.id" >
-	{{ if $item.conv }}
-			<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
-	{{ endif }}
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-</div>
-
-<div class="wall-item-outside-wrapper-end $item.indent $item.shiny" ></div>
diff --git a/view/theme/testbubble/smarty3/comment_item.tpl b/view/theme/testbubble/templates/comment_item.tpl
similarity index 100%
rename from view/theme/testbubble/smarty3/comment_item.tpl
rename to view/theme/testbubble/templates/comment_item.tpl
diff --git a/view/theme/testbubble/smarty3/group_drop.tpl b/view/theme/testbubble/templates/group_drop.tpl
similarity index 100%
rename from view/theme/testbubble/smarty3/group_drop.tpl
rename to view/theme/testbubble/templates/group_drop.tpl
diff --git a/view/theme/testbubble/smarty3/group_edit.tpl b/view/theme/testbubble/templates/group_edit.tpl
similarity index 100%
rename from view/theme/testbubble/smarty3/group_edit.tpl
rename to view/theme/testbubble/templates/group_edit.tpl
diff --git a/view/theme/testbubble/smarty3/group_side.tpl b/view/theme/testbubble/templates/group_side.tpl
similarity index 100%
rename from view/theme/testbubble/smarty3/group_side.tpl
rename to view/theme/testbubble/templates/group_side.tpl
diff --git a/view/theme/testbubble/smarty3/jot-header.tpl b/view/theme/testbubble/templates/jot-header.tpl
similarity index 100%
rename from view/theme/testbubble/smarty3/jot-header.tpl
rename to view/theme/testbubble/templates/jot-header.tpl
diff --git a/view/theme/testbubble/smarty3/jot.tpl b/view/theme/testbubble/templates/jot.tpl
similarity index 100%
rename from view/theme/testbubble/smarty3/jot.tpl
rename to view/theme/testbubble/templates/jot.tpl
diff --git a/view/theme/testbubble/smarty3/match.tpl b/view/theme/testbubble/templates/match.tpl
similarity index 100%
rename from view/theme/testbubble/smarty3/match.tpl
rename to view/theme/testbubble/templates/match.tpl
diff --git a/view/theme/testbubble/smarty3/nav.tpl b/view/theme/testbubble/templates/nav.tpl
similarity index 100%
rename from view/theme/testbubble/smarty3/nav.tpl
rename to view/theme/testbubble/templates/nav.tpl
diff --git a/view/theme/testbubble/smarty3/photo_album.tpl b/view/theme/testbubble/templates/photo_album.tpl
similarity index 100%
rename from view/theme/testbubble/smarty3/photo_album.tpl
rename to view/theme/testbubble/templates/photo_album.tpl
diff --git a/view/theme/testbubble/smarty3/photo_top.tpl b/view/theme/testbubble/templates/photo_top.tpl
similarity index 100%
rename from view/theme/testbubble/smarty3/photo_top.tpl
rename to view/theme/testbubble/templates/photo_top.tpl
diff --git a/view/theme/testbubble/smarty3/photo_view.tpl b/view/theme/testbubble/templates/photo_view.tpl
similarity index 100%
rename from view/theme/testbubble/smarty3/photo_view.tpl
rename to view/theme/testbubble/templates/photo_view.tpl
diff --git a/view/theme/testbubble/smarty3/profile_entry.tpl b/view/theme/testbubble/templates/profile_entry.tpl
similarity index 100%
rename from view/theme/testbubble/smarty3/profile_entry.tpl
rename to view/theme/testbubble/templates/profile_entry.tpl
diff --git a/view/theme/testbubble/smarty3/profile_vcard.tpl b/view/theme/testbubble/templates/profile_vcard.tpl
similarity index 100%
rename from view/theme/testbubble/smarty3/profile_vcard.tpl
rename to view/theme/testbubble/templates/profile_vcard.tpl
diff --git a/view/theme/testbubble/smarty3/saved_searches_aside.tpl b/view/theme/testbubble/templates/saved_searches_aside.tpl
similarity index 100%
rename from view/theme/testbubble/smarty3/saved_searches_aside.tpl
rename to view/theme/testbubble/templates/saved_searches_aside.tpl
diff --git a/view/theme/testbubble/smarty3/search_item.tpl b/view/theme/testbubble/templates/search_item.tpl
similarity index 100%
rename from view/theme/testbubble/smarty3/search_item.tpl
rename to view/theme/testbubble/templates/search_item.tpl
diff --git a/view/theme/testbubble/smarty3/wall_thread.tpl b/view/theme/testbubble/templates/wall_thread.tpl
similarity index 100%
rename from view/theme/testbubble/smarty3/wall_thread.tpl
rename to view/theme/testbubble/templates/wall_thread.tpl
diff --git a/view/theme/testbubble/wall_thread.tpl b/view/theme/testbubble/wall_thread.tpl
deleted file mode 100644
index c2ccf9d721..0000000000
--- a/view/theme/testbubble/wall_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">
-<div class="wall-item-outside-wrapper $item.indent $item.shiny wallwall" id="wall-item-outside-wrapper-$item.id" >
-	<div class="wall-item-content-wrapper $item.indent $item.shiny" 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 mframe 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 mframe{{ 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-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>
-		</div>
-		<div class="wall-item-lock-wrapper">
-				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}
-		</div>
-		<div class="wall-item-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>
-				{{ if $item.vote.dislike }}<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 }}
-				<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-			</div>
-			{{ endif }}
-			{{ if $item.plink }}
-				<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></div>
-			{{ endif }}
-			{{ if $item.edpost }}
-				<a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
-			{{ endif }}
-			 
-			{{ if $item.star }}
-			<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
-			{{ endif }}
-			{{ if $item.tagger }}
-			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.tagger.add"></a>
-			{{ endif }}
-			
-			<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 class="wall-item-author">
-			<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-			<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
-		</div>	
-	</div>	
-	<div class="wall-item-wrapper-end"></div>
-	<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-	<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
-	{{ if $item.threaded }}
-	{{ if $item.comment }}
-	<div class="wall-item-comment-wrapper $item.indent $item.shiny" >
-		$item.comment
-	</div>
-	{{ endif }}
-	{{ endif }}
-</div>
-
-<div class="wall-item-outside-wrapper-end $item.indent $item.shiny" ></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/theme/vier/comment_item.tpl b/view/theme/vier/comment_item.tpl
deleted file mode 100644
index 4e39c0772a..0000000000
--- a/view/theme/vier/comment_item.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-		{{ if $threaded }}
-		<div class="comment-wwedit-wrapper threaded" id="comment-edit-wrapper-$id" style="display: block;">
-		{{ else }}
-		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
-		{{ endif }}
-			<form class="comment-edit-form" style="display: block;" 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" />
-				<input type="hidden" name="post_id_random" value="$rand_num" />
-
-				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
-					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
-				</div>
-				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);">$comment</textarea>
-				{{ if $qcomment }}
-					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
-					<option value=""></option>
-				{{ for $qcomment as $qc }}
-					<option value="$qc">$qc</option>				
-				{{ endfor }}
-					</select>
-				{{ endif }}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-
-				<div class="comment-edit-bb">
-	                                <a title="$edimg" onclick="insertFormatting('$comment','img',$id);"><i class="icon-picture"></i></a>      
-	                                <a title="$edurl" onclick="insertFormatting('$comment','url',$id);"><i class="icon-bookmark"></i></a>
-	                                <a title="$edvideo" onclick="insertFormatting('$comment','video',$id);"><i class="icon-film"></i></a>
-                                                                                
-	                                <a title="$eduline" onclick="insertFormatting('$comment','u',$id);"><i class="icon-underline"></i></a>
-	                                <a title="$editalic" onclick="insertFormatting('$comment','i',$id);"><i class="icon-italic"></i></a>
-	                                <a title="$edbold" onclick="insertFormatting('$comment','b',$id);"><i class="icon-bold"></i></a>
-	                                <a title="$edquote" onclick="insertFormatting('$comment','quote',$id);"><i class="icon-comments"></i></a>
-
-                                </div>
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/theme/vier/mail_list.tpl b/view/theme/vier/mail_list.tpl
deleted file mode 100644
index 1d78db2fc5..0000000000
--- a/view/theme/vier/mail_list.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="mail-list-wrapper">
-	<span class="mail-subject {{if $seen}}seen{{else}}unseen{{endif}}"><a href="message/$id" class="mail-link">$subject</a></span>
-	<span class="mail-from">$from_name</span>
-	<span class="mail-date">$date</span>
-	<span class="mail-count">$count</span>
-	
-	<a href="message/dropconv/$id" onclick="return confirmDelete();"  title="$delete" class="mail-delete"><i class="icon-trash icon-large"></i></a>
-</div>
diff --git a/view/theme/vier/nav.tpl b/view/theme/vier/nav.tpl
deleted file mode 100644
index dfb35a62c0..0000000000
--- a/view/theme/vier/nav.tpl
+++ /dev/null
@@ -1,145 +0,0 @@
-<header>
-	{# $langselector #}
-
-	<div id="site-location">$sitelocation</div>
-	<div id="banner">$banner</div>
-</header>
-<nav>
-	<ul>
-		{{ if $nav.community }}
-			<li id="nav-community-link" class="nav-menu $sel.community">
-				<a class="$nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
-			</li>
-		{{ endif }}
-		
-		{{ if $nav.network }}
-			<li id="nav-network-link" class="nav-menu $sel.network">
-				<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
-				<span id="net-update" class="nav-notify"></span>
-			</li>
-		{{ endif }}
-		{{ if $nav.home }}
-			<li id="nav-home-link" class="nav-menu $sel.home">
-				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
-				<span id="home-update" class="nav-notify"></span>
-			</li>
-		{{ endif }}
-		{{ if $nav.messages }}
-			<li id="nav-messages-linkmenu" class="nav-menu">
-				<a href="$nav.messages.0" rel="#nav-messages-menu" title="$nav.messages.1">$nav.messages.1
-                        	<span id="mail-update" class="nav-notify"></span></a>
-                        	<ul id="nav-messages-menu" class="menu-popup">
-                                	<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
-                                        <li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
-                        	</ul>
-                        </li>           
-                {{ endif }}
-
-		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear"></span></a>
-			<ul id="nav-site-menu" class="menu-popup">
-				{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}				
-				{{ if $nav.help }} <li><a class="$nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a></li>{{ endif }}
-				<li><a class="$nav.search.2" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
-				<li><a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a></li>
-				{{ if $nav.delegations }}<li><a class="$nav.delegations.2" href="$nav.delegations.0" title="$nav.delegations.3">$nav.delegations.1</a></li>{{ endif }}
-				{{ if $nav.settings }}<li><a class="$nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
-				{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
-
-				{{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }}
-				{{ if $nav.login }}<li><a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a><li>{{ endif }}
-			</ul>		
-		</li>
-		{{ if $nav.notifications }}
-			<li  id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon s22 notify"></span></a>
-				<span id="notify-update" class="nav-notify"></span>
-				<ul id="nav-notifications-menu" class="menu-popup">
-					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-					<li class="empty">$emptynotifications</li>
-				</ul>
-			</li>		
-		{{ endif }}		
-		
-<!--		
-		{{ if $nav.help }} 
-		<li id="nav-help-link" class="nav-menu $sel.help">
-			<a class="$nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
-		</li>
-		{{ endif }}
--->
-
-		{{ if $userinfo }}
-			<li id="nav-user-linklabel" class="nav-menu"><a href="#" rel="#nav-user-menu" title="$sitelocation">$userinfo.name</a>
-			<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="$userinfo.icon" alt="$userinfo.name"></a>
-				<ul id="nav-user-menu" class="menu-popup">
-					{{ for $nav.usermenu as $usermenu }}
-						<li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
-					{{ endfor }}
-					{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
-					{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
-					{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}	
-				</ul>
-			</li>
-		{{ endif }}
-		
-		{{ if $nav.search}}
-                <li id="search-box">
-                        <form method="get" action="$nav.search.0">
-                        	<input id="search-text" class="nav-menu-search" type="text" value="" name="search">
-                        </form>
-                </li>
-		{{ endif }}
-		
-		{{ if $nav.apps }}
-			<li id="nav-apps-link" class="nav-menu $sel.apps">
-				<a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a>
-				<ul id="nav-apps-menu" class="menu-popup">
-					{{ for $apps as $ap }}
-					<li>$ap</li>
-					{{ endfor }}
-				</ul>
-			</li>
-		{{ endif }}
-	</ul>
-
-</nav>
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li><a href="{0}"><img data-src="{1}">{2} <span class="notif-when">{3}</span></a></li>
-</ul>
-
-{#
-
-{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
-{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-
-<span id="nav-link-wrapper" >
-
-{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-
-<a id="nav-help-link" class="nav-link $nav.help.2" target="friendica-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
-	
-{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
-<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
-<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
-{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
-{{ if $nav.notifications }}
-<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
-<span id="notify-update" class="nav-ajax-left"></span>
-{{ endif }}
-{{ if $nav.messages }}
-<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
-<span id="mail-update" class="nav-ajax-left"></span>
-{{ endif }}
-
-{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
-{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
-
-</span>
-<span id="nav-end"></span>
-<span id="banner">$banner</span>
-#}
diff --git a/view/theme/vier/profile_edlink.tpl b/view/theme/vier/profile_edlink.tpl
deleted file mode 100644
index 5bdbb834a5..0000000000
--- a/view/theme/vier/profile_edlink.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<div class="clear"></div>
diff --git a/view/theme/vier/profile_vcard.tpl b/view/theme/vier/profile_vcard.tpl
deleted file mode 100644
index aa716f100b..0000000000
--- a/view/theme/vier/profile_vcard.tpl
+++ /dev/null
@@ -1,65 +0,0 @@
-<div class="vcard">
-
-	<div class="tool">
-		<div class="fn label">$profile.name</div>
-		{{ if $profile.edit }}
-			<div class="action">
-			<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="$profile.edit.3"><span>$profile.edit.1</span></a>
-			<ul id="profiles-menu" class="menu-popup">
-				{{ for $profile.menu.entries as $e }}
-				<li>
-					<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
-				</li>
-				{{ endfor }}
-				<li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
-				<li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
-				<li><a href="profiles" >$profile.edit.3</a></li>
-								
-			</ul>
-			</div>
-		{{ else }}
-			<div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="$editprofile" href="profiles" ></a></div>
-		{{ endif }}
-	</div>
-
-
-	<div id="profile-photo-wrapper"><img class="photo" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
-	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-
-
-	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt><br> 
-		<dd class="adr">
-			{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal-code</span>
-			</span>
-			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
-		</dd>
-		</dl>
-	{{ endif }}
-
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-	
-	{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
-
-	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-
-	{{ inc diaspora_vcard.tpl }}{{ endinc }}
-	
-	<div id="profile-extra-links">
-		<ul>
-			{{ if $connect }}
-				<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-			{{ endif }}
-		</ul>
-	</div>
-</div>
-
-$contact_block
-
-
diff --git a/view/theme/vier/search_item.tpl b/view/theme/vier/search_item.tpl
deleted file mode 100644
index 334e33fca7..0000000000
--- a/view/theme/vier/search_item.tpl
+++ /dev/null
@@ -1,92 +0,0 @@
-
-<div class="wall-item-decor">
-	<span class="icon star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
-	{{ if $item.lock }}<span class="icon lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}	
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-
-<div class="wall-item-container $item.indent $item.shiny ">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="wall-item-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-		</div>
-		<div class="wall-item-actions-author">
-			<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
-			<span class="wall-item-ago">
-				{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-				{{ if $item.lock }}<span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-		</div>
-		<div class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="">
-			<!-- {{ if $item.plink }}<a title="$item.plink.title" href="$item.plink.href"><i class="icon-link icon-large"></i></a>{{ endif }} -->
-			{{ if $item.conv }}<a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'><i class="icon-link icon-large"></i></a>{{ endif }}
-		</div>
-		<div class="wall-item-actions">
-
-			<div class="wall-item-location">$item.location&nbsp;</div>	
-			
-			<div class="wall-item-actions-social">
-			{{ if $item.star }}
-				<a href="#" id="star-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classdo"  title="$item.star.do">$item.star.do</a>
-				<a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo">$item.star.undo</a>
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
-			{{ endif }}
-			
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-				<a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false">$item.vote.dislike.1</a>
-			{{ endif }}
-						
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false">$item.vote.share.1</a>
-			{{ endif }}			
-			</div>
-			
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.pagedrop }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-				{{ endif }}
-				{{ if $item.drop.dropping }}
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a class="icon edit s16" href="$item.edpost.0" title="$item.edpost.1"></a>
-				{{ endif }}
-			</div>
-			
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links"></div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-</div>
diff --git a/view/theme/vier/smarty3/comment_item.tpl b/view/theme/vier/templates/comment_item.tpl
similarity index 100%
rename from view/theme/vier/smarty3/comment_item.tpl
rename to view/theme/vier/templates/comment_item.tpl
diff --git a/view/theme/vier/smarty3/mail_list.tpl b/view/theme/vier/templates/mail_list.tpl
similarity index 100%
rename from view/theme/vier/smarty3/mail_list.tpl
rename to view/theme/vier/templates/mail_list.tpl
diff --git a/view/theme/vier/smarty3/nav.tpl b/view/theme/vier/templates/nav.tpl
similarity index 100%
rename from view/theme/vier/smarty3/nav.tpl
rename to view/theme/vier/templates/nav.tpl
diff --git a/view/theme/vier/smarty3/profile_edlink.tpl b/view/theme/vier/templates/profile_edlink.tpl
similarity index 100%
rename from view/theme/vier/smarty3/profile_edlink.tpl
rename to view/theme/vier/templates/profile_edlink.tpl
diff --git a/view/theme/vier/smarty3/profile_vcard.tpl b/view/theme/vier/templates/profile_vcard.tpl
similarity index 100%
rename from view/theme/vier/smarty3/profile_vcard.tpl
rename to view/theme/vier/templates/profile_vcard.tpl
diff --git a/view/theme/vier/smarty3/search_item.tpl b/view/theme/vier/templates/search_item.tpl
similarity index 100%
rename from view/theme/vier/smarty3/search_item.tpl
rename to view/theme/vier/templates/search_item.tpl
diff --git a/view/theme/vier/smarty3/threaded_conversation.tpl b/view/theme/vier/templates/threaded_conversation.tpl
similarity index 100%
rename from view/theme/vier/smarty3/threaded_conversation.tpl
rename to view/theme/vier/templates/threaded_conversation.tpl
diff --git a/view/theme/vier/smarty3/wall_thread.tpl b/view/theme/vier/templates/wall_thread.tpl
similarity index 100%
rename from view/theme/vier/smarty3/wall_thread.tpl
rename to view/theme/vier/templates/wall_thread.tpl
diff --git a/view/theme/vier/threaded_conversation.tpl b/view/theme/vier/threaded_conversation.tpl
deleted file mode 100644
index 82e071134e..0000000000
--- a/view/theme/vier/threaded_conversation.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-$live_update
-
-{{ for $threads as $thread }}
-
-<div id="tread-wrapper-$thread.id" class="tread-wrapper {{ if $thread.threaded }}threaded{{ endif }}  $thread.toplevel">
-       
-       
-		{{ if $thread.type == tag }}
-			{{ inc wall_item_tag.tpl with $item=$thread }}{{ endinc }}
-		{{ else }}
-			{{ inc $thread.template with $item=$thread }}{{ endinc }}
-		{{ endif }}
-		
-</div>
-{{ endfor }}
-
-<div id="conversation-end"></div>
-
-{{ if $dropping }}
-<a id="item-delete-selected" href="#" onclick="deleteCheckedItems();return false;">
-	<span class="icon s22 delete text">$dropping</span>
-</a>
-<img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
-{{ endif }}
-
-<script>
-// jquery color plugin from https://raw.github.com/gist/1891361/17747b50ad87f7a59a14b4e0f38d8f3fb6a18b27/gistfile1.js
-    (function(d){d.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor","borderTopColor","color","outlineColor"],function(f,e){d.fx.step[e]=function(g){if(!g.colorInit){g.start=c(g.elem,e);g.end=b(g.end);g.colorInit=true}g.elem.style[e]="rgb("+[Math.max(Math.min(parseInt((g.pos*(g.end[0]-g.start[0]))+g.start[0]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[1]-g.start[1]))+g.start[1]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[2]-g.start[2]))+g.start[2]),255),0)].join(",")+")"}});function b(f){var e;if(f&&f.constructor==Array&&f.length==3){return f}if(e=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(f)){return[parseInt(e[1]),parseInt(e[2]),parseInt(e[3])]}if(e=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(f)){return[parseFloat(e[1])*2.55,parseFloat(e[2])*2.55,parseFloat(e[3])*2.55]}if(e=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(f)){return[parseInt(e[1],16),parseInt(e[2],16),parseInt(e[3],16)]}if(e=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(f)){return[parseInt(e[1]+e[1],16),parseInt(e[2]+e[2],16),parseInt(e[3]+e[3],16)]}if(e=/rgba\(0, 0, 0, 0\)/.exec(f)){return a.transparent}return a[d.trim(f).toLowerCase()]}function c(g,e){var f;do{f=d.curCSS(g,e);if(f!=""&&f!="transparent"||d.nodeName(g,"body")){break}e="backgroundColor"}while(g=g.parentNode);return b(f)}var a={transparent:[255,255,255]}})(jQuery);
-    var colWhite = {backgroundColor:'#EFF0F1'};
-    var colShiny = {backgroundColor:'#FCE94F'};
-</script>
-
-{{ if $mode == display }}
-<script>
-    var id = window.location.pathname.split("/").pop();
-    $(window).scrollTop($('#item-'+id).position().top);
-    $('#item-'+id).animate(colWhite, 1000).animate(colShiny).animate(colWhite, 2000);   
-</script>
-{{ endif }}
-
diff --git a/view/theme/vier/wall_thread.tpl b/view/theme/vier/wall_thread.tpl
deleted file mode 100644
index 756015bc0f..0000000000
--- a/view/theme/vier/wall_thread.tpl
+++ /dev/null
@@ -1,172 +0,0 @@
-{{if $mode == display}}
-{{ else }}
-{{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>
-			{{ if $item.thread_level==3 }} - 
-			<span id="hide-thread-$item-id"
-				class="fakelink"
-				onclick="showThread($item.id);">expand</span> /
-			<span id="hide-thread-$item-id"
-				class="fakelink"
-				onclick="hideThread($item.id);">collapse</span> thread{{ endif }}
-	</div>
-	<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
-{{endif}}
-{{ endif }}
-
-{{ if $item.thread_level!=1 }}<div class="children">{{ endif }}
-
-<div class="wall-item-decor">
-	<span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
-	{{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}	
-	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-
-<div class="wall-item-container $item.indent $item.shiny " id="item-$item.id">
-	<div class="wall-item-item">
-		<div class="wall-item-info">
-			<div class="contact-photo-wrapper mframe{{ if $item.owner_url }} wwfrom{{ endif }}"
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
-				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo $item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-				</a>
-				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-				$item.item_photo_menu
-				</ul>
-				
-			</div>
-			{{ if $item.owner_url }}
-			<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$item.id">
-					<img src="$item.owner_photo" class="contact-photo $item.osparkle" id="wall-item-ownerphoto-$item.id" alt="$item.owner_name" />
-				</a>
-			</div>
-			{{ endif }}			
-		</div>
-		<div class="wall-item-actions-author">
-			<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a>
-			 {{ if $item.owner_url }}$item.via <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 }}
-			<span class="wall-item-ago">
-				{{ if $item.plink }}<a title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
-				{{ if $item.lock }}<span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
-			</span>
-		</div>
-
-		<div itemprop="description" class="wall-item-content">
-			{{ if $item.title }}<h2><a href="$item.plink.href" class="$item.sparkle">$item.title</a></h2>{{ endif }}
-			$item.body
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-tags">
-			{{ for $item.hashtags as $tag }}
-				<span class='tag'>$tag</span>
-			{{ endfor }}
-  			{{ for $item.mentions as $tag }}
-				<span class='mention'>$tag</span>
-			{{ endfor }}
-               {{ for $item.folders as $cat }}
-                    <span class='folder'>$cat.name</a>{{if $cat.removeurl}} (<a href="$cat.removeurl" title="$remove">x</a>) {{endif}} </span>
-               {{ endfor }}
-                {{ for $item.categories as $cat }}
-                    <span class='category'>$cat.name</a>{{if $cat.removeurl}} (<a href="$cat.removeurl" title="$remove">x</a>) {{endif}} </span>
-                {{ endfor }}
-		</div>
-	</div>	
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-			{{ if $item.plink }}<a title="$item.plink.title" href="$item.plink.href"><i class="icon-link icon-large"></i></a>{{ endif }}
-		</div>
-		<div class="wall-item-actions">
-			<div class="wall-item-actions-social">
-			{{ if $item.threaded }}{{ if $item.comment }}
-				<span id="comment-$item.id" class="fakelink togglecomment" onclick="openClose('item-comments-$item.id');"><i class="icon-comment"></i></span>
-			{{ endif }}{{ endif }}
-			{{ if $item.vote }}
-				<a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"><i class="icon-thumbs-up icon-large"></i></a>
-				{{ if $item.vote.dislike }}
-				<a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"><i class="icon-thumbs-down icon-large"></i></a>
-				{{ endif }}
-			{{ endif }}
-			{{ if $item.vote.share }}
-				<a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false"><i class="icon-retweet icon-large"></i></a>
-			{{ endif }}
-			{{ if $item.star }}
-				<a href="#" id="star-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classdo"  title="$item.star.do"><i class="icon-star icon-large"></i></a>
-				<a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo"><i class="icon-star-empty icon-large"></i></a>
-			{{ endif }}
-			{{ if $item.tagger }}
-				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.tagger.class" title="$item.tagger.add"><i class="icon-tags icon-large"></i></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"><i class="icon-folder-close icon-large"></i></a>
-			{{ endif }}
-			</div>
-			<div class="wall-item-location">$item.location $item.postopts</div>				
-			<div class="wall-item-actions-tools">
-
-				{{ if $item.drop.pagedrop }}
-					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-				{{ endif }}
-				{{ if $item.drop.dropping }}
-					<a href="item/drop/$item.id" onclick="return confirmDelete();" title="$item.drop.delete"><i class="icon-trash icon-large"></i></a>
-				{{ endif }}
-				{{ if $item.edpost }}
-					<a href="$item.edpost.0" title="$item.edpost.1"><i class="icon-edit icon-large"></i></a>
-				{{ endif }}
-			</div>
-			
-		</div>
-	</div>
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
-	</div>
-	
-	{{ if $item.threaded }}{{ if $item.comment }}
-	<div class="wall-item-bottom">
-		<div class="wall-item-links">
-		</div>
-		<div class="wall-item-comment-wrapper" id="item-comments-$item.id" style="display: none;">
-					$item.comment
-		</div>
-	</div>
-	{{ endif }}{{ endif }}
-</div>
-
-
-{{ for $item.children as $child }}
-	{{ if $item.type == tag }}
-		{{ inc wall_item_tag.tpl with $item=$child }}{{ endinc }}
-	{{ else }}
-		{{ inc $item.template with $item=$child }}{{ endinc }}
-	{{ endif }}
-{{ endfor }}
-
-{{ if $item.thread_level!=1 }}</div>{{ endif }}
-
-
-{{if $mode == display}}
-{{ else }}
-{{if $item.comment_lastcollapsed}}</div>{{endif}}
-{{ endif }}
-
-{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
-<div class="wall-item-comment-wrapper" id="item-comments-$item.id">$item.comment</div>
-{{ endif }}{{ endif }}{{ endif }}
-
-
-{{ if $item.flatten }}
-<div class="wall-item-comment-wrapper" id="item-comments-$item.id">$item.comment</div>
-{{ endif }}
diff --git a/view/threaded_conversation.tpl b/view/threaded_conversation.tpl
deleted file mode 100644
index c95ab52967..0000000000
--- a/view/threaded_conversation.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-$live_update
-
-{{ for $threads as $thread }}
-{{ inc $thread.template with $item=$thread }}{{ endinc }}
-{{ endfor }}
-
-<div id="conversation-end"></div>
-
-{{ if $dropping }}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
-  <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
-  <div id="item-delete-selected-desc" >$dropping</div>
-</div>
-<img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
-<div id="item-delete-selected-end"></div>
-{{ endif }}
diff --git a/view/toggle_mobile_footer.tpl b/view/toggle_mobile_footer.tpl
deleted file mode 100644
index 58695f4dff..0000000000
--- a/view/toggle_mobile_footer.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<a id="toggle_mobile_link" href="$toggle_link">$toggle_text</a>
-
diff --git a/view/uexport.tpl b/view/uexport.tpl
deleted file mode 100644
index 30d11d58e0..0000000000
--- a/view/uexport.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<h3>$title</h3>
-
-
-{{ for $options as $o }}
-<dl>
-    <dt><a href="$baseurl/$o.0">$o.1</a></dt>
-    <dd>$o.2</dd>
-</dl>
-{{ endfor }}
\ No newline at end of file
diff --git a/view/uimport.tpl b/view/uimport.tpl
deleted file mode 100644
index 8950c8b541..0000000000
--- a/view/uimport.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-<form action="uimport" method="post" id="uimport-form" enctype="multipart/form-data">
-<h1>$import.title</h1>
-    <p>$import.intro</p>
-    <p>$import.instruct</p>
-    <p><b>$import.warn</b></p>
-     {{inc field_custom.tpl with $field=$import.field }}{{ endinc }}
-     
-     
-	<div id="register-submit-wrapper">
-		<input type="submit" name="submit" id="register-submit-button" value="$regbutt" />
-	</div>
-	<div id="register-submit-end" ></div>    
-</form>
diff --git a/view/vcard-widget.tpl b/view/vcard-widget.tpl
deleted file mode 100644
index d00099adba..0000000000
--- a/view/vcard-widget.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-	<div class="vcard">
-		<div class="fn">$name</div>
-		<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="$photo" alt="$name" /></div>
-	</div>
-
diff --git a/view/viewcontact_template.tpl b/view/viewcontact_template.tpl
deleted file mode 100644
index d6f01643ea..0000000000
--- a/view/viewcontact_template.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<h3>$title</h3>
-
-{{ for $contacts as $contact }}
-	{{ inc contact_template.tpl }}{{ endinc }}
-{{ endfor }}
-
-<div id="view-contact-end"></div>
-
-$paginate
diff --git a/view/voting_fakelink.tpl b/view/voting_fakelink.tpl
deleted file mode 100644
index a1ff04a703..0000000000
--- a/view/voting_fakelink.tpl
+++ /dev/null
@@ -1 +0,0 @@
-$phrase
diff --git a/view/wall_thread.tpl b/view/wall_thread.tpl
deleted file mode 100644
index 716956c655..0000000000
--- a/view/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="tread-wrapper-$item.id" class="tread-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 $item.shiny" id="wall-item-content-wrapper-$item.id" >
-		<div class="wall-item-info{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-info-$item.id">
-			{{ if $item.owner_url }}
-			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
-				<img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></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" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-                    <ul>
-                        $item.item_photo_menu
-                    </ul>
-                </div>
-
-			</div>
-			<div class="wall-item-photo-end"></div>
-			<div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-				{{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
-				{{ else }}<div class="wall-item-lock"></div>{{ endif }}	
-				<div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
-			</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>{{ 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.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>
-			{{ if $item.has_cats }}
-			<div class="categorytags"><span>$item.txt_cats {{ for $item.categories as $cat }}$cat.name{{ if $cat.removeurl }} <a href="$cat.removeurl" title="$remove">[$remove]</a>{{ endif }} {{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-
-			{{ if $item.has_folders }}
-			<div class="filesavetags"><span>$item.txt_folders {{ for $item.folders as $cat }}$cat.name{{ if $cat.removeurl}} <a href="$cat.removeurl" title="$remove">[$remove]</a>{{ endif }}{{ if $cat.last }}{{ else }}, {{ endif }}{{ endfor }}
-			</div>
-			{{ endif }}
-			</div>
-		</div>
-		<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.vote.dislike }}<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 }}
-				<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-			</div>
-			{{ endif }}
-			{{ if $item.plink }}
-				<div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link$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>
-			{{ endif }}
-			{{ if $item.tagger }}
-			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.tagger.add"></a>
-			{{ endif }}
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
-			{{ endif }}			
-			
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" 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/wallmessage.tpl b/view/wallmessage.tpl
deleted file mode 100644
index 66b2bc3a05..0000000000
--- a/view/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/wallmsg-end.tpl b/view/wallmsg-end.tpl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/view/wallmsg-header.tpl b/view/wallmsg-header.tpl
deleted file mode 100644
index 200dfcbd06..0000000000
--- a/view/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 : 'div',
-		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/xrd_diaspora.tpl b/view/xrd_diaspora.tpl
deleted file mode 100644
index 25cda533cb..0000000000
--- a/view/xrd_diaspora.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-	<Link rel="http://joindiaspora.com/seed_location" type="text/html" href="$baseurl/" />
-	<Link rel="http://joindiaspora.com/guid" type="text/html" href="$dspr_guid" />
-	<Link rel="diaspora-public-key" type="RSA" href="$dspr_key" />
diff --git a/view/xrd_host.tpl b/view/xrd_host.tpl
deleted file mode 100644
index 94e3c2146e..0000000000
--- a/view/xrd_host.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'
-     xmlns:hm='http://host-meta.net/xrd/1.0'>
- 
-    <hm:Host>$zhost</hm:Host>
- 
-    <Link rel='lrdd' template='$domain/xrd/?uri={uri}' />
-    <Link rel='acct-mgmt' href='$domain/amcd' />
-    <Link rel='http://services.mozilla.com/amcd/0.1' href='$domain/amcd' />
-	<Link rel="http://oexchange.org/spec/0.8/rel/resident-target" type="application/xrd+xml" 
-        href="$domain/oexchange/xrd" />
-
-    <Property xmlns:mk="http://salmon-protocol.org/ns/magic-key"
-        type="http://salmon-protocol.org/ns/magic-key"
-        mk:key_id="1">$bigkey</Property>
-
-
-</XRD>
diff --git a/view/xrd_person.tpl b/view/xrd_person.tpl
deleted file mode 100644
index d79203465b..0000000000
--- a/view/xrd_person.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
- 
-    <Subject>$accturi</Subject>
-	<Alias>$accturi</Alias>
-    <Alias>$profile_url</Alias>
- 
-    <Link rel="http://purl.org/macgirvin/dfrn/1.0"
-          href="$profile_url" />
-    <Link rel="http://schemas.google.com/g/2010#updates-from" 
-          type="application/atom+xml" 
-          href="$atom" />
-    <Link rel="http://webfinger.net/rel/profile-page"
-          type="text/html"
-          href="$profile_url" />
-    <Link rel="http://microformats.org/profile/hcard"
-          type="text/html"
-          href="$hcard_url" />
-    <Link rel="http://portablecontacts.net/spec/1.0"
-          href="$poco_url" />
-    <Link rel="http://webfinger.net/rel/avatar"
-          type="image/jpeg"
-          href="$photo" />
-	$dspr
-    <Link rel="salmon" 
-          href="$salmon" />
-    <Link rel="http://salmon-protocol.org/ns/salmon-replies" 
-          href="$salmon" />
-    <Link rel="http://salmon-protocol.org/ns/salmon-mention" 
-          href="$salmen" />
-    <Link rel="magic-public-key" 
-          href="$modexp" />
- 
-	<Property xmlns:mk="http://salmon-protocol.org/ns/magic-key"
-          type="http://salmon-protocol.org/ns/magic-key"
-          mk:key_id="1">$bigkey</Property>
-
-</XRD>