diff --git a/include/pgettext.php b/include/pgettext.php
index 2e902a6ab..ae1ce009c 100644
--- a/include/pgettext.php
+++ b/include/pgettext.php
@@ -120,48 +120,90 @@ function load_translation_table($lang) {
 
 }}
 
-// translate string if translation exists
-
-if (! function_exists('t')) {
-function t($s) {
-
+/**
+ * @brief Return the localized version of the provided string with optional string interpolation
+ *
+ * This function takes a english string as parameter, and if a localized version
+ * exists for the current language, substitutes it before performing an eventual
+ * string interpolation (sprintf) with additional optional arguments.
+ *
+ * Usages:
+ * - t('This is an example')
+ * - t('URL %s returned no result', $url)
+ * - t('Current version: %s, new version: %s', $current_version, $new_version)
+ *
+ * @param string $s
+ * @return string
+ */
+function t($s)
+{
 	$a = get_app();
 
-	if (x($a->strings,$s)) {
+	if (x($a->strings, $s)) {
 		$t = $a->strings[$s];
-		return is_array($t)?$t[0]:$t;
+		$s = is_array($t) ? $t[0] : $t;
+	}
+	if (func_num_args() > 1) {
+		$args = array_slice(func_get_args(), 1);
+		$s = @vsprintf($s, $args);
 	}
-	return $s;
-}}
 
-if (! function_exists('tt')){
-function tt($singular, $plural, $count){
+	return $s;
+}
+
+/**
+ * @brief Return the localized version of a singular/plural string with optional string interpolation
+ *
+ * This function takes two english strings as parameters, singular and plural, as
+ * well as a count. If a localized version exists for the current language, they
+ * are used instead. Discrimination between singular and plural is done using the
+ * localized function if any or the default one. Finally, a string interpolation
+ * is performed using the count as parameter.
+ *
+ * Usages:
+ * - tt('Like', 'Likes', $count)
+ * - tt("%s user deleted", "%s users deleted", count($users))
+ *
+ * @global type $lang
+ * @param string $singular
+ * @param string $plural
+ * @param int $count
+ * @return string
+ */
+function tt($singular, $plural, $count)
+{
 	global $lang;
 	$a = get_app();
 
-	if (x($a->strings,$singular)) {
+	if (x($a->strings, $singular)) {
 		$t = $a->strings[$singular];
-		$f = 'string_plural_select_' . str_replace('-','_',$lang);
-		if (! function_exists($f))
-			$f = 'string_plural_select_default';
-		$k = $f($count);
-		return is_array($t)?$t[$k]:$t;
+		if (is_array($t)) {
+			$plural_function = 'string_plural_select_' . str_replace('-', '_', $lang);
+			if (function_exists($plural_function)) {
+				$plural_function = 'string_plural_select_default';
+			}
+			$i = $plural_function($count);
+			$s = $t[$i];
+		} else {
+			$s = $t;
+		}
+	} elseif (string_plural_select_default($count)) {
+		$s = $plural;
+	} else {
+		$s = $singular;
 	}
 
-	if ($count!=1){
-		return $plural;
-	} else {
-		return $singular;
-	}
-}}
+	$s = @sprintf($s, $count);
+
+	return $s;
+}
 
 // provide a fallback which will not collide with
 // a function defined in any language file
-
-if (! function_exists('string_plural_select_default')) {
-function string_plural_select_default($n) {
-	return ($n != 1);
-}}
+function string_plural_select_default($n)
+{
+	return $n != 1;
+}
 
 
 
diff --git a/view/templates/admin_aside.tpl b/view/templates/admin_aside.tpl
deleted file mode 100644
index 5c9cce0d0..000000000
--- a/view/templates/admin_aside.tpl
+++ /dev/null
@@ -1,47 +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'>
-{{foreach $subpages as $page}}
-	<li class='admin link button {{$page.2}}'><a href='{{$page.0}}'>{{$page.1}}</a></li>
-{{/foreach}}
-</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>
-{{/if}}
-
-
-{{if $admin.plugins_admin}}<h4>{{$plugadmtxt}}</h4>{{/if}}
-<ul class='admin linklist'>
-	{{foreach $admin.plugins_admin as $l}}
-	<li class='admin link button {{$l.2}}'><a href='{{$l.0}}'>{{$l.1}}</a></li>
-	{{/foreach}}
-</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>
-	<li class='admin link button {{$admin.viewlogs.2}}'><a href='{{$admin.viewlogs.0}}'>{{$admin.viewlogs.1}}</a></li>
-</ul>
-
-<h4>{{$diagnosticstxt}}</h4>
-<ul class='admin linklist'>
-	<li class='admin link {{$admin.diagnostics_probe.2}}'><a href="{{$admin.diagnostics_probe.0}}">{{$admin.diagnostics_probe.1}}</a></li>
-	<li class='admin link {{$admin.diagnostics_webfinger.2}}'><a href="{{$admin.diagnostics_webfinger.0}}">{{$admin.diagnostics_webfinger.1}}</a></li>
-</ul>
diff --git a/view/templates/admin_blocklist.tpl b/view/templates/admin_blocklist.tpl
deleted file mode 100644
index 1484c987e..000000000
--- a/view/templates/admin_blocklist.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-<script>
-	function confirm_delete(uname){
-		return confirm("{{$confirm_delete}}".format(uname));
-	}
-</script>
-<div id="adminpage">
-	<h1>{{$title}} - {{$page}}</h1>
-	<p>{{$intro}}</p>
-	<p>{{$public}}</p>
-
-	<h2>{{$addtitle}}</h2>
-	<form action="{{$baseurl}}/admin/blocklist" method="post">
-		<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
-		{{include file="field_input.tpl" field=$newdomain}}
-		{{include file="field_input.tpl" field=$newreason}}
-		<div class="submit"><input type="submit" name="page_blocklist_save" value="{{$submit}}" /></div>
-	</form>
-
-	{{if $entries}}
-	<h2>{{$currenttitle}}</h2>
-	<p>{{$currentintro}}</p>
-	<form action="{{$baseurl}}/admin/blocklist" method="post">
-		<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
-		{{foreach $entries as $e}}
-			{{include file="field_input.tpl" field=$e.domain}}
-			{{include file="field_input.tpl" field=$e.reason}}
-			{{include file="field_checkbox.tpl" field=$e.delete}}
-		{{/foreach}}
-		<div class="submit"><input type="submit" name="page_blocklist_edit" value="{{$savechanges}}" /></div>
-		{{/if}}
-	</form>
-
-</div>
diff --git a/view/templates/admin_deleteitem.tpl b/view/templates/admin_deleteitem.tpl
deleted file mode 100644
index cf819dea6..000000000
--- a/view/templates/admin_deleteitem.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-<div id="adminpage">
-	<h1>{{$title}} - {{$page}}</h1>
-	<p>{{$intro1}}</p>
-	<p>{{$intro2}}</p>
-</div>
-
-<form action="{{$baseurl}}/admin/deleteitem" method="post">
-	<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
-	{{include file="field_input.tpl" field=$deleteitemguid}}
-	<div class="submit"><input type="submit" name="page_deleteitem_submit" value="{{$submit}}" /></div>
-</form>
diff --git a/view/templates/admin_federation.tpl b/view/templates/admin_federation.tpl
deleted file mode 100644
index ee33df09b..000000000
--- a/view/templates/admin_federation.tpl
+++ /dev/null
@@ -1,58 +0,0 @@
-<script src="{{$baseurl}}/library/Chart.js-1.0.2/Chart.min.js"></script>
-<canvas id="FederationChart" class="federation-graph"></canvas>
-<div id="adminpage">
-    <h1>{{$title}} - {{$page}}</h1>
-    <p>{{$intro}}</p>
-    {{if not $autoactive}}
-	<p class="error-message">{{$hint}}</p>
-    {{/if}}
-    <p>{{$legendtext}}
-    <ul>
-    {{foreach $counts as $c}}
-	{{if $c[0]['total'] > 0}}
-	    <li>{{$c[0]['platform']}} ({{$c[0]['total']}})</li>
-	{{/if}}
-    {{/foreach}}
-    </ul>
-    </p>
-</div>
-<script>
-var FedData = [
-{{foreach $counts as $c}}
-    { value: {{$c[0]['total']}}, label: "{{$c[0]['platform']}}", color: '{{$c[3]}}', highlight: "#EE90A1", },
-{{/foreach}}
-];
-var ctx = document.getElementById("FederationChart").getContext("2d");
-var myDoughnutChart = new Chart(ctx).Doughnut(FedData, { animateRotate : false, });
-</script>
-
-<table id="federation-stats">
-{{foreach $counts as $c}}
-    {{if $c[0]['total'] > 0}}
-    <tr>
-	    <th>{{$c[0]['platform']}}</th>
-	    <th><strong>{{$c[0]['total']}}</strong></td>
-	    <td>{{$c[0]['network']}}</td>
-    </tr>
-    <tr>
-    <td colspan="3" class="federation-data">
-    <canvas id="{{$c[2]}}Chart" class="federation-network-graph"></canvas>
-    <script>
-    var {{$c[2]}}data = [
-    {{foreach $c[1] as $v}}
-	{ value: {{$v['total']}}, label: '{{$v['version']}}', color: "{{$c[3]}}", highlight: "#EE90A1",},
-    {{/foreach}}
-    ];
-    var ctx = document.getElementById("{{$c[2]}}Chart").getContext("2d");
-    var my{{$c[2]}}DoughnutChart = new Chart(ctx).Doughnut({{$c[2]}}data, {animateRotate : false,});
-    </script>
-    <ul class="federation-stats">
-    {{foreach $c[1] as $v}}
-	<li>{{if ($c[0]['platform']==='Friendica' and  $version===$v['version']) }}<span class="version-match">{{$v['version']}}</span>{{else}}{{$v['version']}}{{/if}} ({{$v['total']}})</li>
-    {{/foreach}}
-    </ul>
-    </td>
-    </tr>
-    {{/if}}
-{{/foreach}}
-</table>
diff --git a/view/templates/admin_logs.tpl b/view/templates/admin_logs.tpl
deleted file mode 100644
index b2e6357a9..000000000
--- a/view/templates/admin_logs.tpl
+++ /dev/null
@@ -1,22 +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|escape:'html'}}">
-
-	    {{include file="field_checkbox.tpl" field=$debugging}}
-	    {{include file="field_input.tpl" field=$logfile}}
-	    {{include file="field_select.tpl" field=$loglevel}}
-	
-	    <div class="submit"><input type="submit" name="page_logs" value="{{$submit|escape:'html'}}" /></div>
-	
-	</form>
-
-	<h2>{{$phpheader}}</h2>
-	<div>
-		<p>{{$phplogenabled}}<p>
-		<p>{{$phphint}}</p>
-		<pre>{{$phplogcode}}</pre>
-	</div>
-	
-</div>
diff --git a/view/templates/admin_plugins.tpl b/view/templates/admin_plugins.tpl
deleted file mode 100644
index 75565dd2e..000000000
--- a/view/templates/admin_plugins.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-
-<div id='adminpage'>
-	<h1>{{$title}} - {{$page}}</h1>
-		{{if $pcount eq 0}}
-		    <div class="error-message">
-		    {{$noplugshint}}
-		    </div>
-		{{else}}
-		<a class="btn" href="{{$baseurl}}/admin/{{$function}}?a=r&amp;t={{$form_security_token}}">{{$reload}}</a>
-		<ul id='pluginslist'>
-		{{foreach $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{{/if}}" ><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}} {{/if}}{{if $p.2.unsupported}} {{$unsupported}} {{/if}}
-
-					<div class='desc'>{{$p.2.description}}</div>
-			</li>
-		{{/foreach}}
-		</ul>
-		{{/if}}
-</div>
diff --git a/view/templates/admin_plugins_details.tpl b/view/templates/admin_plugins_details.tpl
deleted file mode 100644
index 9def8fc60..000000000
--- a/view/templates/admin_plugins_details.tpl
+++ /dev/null
@@ -1,37 +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}}
-	{{foreach $info.author as $a}}
-		{{if $a.link}}<a href="{{$a.link}}">{{$a.name}}</a>{{else}}{{$a.name}}{{/if}},
-	{{/foreach}}
-	</p>
-
-	<p class="maintainer">{{$str_maintainer}}
-	{{foreach $info.maintainer as $a}}
-		{{if $a.link}}<a href="{{$a.link}}">{{$a.name}}</a>{{else}}{{$a.name}}{{/if}},
-	{{/foreach}}
-	</p>
-	
-	{{if $screenshot}}
-	<a href="{{$screenshot.0}}" class='screenshot'><img src="{{$screenshot.0}}" alt="{{$screenshot.1}}" /></a>
-	{{/if}}
-
-	{{if $admin_form}}
-	<h3>{{$settings}}</h3>
-	<form method="post" action="{{$baseurl}}/admin/{{$function}}/{{$plugin}}/">
-		{{$admin_form}}
-	</form>
-	{{/if}}
-
-	{{if $readme}}
-	<h3>Readme</h3>
-	<div id="plugin_readme">
-		{{$readme}}
-	</div>
-	{{/if}}
-</div>
diff --git a/view/templates/admin_queue.tpl b/view/templates/admin_queue.tpl
deleted file mode 100644
index aaca9b014..000000000
--- a/view/templates/admin_queue.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-<div id='adminpage'>
-	<h1>{{$title}} - {{$page}} ({{$count}})</h1>
-	
-	<p>{{$info}}</p>
-	<table>
-		<tr>
-			<th>{{$id_header}}</th>
-			<th>{{$to_header}}</th>
-			<th>{{$url_header}}</th>
-			<th>{{$network_header}}</th>
-			<th>{{$created_header}}</th>
-			<th>{{$last_header}}</th>
-		</tr>
-		{{foreach $entries as $e}}
-		<tr>
-			<td>{{$e.id}}</td>
-			<td>{{$e.name}}</td>
-			<td><a href="{{$e.nurl}}">{{$e.nurl}}</a></td>
-			<td>{{$e.network}}</td>
-			<td>{{$e.created}}</td>
-			<td>{{$e.last}}</td>
-		</tr>
-		{{/foreach}}
-	</table>
-</div>
diff --git a/view/templates/admin_settings_features.tpl b/view/templates/admin_settings_features.tpl
deleted file mode 100644
index abcc527d4..000000000
--- a/view/templates/admin_settings_features.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-<h1>{{$title}}</h1>
-
-<form action="admin/features" method="post" autocomplete="off">
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-{{foreach $features as $g => $f}}
-<h3 class="settings-heading"><a href="javascript:;">{{$f.0}}</a></h3>
-
-<div class="settings-content-block">
-	{{foreach $f.1 as $fcat}}
-		{{include file="field_yesno.tpl" field=$fcat.0}}
-		{{include file="field_yesno.tpl" field=$fcat.1}}
-	{{/foreach}}
-
-	<div class="settings-submit-wrapper" >
-		<input type="submit" name="submit" class="settings-features-submit" value="{{$submit|escape:'html'}}" />
-	</div>
-</div>
-{{/foreach}}
-
-</form>
diff --git a/view/templates/admin_settings_head.tpl b/view/templates/admin_settings_head.tpl
deleted file mode 100644
index 25c0f804e..000000000
--- a/view/templates/admin_settings_head.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<script>
-	$(document).ready(function() {
-		$('.settings-content-block').hide();
-		$('.settings-heading').click(function(){
-			$('.settings-content-block').hide();
-			$(this).next('.settings-content-block').toggle();
-		});
-	});
-</script>
diff --git a/view/templates/admin_site.tpl b/view/templates/admin_site.tpl
deleted file mode 100644
index 9f7b3601e..000000000
--- a/view/templates/admin_site.tpl
+++ /dev/null
@@ -1,160 +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}}'>
-
-	{{include file="field_input.tpl" field=$sitename}}
-	{{include file="field_input.tpl" field=$hostname}}
-	{{include file="field_input.tpl" field=$sender_email}}
-	{{include file="field_textarea.tpl" field=$banner}}
-	{{include file="field_input.tpl" field=$shortcut_icon}}
-	{{include file="field_input.tpl" field=$touch_icon}}
-	{{include file="field_textarea.tpl" field=$info}}
-	{{include file="field_select.tpl" field=$language}}
-	{{include file="field_select.tpl" field=$theme}}
-	{{include file="field_select.tpl" field=$theme_mobile}}
-	{{include file="field_select.tpl" field=$ssl_policy}}
-	{{if $ssl_policy.2 == 1}}{{include file="field_checkbox.tpl" field=$force_ssl}}{{/if}}
-	{{include file="field_checkbox.tpl" field=$hide_help}}
-	{{include file="field_select.tpl" field=$singleuser}}
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
-
-	<h3>{{$registration}}</h3>
-	{{include file="field_input.tpl" field=$register_text}}
-	{{include file="field_select.tpl" field=$register_policy}}
-	{{include file="field_input.tpl" field=$daily_registrations}}
-	{{include file="field_checkbox.tpl" field=$no_multi_reg}}
-	{{include file="field_checkbox.tpl" field=$no_openid}}
-	{{include file="field_checkbox.tpl" field=$no_regfullname}}
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
-
-	<h3>{{$upload}}</h3>
-	{{include file="field_input.tpl" field=$maximagesize}}
-	{{include file="field_input.tpl" field=$maximagelength}}
-	{{include file="field_input.tpl" field=$jpegimagequality}}
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
-
-	<h3>{{$corporate}}</h3>
-	{{include file="field_input.tpl" field=$allowed_sites}}
-	{{include file="field_input.tpl" field=$allowed_email}}
-	{{include file="field_checkbox.tpl" field=$block_public}}
-	{{include file="field_checkbox.tpl" field=$force_publish}}
-	{{include file="field_select.tpl" field=$community_page_style}}
-	{{include file="field_input.tpl" field=$max_author_posts_community_page}}
-
-	{{include file="field_checkbox.tpl" field=$ostatus_disabled}}
-	{{include file="field_checkbox.tpl" field=$ostatus_full_threads}}
-
-	{{if $diaspora_able}}
-		{{include file="field_checkbox.tpl" field=$diaspora_enabled}}
-	{{else}}
-		<div class='field checkbox' id='div_id_{{$diaspora_enabled.0}}'>
-			<label for='id_{{$diaspora_enabled.0}}'>{{$diaspora_enabled.1}}</label>
-			<span id='id_{{$diaspora_enabled.0}}'>{{$diaspora_not_able}}</span>
-		</div>
-	{{/if}}
-	{{include file="field_checkbox.tpl" field=$dfrn_only}}
-	{{include file="field_input.tpl" field=$global_directory}}
-	<div class="submit"><input type="submit" name="republish_directory" value="{{$republish|escape:'html'}}" /></div>
-	{{include file="field_checkbox.tpl" field=$newuser_private}}
-	{{include file="field_checkbox.tpl" field=$enotify_no_content}}
-	{{include file="field_checkbox.tpl" field=$private_addons}}
-	{{include file="field_checkbox.tpl" field=$disable_embedded}}
-	{{include file="field_checkbox.tpl" field=$allow_users_remote_self}}
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
-
-	<h3>{{$advanced}}</h3>
-	{{include file="field_select.tpl" field=$rino}}
-	{{include file="field_checkbox.tpl" field=$verifyssl}}
-	{{include file="field_input.tpl" field=$proxy}}
-	{{include file="field_input.tpl" field=$proxyuser}}
-	{{include file="field_input.tpl" field=$timeout}}
-	{{include file="field_input.tpl" field=$maxloadavg_frontend}}
-	{{include file="field_input.tpl" field=$optimize_max_tablesize}}
-	{{include file="field_input.tpl" field=$optimize_fragmentation}}
-	{{include file="field_input.tpl" field=$abandon_days}}
-	{{include file="field_input.tpl" field=$temppath}}
-	{{include file="field_input.tpl" field=$basepath}}
-	{{include file="field_checkbox.tpl" field=$suppress_tags}}
-	{{include file="field_checkbox.tpl" field=$nodeinfo}}
-	{{include file="field_select.tpl" field=$check_new_version_url}}
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
-
-	<h3>{{$portable_contacts}}</h3>
-	{{include file="field_checkbox.tpl" field=$poco_completion}}
-	{{include file="field_input.tpl" field=$poco_requery_days}}
-	{{include file="field_select.tpl" field=$poco_discovery}}
-	{{include file="field_select.tpl" field=$poco_discovery_since}}
-	{{include file="field_checkbox.tpl" field=$poco_local_search}}
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
-
-	<h3>{{$performance}}</h3>
-	{{include file="field_checkbox.tpl" field=$only_tag_search}}
-	{{include file="field_input.tpl" field=$itemcache}}
-	{{include file="field_input.tpl" field=$itemcache_duration}}
-	{{include file="field_input.tpl" field=$max_comments}}
-	{{include file="field_checkbox.tpl" field=$proxy_disabled}}
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
-
-	<h3>{{$worker_title}}</h3>
-	{{include file="field_input.tpl" field=$maxloadavg}}
-	{{include file="field_input.tpl" field=$min_memory}}
-	{{include file="field_input.tpl" field=$worker_queues}}
-	{{include file="field_checkbox.tpl" field=$worker_dont_fork}}
-	{{include file="field_checkbox.tpl" field=$worker_fastlane}}
-	{{include file="field_checkbox.tpl" field=$worker_frontend}}
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
-
-	</form>
-
-	{{* separate form for relocate... *}}
-	<form action="{{$baseurl}}/admin/site" method="post">
-	<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-	<h3>{{$relocate}}</h3>
-	{{include file="field_input.tpl" field=$relocate_url}}
-	<input type="hidden" name="page_site" value="{{$submit|escape:'html'}}">
-	<div class="submit"><input type="submit" name="relocate" value="{{$submit|escape:'html'}}" /></div>
-	</form>
-
-</div>
diff --git a/view/templates/admin_summary.tpl b/view/templates/admin_summary.tpl
deleted file mode 100644
index e65014413..000000000
--- a/view/templates/admin_summary.tpl
+++ /dev/null
@@ -1,48 +0,0 @@
-
-<div id='adminpage'>
-	<h1>{{$title}} - {{$page}}</h1>
-{{if $showwarning}}
-	<div id="admin-warning-message-wrapper">
-		{{foreach $warningtext as $wt}}
-		<p class="warning-message">{{$wt}}</p>
-		{{/foreach}}
-	</div>
-{{/if}}
-
-	<dl>
-		<dt>{{$queues.label}}</dt>
-		<dd><a href="{{$baseurl}}/admin/queue">{{$queues.queue}}</a> - {{$queues.workerq}}</dd>
-	</dl>
-	<dl>
-		<dt>{{$pending.0}}</dt>
-		<dd>{{$pending.1}}</dt>
-	</dl>
-
-	<dl>
-		<dt>{{$users.0}}</dt>
-		<dd>{{$users.1}}</dd>
-	</dl>
-	{{foreach $accounts as $p}}
-		<dl>
-			<dt>{{$p.0}}</dt>
-			<dd>{{if $p.1}}{{$p.1}}{{else}}0{{/if}}</dd>
-		</dl>
-	{{/foreach}}
-
-
-	<dl>
-		<dt>{{$plugins.0}}</dt>
-		
-		{{foreach $plugins.1 as $p}}
-			<dd><a href="/admin/plugins/{{$p}}/">{{$p}}</a></dd>
-		{{/foreach}}
-		
-	</dl>
-
-	<dl>
-		<dt>{{$version.0}}</dt>
-		<dd> {{$platform}} '{{$codename}}' {{$version.1}} - {{$build}}</dt>
-	</dl>
-
-
-</div>
diff --git a/view/templates/admin_users.tpl b/view/templates/admin_users.tpl
deleted file mode 100644
index a842d6e36..000000000
--- a/view/templates/admin_users.tpl
+++ /dev/null
@@ -1,155 +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>
-					{{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-			{{foreach $pending as $u}}
-				<tr>
-					<td class="created">{{$u.created}}</td>
-					<td class="name">{{$u.name}}</td>
-					<td class="email">{{$u.email}}</td>
-					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}" /></td>
-					<td class="tools">
-						<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title='{{$approve}}'><span class='icon like'></span></a>
-						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><span class='icon dislike'></span></a>
-					</td>
-				</tr>
-				<tr>
-					<td class="pendingnote"><p><span>{{$pendingnotetext}}:</span> {{$u.note}}</p></td>
-				</tr>
-			{{/foreach}}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">{{$select_all}}</a></div>
-			<div class="submit"><input type="submit" name="page_users_deny" value="{{$deny|escape:'html'}}"/> <input type="submit" name="page_users_approve" value="{{$approve|escape:'html'}}" /></div>			
-		{{else}}
-			<p>{{$no_pending}}</p>
-		{{/if}}
-	
-		<h3>{{$h_users}}</h3>
-		{{if $users}}
-			<table id='users'>
-				<thead>
-				<tr>
-					<th></th>
-					{{foreach $th_users as $th}}
-					<th>
-						<a href="{{$baseurl}}/admin/users/?o={{if $order_direction_users == "+"}}-{{/if}}{{$th.1}}">
-							{{if $order_users == $th.1}}
-								{{if $order_direction_users == "+"}}
-								&#8595;
-								{{else}}
-								&#8593;
-								{{/if}}
-							{{else}}
-								&#8597;
-							{{/if}}
-						{{$th.0}}</a>
-					</th>
-					{{/foreach}}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{foreach $users as $u}}
-					<tr>
-						<td><img class='icon' src="{{$u.micro}}" alt="{{$u.nickname}}" title="{{$u.nickname}}"></td>
-						<td class='name'><a href="{{$u.url}}" title="{{$u.nickname}}" >{{$u.name}}</a></td>
-						<td class='email'>{{$u.email}}</td>
-						<td class='register_date'>{{$u.register_date}}</td>
-						<td class='login_date'>{{$u.login_date}}</td>
-						<td class='lastitem_date'>{{$u.lastitem_date}}</td>
-						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}</td>
-						<td class="checkbox"> 
-						{{if $u.is_deletable}}
-							<input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
-						{{else}}
-							&nbsp;
-						{{/if}}
-						<td class="tools">
-						{{if $u.is_deletable}}
-							<a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><span class='icon block {{if $u.blocked==0}}dim{{/if}}'></span></a>
-							<a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><span class='icon drop'></span></a>
-						{{else}}
-							&nbsp;
-						{{/if}}
-						</td>
-					</tr>
-				{{/foreach}}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">{{$select_all}}</a></div>
-			<div class="submit"><input type="submit" name="page_users_block" value="{{$block|escape:'html'}}/{{$unblock|escape:'html'}}" /> <input type="submit" name="page_users_delete" value="{{$delete|escape:'html'}}" onclick="return confirm_delete_multi()" /></div>						
-		{{else}}
-			NO USERS?!?
-		{{/if}}
-	</form>
-	{{if $deleted}}
-		<h3>{{$h_deleted}}</h3>
-			<table id='deleted'>
-				<thead>
-				<tr>
-					<th></th>
-					{{foreach $th_deleted as $th}}<th>{{$th}}</th>{{/foreach}}
-				</tr>
-				</thead>
-				<tbody>
-				{{foreach $deleted as $u}}
-					<tr>
-						<td><img class='icon' 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.deleted}}</td>
-					</tr>
-				{{/foreach}}
-				</tbody>
-			</table>
-		{{/if}}
-  <h3>{{$h_newuser}}</h3> 
-  <form action="{{$baseurl}}/admin/users" method="post"> 
-  <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> 
-  <table id='users'> 
-      <tbody> 
-        <tr> 
-        <td>{{include file="field_input.tpl" field=$newusername}}</td> 
-    </tr> 
-        <tr> 
-        <td>{{include file="field_input.tpl" field=$newusernickname}}</td> 
-    </tr> 
-        <tr> 
-        <td>{{include file="field_input.tpl" field=$newuseremail}}</td> 
-    </tr> 
-      </tbody> 
-  </table> 
-  <div class="submit"><input type="submit" name="add_new_user_submit" value="{{$submit|escape:'html'}}" /></div>             
-  </form>
-</div>
diff --git a/view/templates/admin_viewlogs.tpl b/view/templates/admin_viewlogs.tpl
deleted file mode 100644
index c80264c52..000000000
--- a/view/templates/admin_viewlogs.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<div id='adminpage'>
-	<h1>{{$title}} - {{$page}}</h1>
-	
-	<h3>{{$logname}}</h3>
-	<div style="width:100%; height:400px; overflow: auto; "><pre>{{$data}}</pre></div>
-</div>
diff --git a/view/theme/frio/templates/admin_aside.tpl b/view/theme/frio/templates/admin_aside.tpl
deleted file mode 100644
index a90ec6916..000000000
--- a/view/theme/frio/templates/admin_aside.tpl
+++ /dev/null
@@ -1,85 +0,0 @@
-<script type="text/javascript">
-	// 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.html(register);
-		});
-	});
-</script>
-
-<div class="widget">
-	<h3><a href="{{$admurl}}">{{$admtxt}}</a></h3>
-
-	<ul role="menu">
-		{{foreach $subpages as $name => $item}}
-		<li role="menuitem" class="{{$item.2}}">
-			<a href="{{$item.0}}" {{if $item.accesskey}}accesskey="{{$item.accesskey}}"{{/if}}>
-				{{$item.1}}
-				{{if $name == "users"}}
-				 <span id="pending-update" class="badge pull-right"></span>
-				{{/if}}
-			</a>
-		</li>
-		{{/foreach}}
-	</ul>
-
-	{{if $admin.update}}
-	<ul role="menu">
-		<li role="menuitem" class="{{$admin.update.2}}">
-			<a href="{{$admin.update.0}}" {{if $admin.update.accesskey}}accesskey="{{$admin.update.accesskey}}"{{/if}}>
-				{{$admin.update.1}}
-			</a>
-		</li>
-	</ul>
-	{{/if}}
-</div>
-
-{{if $admin.plugins_admin}}
-<div class="widget">
-	<h3>{{$plugadmtxt}}</h3>
-	<ul role="menu">
-		{{foreach $admin.plugins_admin as $name => $item}}
-		<li role="menuitem" class="{{$item.2}}">
-			<a href="{{$item.0}}" {{if $item.accesskey}}accesskey="{{$item.accesskey}}"{{/if}}>
-				{{$item.1}}
-			</a>
-		</li>
-		{{/foreach}}
-	</ul>
-</div>
-{{/if}}
-
-<div class="widget">
-	<h3>{{$logtxt}}</h3>
-	<ul role="menu">
-		<li role="menuitem" class="{{$admin.logs.2}}">
-			<a href="{{$admin.logs.0}}" {{if $admin.logs.accesskey}}accesskey="{{$admin.logs.accesskey}}"{{/if}}>
-				{{$admin.logs.1}}
-			</a>
-		</li>
-		<li role="menuitem" class="{{$admin.viewlogs.2}}">
-			<a href="{{$admin.viewlogs.0}}" {{if $admin.viewlogs.accesskey}}accesskey="{{$admin.viewlogs.accesskey}}"{{/if}}>
-				{{$admin.viewlogs.1}}
-			</a>
-		</li>
-	</ul>
-</div>
-
-<div class="widget">
-	<h3>{{$diagnosticstxt}}</h3>
-	<ul role="menu">
-		<li role="menuitem" class="{{$admin.diagnostics_probe.2}}">
-			<a href="{{$admin.diagnostics_probe.0}}" {{if $admin.diagnostics_probe.accesskey}}accesskey="{{$admin.diagnostics_probe.accesskey}}"{{/if}}>
-				{{$admin.diagnostics_probe.1}}
-			</a>
-		</li>
-		<li role="menuitem" class="{{$admin.diagnostics_webfinger.2}}">
-			<a href="{{$admin.diagnostics_webfinger.0}}" {{if $admin.viewlogs.accesskey}}accesskey="{{$admin.diagnostics_webfinger.accesskey}}"{{/if}}>
-				{{$admin.diagnostics_webfinger.1}}
-			</a>
-		</li>
-	</ul>
-</div>
diff --git a/view/theme/frost-mobile/templates/admin_aside.tpl b/view/theme/frost-mobile/templates/admin_aside.tpl
deleted file mode 100644
index 74b6cd5f6..000000000
--- a/view/theme/frost-mobile/templates/admin_aside.tpl
+++ /dev/null
@@ -1,32 +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>
-{{/if}}
-
-
-{{if $admin.plugins_admin}}<h4>{{$plugadmtxt}}</h4>{{/if}}
-<ul class='admin linklist'>
-	{{foreach $admin.plugins_admin as $l}}
-	<li class='admin button {{$l.2}}'><a href='{{$l.0}}'>{{$l.1}}</a></li>
-	{{/foreach}}
-</ul>
-	
-	
-<h4>{{$logtxt}}</h4>
-<ul class='admin linklist'>
-	<li class='admin button {{$admin.logs.2}}'><a href='{{$admin.logs.0}}'>{{$admin.logs.1}}</a></li>
-</ul>
-
diff --git a/view/theme/frost-mobile/templates/admin_site.tpl b/view/theme/frost-mobile/templates/admin_site.tpl
deleted file mode 100644
index d5b64e58d..000000000
--- a/view/theme/frost-mobile/templates/admin_site.tpl
+++ /dev/null
@@ -1,65 +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}}'>
-
-	{{include file="field_input.tpl" field=$sitename}}
-	{{include file="field_textarea.tpl" field=$banner}}
-	{{include file="field_select.tpl" field=$language}}
-	{{include file="field_select.tpl" field=$theme}}
-	{{include file="field_select.tpl" field=$theme_mobile}}
-	{{include file="field_select.tpl" field=$ssl_policy}}
-	{{include file="field_checkbox.tpl" field=$old_share}}
-	{{include file="field_checkbox.tpl" field=$hide_help}} 
-	{{include file="field_select.tpl" field=$singleuser}} 
-	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
-	
-	<h3>{{$registration}}</h3>
-	{{include file="field_input.tpl" field=$register_text}}
-	{{include file="field_select.tpl" field=$register_policy}}
-	
-	{{include file="field_checkbox.tpl" field=$no_multi_reg}}
-	{{include file="field_checkbox.tpl" field=$no_openid}}
-	{{include file="field_checkbox.tpl" field=$no_regfullname}}
-	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
-
-	<h3>{{$upload}}</h3>
-	{{include file="field_input.tpl" field=$maximagesize}}
-	{{include file="field_input.tpl" field=$maximagelength}}
-	{{include file="field_input.tpl" field=$jpegimagequality}}
-	
-	<h3>{{$corporate}}</h3>
-	{{include file="field_input.tpl" field=$allowed_sites}}
-	{{include file="field_input.tpl" field=$allowed_email}}
-	{{include file="field_checkbox.tpl" field=$block_public}}
-	{{include file="field_checkbox.tpl" field=$force_publish}}
-	{{include file="field_checkbox.tpl" field=$no_community_page}}
-	{{include file="field_checkbox.tpl" field=$ostatus_disabled}}
-	{{include file="field_checkbox.tpl" field=$diaspora_enabled}}
-	{{include file="field_checkbox.tpl" field=$dfrn_only}}
-	{{include file="field_input.tpl" field=$global_directory}}
-	{{include file="field_checkbox.tpl" field=$newuser_private}}
-	{{include file="field_checkbox.tpl" field=$enotify_no_content}}
-	{{include file="field_checkbox.tpl" field=$private_addons}}	
-	{{include file="field_checkbox.tpl" field=$disable_embedded}}	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
-	
-	<h3>{{$advanced}}</h3>
-	{{include file="field_checkbox.tpl" field=$verifyssl}}
-	{{include file="field_input.tpl" field=$proxy}}
-	{{include file="field_input.tpl" field=$proxyuser}}
-	{{include file="field_input.tpl" field=$timeout}}
-	{{include file="field_input.tpl" field=$delivery_interval}}
-	{{include file="field_input.tpl" field=$poll_interval}}
-	{{include file="field_input.tpl" field=$maxloadavg}}
-	{{include file="field_input.tpl" field=$abandon_days}}
-	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
-	
-	</form>
-</div>
diff --git a/view/theme/frost-mobile/templates/admin_users.tpl b/view/theme/frost-mobile/templates/admin_users.tpl
deleted file mode 100644
index f0c4869a7..000000000
--- a/view/theme/frost-mobile/templates/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>
-					{{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-			{{foreach $pending as $u}}
-				<tr>
-					<td class="created">{{$u.created}}</td>
-					<td class="name">{{$u.name}}</td>
-					<td class="email">{{$u.email}}</td>
-					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}" /></td>
-					<td class="tools">
-						<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title='{{$approve}}'><span class='tool like'></span></a>
-						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><span class='tool dislike'></span></a>
-					</td>
-				</tr>
-			{{/foreach}}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">{{$select_all}}</a></div>
-			<div class="submit"><input type="submit" name="page_users_deny" value="{{$deny}}"/> <input type="submit" name="page_users_approve" value="{{$approve}}" /></div>			
-		{{else}}
-			<p>{{$no_pending}}</p>
-		{{/if}}
-	
-	
-		
-	
-		<h3>{{$h_users}}</h3>
-		{{if $users}}
-			<table id='users'>
-				<thead>
-				<tr>
-					<th></th>
-					{{foreach $th_users as $th}}<th>{{$th}}</th>{{/foreach}}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{foreach $users as $u}}
-					<tr>
-						<td><img src="{{$u.micro}}" alt="{{$u.nickname}}" title="{{$u.nickname}}"></td>
-						<td class='name'><a href="{{$u.url}}" title="{{$u.nickname}}" >{{$u.name}}</a></td>
-						<td class='email'>{{$u.email}}</td>
-						<td class='register_date'>{{$u.register_date}}</td>
-						<td class='login_date'>{{$u.login_date}}</td>
-						<td class='lastitem_date'>{{$u.lastitem_date}}</td>
-						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}</td>
-						<td class="checkbox"> 
-                                    {{if $u.is_admin}}
-                                        &nbsp;
-                                    {{else}}
-                                        <input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
-                                    {{/if}}
-						<td class="tools">
-                                    {{if $u.is_admin}}
-                                        &nbsp;
-                                    {{else}}
-                                        <a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><span class='icon block {{if $u.blocked==0}}dim{{/if}}'></span></a>
-                                        <a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><span class='icon drop'></span></a>
-                                    {{/if}}
-						</td>
-					</tr>
-				{{/foreach}}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">{{$select_all}}</a></div>
-			<div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div>						
-		{{else}}
-			NO USERS?!?
-		{{/if}}
-	</form>
-</div>
diff --git a/view/theme/frost/templates/admin_aside.tpl b/view/theme/frost/templates/admin_aside.tpl
deleted file mode 100644
index 74b6cd5f6..000000000
--- a/view/theme/frost/templates/admin_aside.tpl
+++ /dev/null
@@ -1,32 +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>
-{{/if}}
-
-
-{{if $admin.plugins_admin}}<h4>{{$plugadmtxt}}</h4>{{/if}}
-<ul class='admin linklist'>
-	{{foreach $admin.plugins_admin as $l}}
-	<li class='admin button {{$l.2}}'><a href='{{$l.0}}'>{{$l.1}}</a></li>
-	{{/foreach}}
-</ul>
-	
-	
-<h4>{{$logtxt}}</h4>
-<ul class='admin linklist'>
-	<li class='admin button {{$admin.logs.2}}'><a href='{{$admin.logs.0}}'>{{$admin.logs.1}}</a></li>
-</ul>
-
diff --git a/view/theme/frost/templates/admin_site.tpl b/view/theme/frost/templates/admin_site.tpl
deleted file mode 100644
index 8dcfa9129..000000000
--- a/view/theme/frost/templates/admin_site.tpl
+++ /dev/null
@@ -1,73 +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}}'>
-
-	{{include file="field_input.tpl" field=$sitename}}
-	{{include file="field_textarea.tpl" field=$banner}}
-	{{include file="field_select.tpl" field=$language}}
-	{{include file="field_select.tpl" field=$theme}}
-	{{include file="field_select.tpl" field=$theme_mobile}}
-	{{include file="field_select.tpl" field=$ssl_policy}}
-	{{include file="field_checkbox.tpl" field=$old_share}}
-	{{include file="field_checkbox.tpl" field=$hide_help}} 
-	{{include file="field_select.tpl" field=$singleuser}}
-	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
-	
-	<h3>{{$registration}}</h3>
-	{{include file="field_input.tpl" field=$register_text}}
-	{{include file="field_select.tpl" field=$register_policy}}
-	{{include file="field_input.tpl" field=$daily_registrations}}
-	{{include file="field_checkbox.tpl" field=$no_multi_reg}}
-	{{include file="field_checkbox.tpl" field=$no_openid}}
-	{{include file="field_checkbox.tpl" field=$no_regfullname}}
-	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
-
-	<h3>{{$upload}}</h3>
-	{{include file="field_input.tpl" field=$maximagesize}}
-	{{include file="field_input.tpl" field=$maximagelength}}
-	{{include file="field_input.tpl" field=$jpegimagequality}}
-	
-	<h3>{{$corporate}}</h3>
-	{{include file="field_input.tpl" field=$allowed_sites}}
-	{{include file="field_input.tpl" field=$allowed_email}}
-	{{include file="field_checkbox.tpl" field=$block_public}}
-	{{include file="field_checkbox.tpl" field=$force_publish}}
-	{{include file="field_checkbox.tpl" field=$no_community_page}}
-	{{include file="field_checkbox.tpl" field=$ostatus_disabled}}
-	{{include file="field_checkbox.tpl" field=$diaspora_enabled}}
-	{{include file="field_checkbox.tpl" field=$dfrn_only}}
-	{{include file="field_input.tpl" field=$global_directory}}
-	{{include file="field_checkbox.tpl" field=$newuser_private}}
-	{{include file="field_checkbox.tpl" field=$enotify_no_content}}
-	{{include file="field_checkbox.tpl" field=$private_addons}}	
-	{{include file="field_checkbox.tpl" field=$disable_embedded}}	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
-	
-	<h3>{{$advanced}}</h3>
-	{{include file="field_checkbox.tpl" field=$verifyssl}}
-	{{include file="field_input.tpl" field=$proxy}}
-	{{include file="field_input.tpl" field=$proxyuser}}
-	{{include file="field_input.tpl" field=$timeout}}
-	{{include file="field_input.tpl" field=$delivery_interval}}
-	{{include file="field_input.tpl" field=$poll_interval}}
-	{{include file="field_input.tpl" field=$maxloadavg}}
-	{{include file="field_input.tpl" field=$abandon_days}}
-	{{include file="field_input.tpl" field=$lockpath}}
-	{{include file="field_input.tpl" field=$temppath}}
-	{{include file="field_input.tpl" field=$basepath}}
-
-	<h3>{{$performance}}</h3>
-	{{include file="field_input.tpl" field=$itemcache}}
-	{{include file="field_input.tpl" field=$itemcache_duration}}
-
-	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
-	
-	</form>
-</div>
diff --git a/view/theme/frost/templates/admin_users.tpl b/view/theme/frost/templates/admin_users.tpl
deleted file mode 100644
index f0c4869a7..000000000
--- a/view/theme/frost/templates/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>
-					{{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-			{{foreach $pending as $u}}
-				<tr>
-					<td class="created">{{$u.created}}</td>
-					<td class="name">{{$u.name}}</td>
-					<td class="email">{{$u.email}}</td>
-					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}" /></td>
-					<td class="tools">
-						<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title='{{$approve}}'><span class='tool like'></span></a>
-						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><span class='tool dislike'></span></a>
-					</td>
-				</tr>
-			{{/foreach}}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">{{$select_all}}</a></div>
-			<div class="submit"><input type="submit" name="page_users_deny" value="{{$deny}}"/> <input type="submit" name="page_users_approve" value="{{$approve}}" /></div>			
-		{{else}}
-			<p>{{$no_pending}}</p>
-		{{/if}}
-	
-	
-		
-	
-		<h3>{{$h_users}}</h3>
-		{{if $users}}
-			<table id='users'>
-				<thead>
-				<tr>
-					<th></th>
-					{{foreach $th_users as $th}}<th>{{$th}}</th>{{/foreach}}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{foreach $users as $u}}
-					<tr>
-						<td><img src="{{$u.micro}}" alt="{{$u.nickname}}" title="{{$u.nickname}}"></td>
-						<td class='name'><a href="{{$u.url}}" title="{{$u.nickname}}" >{{$u.name}}</a></td>
-						<td class='email'>{{$u.email}}</td>
-						<td class='register_date'>{{$u.register_date}}</td>
-						<td class='login_date'>{{$u.login_date}}</td>
-						<td class='lastitem_date'>{{$u.lastitem_date}}</td>
-						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}</td>
-						<td class="checkbox"> 
-                                    {{if $u.is_admin}}
-                                        &nbsp;
-                                    {{else}}
-                                        <input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
-                                    {{/if}}
-						<td class="tools">
-                                    {{if $u.is_admin}}
-                                        &nbsp;
-                                    {{else}}
-                                        <a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><span class='icon block {{if $u.blocked==0}}dim{{/if}}'></span></a>
-                                        <a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><span class='icon drop'></span></a>
-                                    {{/if}}
-						</td>
-					</tr>
-				{{/foreach}}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">{{$select_all}}</a></div>
-			<div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div>						
-		{{else}}
-			NO USERS?!?
-		{{/if}}
-	</form>
-</div>
diff --git a/view/theme/quattro/templates/admin_users.tpl b/view/theme/quattro/templates/admin_users.tpl
deleted file mode 100644
index ddb395db9..000000000
--- a/view/theme/quattro/templates/admin_users.tpl
+++ /dev/null
@@ -1,155 +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>
-					{{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-			{{foreach $pending as $u}}
-				<tr>
-					<td class="created">{{$u.created}}</td>
-					<td class="name">{{$u.name}}</td>
-					<td class="email">{{$u.email}}</td>
-					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}" /></td>
-					<td class="tools">
-						<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title='{{$approve}}'><span class='icon like'></span></a>
-						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><span class='icon dislike'></span></a>
-					</td>
-				</tr>
-				<tr>
-					<td class="pendingnote"><p><span>{{$pendingnotetext}}:</span> {{$u.note}}</p></td>
-				</tr>
-			{{/foreach}}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">{{$select_all}}</a></div>
-			<div class="submit"><input type="submit" name="page_users_deny" value="{{$deny}}"/> <input type="submit" name="page_users_approve" value="{{$approve}}" /></div>			
-		{{else}}
-			<p>{{$no_pending}}</p>
-		{{/if}}
-	
-		<h3>{{$h_users}}</h3>
-		{{if $users}}
-			<table id='users'>
-				<thead>
-				<tr>
-					<th></th>
-					{{foreach $th_users as $th}}
-					<th>
-						<a href="{{$baseurl}}/admin/users/?o={{if $order_direction_users == "+"}}-{{/if}}{{$th.1}}">
-							{{if $order_users == $th.1}}
-								{{if $order_direction_users == "+"}}
-								&#8595;
-								{{else}}
-								&#8593;
-								{{/if}}
-							{{else}}
-								&#8597;
-							{{/if}}
-						{{$th.0}}</a>
-					</th>
-					{{/foreach}}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{foreach $users as $u}}
-					<tr>
-						<td><img class='icon' src="{{$u.micro}}" alt="{{$u.nickname}}" title="{{$u.nickname}}"></td>
-						<td class='name'><a href="{{$u.url}}" title="{{$u.nickname}}" >{{$u.name}}</a></td>
-						<td class='email'>{{$u.email}}</td>
-						<td class='register_date'>{{$u.register_date}}</td>
-						<td class='login_date'>{{$u.login_date}}</td>
-						<td class='lastitem_date'>{{$u.lastitem_date}}</td>
-						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}</td>
-						<td class="checkbox"> 
-						{{if $u.is_deletable}}
-							<input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
-						{{else}}
-							&nbsp;
-						{{/if}}
-						<td class="tools">
-						{{if $u.is_deletable}}
-							<a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><span class='icon {{if $u.blocked==0}}unlock{{else}}lock{{/if}}'></span></a>
-							<a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><span class='icon delete'></span></a>
-						{{else}}
-							&nbsp;
-						{{/if}}
-						</td>
-					</tr>
-				{{/foreach}}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">{{$select_all}}</a></div>
-			<div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div>						
-		{{else}}
-			NO USERS?!?
-		{{/if}}
-	</form>
-	{{if $deleted}}
-		<h3>{{$h_deleted}}</h3>
-			<table id='deleted'>
-				<thead>
-				<tr>
-					<th></th>
-					{{foreach $th_deleted as $th}}<th>{{$th}}</th>{{/foreach}}
-				</tr>
-				</thead>
-				<tbody>
-				{{foreach $deleted as $u}}
-					<tr>
-						<td><img class='icon' 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.deleted}}</td>
-					</tr>
-				{{/foreach}}
-				</tbody>
-			</table>
-		{{/if}}
-  <h3>{{$h_newuser}}</h3> 
-  <form action="{{$baseurl}}/admin/users" method="post"> 
-  <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> 
-  <table id='users'> 
-      <tbody> 
-        <tr> 
-        <td>{{include file="field_input.tpl" field=$newusername}}</td> 
-    </tr> 
-        <tr> 
-        <td>{{include file="field_input.tpl" field=$newusernickname}}</td> 
-    </tr> 
-        <tr> 
-        <td>{{include file="field_input.tpl" field=$newuseremail}}</td> 
-    </tr> 
-      </tbody> 
-  </table> 
-  <div class="submit"><input type="submit" name="add_new_user_submit" value="{{$submit}}" /></div>             
-  </form>
-</div>