Merge https://github.com/friendica/red into zpull

370 files changed, 3049 insertions, 7781 deletions

diff --git a/.gitignore b/.gitignore
index 6cb36fb26..1a1b8259e 100644..100755
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,6 @@ report/
 
 #ignore OSX .DS_Store files 
 .DS_Store
+
+#netbeans project folder
+nbproject

diff --git a/boot.php b/boot.php
index 273f71f2a..cf45fed16 100644..100755
--- a/boot.php
+++ b/boot.php
@@ -546,9 +546,14 @@ class 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' => '',
 		'smarty3' => '{{'
@@ -680,6 +685,16 @@ class App {
 		$this->is_tablet = $mobile_detect->isTablet();
 
 		BaseObject::set_app($this);
+		
+		/**
+		 * 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_baseurl($ssl = false) {
@@ -897,28 +912,79 @@ class App {
 		return $this->curl_headers;
 	}
 
+	
+	/**
+	* 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') {
+	function set_template_engine($engine = 'smarty3') {
 
-		$this->theme['template_engine'] = 'internal';
+		$this->theme['template_engine'] = $engine;
 
-		switch($engine) {
+		/*if ($engine) {
 			case 'smarty3':
-				if(is_writable('view/tpl/smarty3/'))
-					$this->theme['template_engine'] = 'smarty3';
+				if(!is_writable('view/tpl/smarty3/'))
+					echo "<b>ERROR</b> folder <tt>view/tpl/smarty3/</tt> must be writable by webserver."; killme();
+					
 				break;
 			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/ITemplateEngine.php b/include/ITemplateEngine.php
new file mode 100755
index 000000000..53c1845f4
--- /dev/null
+++ b/include/ITemplateEngine.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_markup_template($file, $root='');

+}

diff --git a/include/friendica_smarty.php b/include/friendica_smarty.php
index b9ed2e982..a4675acd4 100644..100755
--- a/include/friendica_smarty.php
+++ b/include/friendica_smarty.php
@@ -1,7 +1,8 @@
 <?php /** @file */
-
+require_once 'include/ITemplateEngine.php';
 require_once("library/Smarty/libs/Smarty.class.php");
 
+
 class FriendicaSmarty extends Smarty {
 
 	public $filename;
@@ -14,10 +15,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/tpl/smarty3/");
+		$template_dirs = array('theme' => "view/theme/$theme/tpl/");
 		if( x($a->theme_info,"extends") )
-			$template_dirs = $template_dirs + array('extends' => "view/theme/".$a->theme_info["extends"]."/tpl/smarty3/");
-		$template_dirs = $template_dirs + array('base' => 'view/tpl/smarty3/');
+			$template_dirs = $template_dirs + array('extends' => "view/theme/".$a->theme_info["extends"]."/tpl/");
+		$template_dirs = $template_dirs + array('base' => 'view/tpl/');
 		$this->setTemplateDir($template_dirs);
 
 		$this->setCompileDir('view/tpl/smarty3/compiled/');
@@ -41,3 +42,39 @@ class FriendicaSmarty extends Smarty {
 
 
 
+class FriendicaSmartyEngine implements ITemplateEngine {
+	static $name ="smarty3";
+	
+	public function __construct(){
+		if(!is_writable('view/tpl/smarty3/')){
+			echo "<b>ERROR:</b> folder <tt>view/tpl/smarty3/</tt> must be writable by webserver."; killme();
+		}
+	}
+	
+	// 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_markup_template($file, $root=''){
+		$template_file = theme_include($file, $root);
+		if($template_file) {
+			$template = new FriendicaSmarty();
+			$template->filename = $template_file;
+
+			return $template;
+		}		
+		return "";
+	}
+}
\ No newline at end of file
diff --git a/include/plugin.php b/include/plugin.php
index 79f6ed9c7..8406c45e5 100644..100755
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -569,24 +569,9 @@ function get_intltext_template($s) {
 
 
 function get_markup_template($s, $root = '') {
-
 	$a = get_app();
-
-	$template_eng = $a->get_template_engine();
-	if($template_eng === 'internal') {
-		$template_file = theme_include($s, $root);
-		if($template_file)
-			return file_get_contents($template_file);
-	}
-	else {
-		$template_file = theme_include("$template_eng/$s", $root);
-
-		if($template_file) {
-			$template = new FriendicaSmarty();
-			$template->filename = $template_file;
-
-			return $template;
-		}
-	}	
+	$t = $a->template_engine();
+	$template = $t->get_markup_template($s, $root);
+	return $template;
 }
 
diff --git a/include/template_processor.php b/include/template_processor.php
index 0b4b4142f..74acc9c67 100644..100755
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -1,7 +1,11 @@
-<?php /** @file */
+<?php
+	require_once 'include/ITemplateEngine.php';
+
 	define ("KEY_NOT_EXISTS", '^R_key_not_Exists^');
 
-	class Template {
+	class Template implements ITemplateEngine {
+		static $name ="internal";
+	
 		var $r;
 		var $search;
 		var $replace;
@@ -244,9 +248,13 @@
 			
 			return $s;
 		}
-	
-		public function replace($s, $r) {
-			$t1 = dba_timer();
+		
+		private function replace($s,$r) {
+			$this->replace_macros($s, $r);
+		}
+		
+		// TemplateEngine interface
+		public function replace_macros($s, $r) {
 			$this->r = $r;
 			
 			$s = $this->_build_nodes($s);
@@ -265,14 +273,18 @@
 				$os=$s; $count++;
 				$s = $this->var_replace($s);
 			}
-			$t3 = dba_timer();
-//			logger('macro timer: ' . sprintf('%01.4f %01.4f',$t3 - $t2, $t2  - $t1));
-
 			return $s;
 		}
+
+		public function get_markup_template($file, $root='') {
+			$template_file = theme_include($file, $root);
+			if ($template_file) {
+				$content = file_get_contents($template_file);
+			}
+			return $content;		
+		}			
 	}
 	
-	$t = new Template;
 
 
 
diff --git a/include/text.php b/include/text.php
index c7210010c..3b3620f33 100644..100755
--- a/include/text.php
+++ b/include/text.php
@@ -1,44 +1,23 @@
 <?php /** @file */
 
-// This is our template processor.
-// $s is the string requiring macro substitution.
-// $r is an array of key value pairs (search => replace)
-// returns substituted string.
-
 
 require_once("include/template_processor.php");
+require_once("include/friendica_smarty.php");
 
-
+/**
+ * This is our template processor
+ * 
+ * @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;
-
-//	$ts = microtime();
 	$a = get_app();
 
-	if($a->get_template_engine() === 'smarty3') {
-		$output = '';
-		if(gettype($s) !== 'NULL') {
-			$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);
-	}
-//	$tt = microtime() - $ts;
-//	$a->page['debug'] .= "$tt <br>\n";
 	return $output;
 }
 
@@ -71,6 +50,8 @@ function random_string($size = 64,$type = RANDOM_STRING_HEX) {
  * They will be replaced with safer brackets. This may be filtered further
  * if these are not allowed either.   
  *
+ * @param string $string Input string
+ * @return string Filtered string
  */
 
 
@@ -86,6 +67,13 @@ function notags($string) {
 // and allow them to be safely displayed.
 
 
+
+/**
+ * use this on "body" or "content" input where angle chars shouldn't be removed,
+ * and allow them to be safely displayed.
+ * @param string $string
+ * @return string
+ */
 function escape_tags($string) {
 
 	return(htmlspecialchars($string, ENT_COMPAT, 'UTF-8', false));
@@ -97,6 +85,12 @@ function escape_tags($string) {
 // used to generate initial passwords
 
 
+/**
+ * generate a string that's random, but usually pronounceable. 
+ * used to generate initial passwords
+ * @param int $len
+ * @return string
+ */
 function autoname($len) {
 
 	if($len <= 0)
@@ -172,6 +166,11 @@ function autoname($len) {
 // returns escaped text.
 
 
+/**
+ * escape text ($str) for XML transport
+ * @param string $str
+ * @return string Escaped text.
+ */
 function xmlify($str) {
 	$buffer = '';
 	
diff --git a/util/precompile_smarty3.php b/util/precompile_smarty3.php
new file mode 100755
index 000000000..65cb760ef
--- /dev/null
+++ b/util/precompile_smarty3.php
@@ -0,0 +1,27 @@
+<?php

+

+

+/**

+* @package util

+*/

+

+#require_once('boot.php');

+#require_once('include/cli_startup.php');

+require_once "library/Smarty/libs/Smarty.class.php";

+

+#cli_startup();

+

+$folders = array_merge(array('view/tpl/'),glob('view/theme/*/tpl/*',GLOB_ONLYDIR));

+

+$s = new Smarty();

+

+$s->setTemplateDir($folders);

+

+$s->setCompileDir('view/tpl/smarty3/compiled/');

+$s->setConfigDir('view/tpl/smarty3/config/');

+$s->setCacheDir('view/tpl/smarty3/cache/');

+

+$s->left_delimiter = "{{";

+$s->right_delimiter = "}}";

+

+$s->compileAllTemplates('.tpl',true);
\ No newline at end of file
diff --git a/view/theme/redbasic/tpl/basic_theme_settings.tpl b/view/theme/redbasic/tpl/basic_theme_settings.tpl
index 6f71a6a1a..33a34b292 100644..100755
--- a/view/theme/redbasic/tpl/basic_theme_settings.tpl
+++ b/view/theme/redbasic/tpl/basic_theme_settings.tpl
@@ -1,9 +1,14 @@
-{{inc field_select.tpl with $field=$font_size}}{{endinc}}
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{include file="field_select.tpl" field=$font_size}}
 
-{{inc field_select.tpl with $field=$line_height}}{{endinc}}
+{{include file="field_select.tpl" field=$line_height}}
 
-{{inc field_select.tpl with $field=$colour_scheme}}{{endinc}}
+{{include file="field_select.tpl" field=$colour_scheme}}
 
 <div class="settings-submit-wrapper">
-	<input type="submit" value="$submit" class="settings-submit" name="redbasic-settings-submit" />
+	<input type="submit" value="{{$submit}}" class="settings-submit" name="redbasic-settings-submit" />
 </div>
diff --git a/view/theme/redbasic/tpl/smarty3/basic_theme_settings.tpl b/view/theme/redbasic/tpl/smarty3/basic_theme_settings.tpl
deleted file mode 100644
index 33a34b292..000000000
--- a/view/theme/redbasic/tpl/smarty3/basic_theme_settings.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{include file="field_select.tpl" field=$font_size}}
-
-{{include file="field_select.tpl" field=$line_height}}
-
-{{include file="field_select.tpl" field=$colour_scheme}}
-
-<div class="settings-submit-wrapper">
-	<input type="submit" value="{{$submit}}" class="settings-submit" name="redbasic-settings-submit" />
-</div>
diff --git a/view/theme/redbasic/tpl/smarty3/theme_settings.tpl b/view/theme/redbasic/tpl/smarty3/theme_settings.tpl
deleted file mode 100644
index f8d9f223c..000000000
--- a/view/theme/redbasic/tpl/smarty3/theme_settings.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{include file="field_select.tpl" field=$colour}}
-
-{{include file="field_input.tpl" field=$font_size}}
-
-{{include file="field_input.tpl" field=$line_height}}
-
-{{include file="field_select.tpl" field=$shadow}}
-
-{{include file="field_select.tpl" field=$navcolour}}
-
-{{include file="field_select.tpl" field=$displaystyle}}
-
-{{include file="field_input.tpl" field=$linkcolour}}
-
-{{include file="field_select.tpl" field=$iconset}}
-
-{{include file="field_select.tpl" field=$shiny}}
-
-<div class="settings-submit-wrapper">
-	<input type="submit" value="{{$submit}}" class="settings-submit" name="redbasic-settings-submit" />
-</div>
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index 6e7e079e0..f8d9f223c 100644..100755
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -1,21 +1,26 @@
-{{inc field_select.tpl with $field=$colour}}{{endinc}}
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{include file="field_select.tpl" field=$colour}}
 
-{{inc field_input.tpl with $field=$font_size}}{{endinc}}
+{{include file="field_input.tpl" field=$font_size}}
 
-{{inc field_input.tpl with $field=$line_height}}{{endinc}}
+{{include file="field_input.tpl" field=$line_height}}
 
-{{inc field_select.tpl with $field=$shadow}}{{endinc}}
+{{include file="field_select.tpl" field=$shadow}}
 
-{{inc field_select.tpl with $field=$navcolour}}{{endinc}}
+{{include file="field_select.tpl" field=$navcolour}}
 
-{{inc field_select.tpl with $field=$displaystyle}}{{endinc}}
+{{include file="field_select.tpl" field=$displaystyle}}
 
-{{inc field_input.tpl with $field=$linkcolour}}{{endinc}}
+{{include file="field_input.tpl" field=$linkcolour}}
 
-{{inc field_select.tpl with $field=$iconset}}{{endinc}}
+{{include file="field_select.tpl" field=$iconset}}
 
-{{inc field_select.tpl with $field=$shiny}}{{endinc}}
+{{include file="field_select.tpl" field=$shiny}}
 
 <div class="settings-submit-wrapper">
-	<input type="submit" value="$submit" class="settings-submit" name="redbasic-settings-submit" />
+	<input type="submit" value="{{$submit}}" class="settings-submit" name="redbasic-settings-submit" />
 </div>
diff --git a/view/tpl/404.tpl b/view/tpl/404.tpl
index bf4d4e949..2d581ab8d 100644..100755
--- a/view/tpl/404.tpl
+++ b/view/tpl/404.tpl
@@ -1 +1,6 @@
-<h1>$message</h1>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$message}}</h1>
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 7f20f3398..9f6556842 100644..100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -1,74 +1,79 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
-<h2>$header</h2>
+<h2>{{$header}}</h2>
 
-<h3>$addr</h3>
+<h3>{{$addr}}</h3>
 
-{{ if $notself }}
+{{if $notself}}
 <div id="connection-flag-tabs">
-$tabs
+{{$tabs}}
 </div>
-{{ endif }}
+{{/if}}
 
-{{ if $self }}
-<div id="autoperm-desc" class="descriptive-paragraph">$autolbl</div>
-{{ endif }}
+{{if $self}}
+<div id="autoperm-desc" class="descriptive-paragraph">{{$autolbl}}</div>
+{{/if}}
 
 
 <div id="contact-edit-wrapper">
 
-{{ if $notself }}
-{{ if $slide }}
-<h3>$lbl_slider</h3>
+{{if $notself}}
+{{if $slide}}
+<h3>{{$lbl_slider}}</h3>
 
-$slide
+{{$slide}}
 
-{{ endif }}
-{{ endif }}
+{{/if}}
+{{/if}}
 
 
 
-<h3>$permlbl</h3>
+<h3>{{$permlbl}}</h3>
 
-<form id="abook-edit-form" action="connections/$contact_id" method="post" >
-<input type="hidden" name="contact_id" value="$contact_id">
-<input id="contact-closeness-mirror" type="hidden" name="closeness" value="$close" />
+<form id="abook-edit-form" action="connections/{{$contact_id}}" method="post" >
+<input type="hidden" name="contact_id" value="{{$contact_id}}">
+<input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" />
 
-{{ if $noperms }}
-<div id="noperm-desc" class="descriptive-paragraph">$noperms</div>
-{{ endif }}
+{{if $noperms}}
+<div id="noperm-desc" class="descriptive-paragraph">{{$noperms}}</div>
+{{/if}}
 
 
-{{ if $is_pending }}
-{{inc field_checkbox.tpl with $field=$unapproved }}{{endinc}}
-{{ endif }}
+{{if $is_pending}}
+{{include file="field_checkbox.tpl" field=$unapproved}}
+{{/if}}
 
 <br />
-<b>$quick</b>
+<b>{{$quick}}</b>
 <ul>
-{{ if $self }}
-<li><span class="fakelink" onclick="connectForum(); $('#abook-edit-form').submit();">$forum</span></li>
-<li><span class="fakelink" onclick="connectSoapBox(); $('#abook-edit-form').submit();">$soapbox</span></li>
-{{ endif }}
-<li><span class="fakelink" onclick="connectFullShare(); $('#abook-edit-form').submit();">$full</span></li>
-<li><span class="fakelink" onclick="connectCautiousShare(); $('#abook-edit-form').submit();">$cautious</span></li>
-<li><span class="fakelink" onclick="connectFollowOnly(); $('#abook-edit-form').submit();">$follow</span></li>
+{{if $self}}
+<li><span class="fakelink" onclick="connectForum(); $('#abook-edit-form').submit();">{{$forum}}</span></li>
+<li><span class="fakelink" onclick="connectSoapBox(); $('#abook-edit-form').submit();">{{$soapbox}}</span></li>
+{{/if}}
+<li><span class="fakelink" onclick="connectFullShare(); $('#abook-edit-form').submit();">{{$full}}</span></li>
+<li><span class="fakelink" onclick="connectCautiousShare(); $('#abook-edit-form').submit();">{{$cautious}}</span></li>
+<li><span class="fakelink" onclick="connectFollowOnly(); $('#abook-edit-form').submit();">{{$follow}}</span></li>
 </ul>
 
-<div id="abook-advanced" class="fakelink" onclick="openClose('abook-advanced-panel');">$advanced</div>
+<div id="abook-advanced" class="fakelink" onclick="openClose('abook-advanced-panel');">{{$advanced}}</div>
 
 <div id="abook-advanced-panel" style="display: none;">
 
-<span class="abook-them">$them</span><span class="abook-me">$me</span>
+<span class="abook-them">{{$them}}</span><span class="abook-me">{{$me}}</span>
 <br />
 <br />
-{{ for $perms as $prm }}
-{{inc field_acheckbox.tpl with $field=$prm }}{{endinc}}
-{{ endfor }}
+{{foreach $perms as $prm}}
+{{include file="field_acheckbox.tpl" field=$prm}}
+{{/foreach}}
 <br />
 
 </div>
 
-<input class="contact-edit-submit" type="submit" name="done" value="$submit" />
+<input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" />
 
 </form>
 </div>
diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
index e5231b0f8..aebef71ee 100644..100755
--- a/view/tpl/acl_selector.tpl
+++ b/view/tpl/acl_selector.tpl
@@ -1,6 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="acl-wrapper">
 	<input id="acl-search">
-	<a href="#" id="acl-showall">$showall</a>
+	<a href="#" id="acl-showall">{{$showall}}</a>
 	<div id="acl-list">
 		<div id="acl-list-content">
 		</div>
@@ -10,8 +15,8 @@
 
 <div class="acl-list-item" rel="acl-template" style="display:none">
 	<img src="{0}"><p>{1}</p>
-	<a href="#" class='acl-button-show'>$show</a>
-	<a href="#" class='acl-button-hide'>$hide</a>
+	<a href="#" class='acl-button-show'>{{$show}}</a>
+	<a href="#" class='acl-button-hide'>{{$hide}}</a>
 </div>
 
 <script>
@@ -20,7 +25,7 @@ $(document).ready(function() {
 		if(typeof acl=="undefined"){
 			acl = new ACL(
 				baseurl+"/acl",
-				[ $allowcid,$allowgid,$denycid,$denygid ]
+				[ {{$allowcid}},{{$allowgid}},{{$denycid}},{{$denygid}} ]
 			);
 		}
 	}, 5000 );
diff --git a/view/tpl/admin_aside.tpl b/view/tpl/admin_aside.tpl
index ca1f4985c..69445d3b1 100644..100755
--- a/view/tpl/admin_aside.tpl
+++ b/view/tpl/admin_aside.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script>
 	// update pending count //
 	$(function(){
@@ -10,33 +15,33 @@
 		});
 	});
 </script>
-<h4><a href="$admurl">$admtxt</a></h4>
+<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>
+	<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 }}
+{{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>
+	<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}}
 
 
-{{ if $admin.plugins_admin }}<h4>$plugadmtxt</h4>{{ endif }}
+{{if $admin.plugins_admin}}<h4>{{$plugadmtxt}}</h4>{{/if}}
 <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 }}
+	{{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>
+<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.logs.2}}'><a href='{{$admin.logs.0}}'>{{$admin.logs.1}}</a></li>
 </ul>
 
diff --git a/view/tpl/admin_logs.tpl b/view/tpl/admin_logs.tpl
index b777cf420..6a2259500 100644..100755
--- a/view/tpl/admin_logs.tpl
+++ b/view/tpl/admin_logs.tpl
@@ -1,19 +1,24 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id='adminpage'>
-	<h1>$title - $page</h1>
+	<h1>{{$title}} - {{$page}}</h1>
 	
-	<form action="$baseurl/admin/logs" method="post">
-    <input type='hidden' name='form_security_token' value='$form_security_token'>
+	<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 }}
+	{{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" /></div>
+	<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> -->
+	<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/tpl/admin_plugins.tpl b/view/tpl/admin_plugins.tpl
index 74b56bb4e..307814e87 100644..100755
--- a/view/tpl/admin_plugins.tpl
+++ b/view/tpl/admin_plugins.tpl
@@ -1,15 +1,20 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id='adminpage'>
-	<h1>$title - $page</h1>
+	<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 }}
+		{{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>
+					<div class='desc'>{{$p.2.description}}</div>
 			</li>
-		{{ endfor }}
+		{{/foreach}}
 		</ul>
 </div>
diff --git a/view/tpl/admin_plugins_details.tpl b/view/tpl/admin_plugins_details.tpl
index 931c7b83c..e81701732 100644..100755
--- a/view/tpl/admin_plugins_details.tpl
+++ b/view/tpl/admin_plugins_details.tpl
@@ -1,36 +1,41 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id='adminpage'>
-	<h1>$title - $page</h1>
+	<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><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 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
-	{{ for $info.maintainer as $a }}
-		{{ if $a.link }}<a href="$a.link">$a.name</a>{{ else }}$a.name{{ endif }},
-	{{ endfor }}
+	<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>
-	{{ endif }}
+	{{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
+	{{if $admin_form}}
+	<h3>{{$settings}}</h3>
+	<form method="post" action="{{$baseurl}}/admin/{{$function}}/{{$plugin}}/">
+		{{$admin_form}}
 	</form>
-	{{ endif }}
+	{{/if}}
 
-	{{ if $readme }}
+	{{if $readme}}
 	<h3>Readme</h3>
 	<div id="plugin_readme">
-		$readme
+		{{$readme}}
 	</div>
-	{{ endif }}
+	{{/if}}
 </div>
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index 47e952164..eaf067c27 100644..100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script>
 	$(function(){
 		
@@ -6,7 +11,7 @@
 			autoDimensions: false,
 			onStart: function(){
 				var theme = $("#id_theme :selected").val();
-				$("#cnftheme").attr('href',"$baseurl/admin/themes/"+theme);
+				$("#cnftheme").attr('href',"{{$baseurl}}/admin/themes/"+theme);
 			}, 
 			onComplete: function(){
 				$("div#fancybox-content form").submit(function(e){
@@ -35,50 +40,50 @@
 	});
 </script>
 <div id='adminpage'>
-	<h1>$title - $page</h1>
+	<h1>{{$title}} - {{$page}}</h1>
 	
-	<form action="$baseurl/admin/site" method="post">
-    <input type='hidden' name='form_security_token' value='$form_security_token'>
+	<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=$theme_accessibility }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
+	{{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=$theme_accessibility}}
+	{{include file="field_select.tpl" field=$ssl_policy}}
 	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
+	<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 }}
+	<h3>{{$registration}}</h3>
+	{{include file="field_input.tpl" field=$register_text}}
+	{{include file="field_select.tpl" field=$register_policy}}
 	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
-	<h3>$upload</h3>
-	{{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }}
+	<h3>{{$upload}}</h3>
+	{{include file="field_input.tpl" field=$maximagesize}}
 	
-	<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_input.tpl with $field=$global_directory }}{{ endinc }}
+	<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_input.tpl" field=$global_directory}}
 	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 	
-	<h3>$advanced</h3>
-	{{ 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 }}
+	<h3>{{$advanced}}</h3>
+	{{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>
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 	
 	</form>
 </div>
diff --git a/view/tpl/admin_summary.tpl b/view/tpl/admin_summary.tpl
index 99221c13e..76ac23d29 100644..100755
--- a/view/tpl/admin_summary.tpl
+++ b/view/tpl/admin_summary.tpl
@@ -1,39 +1,44 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id='adminpage'>
-	<h1>$title - $page</h1>
+	<h1>{{$title}} - {{$page}}</h1>
 
 	<dl>
-		<dt>$queues.label</dt>
-		<dd>$queues.queue</dd>
+		<dt>{{$queues.label}}</dt>
+		<dd>{{$queues.queue}}</dd>
 	</dl>
 	<dl>
-		<dt>$pending.0</dt>
-		<dd>$pending.1</dt>
+		<dt>{{$pending.0}}</dt>
+		<dd>{{$pending.1}}</dt>
 	</dl>
 
 	<dl>
-		<dt>$users.0</dt>
-		<dd>$users.1</dd>
+		<dt>{{$users.0}}</dt>
+		<dd>{{$users.1}}</dd>
 	</dl>
-	{{ for $accounts as $p }}
+	{{foreach $accounts as $p}}
 		<dl>
-			<dt>$p.0</dt>
-			<dd>{{ if $p.1 }}$p.1{{ else }}0{{ endif }}</dd>
+			<dt>{{$p.0}}</dt>
+			<dd>{{if $p.1}}{{$p.1}}{{else}}0{{/if}}</dd>
 		</dl>
-	{{ endfor }}
+	{{/foreach}}
 
 
 	<dl>
-		<dt>$plugins.0</dt>
+		<dt>{{$plugins.0}}</dt>
 		
-		{{ for $plugins.1 as $p }}
-			<dd>$p</dd>
-		{{ endfor }}
+		{{foreach $plugins.1 as $p}}
+			<dd>{{$p}}</dd>
+		{{/foreach}}
 		
 	</dl>
 
 	<dl>
-		<dt>$version.0</dt>
-		<dd>$version.1 - $build</dt>
+		<dt>{{$version.0}}</dt>
+		<dd>{{$version.1}} - {{$build}}</dt>
 	</dl>
 
 
diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl
index 6de504e2a..136ce3c3e 100644..100755
--- a/view/tpl/admin_users.tpl
+++ b/view/tpl/admin_users.tpl
@@ -1,9 +1,14 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script>
 	function confirm_delete(uname){
-		return confirm( "$confirm_delete".format(uname));
+		return confirm( "{{$confirm_delete}}".format(uname));
 	}
 	function confirm_delete_multi(){
-		return confirm("$confirm_delete_multi");
+		return confirm("{{$confirm_delete_multi}}");
 	}
 	function selectall(cls){
 		$("."+cls).attr('checked','checked');
@@ -11,77 +16,77 @@
 	}
 </script>
 <div id='adminpage'>
-	<h1>$title - $page</h1>
+	<h1>{{$title}} - {{$page}}</h1>
 	
-	<form action="$baseurl/admin/users" method="post">
-        <input type='hidden' name='form_security_token' value='$form_security_token'>
+	<form action="{{$baseurl}}/admin/users" method="post">
+        <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 		
-		<h3>$h_pending</h3>
-		{{ if $pending }}
+		<h3>{{$h_pending}}</h3>
+		{{if $pending}}
 			<table id='pending'>
 				<thead>
 				<tr>
-					{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
+					{{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}}
 					<th></th>
 					<th></th>
 				</tr>
 				</thead>
 				<tbody>
-			{{ for $pending as $u }}
+			{{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="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>
+						<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 }}
+			{{/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>
-		{{ endif }}
+			<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 }}
+		<h3>{{$h_users}}</h3>
+		{{if $users}}
 			<table id='users'>
 				<thead>
 				<tr>
 					<th></th>
-					{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
+					{{foreach $th_users as $th}}<th>{{$th}}</th>{{/foreach}}
 					<th></th>
 					<th></th>
 				</tr>
 				</thead>
 				<tbody>
-				{{ for $users as $u }}
+				{{foreach $users as $u}}
 					<tr>
-						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
-						<td class='email'>$u.account_email</td>
-						<td class='register_date'>$u.account_created</td>
-						<td class='login_date'>$u.account_lastlog</td>
-						<td class='service_class'>$u.account_service_class</td>
-						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
+						<td><img src="{{$u.micro}}" alt="{{$u.nickname}}" title="{{$u.nickname}}"></td>
+						<td class='email'>{{$u.account_email}}</td>
+						<td class='register_date'>{{$u.account_created}}</td>
+						<td class='login_date'>{{$u.account_lastlog}}</td>
+						<td class='service_class'>{{$u.account_service_class}}</td>
+						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
 						<td class="tools">
-							<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>
+							<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>
 						</td>
 					</tr>
-				{{ endfor }}
+				{{/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 }}
+			<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 }}
+		{{/if}}
 	</form>
 </div>
diff --git a/view/tpl/album_edit.tpl b/view/tpl/album_edit.tpl
index 56a7b73fc..36c07a9f0 100644..100755
--- a/view/tpl/album_edit.tpl
+++ b/view/tpl/album_edit.tpl
@@ -1,14 +1,19 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="photo-album-edit-wrapper">
-<form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/$nickname/album/$hexalbum" method="post" >
+<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" >
+<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();" />
+<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>
diff --git a/view/tpl/api_config_xml.tpl b/view/tpl/api_config_xml.tpl
index 3281e59dd..09aa00ac4 100644..100755
--- a/view/tpl/api_config_xml.tpl
+++ b/view/tpl/api_config_xml.tpl
@@ -1,24 +1,29 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <config>
  <site>
-  <name>$config.site.name</name>
-  <server>$config.site.server</server>
+  <name>{{$config.site.name}}</name>
+  <server>{{$config.site.server}}</server>
   <theme>default</theme>
   <path></path>
-  <logo>$config.site.logo</logo>
+  <logo>{{$config.site.logo}}</logo>
 
   <fancy>true</fancy>
   <language>en</language>
-  <email>$config.site.email</email>
+  <email>{{$config.site.email}}</email>
   <broughtby></broughtby>
   <broughtbyurl></broughtbyurl>
   <timezone>UTC</timezone>
-  <closed>$config.site.closed</closed>
+  <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>
+  <private>{{$config.site.private}}</private>
+  <textlimit>{{$config.site.textlimit}}</textlimit>
+  <ssl>{{$config.site.ssl}}</ssl>
+  <sslserver>{{$config.site.sslserver}}</sslserver>
   <shorturllength>30</shorturllength>
 
 </site>
diff --git a/view/tpl/api_friends_xml.tpl b/view/tpl/api_friends_xml.tpl
index 0ea7eb13b..e9c40293b 100644..100755
--- a/view/tpl/api_friends_xml.tpl
+++ b/view/tpl/api_friends_xml.tpl
@@ -1,5 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <users type="array">
-	{{for $users as $user }}
-	{{inc api_user_xml.tpl }}{{endinc}}
-	{{endfor}}
+	{{foreach $users as $user}}
+	{{include file="api_user_xml.tpl"}}
+	{{/foreach}}
 </users>
diff --git a/view/tpl/api_ratelimit_xml.tpl b/view/tpl/api_ratelimit_xml.tpl
index 36ec1993d..a34eb6723 100644..100755
--- a/view/tpl/api_ratelimit_xml.tpl
+++ b/view/tpl/api_ratelimit_xml.tpl
@@ -1,6 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <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>
+ <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/tpl/api_status_xml.tpl b/view/tpl/api_status_xml.tpl
index f6cd9c2c0..e3e80d2b1 100644..100755
--- a/view/tpl/api_status_xml.tpl
+++ b/view/tpl/api_status_xml.tpl
@@ -1,46 +1,51 @@
-<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>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<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>
+	  <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>
+  	  <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>
+  	  <statuses_count>{{$status.user.statuses_count}}</statuses_count>
+  	  <lang>{{$status.user.lang}}</lang>
+  	  <contributors_enabled>{{$status.user.contributors_enabled}}</contributors_enabled>
 	  </user>
-{{ endif }}</status>
+{{/if}}</status>
diff --git a/view/tpl/api_test_xml.tpl b/view/tpl/api_test_xml.tpl
index 7509a2dc1..df5009af5 100644..100755
--- a/view/tpl/api_test_xml.tpl
+++ b/view/tpl/api_test_xml.tpl
@@ -1 +1,6 @@
-<ok>$ok</ok>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<ok>{{$ok}}</ok>
diff --git a/view/tpl/api_timeline_atom.tpl b/view/tpl/api_timeline_atom.tpl
index 9039220e7..00a28e390 100644..100755
--- a/view/tpl/api_timeline_atom.tpl
+++ b/view/tpl/api_timeline_atom.tpl
@@ -1,90 +1,95 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <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>
+ <id>{{$rss.self}}</id>
  <title>Friendika</title>
  <subtitle>Friendika 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"/>
+ <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:obj_type>http://activitystrea.ms/schema/1.0/person</activity:obj_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"/>
+	<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: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:value>{{$user.url}}</poco:value>
 		<poco:primary>true</poco:primary>
 	</poco:urls>
-	<statusnet:profile_info local_id="$user.id"></statusnet:profile_info>
+	<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:obj_type>http://activitystrea.ms/schema/1.0/person</activity:obj_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>
+	<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:value>{{$user.url}}</poco:value>
 		<poco:primary>true</poco:primary>
 	</poco:urls>
-	<statusnet:profile_info local_id="$user.id"></statusnet:profile_info>
+	<statusnet:profile_info local_id="{{$user.id}}"></statusnet:profile_info>
  </activity:subject>
  
  
-  	{{ for $statuses as $status }}
+  	{{foreach $statuses as $status}}
 	<entry>
-		<activity:obj_type>$status.objecttype</activity:obj_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>
+		<activity:obj_type>{{$status.objecttype}}</activity:obj_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" >
+		<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:obj_type>http://activitystrea.ms/schema/1.0/person</activity:obj_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"/>
+			<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: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:value>{{$status.user.url}}</poco:value>
 				<poco:primary>true</poco:primary>
 			</poco:urls>
 		</author>
-		<link rel="ostatus:conversation" type="text/html" href="$status.url"/> 
+		<link rel="ostatus:conversation" type="text/html" href="{{$status.url}}"/> 
 
 	</entry>    
-    {{ endfor }}
+    {{/foreach}}
 </feed>
diff --git a/view/tpl/api_timeline_rss.tpl b/view/tpl/api_timeline_rss.tpl
index 40239273c..afad50aab 100644..100755
--- a/view/tpl/api_timeline_rss.tpl
+++ b/view/tpl/api_timeline_rss.tpl
@@ -1,26 +1,31 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <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>Friendika</title>
-    <link>$rss.alternate</link>
-    <atom:link type="application/rss+xml" rel="self" href="$rss.self"/>
+    <link>{{$rss.alternate}}</link>
+    <atom:link type="application/rss+xml" rel="self" href="{{$rss.self}}"/>
     <description>Friendika timeline</description>
-    <language>$rss.language</language>
+    <language>{{$rss.language}}</language>
     <ttl>40</ttl>
 	<image>
-		<link>$user.link</link>
-		<title>$user.name's items</title>
-		<url>$user.profile_image_url</url>
+		<link>{{$user.link}}</link>
+		<title>{{$user.name}}'s items</title>
+		<url>{{$user.profile_image_url}}</url>
 	</image>
 	
-{{ for $statuses as $status }}
+{{foreach $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>
+    <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 }}
+{{/foreach}}
   </channel>
 </rss>
diff --git a/view/tpl/api_timeline_xml.tpl b/view/tpl/api_timeline_xml.tpl
index 4a32b411b..84148d17f 100644..100755
--- a/view/tpl/api_timeline_xml.tpl
+++ b/view/tpl/api_timeline_xml.tpl
@@ -1,20 +1,25 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <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>
+{{foreach $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>
+{{include file="api_user_xml.tpl" user=$status.user}}  <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>
+{{/foreach}}</statuses>
diff --git a/view/tpl/api_user_xml.tpl b/view/tpl/api_user_xml.tpl
index d286652c0..d7efcf3fb 100644..100755
--- a/view/tpl/api_user_xml.tpl
+++ b/view/tpl/api_user_xml.tpl
@@ -1,46 +1,51 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
   <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>
+   <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>
+  {{/if}}</status>
   </user>
diff --git a/view/tpl/apps.tpl b/view/tpl/apps.tpl
index 4c7f8c94c..01d9bb8c8 100644..100755
--- a/view/tpl/apps.tpl
+++ b/view/tpl/apps.tpl
@@ -1,7 +1,12 @@
-<h3>$title</h3>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$title}}</h3>
 
 <ul>
-	{{ for $apps as $ap }}
-	<li>$ap</li>
-	{{ endfor }}
+	{{foreach $apps as $ap}}
+	<li>{{$ap}}</li>
+	{{/foreach}}
 </ul>
diff --git a/view/tpl/atom_feed.tpl b/view/tpl/atom_feed.tpl
index 2feb547ee..db553d99f 100644..100755
--- a/view/tpl/atom_feed.tpl
+++ b/view/tpl/atom_feed.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?xml version="1.0" encoding="utf-8" ?>
 <feed xmlns="http://www.w3.org/2005/Atom"
       xmlns:thr="http://purl.org/syndication/thread/1.0"
@@ -10,20 +15,20 @@
       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>
+  <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
+  {{$hub}}
+  {{$salmon}}
+  {{$community}}
 
-  <updated>$feed_updated</updated>
+  <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
+    <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/tpl/atom_feed_dfrn.tpl b/view/tpl/atom_feed_dfrn.tpl
index 0bae62b52..87d78a518 100644..100755
--- a/view/tpl/atom_feed_dfrn.tpl
+++ b/view/tpl/atom_feed_dfrn.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?xml version="1.0" encoding="utf-8" ?>
 <feed xmlns="http://www.w3.org/2005/Atom"
       xmlns:thr="http://purl.org/syndication/thread/1.0"
@@ -10,20 +15,20 @@
       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>
+  <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
+  {{$hub}}
+  {{$salmon}}
+  {{$community}}
 
-  <updated>$feed_updated</updated>
+  <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
+    <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/tpl/birthdays_reminder.tpl b/view/tpl/birthdays_reminder.tpl
index 8db7d22f4..56749cd12 100644..100755
--- a/view/tpl/birthdays_reminder.tpl
+++ b/view/tpl/birthdays_reminder.tpl
@@ -1,10 +1,15 @@
-{{ 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>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{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> <a href="$event.link">$event.title</a> $event.date </div>
-{{ endfor }}
+{{foreach $events as $event}}
+<div class="birthday-list" id="birthday-{{$event.id}}"></a> <a href="{{$event.link}}">{{$event.title}}</a> {{$event.date}} </div>
+{{/foreach}}
 </div>
-{{ endif }}
+{{/if}}
 
diff --git a/view/tpl/build_query.tpl b/view/tpl/build_query.tpl
index 0f4905638..a84f09031 100644..100755
--- a/view/tpl/build_query.tpl
+++ b/view/tpl/build_query.tpl
@@ -1,28 +1,33 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script> 
 
-	var bParam_cmd = "$baseurl/update_$pgtype";
+	var bParam_cmd = "{{$baseurl}}/update_{{$pgtype}}";
 
 
-	var bParam_uid = $uid;
-	var bParam_gid = $gid;
-	var bParam_cid = $cid;
-	var bParam_cmin = $cmin;
-	var bParam_cmax = $cmax;
-	var bParam_star = $star;
-	var bParam_liked = $liked;
-	var bParam_conv = $conv;
-	var bParam_spam = $spam;
-	var bParam_new = $nouveau;
-	var bParam_page = $page;
-	var bParam_wall = $wall;
+	var bParam_uid = {{$uid}};
+	var bParam_gid = {{$gid}};
+	var bParam_cid = {{$cid}};
+	var bParam_cmin = {{$cmin}};
+	var bParam_cmax = {{$cmax}};
+	var bParam_star = {{$star}};
+	var bParam_liked = {{$liked}};
+	var bParam_conv = {{$conv}};
+	var bParam_spam = {{$spam}};
+	var bParam_new = {{$nouveau}};
+	var bParam_page = {{$page}};
+	var bParam_wall = {{$wall}};
 
-	var bParam_search = "$search";
-	var bParam_order = "$order";
-	var bParam_file = "$file";
-	var bParam_cats = "$cats";
-	var bParam_dend = "$dend";
-	var bParam_dbegin = "$dbegin";
-	var bParam_mid = "$mid";
+	var bParam_search = "{{$search}}";
+	var bParam_order = "{{$order}}";
+	var bParam_file = "{{$file}}";
+	var bParam_cats = "{{$cats}}";
+	var bParam_dend = "{{$dend}}";
+	var bParam_dbegin = "{{$dbegin}}";
+	var bParam_mid = "{{$mid}}";
 
 	function buildCmd() {
 		var udargs = ((page_load) ? "/load" : "");
diff --git a/view/tpl/categories_widget.tpl b/view/tpl/categories_widget.tpl
index 19e91c560..75da9fc43 100644..100755
--- a/view/tpl/categories_widget.tpl
+++ b/view/tpl/categories_widget.tpl
@@ -1,12 +1,17 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="categories-sidebar" class="widget">
-	<h3>$title</h3>
-	<div id="categories-sidebar-desc">$desc</div>
+	<h3>{{$title}}</h3>
+	<div id="categories-sidebar-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=&cat=$term.name" class="categories-link{{ if $term.selected }} categories-selected{{ endif }}">$term.name</a></li>
-		{{ endfor }}
+		<li class="tool"><a href="{{$base}}" class="categories-link categories-all{{if $sel_all}} categories-selected{{/if}}">{{$all}}</a></li>
+		{{foreach $terms as $term}}
+			<li class="tool"><a href="{{$base}}?f=&cat={{$term.name}}" class="categories-link{{if $term.selected}} categories-selected{{/if}}">{{$term.name}}</a></li>
+		{{/foreach}}
 	</ul>
 	
 </div>
diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl
index af4f9b703..b49cf19cc 100644..100755
--- a/view/tpl/channel.tpl
+++ b/view/tpl/channel.tpl
@@ -1,12 +1,17 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="channel-selection">
-{{ if $channel.default_links }}
-{{ if $channel.default }}
-<div class="channel-selection-default default">$msg_default</div>
-{{ else }}
-<div class="channel-selection-default"><a href="manage/$channel.channel_id/default">$msg_make_default</a></div>
-{{ endif }}
-{{ endif }}
-<a href="$channel.link" class="channel-selection-photo-link" title="$channel.channel_name"><img class="channel-photo" src="$channel.xchan_photo_m" alt="$channel.channel_name" /></a>
-<a href="$channel.link" class="channel-selection-name-link" title="$channel.channel_name"><div class="channel-name">$channel.channel_name</div></a>
+{{if $channel.default_links}}
+{{if $channel.default}}
+<div class="channel-selection-default default">{{$msg_default}}</div>
+{{else}}
+<div class="channel-selection-default"><a href="manage/{{$channel.channel_id}}/default">{{$msg_make_default}}</a></div>
+{{/if}}
+{{/if}}
+<a href="{{$channel.link}}" class="channel-selection-photo-link" title="{{$channel.channel_name}}"><img class="channel-photo" src="{{$channel.xchan_photo_m}}" alt="{{$channel.channel_name}}" /></a>
+<a href="{{$channel.link}}" class="channel-selection-name-link" title="{{$channel.channel_name}}"><div class="channel-name">{{$channel.channel_name}}</div></a>
 </div>
 <div class="channel-selection-end"></div>
diff --git a/view/tpl/channel_import.tpl b/view/tpl/channel_import.tpl
index 8002b6e03..872f039b7 100644..100755
--- a/view/tpl/channel_import.tpl
+++ b/view/tpl/channel_import.tpl
@@ -1,34 +1,39 @@
-<h2>$title</h2>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h2>{{$title}}</h2>
 
 <form action="import" method="post" id="import-channel-form">
 
-	<div id="import-desc" class="descriptive-paragraph">$desc</div>
+	<div id="import-desc" class="descriptive-paragraph">{{$desc}}</div>
 
-	<label for="import-filename" id="label-import-filename" class="import-label" >$label_filename</label>
+	<label for="import-filename" id="label-import-filename" class="import-label" >{{$label_filename}}</label>
 	<input type="file" name="filename" id="import-filename" class="import-input" value="" />
 	<div id="import-filename-end" class="import-field-end"></div>
 
-	<div id="import-choice" class="descriptive-paragraph">$choice</div>
+	<div id="import-choice" class="descriptive-paragraph">{{$choice}}</div>
 
-	<label for="import-old-address" id="label-import-old-address" class="import-label" >$label_old_address</label>
+	<label for="import-old-address" id="label-import-old-address" class="import-label" >{{$label_old_address}}</label>
 	<input type="text" name="old_address" id="import-old-address" class="import-input" value="" />
 	<div id="import-old-address-end" class="import-field-end"></div>
 
-	<label for="import-old-email" id="label-import-old-email" class="import-label" >$label_old_email</label>
-	<input type="text" name="email" id="import-old-email" class="import-input" value="$email" />
+	<label for="import-old-email" id="label-import-old-email" class="import-label" >{{$label_old_email}}</label>
+	<input type="text" name="email" id="import-old-email" class="import-input" value="{{$email}}" />
 	<div id="import-old-email-end" class="import-field-end"></div>
 
-	<label for="import-old-pass" id="label-import-old-pass" class="import-label" >$label_old_pass</label>
-	<input type="password" name="password" id="import-old-pass" class="import-input" value="$pass" />
+	<label for="import-old-pass" id="label-import-old-pass" class="import-label" >{{$label_old_pass}}</label>
+	<input type="password" name="password" id="import-old-pass" class="import-input" value="{{$pass}}" />
 	<div id="import-old-pass-end" class="import-field-end"></div>
 
-	<div id="import-common-desc" class="descriptive-paragraph">$common</div>
+	<div id="import-common-desc" class="descriptive-paragraph">{{$common}}</div>
 
 	<input type="checkbox" name="make_primary" id="import-make-primary" value="1" />
-	<label for="import-make-primary" id="label-import-make-primary">$label_import_primary</label>
+	<label for="import-make-primary" id="label-import-make-primary">{{$label_import_primary}}</label>
 	<div id="import-make-primary-end" class="import-field-end"></div>
 
-	<input type="submit" name="submit" id="import-submit-button" value="$submit" />
+	<input type="submit" name="submit" id="import-submit-button" value="{{$submit}}" />
 	<div id="import-submit-end" class="import-field-end"></div>
 
 </form>
diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl
index 916ba1c75..cfb66401b 100644..100755
--- a/view/tpl/channels.tpl
+++ b/view/tpl/channels.tpl
@@ -1,22 +1,27 @@
-<h3>$header</h3>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$header}}</h3>
 
 
-{{ if $links }}
-{{ for $links as $l }}
-<a class="channels-links" href="$l.0" title="$l.1">$l.2</a>
-{{ endfor }}
-{{ endif }} 
+{{if $links}}
+{{foreach $links as $l}}
+<a class="channels-links" href="{{$l.0}}" title="{{$l.1}}">{{$l.2}}</a>
+{{/foreach}}
+{{/if}} 
 
-{{ if $selected }}
-<div id="channels-selected">$msg_selected</div>
-{{ inc channel.tpl with $channel=$selected }}{{ endinc }}
+{{if $selected}}
+<div id="channels-selected">{{$msg_selected}}</div>
+{{include file="channel.tpl" channel=$selected}}
 <div class="channels-end selected"></div>
-{{ endif }}
+{{/if}}
 
-<div id="channels-desc" class="descriptive-text">$desc</div>
+<div id="channels-desc" class="descriptive-text">{{$desc}}</div>
 
-{{ for $all_channels as $chn }}
-{{ inc channel.tpl with $channel=$chn }}{{ endinc }}
-{{ endfor }} 
+{{foreach $all_channels as $chn}}
+{{include file="channel.tpl" channel=$chn}}
+{{/foreach}} 
 
 <div class="channels-end all"></div>
diff --git a/view/tpl/chanview.tpl b/view/tpl/chanview.tpl
index da96c9c0c..4b0f29f6c 100644..100755
--- a/view/tpl/chanview.tpl
+++ b/view/tpl/chanview.tpl
@@ -1,2 +1,7 @@
-<div id="chanview-iframe-border" class="fakelink" onclick="chanviewFull(); return true;" title="$full" >&#x2610;</div>
-<iframe id="remote-channel" width="100%" src="$url" onload="resize_iframe()"></iframe>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id="chanview-iframe-border" class="fakelink" onclick="chanviewFull(); return true;" title="{{$full}}" >&#x2610;</div>
+<iframe id="remote-channel" width="100%" src="{{$url}}" onload="resize_iframe()"></iframe>
diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
index a9a71cc8e..d15009d7f 100644..100755
--- a/view/tpl/comment_item.tpl
+++ b/view/tpl/comment_item.tpl
@@ -1,64 +1,69 @@
-		{{ 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" />
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+		{{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;">
+		{{/if}}
+			<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" />
 
-				<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 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">
+				<ul class="comment-edit-bb-{{$id}}">
 					<li><a class="editicon boldbb shadow"
-						style="cursor: pointer;" title="$edbold"
-						onclick="insertFormatting('$comment','b', $id);"></a></li>
+						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>
+						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>
+						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>
+						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>
+						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>
+						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>
+						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>
+						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);" >
+				<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 }}
+				{{foreach $qcomment as $qc}}
+					<option value="{{$qc}}">{{$qc}}</option>				
+				{{/foreach}}
 					</select>
-				{{ endif }}
+				{{/if}}
 
 				<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" />
-					{{ if $preview }}
-					<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>
-					{{ 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}}" />
+					{{if $preview}}
+					<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>
+					{{/if}}
 				</div>
 
 				<div class="comment-edit-end"></div>
diff --git a/view/tpl/common_friends.tpl b/view/tpl/common_friends.tpl
index 1f610d8c4..499cfe626 100644..100755
--- a/view/tpl/common_friends.tpl
+++ b/view/tpl/common_friends.tpl
@@ -1,12 +1,17 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="profile-match-wrapper">
 	<div class="profile-match-photo">
-		<a href="$url">
-			<img src="$photo" alt="$name" width="80" height="80" title="$name [$url]" />
+		<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>
+		<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/tpl/common_tabs.tpl b/view/tpl/common_tabs.tpl
index 97b771e7a..07c501499 100644..100755
--- a/view/tpl/common_tabs.tpl
+++ b/view/tpl/common_tabs.tpl
@@ -1,6 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <ul class="tabs">
-	{{ for $tabs as $tab }}
-		<li {{ if $tab.id }}id="$tab.id"{{ endif }}><a href="$tab.url" class="tab button $tab.sel"{{ if $tab.title }} title="$tab.title"{{ endif }}>$tab.label</a></li>
-	{{ endfor }}
+	{{foreach $tabs as $tab}}
+		<li {{if $tab.id}}id="{{$tab.id}}"{{/if}}><a href="{{$tab.url}}" class="tab button {{$tab.sel}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
+	{{/foreach}}
 </ul>
 <div class="tabs-end"></div>
\ No newline at end of file
diff --git a/view/tpl/contact_block.tpl b/view/tpl/contact_block.tpl
index b90469199..3b07a1ea3 100644..100755
--- a/view/tpl/contact_block.tpl
+++ b/view/tpl/contact_block.tpl
@@ -1,12 +1,17 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="contact-block">
-<div id="contact-block-numcontacts">$contacts</div>
-{{ if $micropro }}
-		<a class="allcontact-link" href="viewconnections/$nickname">$viewconnections</a>
+<div id="contact-block-numcontacts">{{$contacts}}</div>
+{{if $micropro}}
+		<a class="allcontact-link" href="viewconnections/{{$nickname}}">{{$viewconnections}}</a>
 		<div class='contact-block-content'>
-		{{ for $micropro as $m }}
-			$m
-		{{ endfor }}
+		{{foreach $micropro as $m}}
+			{{$m}}
+		{{/foreach}}
 		</div>
-{{ endif }}
+{{/if}}
 </div>
 <div class="clear"></div>
diff --git a/view/tpl/contact_head.tpl b/view/tpl/contact_head.tpl
index 9cfd81710..27bc286b1 100644..100755
--- a/view/tpl/contact_head.tpl
+++ b/view/tpl/contact_head.tpl
@@ -1,10 +1,15 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script language="javascript" type="text/javascript"
-          src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+          src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
           <script language="javascript" type="text/javascript">
 
 tinyMCE.init({
 	theme : "advanced",
-	mode : "$editselect",
+	mode : "{{$editselect}}",
 	elements: "contact-edit-info",
 	plugins : "bbcode",
 	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
@@ -20,7 +25,7 @@ tinyMCE.init({
 	force_p_newlines : false,
 	force_br_newlines : true,
 	forced_root_block : '',
-	content_css: "$baseurl/view/custom_tinymce.css"
+	content_css: "{{$baseurl}}/view/custom_tinymce.css"
 
 
 });
diff --git a/view/tpl/contact_slider.tpl b/view/tpl/contact_slider.tpl
index 2ccb08a90..80fa6f056 100644..100755
--- a/view/tpl/contact_slider.tpl
+++ b/view/tpl/contact_slider.tpl
@@ -1,4 +1,9 @@
-<div id="contact-slider" class="slider" style="height: 32px; position: relative; left: 5%; width: 90%;"><input id="contact-range" type="text" name="fake-closeness" value="$val" /></div>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id="contact-slider" class="slider" style="height: 32px; position: relative; left: 5%; width: 90%;"><input id="contact-range" type="text" name="fake-closeness" value="{{$val}}" /></div>
 <script>
-	$("#contact-range").slider({ from: 0, to: 99, step: 1, scale: ['$me', '|', '$intimate', '|', '$friends', '|', '$oldfriends', '|', '$acquaintances', '|', '$world' ], onstatechange: function(v) { $("#contact-closeness-mirror").val(v); }  });
+	$("#contact-range").slider({ from: 0, to: 99, step: 1, scale: ['{{$me}}', '|', '{{$intimate}}', '|', '{{$friends}}', '|', '{{$oldfriends}}', '|', '{{$acquaintances}}', '|', '{{$world}}' ], onstatechange: function(v) { $("#contact-closeness-mirror").val(v); }  });
 </script>
diff --git a/view/tpl/contact_template.tpl b/view/tpl/contact_template.tpl
index ec1d35c3c..2f3ef645c 100644..100755
--- a/view/tpl/contact_template.tpl
+++ b/view/tpl/contact_template.tpl
@@ -1,9 +1,14 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
+<div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}" >
 	<div class="contact-entry-photo-wrapper" >
-		<a href="$contact.link" title="$contact.img_hover" /><img class="contact-block-img" src="$contact.thumb" alt="$contact.name" /></a>
+		<a href="{{$contact.link}}" title="{{$contact.img_hover}}" /><img class="contact-block-img" src="{{$contact.thumb}}" alt="{{$contact.name}}" /></a>
 	</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-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div>
 	<div class="contact-entry-end" ></div>
 </div>
diff --git a/view/tpl/contacts-template.tpl b/view/tpl/contacts-template.tpl
index ecb342bf4..66f3f5c87 100644..100755
--- a/view/tpl/contacts-template.tpl
+++ b/view/tpl/contacts-template.tpl
@@ -1,25 +1,30 @@
-<h1>$header{{ if $total }} ($total){{ endif }}</h1>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$header}}{{if $total}} ({{$total}}){{/if}}</h1>
 
-{{ if $finding }}<h4>$finding</h4>{{ endif }}
+{{if $finding}}<h4>{{$finding}}</h4>{{/if}}
 
 <div id="contacts-search-wrapper">
-<form id="contacts-search-form" action="$cmd" method="get" >
-<span class="contacts-search-desc">$desc</span>
-<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="$search" />
-<input type="submit" name="submit" id="contacts-search-submit" value="$submit" />
+<form 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
+{{$tabs}}
 
 
-{{ for $contacts as $contact }}
-	{{ inc contact_template.tpl }}{{ endinc }}
-{{ endfor }}
+{{foreach $contacts as $contact}}
+	{{include file="contact_template.tpl"}}
+{{/foreach}}
 <div id="contact-edit-end"></div>
 
-$paginate
+{{$paginate}}
 
 
 
diff --git a/view/tpl/conv.tpl b/view/tpl/conv.tpl
index b7222f154..c91ab635a 100644..100755
--- a/view/tpl/conv.tpl
+++ b/view/tpl/conv.tpl
@@ -1,17 +1,22 @@
-{{ for $threads as $thread }}
-<div id="thread-wrapper-$thread.id" class="thread-wrapper">
-	{{ for $thread.items as $item }}
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{foreach $threads as $thread}}
+<div id="thread-wrapper-{{$thread.id}}" class="thread-wrapper">
+	{{foreach $thread.items as $item}}
 		{{if $item.comment_firstcollapsed}}
 			<div class="hide-comments-outer">
-			<span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span>
+			<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}}
+			<div id="collapsed-comments-{{$thread.id}}" class="collapsed-comments" style="display: none;">
+		{{/if}}
+		{{if $item.comment_lastcollapsed}}</div>{{/if}}
 		
-		{{ inc $item.template }}{{ endinc }}
+		{{include file="{{$item.template}}"}}
 		
 		
-	{{ endfor }}
+	{{/foreach}}
 </div>
-{{ endfor }}
+{{/foreach}}
diff --git a/view/tpl/conv_frame.tpl b/view/tpl/conv_frame.tpl
index 202b095e7..81d655be2 100644..100755
--- a/view/tpl/conv_frame.tpl
+++ b/view/tpl/conv_frame.tpl
@@ -1,14 +1,19 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="threads-begin"></div>
 <div id="threads-end"></div>
 <div id="conversation-end"></div>
 
-{{ if $dropping }}
+{{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 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 }}
+{{/if}}
 
-<img id="page-spinner" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+<img id="page-spinner" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
 
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index aa2190f0f..a03b79a90 100644..100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -1,115 +1,120 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 {{if $item.comment_firstcollapsed}}
 	<div class="hide-comments-outer">
-	<span id="hide-comments-total-$item.id" class="hide-comments-total">$item.num_comments</span> <span id="hide-comments-$item.id" class="hide-comments fakelink" onclick="showHideComments($item.id);">$item.hide_text</span>
+	<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> <span id="hide-comments-{{$item.id}}" class="hide-comments fakelink" onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
 	</div>
-	<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
-{{endif}}
-<div id="thread-wrapper-$item.id" class="thread-wrapper $item.toplevel">
-<a name="$item.id" ></a>
-<div class="wall-item-outside-wrapper $item.indent$item.previewing{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-outside-wrapper-$item.id" >
-	<div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
-		<div class="wall-item-info{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-info-$item.id">
-			{{ if $item.owner_url }}
-			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-				<a href="$item.owner_url" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
-				<img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
+	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
+{{/if}}
+<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper {{$item.toplevel}}">
+<a name="{{$item.id}}" ></a>
+<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" >
+	<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" >
+		<div class="wall-item-info{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}">
+			{{if $item.owner_url}}
+			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
+				<a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
+				<img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" /></a>
 			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
-			{{ endif }}
-			<div class="wall-item-photo-wrapper{{ if $item.owner_url }} wwfrom{{ endif }}" id="wall-item-photo-wrapper-$item.id" 
-				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
-                onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
+			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
+			{{/if}}
+			<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}" 
+				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
+                onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
+				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+                <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
                     <ul>
-                        $item.item_photo_menu
+                        {{$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 class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
+				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
+				{{else}}<div class="wall-item-lock"></div>{{/if}}	
+				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
 			</div>
 		</div>
 		<div class="wall-item-author">
-				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>{{ if $item.owner_url }} $item.to <a href="$item.owner_url" 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.isotime">$item.localtime</div>				
+				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}{{/if}}<br />
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.isotime}}">{{$item.localtime}}</div>				
 		</div>			
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
+		<div class="wall-item-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="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 }}
+						{{foreach $item.tags as $tag}}
+							<span class='tag'>{{$tag}}</span>
+						{{/foreach}}
 					</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 }}
+			{{if $item.has_cats}}
+			<div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
 			</div>
-			{{ endif }}
+			{{/if}}
 
-			{{ 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 }}
+			{{if $item.has_folders}}
+			<div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
 			</div>
-			{{ endif }}
+			{{/if}}
 			</div>
 		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			{{ if $item.like }}
-				<a href="#" class="icon like item-tool" title="$item.like.0" onclick="dolike($item.id,'like'); return false"></a>
-			{{ endif }}
-			{{ if $item.dislike }}
-				<a href="#" class="icon dislike item-tool" title="$item.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
-			{{ endif }}
-			{{ if $item.share }}
-				<a href="#" class="icon recycle item-tool" title="$item.share.0" onclick="jotShare($item.id); return false"></a>
-			{{ endif }}
-			{{ if $item.plink }}
-				<a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon item-tool remote-link$item.sparkle"></a>
-			{{ endif }}
-			{{ if $item.edpost }}
-				<a class="editpost icon pencil item-tool" 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-tool $item.star.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 item-tool tagged" title="$item.tagger.tagit"></a>
-			{{ endif }}
-			{{ if $item.filer }}
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon item-tool" title="$item.filer"></a>
-			{{ endif }}			
-			<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
+			{{if $item.like}}
+				<a href="#" class="icon like item-tool" title="{{$item.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></a>
+			{{/if}}
+			{{if $item.dislike}}
+				<a href="#" class="icon dislike item-tool" title="{{$item.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>
+			{{/if}}
+			{{if $item.share}}
+				<a href="#" class="icon recycle item-tool" title="{{$item.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>
+			{{/if}}
+			{{if $item.plink}}
+				<a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="icon item-tool remote-link{{$item.sparkle}}"></a>
+			{{/if}}
+			{{if $item.edpost}}
+				<a class="editpost icon pencil item-tool" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
+			{{/if}}			 
+			{{if $item.star}}
+			<a href="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon item-tool {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></a>
+			{{/if}}
+			{{if $item.tagger}}
+			<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon item-tool tagged" title="{{$item.tagger.tagit}}"></a>
+			{{/if}}
+			{{if $item.filer}}
+			<a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon item-tool" title="{{$item.filer}}"></a>
+			{{/if}}			
+			<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
 
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ 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>{{/if}}
 			</div>
-				{{ if $item.drop.pagedrop }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
+				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
 			<div class="wall-item-delete-end"></div>
 		</div>
 	</div>	
 	<div class="wall-item-wrapper-end"></div>
-	<div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.showlike</div>
-	<div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.showdislike</div>
+	<div class="wall-item-like {{$item.indent}}" id="wall-item-like-{{$item.id}}">{{$item.showlike}}</div>
+	<div class="wall-item-dislike {{$item.indent}}" id="wall-item-dislike-{{$item.id}}">{{$item.showdislike}}</div>
 
-<div class="wall-item-outside-wrapper-end $item.indent" ></div>
+<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
 </div>
-{{ if $item.toplevel }}
-{{ for $item.children as $child }}
-	{{ inc $child.template with $item=$child }}{{ endinc }}
-{{ endfor }}
-{{ endif }}
+{{if $item.toplevel}}
+{{foreach $item.children as $child}}
+	{{include file="{{$child.template}}" item=$child}}
+{{/foreach}}
+{{/if}}
 
 <div class="wall-item-comment-wrapper" >
-	$item.comment
+	{{$item.comment}}
 </div>
 
 
 </div>
-{{if $item.comment_lastcollapsed}}</div>{{endif}}
+{{if $item.comment_lastcollapsed}}</div>{{/if}}
diff --git a/view/tpl/conversation.tpl b/view/tpl/conversation.tpl
index 70cd389c9..837fbc11f 100644..100755
--- a/view/tpl/conversation.tpl
+++ b/view/tpl/conversation.tpl
@@ -1,28 +1,33 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="threads-begin"></div>
-{{ for $threads as $thread }}
-<div id="thread-wrapper-$thread.id" class="thread-wrapper">
-	{{ for $thread.items as $item }}
+{{foreach $threads as $thread}}
+<div id="thread-wrapper-{{$thread.id}}" class="thread-wrapper">
+	{{foreach $thread.items as $item}}
 		{{if $item.comment_firstcollapsed}}
 			<div class="hide-comments-outer">
-			<span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span>
+			<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}}
+			<div id="collapsed-comments-{{$thread.id}}" class="collapsed-comments" style="display: none;">
+		{{/if}}
+		{{if $item.comment_lastcollapsed}}</div>{{/if}}
 		
-		{{ inc $item.template }}{{ endinc }}
+		{{include file="{{$item.template}}"}}
 		
 		
-	{{ endfor }}
+	{{/foreach}}
 </div>
-{{ endfor }}
+{{/foreach}}
 <div id="threads-end"></div>
 <div id="conversation-end"></div>
 
-{{ if $dropping }}
+{{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 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 }}
+{{/if}}
diff --git a/view/tpl/convobj.tpl b/view/tpl/convobj.tpl
index a35e232e2..2a714c100 100644..100755
--- a/view/tpl/convobj.tpl
+++ b/view/tpl/convobj.tpl
@@ -1,4 +1,9 @@
-{{ for $threads as $item }}
-{{ inc $item.template }}{{ endinc }}
-{{ endfor }}
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{foreach $threads as $item}}
+{{include file="{{$item.template}}"}}
+{{/foreach}}
 
diff --git a/view/tpl/crepair.tpl b/view/tpl/crepair.tpl
index a3e532b61..8d3ed7df8 100644..100755
--- a/view/tpl/crepair.tpl
+++ b/view/tpl/crepair.tpl
@@ -1,45 +1,50 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
-<form id="crepair-form" action="crepair/$contact_id" method="post" >
+<form id="crepair-form" action="crepair/{{$contact_id}}" method="post" >
 
-<h4>$contact_name</h4>
+<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" />
+<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" />
+<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" />
+<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" />
+<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" />
+<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" />
+<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" />
+<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" />
+<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>
+<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" />
+<input type="submit" name="submit" value="{{$lbl_submit}}" />
 
 </form>
 
diff --git a/view/tpl/cropbody.tpl b/view/tpl/cropbody.tpl
index 4c0ca3d63..e6fcd355f 100644..100755
--- a/view/tpl/cropbody.tpl
+++ b/view/tpl/cropbody.tpl
@@ -1,9 +1,14 @@
-<h1>$title</h1>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$title}}</h1>
 <p id="cropimage-desc">
-$desc
+{{$desc}}
 </p>
 <div id="cropimage-wrapper">
-<img src="$image_url" id="croppa" class="imgCrop" alt="$title" />
+<img src="{{$image_url}}" id="croppa" class="imgCrop" alt="{{$title}}" />
 </div>
 <div id="cropimage-preview-wrapper" >
 <div id="previewWrap" ></div>
@@ -39,10 +44,10 @@ $desc
 
 </script>
 
-<form action="profile_photo/$resource" id="crop-image-form" method="post" />
-<input type='hidden' name='form_security_token' value='$form_security_token'>
+<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='profile' value='{{$profile}}'>
 <input type="hidden" name="cropfinal" value="1" />
 <input type="hidden" name="xstart" id="x1" />
 <input type="hidden" name="ystart" id="y1" />
@@ -52,7 +57,7 @@ $desc
 <input type="hidden" name="width"  id="width" />
 
 <div id="crop-image-submit-wrapper" >
-<input type="submit" name="submit" value="$done" />
+<input type="submit" name="submit" value="{{$done}}" />
 </div>
 
 </form>
diff --git a/view/tpl/crophead.tpl b/view/tpl/crophead.tpl
index 48f375426..d51b87d12 100644..100755
--- a/view/tpl/crophead.tpl
+++ b/view/tpl/crophead.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
       <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
       <script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
       <script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>
diff --git a/view/tpl/delegate.tpl b/view/tpl/delegate.tpl
index 9a7d2e18d..7aa85cf39 100644..100755
--- a/view/tpl/delegate.tpl
+++ b/view/tpl/delegate.tpl
@@ -1,57 +1,62 @@
-<h3>$header</h3>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$header}}</h3>
 
-<div id="delegate-desc" class="delegate-desc">$desc</div>
+<div id="delegate-desc" class="delegate-desc">{{$desc}}</div>
 
-{{ if $managers }}
-<h3>$head_managers</h3>
+{{if $managers}}
+<h3>{{$head_managers}}</h3>
 
-{{ for $managers as $x }}
+{{foreach $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)" />
+<img class="contact-block-img" src="{{$base}}/photo/thumb/{{$x.uid}}" title="{{$x.username}} ({{$x.nickname}})" />
 </a>
 </div>
 
-{{ endfor }}
+{{/foreach}}
 <div class="clear"></div>
 <hr />
-{{ endif }}
+{{/if}}
 
 
-<h3>$head_delegates</h3>
+<h3>{{$head_delegates}}</h3>
 
-{{ if $delegates }}
-{{ for $delegates as $x }}
+{{if $delegates}}
+{{foreach $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 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 }}
+{{/foreach}}
 <div class="clear"></div>
-{{ else }}
-$none
-{{ endif }}
+{{else}}
+{{$none}}
+{{/if}}
 <hr />
 
 
-<h3>$head_potentials</h3>
-{{ if $potentials }}
-{{ for $potentials as $x }}
+<h3>{{$head_potentials}}</h3>
+{{if $potentials}}
+{{foreach $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 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 }}
+{{/foreach}}
 <div class="clear"></div>
-{{ else }}
-$none
-{{ endif }}
+{{else}}
+{{$none}}
+{{/if}}
 <hr />
 
diff --git a/view/tpl/directory_header.tpl b/view/tpl/directory_header.tpl
index e1def851b..293e65be2 100644..100755
--- a/view/tpl/directory_header.tpl
+++ b/view/tpl/directory_header.tpl
@@ -1,14 +1,19 @@
-<h1>$dirlbl</h1>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$dirlbl}}</h1>
 
-{{ if $search }}
-<h4>$finddsc $safetxt</h4> 
-{{ endif }}
+{{if $search}}
+<h4>{{$finddsc}} {{$safetxt}}</h4> 
+{{/if}}
 
-{{for $entries as $entry}}
+{{foreach $entries as $entry}}
 
-{{ inc direntry.tpl }}{{ endinc }}
+{{include file="direntry.tpl"}}
 
-{{ endfor }}
+{{/foreach}}
 
 
 
diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl
index e860da41c..c1009efc7 100644..100755
--- a/view/tpl/direntry.tpl
+++ b/view/tpl/direntry.tpl
@@ -1,11 +1,16 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
-<div class="directory-item lframe" id="directory-item-$entry.id" >
-	<div class="contact-photo-wrapper" id="directory-photo-wrapper-$entry.id" > 
-		<div class="contact-photo" id="directory-photo-$entry.id" >
-			<a href="$entry.profile_link" class="directory-profile-link" id="directory-profile-link-$entry.id" ><img class="directory-photo-img" src="$entry.photo" alt="$entry.alttext" title="$entry.alttext" /></a>
+<div class="directory-item lframe" id="directory-item-{{$entry.id}}" >
+	<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$entry.id}}" > 
+		<div class="contact-photo" id="directory-photo-{{$entry.id}}" >
+			<a href="{{$entry.profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$entry.id}}" ><img class="directory-photo-img" src="{{$entry.photo}}" alt="{{$entry.alttext}}" title="{{$entry.alttext}}" /></a>
 		</div>
 	</div>
 
-	<div class="contact-name" id="directory-name-$entry.id">$entry.name</div>
-	<div class="contact-details">$entry.details</div>
+	<div class="contact-name" id="directory-name-{{$entry.id}}">{{$entry.name}}</div>
+	<div class="contact-details">{{$entry.details}}</div>
 </div>
diff --git a/view/tpl/display-head.tpl b/view/tpl/display-head.tpl
index 3d4e7e96a..7750b655e 100644..100755
--- a/view/tpl/display-head.tpl
+++ b/view/tpl/display-head.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script>
 $(document).ready(function() {
 	$(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
diff --git a/view/tpl/edpost_head.tpl b/view/tpl/edpost_head.tpl
index b83e606a0..2bf28002d 100644..100755
--- a/view/tpl/edpost_head.tpl
+++ b/view/tpl/edpost_head.tpl
@@ -1 +1,6 @@
-<h2>$title</h2>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h2>{{$title}}</h2>
diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl
index c6c1ea83f..18f7132db 100644..100755
--- a/view/tpl/email_notify_html.tpl
+++ b/view/tpl/email_notify_html.tpl
@@ -1,26 +1,31 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
 <html>
 <head>
-	<title>$banner</title>
+	<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:#ff0000; 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/r!.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 colspan="2" style="background:#ff0000; 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/r!.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>
+	<tr><td style="padding-top:22px;" colspan="2">{{$preamble}}</td></tr>
 
 
-	<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>
-	<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>
+	<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>
+	<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>
diff --git a/view/tpl/email_notify_text.tpl b/view/tpl/email_notify_text.tpl
index 018bb6078..e164f3023 100644..100755
--- a/view/tpl/email_notify_text.tpl
+++ b/view/tpl/email_notify_text.tpl
@@ -1,13 +1,18 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
-$preamble
+{{$preamble}}
 	
-$title
+{{$title}}
 
-$textversion
+{{$textversion}}
 				
-$tsitelink
-$titemlink
+{{$tsitelink}}
+{{$titemlink}}
 
-$thanks
-$site_admin
+{{$thanks}}
+{{$site_admin}}
 
diff --git a/view/tpl/event.tpl b/view/tpl/event.tpl
index f1150c158..76c9433fd 100644..100755
--- a/view/tpl/event.tpl
+++ b/view/tpl/event.tpl
@@ -1,10 +1,15 @@
-{{ for $events as $event }}
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{foreach $events as $event}}
 	<div class="event">
 	
-	{{ if $event.item.author.xchan_name }}<a href="$event.item.author.xchan_url" ><img src="$event.item.author.xchan_photo_s" height="32" width="32" />$event.item.author.xchan_name</a>{{ endif }}
-	$event.html
-	{{ if $event.item.plink }}<a href="$event.plink.0" title="$event.plink.1"  class="plink-event-link icon s22 remote-link"></a>{{ endif }}
-	{{ if $event.edit }}<a href="$event.edit.0" title="$event.edit.1" class="edit-event-link icon s22 pencil"></a>{{ endif }}
+	{{if $event.item.author.xchan_name}}<a href="{{$event.item.author.xchan_url}}" ><img src="{{$event.item.author.xchan_photo_s}}" height="32" width="32" />{{$event.item.author.xchan_name}}</a>{{/if}}
+	{{$event.html}}
+	{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}"  class="plink-event-link icon s22 remote-link"></a>{{/if}}
+	{{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link icon s22 pencil"></a>{{/if}}
 	</div>
 	<div class="clear"></div>
-{{ endfor }}
+{{/foreach}}
diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl
index c0502397d..96b7a3c2f 100644..100755
--- a/view/tpl/event_form.tpl
+++ b/view/tpl/event_form.tpl
@@ -1,49 +1,54 @@
-<h3>$title</h3>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$title}}</h3>
 
 <p>
-$desc
+{{$desc}}
 </p>
 
-<form action="$post" method="post" >
+<form action="{{$post}}" method="post" >
 
-<input type="hidden" name="event_id" value="$eid" />
-<input type="hidden" name="cid" value="$cid" />
-<input type="hidden" name="mid" value="$mid" />
+<input type="hidden" name="event_id" value="{{$eid}}" />
+<input type="hidden" name="cid" value="{{$cid}}" />
+<input type="hidden" name="mid" value="{{$mid}}" />
 
-<div id="event-start-text">$s_text</div>
-$s_dsel $s_tsel
+<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-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>
+<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>
+<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-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-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>
+<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>
+<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
+{{$acl}}
 
 <div class="clear"></div>
-<input id="event-submit" type="submit" name="submit" value="$submit" />
+<input id="event-submit" type="submit" name="submit" value="{{$submit}}" />
 </form>
 
 
diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl
index 45f07cf5d..6cbb98ae7 100644..100755
--- a/view/tpl/event_head.tpl
+++ b/view/tpl/event_head.tpl
@@ -1,11 +1,16 @@
-<link rel='stylesheet' type='text/css' href='$baseurl/library/fullcalendar/fullcalendar.css' />
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<link rel='stylesheet' type='text/css' href='{{$baseurl}}/library/fullcalendar/fullcalendar.css' />
 <script language="javascript" type="text/javascript"
-          src="$baseurl/library/fullcalendar/fullcalendar.min.js"></script>
+          src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script>
 
 <script>
 	function showEvent(eventid) {
 		$.get(
-			'$baseurl/events/?id='+eventid,
+			'{{$baseurl}}/events/?id='+eventid,
 			function(data){
 				$.fancybox(data);
 			}
@@ -14,7 +19,7 @@
 	
 	$(document).ready(function() {
 		$('#events-calendar').fullCalendar({
-			events: '$baseurl/events/json/',
+			events: '{{$baseurl}}/events/json/',
 			header: {
 				left: 'prev,next today',
 				center: 'title',
@@ -75,7 +80,7 @@
 
 
 <script language="javascript" type="text/javascript"
-          src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+          src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
 <script language="javascript" type="text/javascript">
 
 
@@ -97,7 +102,7 @@
 		force_p_newlines : false,
 		force_br_newlines : true,
 		forced_root_block : '',
-		content_css: "$baseurl/view/custom_tinymce.css",
+		content_css: "{{$baseurl}}/view/custom_tinymce.css",
 		theme_advanced_path : false,
 		setup : function(ed) {
 			ed.onInit.add(function(ed) {
diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl
index b0e182c56..5fa046f5a 100644..100755
--- a/view/tpl/events-js.tpl
+++ b/view/tpl/events-js.tpl
@@ -1,6 +1,11 @@
-$tabs
-<h2>$title</h2>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$tabs}}
+<h2>{{$title}}</h2>
 
-<div id="new-event-link"><a href="$new_event.0" >$new_event.1</a></div>
+<div id="new-event-link"><a href="{{$new_event.0}}" >{{$new_event.1}}</a></div>
 
 <div id="events-calendar"></div>
diff --git a/view/tpl/events_reminder.tpl b/view/tpl/events_reminder.tpl
index f641a5faf..d8e8ceb2a 100644..100755
--- a/view/tpl/events_reminder.tpl
+++ b/view/tpl/events_reminder.tpl
@@ -1,10 +1,15 @@
-{{ 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>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{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> <a href="events/$event.link">$event.title</a> $event.date </div>
-{{ endfor }}
+{{foreach $events as $event}}
+<div class="event-list" id="event-{{$event.id}}"></a> <a href="events/{{$event.link}}">{{$event.title}}</a> {{$event.date}} </div>
+{{/foreach}}
 </div>
-{{ endif }}
+{{/if}}
 
diff --git a/view/tpl/failed_updates.tpl b/view/tpl/failed_updates.tpl
index c6e4cb08e..8161ff2ef 100644..100755
--- a/view/tpl/failed_updates.tpl
+++ b/view/tpl/failed_updates.tpl
@@ -1,17 +1,22 @@
-<h2>$banner</h2>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h2>{{$banner}}</h2>
 
-<div id="failed_updates_desc">$desc</div>
+<div id="failed_updates_desc">{{$desc}}</div>
 
-{{ if $failed }}
-{{ for $failed as $f }}
+{{if $failed}}
+{{foreach $failed as $f}}
 
-<h4>$f</h4>
+<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>
+<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 }}
+{{/foreach}}
+{{/if}}
 
diff --git a/view/tpl/field.tpl b/view/tpl/field.tpl
index 35f5afd39..1bf36d84e 100644..100755
--- a/view/tpl/field.tpl
+++ b/view/tpl/field.tpl
@@ -1,4 +1,9 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
- {{ if $field.0==select }}
- {{ inc field_select.tpl }}{{ endinc }}
- {{ endif }}
+ {{if $field.0==select}}
+ {{include file="field_select.tpl"}}
+ {{/if}}
diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl
index 06bed38e7..da0d44ea6 100644..100755
--- a/view/tpl/field_acheckbox.tpl
+++ b/view/tpl/field_acheckbox.tpl
@@ -1,7 +1,12 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field acheckbox'>
-		<label for='id_$field.0'>$field.1</label>
-		<input type="checkbox" class="abook-edit-them" name='$field.0' id='them_id_$field.0' value="1" disabled="disabled" {{ if $field.2 }}checked="checked"{{ endif }} />
-		<input type="checkbox" class="abook-edit-me" name='$field.0' id='me_id_$field.0' value="$field.4" {{ if $field.3 }}checked="checked"{{ endif }} {{ if $field.5 }} disabled="disabled" {{ endif }}/>
-		<span class='field_abook_help'>$field.6</span>
+		<label for='id_{{$field.0}}'>{{$field.1}}</label>
+		<input type="checkbox" class="abook-edit-them" name='{{$field.0}}' id='them_id_{{$field.0}}' value="1" disabled="disabled" {{if $field.2}}checked="checked"{{/if}} />
+		<input type="checkbox" class="abook-edit-me" name='{{$field.0}}' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} {{if $field.5}} disabled="disabled" {{/if}}/>
+		<span class='field_abook_help'>{{$field.6}}</span>
 	</div>
diff --git a/view/tpl/field_checkbox.tpl b/view/tpl/field_checkbox.tpl
index afab29243..a4ec3dbba 100644..100755
--- a/view/tpl/field_checkbox.tpl
+++ b/view/tpl/field_checkbox.tpl
@@ -1,6 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field checkbox'>
-		<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>
+		<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"{{/if}}>
+		<span class='field_help'>{{$field.3}}</span>
 	</div>
diff --git a/view/tpl/field_combobox.tpl b/view/tpl/field_combobox.tpl
index a4dc8e571..d3cc75635 100644..100755
--- a/view/tpl/field_combobox.tpl
+++ b/view/tpl/field_combobox.tpl
@@ -1,18 +1,23 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<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> #}
+		<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}}" >
+		   {{foreach $field.4 as $opt=>$val}}<option value="{{$val}}">{{/foreach}}
+		</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 }}
+		<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>
+			{{foreach $field.4 as $opt=>$val}}<option value="{{$val}}">{{$val}}</option>{{/foreach}}
 		</select>
 		
-		<span class='field_help'>$field.3</span>
+		<span class='field_help'>{{$field.3}}</span>
 	</div>
 
diff --git a/view/tpl/field_custom.tpl b/view/tpl/field_custom.tpl
index be15d3f60..c2d73275c 100644..100755
--- a/view/tpl/field_custom.tpl
+++ b/view/tpl/field_custom.tpl
@@ -1,6 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field custom'>
-		<label for='$field.0'>$field.1</label>
-		$field.2
-		<span class='field_help'>$field.3</span>
+		<label for='{{$field.0}}'>{{$field.1}}</label>
+		{{$field.2}}
+		<span class='field_help'>{{$field.3}}</span>
 	</div>
diff --git a/view/tpl/field_input.tpl b/view/tpl/field_input.tpl
index 09417deca..696ebbad7 100644..100755
--- a/view/tpl/field_input.tpl
+++ b/view/tpl/field_input.tpl
@@ -1,7 +1,12 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field input'>
-		<label for='id_$field.0' id='label_$field.0'>$field.1</label>
-		<input name='$field.0' id='id_$field.0' value="$field.2">
-		<span id='help_$field.0' class='field_help'>$field.3</span>
-		<div id='end_$field.0' class='field_end'></div>
+		<label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label>
+		<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
+		<span id='help_{{$field.0}}' class='field_help'>{{$field.3}}</span>
+		<div id='end_{{$field.0}}' class='field_end'></div>
 	</div>
diff --git a/view/tpl/field_intcheckbox.tpl b/view/tpl/field_intcheckbox.tpl
index 47a513a55..54967feab 100644..100755
--- a/view/tpl/field_intcheckbox.tpl
+++ b/view/tpl/field_intcheckbox.tpl
@@ -1,6 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<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>
+		<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"{{/if}}>
+		<span class='field_help'>{{$field.4}}</span>
 	</div>
diff --git a/view/tpl/field_password.tpl b/view/tpl/field_password.tpl
index e604b7f5d..5889d2e9c 100644..100755
--- a/view/tpl/field_password.tpl
+++ b/view/tpl/field_password.tpl
@@ -1,6 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<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>
+		<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/tpl/field_radio.tpl b/view/tpl/field_radio.tpl
index a915e8eb3..1d7b56ec6 100644..100755
--- a/view/tpl/field_radio.tpl
+++ b/view/tpl/field_radio.tpl
@@ -1,6 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<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>
+		<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"{{/if}}>
+		<span class='field_help'>{{$field.3}}</span>
 	</div>
diff --git a/view/tpl/field_richtext.tpl b/view/tpl/field_richtext.tpl
index c124ee000..38992f0f8 100644..100755
--- a/view/tpl/field_richtext.tpl
+++ b/view/tpl/field_richtext.tpl
@@ -1,6 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<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>
+		<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/tpl/field_select.tpl b/view/tpl/field_select.tpl
index d79eb48e0..2a4117a70 100644..100755
--- a/view/tpl/field_select.tpl
+++ b/view/tpl/field_select.tpl
@@ -1,8 +1,13 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field select'>
-		<label for='id_$field.0'>$field.1</label>
-		<select name='$field.0' id='id_$field.0'>
-			{{ for $field.4 as $opt=>$val }}<option value="$opt" {{ if $opt==$field.2 }}selected="selected"{{ endif }}>$val</option>{{ endfor }}
+		<label for='id_{{$field.0}}'>{{$field.1}}</label>
+		<select name='{{$field.0}}' id='id_{{$field.0}}'>
+			{{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
 		</select>
-		<span class='field_help'>$field.3</span>
+		<span class='field_help'>{{$field.3}}</span>
 	</div>
diff --git a/view/tpl/field_select_raw.tpl b/view/tpl/field_select_raw.tpl
index 765b285d9..50e34985f 100644..100755
--- a/view/tpl/field_select_raw.tpl
+++ b/view/tpl/field_select_raw.tpl
@@ -1,8 +1,13 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<div class='field select'>
-		<label for='id_$field.0'>$field.1</label>
-		<select name='$field.0' id='id_$field.0'>
-			$field.4
+		<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>
+		<span class='field_help'>{{$field.3}}</span>
 	</div>
diff --git a/view/tpl/field_textarea.tpl b/view/tpl/field_textarea.tpl
index 2425cdd3b..5d71999d4 100644..100755
--- a/view/tpl/field_textarea.tpl
+++ b/view/tpl/field_textarea.tpl
@@ -1,6 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	
 	<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>
+		<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/tpl/field_themeselect.tpl b/view/tpl/field_themeselect.tpl
index 1b3ede36c..be24ff2c6 100644..100755
--- a/view/tpl/field_themeselect.tpl
+++ b/view/tpl/field_themeselect.tpl
@@ -1,9 +1,14 @@
-	<script>$(function(){ previewTheme($("#id_$field.0")[0]); });</script>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	<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=='preview' }}onchange="previewTheme(this);"{{ endif }} >
-			{{ for $field.4 as $opt=>$val }}<option value="$opt" {{ if $opt==$field.2 }}selected="selected"{{ endif }}>$val</option>{{ endfor }}
+		<label for='id_{{$field.0}}'>{{$field.1}}</label>
+		<select name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.5=='preview'}}onchange="previewTheme(this);"{{/if}} >
+			{{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
 		</select>
-		<span class='field_help'>$field.3</span>
+		<span class='field_help'>{{$field.3}}</span>
 		<div id="theme-preview"></div>
 	</div>
diff --git a/view/tpl/field_yesno.tpl b/view/tpl/field_yesno.tpl
index 5d4a775c2..e982c2f05 100644..100755
--- a/view/tpl/field_yesno.tpl
+++ b/view/tpl/field_yesno.tpl
@@ -1,13 +1,18 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 	<div class='field yesno'>
-		<label for='id_$field.0'>$field.1</label>
-		<div class='onoff' id="id_$field.0_onoff">
-			<input  type="hidden" name='$field.0' id='id_$field.0' value="$field.2">
+		<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 }}
+				{{if $field.4}}{{$field.4.0}}{{else}}OFF{{/if}}
 			</a>
 			<a href="#" class='on'>
-				{{ if $field.4 }}$field.4.1{{ else }}ON{{ endif }}
+				{{if $field.4}}{{$field.4.1}}{{else}}ON{{/if}}
 			</a>
 		</div>
-		<span class='field_help'>$field.3</span>
+		<span class='field_help'>{{$field.3}}</span>
 	</div>
diff --git a/view/tpl/fileas_widget.tpl b/view/tpl/fileas_widget.tpl
index 54fba7435..f03f169a2 100644..100755
--- a/view/tpl/fileas_widget.tpl
+++ b/view/tpl/fileas_widget.tpl
@@ -1,12 +1,17 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="fileas-sidebar" class="widget">
-	<h3>$title</h3>
-	<div id="nets-desc">$desc</div>
+	<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 }}
+		<li class="tool"><a href="{{$base}}" class="fileas-link fileas-all{{if $sel_all}} fileas-selected{{/if}}">{{$all}}</a></li>
+		{{foreach $terms as $term}}
+			<li class="tool"><a href="{{$base}}?f=&file={{$term.name}}" class="fileas-link{{if $term.selected}} fileas-selected{{/if}}">{{$term.name}}</a></li>
+		{{/foreach}}
 	</ul>
 	
 </div>
diff --git a/view/tpl/filebrowser.tpl b/view/tpl/filebrowser.tpl
index 7db31d716..b408ca687 100644..100755
--- a/view/tpl/filebrowser.tpl
+++ b/view/tpl/filebrowser.tpl
@@ -1,7 +1,12 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <!DOCTYPE html>
 <html>
 	<head>
-	<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_popup.js"></script>
+	<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;}
@@ -60,24 +65,24 @@
 
 		<div id="general_panel" class="panel current">
 			<div class="filebrowser path">
-				{{ for $path as $p }}<a href="$p.0">$p.1</a>{{ endfor }}
+				{{foreach $path as $p}}<a href="{{$p.0}}">{{$p.1}}</a>{{/foreach}}
 			</div>
 			<div class="filebrowser folders">
 				<ul>
-					{{ for $folders as $f }}<li><a href="$f.0/">$f.1</a></li>{{ endfor }}
+					{{foreach $folders as $f}}<li><a href="{{$f.0}}/">{{$f.1}}</a></li>{{/foreach}}
 				</ul>
 			</div>
-			<div class="filebrowser files $type">
+			<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 }}
+				{{foreach $files as $f}}
+					<li><a href="#" onclick="FileBrowserDialogue.mySubmit('{{$f.0}}'); return false;"><img src="{{$f.2}}"><span>{{$f.1}}</span></a></li>
+				{{/foreach}}
 				</ul>
 			</div>
 		</div>
 	</div>
 	<div class="mceActionPanel">
-		<input type="button" id="cancel" name="cancel" value="$cancel" onclick="tinyMCEPopup.close();" />
+		<input type="button" id="cancel" name="cancel" value="{{$cancel}}" onclick="tinyMCEPopup.close();" />
 	</div>	
 	</body>
 	
diff --git a/view/tpl/filer_dialog.tpl b/view/tpl/filer_dialog.tpl
index ae837d6b7..f17a06766 100644..100755
--- a/view/tpl/filer_dialog.tpl
+++ b/view/tpl/filer_dialog.tpl
@@ -1,4 +1,9 @@
-{{ inc field_combobox.tpl }}{{ endinc }}
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{include file="field_combobox.tpl"}}
 <div class="settings-submit-wrapper" >
-	<input id="filer_save" type="button" class="settings-submit" value="$submit" />
+	<input id="filer_save" type="button" class="settings-submit" value="{{$submit}}" />
 </div>
diff --git a/view/tpl/follow.tpl b/view/tpl/follow.tpl
index 259e74a93..2c3b451b3 100644..100755
--- a/view/tpl/follow.tpl
+++ b/view/tpl/follow.tpl
@@ -1,8 +1,13 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="follow-sidebar" class="widget">
-	<h3>$connect</h3>
-	<div id="connect-desc">$desc</div>
+	<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" />
+		<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/tpl/generic_links_widget.tpl b/view/tpl/generic_links_widget.tpl
index f3404f783..c12273c7b 100644..100755
--- a/view/tpl/generic_links_widget.tpl
+++ b/view/tpl/generic_links_widget.tpl
@@ -1,11 +1,16 @@
-<div class="widget{{ if $class }} $class{{ endif }}">
-	{{if $title}}<h3>$title</h3>{{endif}}
-	{{if $desc}}<div class="desc">$desc</div>{{endif}}
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="widget{{if $class}} {{$class}}{{/if}}">
+	{{if $title}}<h3>{{$title}}</h3>{{/if}}
+	{{if $desc}}<div class="desc">{{$desc}}</div>{{/if}}
 	
 	<ul>
-		{{ for $items as $item }}
-			<li class="tool"><a href="$item.url" class="{{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
-		{{ endfor }}
+		{{foreach $items as $item}}
+			<li class="tool"><a href="{{$item.url}}" class="{{if $item.selected}}selected{{/if}}">{{$item.label}}</a></li>
+		{{/foreach}}
 	</ul>
 	
 </div>
diff --git a/view/tpl/group_drop.tpl b/view/tpl/group_drop.tpl
index 2cbebbb8e..84d380e30 100644..100755
--- a/view/tpl/group_drop.tpl
+++ b/view/tpl/group_drop.tpl
@@ -1,7 +1,12 @@
-<div class="group-delete-wrapper button" id="group-delete-wrapper-$id" >
-	<a href="group/drop/$id?t=$form_security_token" 
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="group-delete-wrapper button" id="group-delete-wrapper-{{$id}}" >
+	<a href="group/drop/{{$id}}?t={{$form_security_token}}" 
 		onclick="return confirmDelete();" 
-		id="group-delete-icon-$id" 
+		id="group-delete-icon-{{$id}}" 
 		class="icon drophide group-delete-icon" 
 		onmouseover="imgbright(this);" 
 		onmouseout="imgdull(this);" ></a>
diff --git a/view/tpl/group_edit.tpl b/view/tpl/group_edit.tpl
index 2fa2b1a55..b7b14eba3 100644..100755
--- a/view/tpl/group_edit.tpl
+++ b/view/tpl/group_edit.tpl
@@ -1,23 +1,28 @@
-<h2>$title</h2>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<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'>
+	<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 }}
+		{{include file="field_input.tpl" field=$gname}}
+		{{if $drop}}{{$drop}}{{/if}}
 		<div id="group-edit-submit-wrapper" >
-			<input type="submit" name="submit" value="$submit" >
+			<input type="submit" name="submit" value="{{$submit}}" >
 		</div>
 		<div id="group-edit-select-end" ></div>
 	</form>
 </div>
 
 
-{{ if $groupeditor }}
+{{if $groupeditor}}
 	<div id="group-update-wrapper">
-		{{ inc groupeditor.tpl }}{{ endinc }}
+		{{include file="groupeditor.tpl"}}
 	</div>
-{{ endif }}
-{{ if $desc }}<div id="group-edit-desc">$desc</div>{{ endif }}
+{{/if}}
+{{if $desc}}<div id="group-edit-desc">{{$desc}}</div>{{/if}}
diff --git a/view/tpl/group_selection.tpl b/view/tpl/group_selection.tpl
index 3809cb994..f16bb5159 100644..100755
--- a/view/tpl/group_selection.tpl
+++ b/view/tpl/group_selection.tpl
@@ -1,8 +1,13 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="field custom">
-<label for="group-selection" id="group-selection-lbl">$label</label>
+<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 }}
+{{foreach $groups as $group}}
+<option value="{{$group.id}}" {{if $group.selected}}selected="selected"{{/if}} >{{$group.name}}</option>
+{{/foreach}}
 </select>
 </div>
diff --git a/view/tpl/group_side.tpl b/view/tpl/group_side.tpl
index ebb194d9c..b6532fb6d 100644..100755
--- a/view/tpl/group_side.tpl
+++ b/view/tpl/group_side.tpl
@@ -1,33 +1,38 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="widget" id="group-sidebar">
-<h3>$title</h3>
+<h3>{{$title}}</h3>
 
 <div id="sidebar-group-list">
 	<ul id="sidebar-group-ul">
-		{{ for $groups as $group }}
+		{{foreach $groups as $group}}
 			<li class="sidebar-group-li">
-				{{ if $group.cid }}
+				{{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 }}
+						class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action" 
+						onclick="contactgroupChangeMember('{{$group.id}}','{{$group.cid}}');return true;"
+						{{if $group.ismember}}checked="checked"{{/if}}
 					/>
-				{{ 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>
+				{{/if}}			
+				{{if $group.edit}}
+					<a class="groupsideedit" href="{{$group.edit.href}}" title="{{$edittext}}"><span id="edit-sidebar-group-element-{{$group.id}}" class="group-edit-icon iconspacer small-pencil"></span></a>
+				{{/if}}
+				<a id="sidebar-group-element-{{$group.id}}" class="sidebar-group-element {{if $group.selected}}group-selected{{/if}}" href="{{$group.href}}">{{$group.text}}</a>
 			</li>
-		{{ endfor }}
+		{{/foreach}}
 	</ul>
 	</div>
   <div id="sidebar-new-group">
-  <a href="group/new">$createtext</a>
+  <a href="group/new">{{$createtext}}</a>
   </div>
-  {{ if $ungrouped }}
+  {{if $ungrouped}}
   <div id="sidebar-ungrouped">
-  <a href="nogroup">$ungrouped</a>
+  <a href="nogroup">{{$ungrouped}}</a>
   </div>
-  {{ endif }}
+  {{/if}}
 </div>
 
 
diff --git a/view/tpl/groupeditor.tpl b/view/tpl/groupeditor.tpl
index 755985eb3..4fad30d5a 100644..100755
--- a/view/tpl/groupeditor.tpl
+++ b/view/tpl/groupeditor.tpl
@@ -1,16 +1,21 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="group">
-<h3>$groupeditor.label_members</h3>
+<h3>{{$groupeditor.label_members}}</h3>
 <div id="group-members" class="contact_list">
-{{ for $groupeditor.members as $c}} $c {{ endfor }}
+{{foreach $groupeditor.members as $c}} {{$c}} {{/foreach}}
 </div>
 <div id="group-members-end"></div>
 <hr id="group-separator" />
 </div>
 
 <div id="contacts">
-<h3>$groupeditor.label_contacts</h3>
+<h3>{{$groupeditor.label_contacts}}</h3>
 <div id="group-all-contacts" class="contact_list">
-{{ for $groupeditor.contacts as $m}} $m {{ endfor }}
+{{foreach $groupeditor.contacts as $m}} {{$m}} {{/foreach}}
 </div>
 <div id="group-all-contacts-end"></div>
 </div>
diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl
index 704809f38..d6a06775e 100644..100755
--- a/view/tpl/head.tpl
+++ b/view/tpl/head.tpl
@@ -1,28 +1,33 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<base href="$baseurl/" />
-<meta name="generator" content="$generator" />
+<base href="{{$baseurl}}/" />
+<meta name="generator" content="{{$generator}}" />
 
 <!--[if IE]>
 <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
 <![endif]-->
 
-$head_css
+{{$head_css}}
 
-$js_strings
+{{$js_strings}}
 
-$head_js
+{{$head_js}}
 
-<link rel="shortcut icon" href="$baseurl/images/r!.png" />
+<link rel="shortcut icon" href="{{$baseurl}}/images/r!.png" />
 <link rel="search"
-         href="$baseurl/opensearch" 
+         href="{{$baseurl}}/opensearch" 
          type="application/opensearchdescription+xml" 
          title="Search in Red" />
 
 
 <script>
 
-	var updateInterval = $update_interval;
-	var localUser = {{ if $local_user }}$local_user{{ else }}false{{ endif }};
+	var updateInterval = {{$update_interval}};
+	var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}};
 
 </script>
 
diff --git a/view/tpl/hide_comments.tpl b/view/tpl/hide_comments.tpl
index 55ee9dd7b..50a354122 100644..100755
--- a/view/tpl/hide_comments.tpl
+++ b/view/tpl/hide_comments.tpl
@@ -1,4 +1,9 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <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>
+<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;">
+<div id="collapsed-comments-{{$id}}" class="collapsed-comments" style="display: {{$display}};">
diff --git a/view/tpl/install.tpl b/view/tpl/install.tpl
index b3a5f46ff..cfb90e61f 100644..100755
--- a/view/tpl/install.tpl
+++ b/view/tpl/install.tpl
@@ -1,10 +1,15 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
-<h1>$title</h1>
-<h2>$pass</h2>
+<h1>{{$title}}</h1>
+<h2>{{$pass}}</h2>
 
 
-{{ if $status }}
-<h3 class="error-message">$status</h3>
-{{ endif }}
+{{if $status}}
+<h3 class="error-message">{{$status}}</h3>
+{{/if}}
 
-$text
+{{$text}}
diff --git a/view/tpl/install_checks.tpl b/view/tpl/install_checks.tpl
index 76287c4a3..9d5ce0eeb 100644..100755
--- a/view/tpl/install_checks.tpl
+++ b/view/tpl/install_checks.tpl
@@ -1,24 +1,29 @@
-<h1>$title</h1>
-<h2>$pass</h2>
-<form  action="$baseurl/index.php?q=setup" method="post">
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$title}}</h1>
+<h2>{{$pass}}</h2>
+<form  action="{{$baseurl}}/index.php?q=setup" 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 }}
+{{foreach $checks as $check}}
+	<tr><td>{{$check.title}} </td><td><span class="icon s22 {{if $check.status}}on{{else}}{{if $check.required}}off{{else}}yellow{{/if}}{{/if}}"></td><td>{{if $check.required}}(required){{/if}}</td></tr>
+	{{if $check.help}}
+	<tr><td colspan="3"><blockquote>{{$check.help}}</blockquote></td></tr>
+	{{/if}}
+{{/foreach}}
 </table>
 
-{{ if $phpath }}
-	<input type="hidden" name="phpath" value="$phpath">
-{{ endif }}
+{{if $phpath}}
+	<input type="hidden" name="phpath" value="{{$phpath}}">
+{{/if}}
 
-{{ if $passed }}
+{{if $passed}}
 	<input type="hidden" name="pass" value="2">
-	<input type="submit" value="$next">
-{{ else }}
+	<input type="submit" value="{{$next}}">
+{{else}}
 	<input type="hidden" name="pass" value="1">
-	<input type="submit" value="$reload">
-{{ endif }}
+	<input type="submit" value="{{$reload}}">
+{{/if}}
 </form>
diff --git a/view/tpl/install_db.tpl b/view/tpl/install_db.tpl
index dd8ba1302..fe8aee85b 100644..100755
--- a/view/tpl/install_db.tpl
+++ b/view/tpl/install_db.tpl
@@ -1,30 +1,35 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
-<h1>$title</h1>
-<h2>$pass</h2>
+<h1>{{$title}}</h1>
+<h2>{{$pass}}</h2>
 
 
 <p>
-$info_01<br>
-$info_02<br>
-$info_03
+{{$info_01}}<br>
+{{$info_02}}<br>
+{{$info_03}}
 </p>
 
-{{ if $status }}
-<h3 class="error-message">$status</h3>
-{{ endif }}
+{{if $status}}
+<h3 class="error-message">{{$status}}</h3>
+{{/if}}
 
-<form id="install-form" action="$baseurl/setup" method="post">
+<form id="install-form" action="{{$baseurl}}/setup" method="post">
 
-<input type="hidden" name="phpath" value="$phpath" />
+<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}}
+{{include file="field_input.tpl" field=$dbhost}}
+{{include file="field_input.tpl" field=$dbuser}}
+{{include file="field_password.tpl" field=$dbpass}}
+{{include file="field_input.tpl" field=$dbdata}}
 
 
-<input id="install-submit" type="submit" name="submit" value="$submit" /> 
+<input id="install-submit" type="submit" name="submit" value="{{$submit}}" /> 
 
 </form>
 
diff --git a/view/tpl/install_settings.tpl b/view/tpl/install_settings.tpl
index ba39b99c5..f91122737 100644..100755
--- a/view/tpl/install_settings.tpl
+++ b/view/tpl/install_settings.tpl
@@ -1,27 +1,32 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
-<h1>$title</h1>
-<h2>$pass</h2>
+<h1>{{$title}}</h1>
+<h2>{{$pass}}</h2>
 
 
-{{ if $status }}
-<h3 class="error-message">$status</h3>
-{{ endif }}
+{{if $status}}
+<h3 class="error-message">{{$status}}</h3>
+{{/if}}
 
-<form id="install-form" action="$baseurl/setup" method="post">
+<form id="install-form" action="{{$baseurl}}/setup" 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="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}}
-{{ inc field_input.tpl with $field=$siteurl }}{{endinc}}
+{{include file="field_input.tpl" field=$adminmail}}
+{{include file="field_input.tpl" field=$siteurl}}
 
-$timezone
+{{$timezone}}
 
-<input id="install-submit" type="submit" name="submit" value="$submit" /> 
+<input id="install-submit" type="submit" name="submit" value="{{$submit}}" /> 
 
 </form>
 
diff --git a/view/tpl/intros.tpl b/view/tpl/intros.tpl
index 6d1f1baa0..4fd27d370 100644..100755
--- a/view/tpl/intros.tpl
+++ b/view/tpl/intros.tpl
@@ -1,18 +1,23 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
-<div class="intro-wrapper" id="intro-$contact_id" >
+<div class="intro-wrapper" id="intro-{{$contact_id}}" >
 
-<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-wrapper-end" id="intro-wrapper-end-$contact_id"></div>
+<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-wrapper-end" id="intro-wrapper-end-{{$contact_id}}"></div>
 <form class="intro-form" action="intro" method="post">
-<input class="intro-submit-ignore" type="submit" name="submit" value="$ignore" />
-<input class="intro-submit-block" type="submit" name="submit" value="$block" />
-<input class="intro-submit-discard" type="submit" name="submit" value="$discard" />
-{{inc field_checkbox.tpl with $field=$hidden }}{{endinc}}
-{# {{ inc field_checkbox.tpl with $field=$activity }}{{endinc}} #}
-<input type="hidden" name="contact_id" value="$contact_id" >
+<input class="intro-submit-ignore" type="submit" name="submit" value="{{$ignore}}" />
+<input class="intro-submit-block" type="submit" name="submit" value="{{$block}}" />
+<input class="intro-submit-discard" type="submit" name="submit" value="{{$discard}}" />
+{{include file="field_checkbox.tpl" field=$hidden}}
+{{* {{include file="field_checkbox.tpl" field=$activity}} *}}
+<input type="hidden" name="contact_id" value="{{$contact_id}}" >
 
-<input class="intro-submit-approve" type="submit" name="submit" value="$approve" />
+<input class="intro-submit-approve" type="submit" name="submit" value="{{$approve}}" />
 </form>
 </div>
 <div class="intro-end"></div>
diff --git a/view/tpl/intros_header.tpl b/view/tpl/intros_header.tpl
index 17afd0cbd..2dbf065d7 100644..100755
--- a/view/tpl/intros_header.tpl
+++ b/view/tpl/intros_header.tpl
@@ -1 +1,6 @@
-<h3>$title</h3>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$title}}</h3>
diff --git a/view/tpl/invite.tpl b/view/tpl/invite.tpl
index e00d27d4a..e699f1f0e 100644..100755
--- a/view/tpl/invite.tpl
+++ b/view/tpl/invite.tpl
@@ -1,13 +1,18 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <form action="invite" method="post" id="invite-form" >
 
-<input type='hidden' name='form_security_token' value='$form_security_token'>
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
 <div id="invite-wrapper">
 
-<h3>$invite</h3>
+<h3>{{$invite}}</h3>
 
 <div id="invite-recipient-text">
-$addr_text
+{{$addr_text}}
 </div>
 
 <div id="invite-recipient-textarea">
@@ -15,15 +20,15 @@ $addr_text
 </div>
 
 <div id="invite-message-text">
-$msg_text
+{{$msg_text}}
 </div>
 
 <div id="invite-message-textarea">
-<textarea id="invite-message" name="message" rows="10" cols="72" >$default_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" />
+<input type="submit" name="submit" value="{{$submit}}" />
 </div>
 
 </div>
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index 8d19ab317..ae0ccc8e8 100644..100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -1,9 +1,14 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script language="javascript" type="text/javascript">
 
 var editor=false;
 var textlen = 0;
-var plaintext = '$editselect';
+var plaintext = '{{$editselect}}';
 
 function initEditor(cb){
 	if (editor==false){
@@ -24,7 +29,7 @@ function initEditor(cb){
 		tinyMCE.init({
 			theme : "advanced",
 			mode : "specific_textareas",
-			editor_selector: $editselect,
+			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",
@@ -42,7 +47,7 @@ function initEditor(cb){
 			force_br_newlines : true,
 			forced_root_block : '',
 			convert_urls: false,
-			content_css: "$baseurl/view/custom_tinymce.css",
+			content_css: "{{$baseurl}}/view/custom_tinymce.css",
 			theme_advanced_path : false,
 			file_browser_callback : "fcFileBrowser",
 			setup : function(ed) {
@@ -104,9 +109,9 @@ function enableOnUser(){
 }
 
 </script>
-<script type="text/javascript" src="$baseurl/js/ajaxupload.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js" ></script>
 <script>
-	var ispublic = '$ispublic';
+	var ispublic = '{{$ispublic}}';
 
 	$(document).ready(function() {
 		
@@ -116,7 +121,7 @@ function enableOnUser(){
 
 		var uploader = new window.AjaxUpload(
 			'wall-image-upload',
-			{ action: '$baseurl/wall_upload/$nickname',
+			{ action: '{{$baseurl}}/wall_upload/{{$nickname}}',
 				name: 'userfile',
 				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
 				onComplete: function(file,response) {
@@ -127,7 +132,7 @@ function enableOnUser(){
 		);
 		var file_uploader = new window.AjaxUpload(
 			'wall-file-upload',
-			{ action: '$baseurl/wall_attach/$nickname',
+			{ action: '{{$baseurl}}/wall_attach/{{$nickname}}',
 				name: 'userfile',
 				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
 				onComplete: function(file,response) {
@@ -159,11 +164,11 @@ function enableOnUser(){
 	}
 
 	function jotGetLink() {
-		reply = prompt("$linkurl");
+		reply = prompt("{{$linkurl}}");
 		if(reply && reply.length) {
 			reply = bin2hex(reply);
 			$('#profile-rotator').show();
-			$.get('$baseurl/parse_url?binurl=' + reply, function(data) {
+			$.get('{{$baseurl}}/parse_url?binurl=' + reply, function(data) {
 				addeditortext(data);
 				$('#profile-rotator').hide();
 			});
@@ -171,14 +176,14 @@ function enableOnUser(){
 	}
 
 	function jotVideoURL() {
-		reply = prompt("$vidurl");
+		reply = prompt("{{$vidurl}}");
 		if(reply && reply.length) {
 			addeditortext('[video]' + reply + '[/video]');
 		}
 	}
 
 	function jotAudioURL() {
-		reply = prompt("$audurl");
+		reply = prompt("{{$audurl}}");
 		if(reply && reply.length) {
 			addeditortext('[audio]' + reply + '[/audio]');
 		}
@@ -186,7 +191,7 @@ function enableOnUser(){
 
 
 	function jotGetLocation() {
-		reply = prompt("$whereareu", $('#jot-location').val());
+		reply = prompt("{{$whereareu}}", $('#jot-location').val());
 		if(reply && reply.length) {
 			$('#jot-location').val(reply);
 		}
@@ -196,7 +201,7 @@ function enableOnUser(){
 		if ($('#jot-popup').length != 0) $('#jot-popup').show();
 
 		$('#like-rotator-' + id).show();
-		$.get('$baseurl/share/' + id, function(data) {
+		$.get('{{$baseurl}}/share/' + id, function(data) {
 			if (!editor) $("#profile-jot-text").val("");
 			initEditor(function(){
 				addeditortext(data);
@@ -220,7 +225,7 @@ function enableOnUser(){
 		if(reply && reply.length) {
 			reply = bin2hex(reply);
 			$('#profile-rotator').show();
-			$.get('$baseurl/parse_url?binurl=' + reply, function(data) {
+			$.get('{{$baseurl}}/parse_url?binurl=' + reply, function(data) {
 				if (!editor) $("#profile-jot-text").val("");
 				initEditor(function(){
 					addeditortext(data);
@@ -231,7 +236,7 @@ function enableOnUser(){
 	}
 
 	function itemTag(id) {
-		reply = prompt("$term");
+		reply = prompt("{{$term}}");
 		if(reply && reply.length) {
 			reply = reply.replace('#','');
 			if(reply.length) {
@@ -239,7 +244,7 @@ function enableOnUser(){
 				commentBusy = true;
 				$('body').css('cursor', 'wait');
 
-				$.get('$baseurl/tagger/' + id + '?term=' + reply);
+				$.get('{{$baseurl}}/tagger/' + id + '?term=' + reply);
 				if(timer) clearTimeout(timer);
 				timer = setTimeout(NavUpdate,3000);
 				liking = 1;
@@ -266,7 +271,7 @@ function enableOnUser(){
 				if(reply && reply.length) {
 					commentBusy = true;
 					$('body').css('cursor', 'wait');
-					$.get('$baseurl/filer/' + id + '?term=' + reply, NavUpdate);
+					$.get('{{$baseurl}}/filer/' + id + '?term=' + reply, NavUpdate);
 //					if(timer) clearTimeout(timer);
 //					timer = setTimeout(NavUpdate,3000);
 					liking = 1;
@@ -294,7 +299,7 @@ function enableOnUser(){
 			tinyMCE.execCommand('mceInsertRawHTML',false,data);
 	}	
 
-	$geotag
+	{{$geotag}}
 
 </script>
 
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index a50d40eca..4f52cff20 100644..100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -1,80 +1,85 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div id="profile-jot-wrapper" >
 
-	<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" />
+	<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="webpage" value="$webpage" />
+		<input type="hidden" name="post_id" value="{{$post_id}}" />
+		<input type="hidden" name="webpage" value="{{$webpage}}" />
 		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div>
-		{{ if $catsenabled }}
-		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
-		{{ endif }}
-		{{ if $webpage }}
-		<div id="jot-pagetitle-wrap"><input name="pagetitle" id="jot-pagetitle" type="text" placeholder="$placeholdpagetitle" value="$pagetitle" class="jothidden" style="display:none" /></div>
-		{{ endif }}
+		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none"></div>
+		{{if $catsenabled}}
+		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" /></div>
+		{{/if}}
+		{{if $webpage}}
+		<div id="jot-pagetitle-wrap"><input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}" class="jothidden" style="display:none" /></div>
+		{{/if}}
 		<div id="jot-text-wrap">
-		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
+		<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}}{{/if}}</textarea>
 		</div>
 
 <div id="profile-jot-submit-wrapper" class="jothidden">
-	<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
+	<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 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 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}};" 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 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 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 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>
+		<a id="profile-nolocation" class="icon noglobe" title="{{$noloc}}" onclick="jotClearLocation();return false;"></a>
 	</div> 
 
-	{{ if $showacl }}
-	<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
+	{{if $showacl}}
+	<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>
-	{{ endif }}
+	{{/if}}
 
-	{{ if $preview }}<span onclick="preview_post();" id="jot-preview-link" class="fakelink">$preview</span>{{ endif }}
+	{{if $preview}}<span onclick="preview_post();" id="jot-preview-link" class="fakelink">{{$preview}}</span>{{/if}}
 
 
 	<div id="profile-jot-perms-end"></div>
 
 
 	<div id="profile-jot-plugin-wrapper">
-	$jotplugins
+	{{$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 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
+			{{$acl}}
 			<hr style="clear:both"/>
-			$jotnets
+			{{$jotnets}}
 		</div>
 	</div>
 
@@ -84,4 +89,4 @@
 <div id="profile-jot-end"></div>
 </form>
 </div>
-		{{ if $content }}<script>initEditor();</script>{{ endif }}
+		{{if $content}}<script>initEditor();</script>{{/if}}
diff --git a/view/tpl/jot_geotag.tpl b/view/tpl/jot_geotag.tpl
index b0f71e73b..1ed2367aa 100644..100755
--- a/view/tpl/jot_geotag.tpl
+++ b/view/tpl/jot_geotag.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 	if(navigator.geolocation) {
 		navigator.geolocation.getCurrentPosition(function(position) {
diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl
index babb1b219..34337e5bb 100644..100755
--- a/view/tpl/js_strings.tpl
+++ b/view/tpl/js_strings.tpl
@@ -1,33 +1,38 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <script>
 
 	var aStr = {
 
-		'delitem'   : '$delitem',
-		'comment'   : '$comment',
-		'showmore'  : '$showmore',
-		'showfewer' : '$showfewer',
-		'pwshort'   : '$pwshort',
-		'pwnomatch' : '$pwnomatch',
-		'everybody' : '$everybody',
+		'delitem'   : '{{$delitem}}',
+		'comment'   : '{{$comment}}',
+		'showmore'  : '{{$showmore}}',
+		'showfewer' : '{{$showfewer}}',
+		'pwshort'   : '{{$pwshort}}',
+		'pwnomatch' : '{{$pwnomatch}}',
+		'everybody' : '{{$everybody}}',
 
-		't01' :  $t01,
-		't02' :  $t02,
-		't03' : '$t03',
-		't04' : '$t04',
-		't05' : '$t05',
-		't06' : '$t06',
-		't07' : '$t07',
-		't08' : '$t08',
-		't09' : '$t09',
-		't10' : '$t10',
-		't11' : '$t11',
-		't12' : '$t12',
-		't13' : '$t13',
-		't14' : '$t14',
-		't15' : '$t15',
-		't16' : '$t16',
-		't17' : '$t17',
+		't01' :  {{$t01}},
+		't02' :  {{$t02}},
+		't03' : '{{$t03}}',
+		't04' : '{{$t04}}',
+		't05' : '{{$t05}}',
+		't06' : '{{$t06}}',
+		't07' : '{{$t07}}',
+		't08' : '{{$t08}}',
+		't09' : '{{$t09}}',
+		't10' : '{{$t10}}',
+		't11' : '{{$t11}}',
+		't12' : '{{$t12}}',
+		't13' : '{{$t13}}',
+		't14' : '{{$t14}}',
+		't15' : '{{$t15}}',
+		't16' : '{{$t16}}',
+		't17' : '{{$t17}}',
 	};
 
 </script>
diff --git a/view/tpl/lang_selector.tpl b/view/tpl/lang_selector.tpl
index e777a0a86..a1aee8277 100644..100755
--- a/view/tpl/lang_selector.tpl
+++ b/view/tpl/lang_selector.tpl
@@ -1,10 +1,15 @@
-<div id="lang-select-icon" class="icon s22 language" title="$title" onclick="openClose('language-selector');" ></div>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id="lang-select-icon" class="icon s22 language" title="{{$title}}" onclick="openClose('language-selector');" ></div>
 <div id="language-selector" style="display: none;" >
 	<form action="#" method="post" >
 		<select name="system_language" onchange="this.form.submit();" >
-			{{ for $langs.0 as $v=>$l }}
-				<option value="$v" {{if $v==$langs.1}}selected="selected"{{endif}}>$l</option>
-			{{ endfor }}
+			{{foreach $langs.0 as $v=>$l}}
+				<option value="{{$v}}" {{if $v==$langs.1}}selected="selected"{{/if}}>{{$l}}</option>
+			{{/foreach}}
 		</select>
 	</form>
 </div>
diff --git a/view/tpl/like_noshare.tpl b/view/tpl/like_noshare.tpl
index 2651ea1f8..b8258d64a 100644..100755
--- a/view/tpl/like_noshare.tpl
+++ b/view/tpl/like_noshare.tpl
@@ -1,5 +1,10 @@
-<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>
-	<a href="#" class="icon dislike" title="$nolike" onclick="dolike($id,'dislike'); return false"></a>
-	<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$id}}">
+	<a href="#" class="icon like" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false"></a>
+	<a href="#" class="icon dislike" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false"></a>
+	<img id="like-rotator-{{$id}}" class="like-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
 </div>
diff --git a/view/tpl/login.tpl b/view/tpl/login.tpl
index 149c46e4c..e530429b2 100644..100755
--- a/view/tpl/login.tpl
+++ b/view/tpl/login.tpl
@@ -1,31 +1,36 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
-<form action="$dest_url" id="$form_id" method="post" >
+<form action="{{$dest_url}}" id="{{$form_id}}" 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 }}
+	{{include file="field_input.tpl" field=$lname}}
+	{{include file="field_password.tpl" field=$lpassword}}
 	</div>
 	
 	<div id="login-extra-links">
-		{{ if $register }}<a href="$register.link" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
-        <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
+		{{if $register}}<a href="{{$register.link}}" title="{{$register.title}}" id="register-link">{{$register.desc}}</a>{{/if}}
+        <a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
 	</div>
 
-	{{ inc field_checkbox.tpl with $field=$remember }}{{ endinc }}
+	{{include file="field_checkbox.tpl" field=$remember}}
 	
 	<div id="login-standard-end"></div>
 
 	<div id="login-submit-wrapper" >
-		<input type="submit" name="submit" id="login-submit-button" value="$login" />
+		<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 }}
+	{{foreach $hiddens as $k=>$v}}
+		<input type="hidden" name="{{$k}}" value="{{$v}}" />
+	{{/foreach}}
 	
 	
 </form>
 
 
-<script type="text/javascript"> $(document).ready(function() { $("#id_$lname.0").focus();} );</script>
+<script type="text/javascript"> $(document).ready(function() { $("#id_{{$lname.0}}").focus();} );</script>
diff --git a/view/tpl/logout.tpl b/view/tpl/logout.tpl
index efc971df8..582d77ed6 100644..100755
--- a/view/tpl/logout.tpl
+++ b/view/tpl/logout.tpl
@@ -1,6 +1,11 @@
-<form action="$dest_url" method="post" >
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<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" />
+<input type="submit" name="submit" id="logout-button" value="{{$logout}}" />
 </div>
 </form>
diff --git a/view/tpl/lostpass.tpl b/view/tpl/lostpass.tpl
index cd3644157..0e437ca48 100644..100755
--- a/view/tpl/lostpass.tpl
+++ b/view/tpl/lostpass.tpl
@@ -1,17 +1,22 @@
-<h3>$title</h3>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$title}}</h3>
 
 <p id="lostpass-desc">
-$desc
+{{$desc}}
 </p>
 
 <form action="lostpass" method="post" >
 <div id="login-name-wrapper">
-        <label for="login-name" id="label-login-name">$name</label>
+        <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" />
+        <input type="submit" name="submit" id="lostpass-submit-button" value="{{$submit}}" />
 </div>
 <div id="login-submit-end"></div>
 </form>
diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl
index fe115d223..8587efbb5 100644..100755
--- a/view/tpl/mail_conv.tpl
+++ b/view/tpl/mail_conv.tpl
@@ -1,13 +1,18 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="mail-conv-outside-wrapper">
 	<div class="mail-conv-sender" >
-		<a href="$mail.from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$mail.sparkle" src="$mail.from_photo" heigth="80" width="80" alt="$mail.from_name" /></a>
-		<div class="mail-conv-sender-name" >$mail.from_name</div>
+		<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 class="mail-conv-sender-name" >{{$mail.from_name}}</div>
 	</div>
 	<div class="mail-conv-detail" >
-		<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-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>
diff --git a/view/tpl/mail_display.tpl b/view/tpl/mail_display.tpl
index 8fbc12929..e14d55478 100644..100755
--- a/view/tpl/mail_display.tpl
+++ b/view/tpl/mail_display.tpl
@@ -1,10 +1,15 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
-{{ for $mails as $mail }}
-	{{ inc mail_conv.tpl }}{{endinc}}
-{{ endfor }}
+{{foreach $mails as $mail}}
+	{{include file="mail_conv.tpl"}}
+{{/foreach}}
 
-{{ if $canreply }}
-{{ inc prv_message.tpl }}{{ endinc }}
-{{ else }}
-$unknown_text
-{{endif }}
\ No newline at end of file
+{{if $canreply}}
+{{include file="prv_message.tpl"}}
+{{else}}
+{{$unknown_text}}
+{{/if}}
\ No newline at end of file
diff --git a/view/tpl/mail_head.tpl b/view/tpl/mail_head.tpl
index afb65f537..f7a39fa8b 100644..100755
--- a/view/tpl/mail_head.tpl
+++ b/view/tpl/mail_head.tpl
@@ -1,3 +1,8 @@
-<h3>$messages</h3>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$messages}}</h3>
 
-$tab_content
+{{$tab_content}}
diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl
index c51783782..717df51d5 100644..100755
--- a/view/tpl/mail_list.tpl
+++ b/view/tpl/mail_list.tpl
@@ -1,7 +1,12 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="mail-list-wrapper">
-	<a href="$from_url" class="mail-list-sender-url" ><img class="mail-list-sender-photo" src="$from_photo" alt="$from_name" /></a>
-	<span class="mail-from">$from_name</span>
-	<span class="mail-subject {{if $seen}}seen{{else}}unseen{{endif}}"><a href="message/$id" class="mail-link">$subject</a></span>
-	<span class="mail-date" title="$date">$date</span>
-	<span class="mail-delete"><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></span>
+	<a href="{{$from_url}}" class="mail-list-sender-url" ><img class="mail-list-sender-photo" src="{{$from_photo}}" alt="{{$from_name}}" /></a>
+	<span class="mail-from">{{$from_name}}</span>
+	<span class="mail-subject {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span>
+	<span class="mail-date" title="{{$date}}">{{$date}}</span>
+	<span class="mail-delete"><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></span>
 </div>
diff --git a/view/tpl/main_slider.tpl b/view/tpl/main_slider.tpl
index a3b7769a6..fe4495f77 100644..100755
--- a/view/tpl/main_slider.tpl
+++ b/view/tpl/main_slider.tpl
@@ -1,8 +1,13 @@
-<div id="main-slider" class="slider" ><input id="main-range" type="text" name="cminmax" value="$val" /></div>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id="main-slider" class="slider" ><input id="main-range" type="text" name="cminmax" value="{{$val}}" /></div>
 <script>
 	var old_cmin = 0;
 	var old_cmax = 99;
-	$("#main-range").slider({ from: 0, to: 99, step: 1, scale: ['$me', '|', '$intimate', '|', '$friends', '|', '$oldfriends', '|', '$acquaintances', '|', '$world' ], onstatechange: function(v) { 
+	$("#main-range").slider({ from: 0, to: 99, step: 1, scale: ['{{$me}}', '|', '{{$intimate}}', '|', '{{$friends}}', '|', '{{$oldfriends}}', '|', '{{$acquaintances}}', '|', '{{$world}}' ], onstatechange: function(v) { 
 		var carr = v.split(";");
 		if(carr[0] != bParam_cmin) {
 			old_cmin = bParam_cmin;
diff --git a/view/tpl/match.tpl b/view/tpl/match.tpl
index b052845ae..14b725466 100644..100755
--- a/view/tpl/match.tpl
+++ b/view/tpl/match.tpl
@@ -1,16 +1,21 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="profile-match-wrapper">
 	<div class="profile-match-photo">
-		<a href="$url">
-			<img src="$photo" alt="$name" title="$name[$tags]" />
+		<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>
+		<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 }}
+	{{if $connlnk}}
+	<div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}">{{$conntxt}}</a></div>
+	{{/if}}
 
 </div>
diff --git a/view/tpl/message_side.tpl b/view/tpl/message_side.tpl
index fce771bd5..7da22ee3e 100644..100755
--- a/view/tpl/message_side.tpl
+++ b/view/tpl/message_side.tpl
@@ -1,10 +1,15 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <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>
+	<div id="message-new"><a href="{{$new.url}}" class="{{if $new.sel}}newmessage-selected{{/if}}">{{$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 }}
+		{{foreach $tabs as $t}}
+			<li class="tool"><a href="{{$t.url}}" class="message-link{{if $t.sel}}message-selected{{/if}}">{{$t.label}}</a></li>
+		{{/foreach}}
 	</ul>
 	
 </div>
diff --git a/view/tpl/micropro_img.tpl b/view/tpl/micropro_img.tpl
index 06df22d7b..de134adba 100644..100755
--- a/view/tpl/micropro_img.tpl
+++ b/view/tpl/micropro_img.tpl
@@ -1 +1,6 @@
-<div class="contact-block-div{{if $class}} $class{{endif}}"><a class="contact-block-link{{if $class}} $class{{endif}}{{if $click}} fakelink{{endif}}" href="{{if $click}}#{{else}}$url{{endif}}" {{if $click}}onclick="$click"{{endif}}><img class="contact-block-img{{if $class}} $class{{endif}}" src="$photo" title="$title" alt="$name" /></a></div>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="contact-block-div{{if $class}} {{$class}}{{/if}}"><a class="contact-block-link{{if $class}} {{$class}}{{/if}}{{if $click}} fakelink{{/if}}" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}}><img class="contact-block-img{{if $class}} {{$class}}{{/if}}" src="{{$photo}}" title="{{$title}}" alt="{{$name}}" /></a></div>
diff --git a/view/tpl/micropro_txt.tpl b/view/tpl/micropro_txt.tpl
index 6a6ef6392..a6438812b 100644..100755
--- a/view/tpl/micropro_txt.tpl
+++ b/view/tpl/micropro_txt.tpl
@@ -1 +1,6 @@
-<div class="contact-block-textdiv{{if $class}} $class{{endif}}"><a class="contact-block-link{{if $class}} $class{{endif}}{{if $click}} fakelink{{endif}}" href="{{if $click}}#{{else}}$url{{endif}}" {{if $click}}onclick="$click"{{endif}} title="$title">$name</a></div>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="contact-block-textdiv{{if $class}} {{$class}}{{/if}}"><a class="contact-block-link{{if $class}} {{$class}}{{/if}}{{if $click}} fakelink{{/if}}" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}} title="{{$title}}">{{$name}}</a></div>
diff --git a/view/tpl/mood_content.tpl b/view/tpl/mood_content.tpl
index 9349c56ae..461303318 100644..100755
--- a/view/tpl/mood_content.tpl
+++ b/view/tpl/mood_content.tpl
@@ -1,20 +1,25 @@
-<h3>$title</h3>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$title}}</h3>
 
-<div id="mood-desc">$desc</div>
+<div id="mood-desc">{{$desc}}</div>
 
 <form action="mood" method="get">
 <br />
 <br />
 
-<input id="mood-parent" type="hidden" value="$parent" name="parent" />
+<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 }}
+{{foreach $verbs as $v}}
+<option value="{{$v.0}}">{{$v.1}}</option>
+{{/foreach}}
 </select>
 <br />
 <br />
-<input type="submit" name="submit" value="$submit" />
+<input type="submit" name="submit" value="{{$submit}}" />
 </form>
 
diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl
index 2d1ea7a61..4c47e1d6d 100644..100755
--- a/view/tpl/msg-header.tpl
+++ b/view/tpl/msg-header.tpl
@@ -1,8 +1,13 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
-<script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
 <script language="javascript" type="text/javascript">
 
-var plaintext = '$editselect';
+var plaintext = '{{$editselect}}';
 
 if(plaintext != 'none') {
 	tinyMCE.init({
@@ -25,7 +30,7 @@ if(plaintext != 'none') {
 		force_br_newlines : true,
 		forced_root_block : '',
 		convert_urls: false,
-		content_css: "$baseurl/view/custom_tinymce.css",
+		content_css: "{{$baseurl}}/view/custom_tinymce.css",
 		     //Character count
 		theme_advanced_path : false,
 		setup : function(ed) {
@@ -51,7 +56,7 @@ else
 	$(document).ready(function() {
 		var uploader = new window.AjaxUpload(
 			'prvmail-upload',
-			{ action: 'wall_upload/$nickname',
+			{ action: 'wall_upload/{{$nickname}}',
 				name: 'userfile',
 				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
 				onComplete: function(file,response) {
@@ -64,7 +69,7 @@ else
 	});
 
 	function jotGetLink() {
-		reply = prompt("$linkurl");
+		reply = prompt("{{$linkurl}}");
 		if(reply && reply.length) {
 			$('#profile-rotator').show();
 			$.get('parse_url?url=' + reply, function(data) {
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index e97064d5f..beddc9109 100644..100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -1,145 +1,150 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <header>
-	<div id="site-location">$sitelocation</div>
-	<div id="banner">$banner</div>
+	<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="$userinfo.name"><img src="$userinfo.icon" alt="$userinfo.name"></a>
-		{{ if $localuser }}
+	{{if $userinfo}}
+		<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="{{$userinfo.name}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"></a>
+		{{if $localuser}}
 			<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="$nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3">$nav.profiles.1</a></li>{{ endif }}
-				{{ 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.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.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 }}
+				{{foreach $nav.usermenu as $usermenu}}
+					<li><a class="{{$usermenu.2}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}">{{$usermenu.1}}</a></li>
+				{{/foreach}}
+				{{if $nav.profiles}}<li><a class="{{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}">{{$nav.profiles.1}}</a></li>{{/if}}
+				{{if $nav.manage}}<li><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a></li>{{/if}}	
+				{{if $nav.contacts}}<li><a class="{{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a></li>{{/if}}
+				{{if $nav.settings}}<li><a class="{{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>{{/if}}
 
-				{{ 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.admin}}<li><a class="{{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a></li>{{/if}}
 
-				{{ 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.logout}}<li><a class="menu-sep {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>{{/if}}
 
 			</ul>
-		{{ endif }}
+		{{/if}}
 		</li>
-	{{ endif }}
+	{{/if}}
 
 
-	{{ if $nav.lock }}
+	{{if $nav.lock}}
 		<li id="nav-rmagic-link" class="nav-menu-icon" >
-			<a class="icon $nav.lock.2" href="$nav.lock.0" title="$nav.lock.3" >$nav.lock.1</a>
+			<a class="icon {{$nav.lock.2}}" href="{{$nav.lock.0}}" title="{{$nav.lock.3}}" >{{$nav.lock.1}}</a>
 		</li>
-	{{ endif }}
+	{{/if}}
 
 		
-	{{ 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>
+	{{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 fakelink" rel="#nav-network-menu"></span>
 			<ul id="nav-network-menu" class="menu-popup notify-menus" rel="network">
-				<li id="nav-network-see-all"><a href="$nav.network.all.0">$nav.network.all.1</a></li>
-				<li id="nav-network-mark-all"><a href="#" onclick="markRead('network'); return false;">$nav.network.mark.1</a></li>
-				<li class="empty">$emptynotifications</li>
+				<li id="nav-network-see-all"><a href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a></li>
+				<li id="nav-network-mark-all"><a href="#" onclick="markRead('network'); return false;">{{$nav.network.mark.1}}</a></li>
+				<li class="empty">{{$emptynotifications}}</li>
 			</ul>
 			</li>
-	{{ endif }}
+	{{/if}}
 
-	{{ 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>
+	{{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 fakelink" rel="#nav-home-menu"></span>
 			<ul id="nav-home-menu" class="menu-popup notify-menus" rel="home">
-				<li id="nav-home-see-all"><a href="$nav.home.all.0">$nav.home.all.1</a></li>
-				<li id="nav-home-mark-all"><a href="#" onclick="markRead('home'); return false;">$nav.home.mark.1</a></li>
-				<li class="empty">$emptynotifications</li>
+				<li id="nav-home-see-all"><a href="{{$nav.home.all.0}}">{{$nav.home.all.1}}</a></li>
+				<li id="nav-home-mark-all"><a href="#" onclick="markRead('home'); return false;">{{$nav.home.mark.1}}</a></li>
+				<li class="empty">{{$emptynotifications}}</li>
 			</ul>
 		</li>
-	{{ endif }}
+	{{/if}}
 
-   {{ if $nav.register }}<li id="nav-register-link" class="nav-menu $nav.register.2"><a href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a><li>{{ endif }}
+   {{if $nav.register}}<li id="nav-register-link" class="nav-menu {{$nav.register.2}}"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a><li>{{/if}}
 
 
-	{{ if $nav.messages }}
-		<li id="nav-mail-link" class="nav-menu $sel.messages">
-			<a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
+	{{if $nav.messages}}
+		<li id="nav-mail-link" class="nav-menu {{$sel.messages}}">
+			<a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>
 			<span id="mail-update" class="nav-notify fakelink" rel="#nav-messages-menu"></span>
 			<ul id="nav-messages-menu" class="menu-popup notify-menus" rel="messages">
-				<li id="nav-messages-see-all"><a href="$nav.messages.all.0">$nav.messages.all.1</a></li>
-				<li id="nav-messages-mark-all"><a href="#" onclick="markRead('messages'); return false;">$nav.messages.mark.1</a></li>
-				<li class="empty">$emptynotifications</li>
+				<li id="nav-messages-see-all"><a href="{{$nav.messages.all.0}}">{{$nav.messages.all.1}}</a></li>
+				<li id="nav-messages-mark-all"><a href="#" onclick="markRead('messages'); return false;">{{$nav.messages.mark.1}}</a></li>
+				<li class="empty">{{$emptynotifications}}</li>
 			</ul>
 		</li>
-	{{ endif }}
+	{{/if}}
 
-	{{ if $nav.all_events }}
-		<li id="nav-all_events-link" class="nav-menu $sel.all_events">
-			<a class="$nav.all_events.2" href="$nav.all_events.0" title="$nav.all_events.3" >$nav.all_events.1</a>
+	{{if $nav.all_events}}
+		<li id="nav-all_events-link" class="nav-menu {{$sel.all_events}}">
+			<a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" >{{$nav.all_events.1}}</a>
 			<span id="all_events-update" class="nav-notify fakelink" rel="#nav-all_events-menu"></span>
 			<ul id="nav-all_events-menu" class="menu-popup notify-menus" rel="all_events">
-				<li id="nav-all_events-see-all"><a href="$nav.all_events.all.0">$nav.all_events.all.1</a></li>
-				<li id="nav-all_events-mark-all"><a href="#" onclick="markRead('all_events'); return false;">$nav.all_events.mark.1</a></li>
-				<li class="empty">$emptynotifications</li>
+				<li id="nav-all_events-see-all"><a href="{{$nav.all_events.all.0}}">{{$nav.all_events.all.1}}</a></li>
+				<li id="nav-all_events-mark-all"><a href="#" onclick="markRead('all_events'); return false;">{{$nav.all_events.mark.1}}</a></li>
+				<li class="empty">{{$emptynotifications}}</li>
 			</ul>
 		</li>
-	{{ endif }}
+	{{/if}}
 
-	{{ if $nav.intros }}
-		<li id="nav-intros-link" class="nav-menu $sel.intros">
-			<a class="$nav.intros.2" href="$nav.intros.0" title="$nav.intros.3" >$nav.intros.1</a>
+	{{if $nav.intros}}
+		<li id="nav-intros-link" class="nav-menu {{$sel.intros}}">
+			<a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" >{{$nav.intros.1}}</a>
 			<span id="intro-update" class="nav-notify fakelink" rel="#nav-intros-menu"></span>
 			<ul id="nav-intros-menu" class="menu-popup notify-menus" rel="intros">
-				<li id="nav-intros-see-all"><a href="$nav.intros.all.0">$nav.intros.all.1</a></li>
-				<li class="empty">$emptynotifications</li>
+				<li id="nav-intros-see-all"><a href="{{$nav.intros.all.0}}">{{$nav.intros.all.1}}</a></li>
+				<li class="empty">{{$emptynotifications}}</li>
 			</ul>
 		</li>
-	{{ endif }}
+	{{/if}}
 		
-	{{ if $nav.notifications }}
+	{{if $nav.notifications}}
 		<li id="nav-notify-linkmenu" class="nav-menu fakelink">
-			<a href="$nav.notifications.0" title="$nav.notifications.1">$nav.notifications.1</a>
+			<a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a>
 			<span id="notify-update" class="nav-notify fakelink" rel="#nav-notify-menu"></span>
 			<ul id="nav-notify-menu" class="menu-popup notify-menus" rel="notify">
-				<li id="nav-notify-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-				<li id="nav-notify-mark-all"><a href="#" onclick="markRead('notify'); return false;">$nav.notifications.mark.1</a></li>
-				<li class="empty">$emptynotifications</li>
+				<li id="nav-notify-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
+				<li id="nav-notify-mark-all"><a href="#" onclick="markRead('notify'); return false;">{{$nav.notifications.mark.1}}</a></li>
+				<li class="empty">{{$emptynotifications}}</li>
 			</ul>
 		</li>
-	{{ endif }}		
+	{{/if}}		
 	
-	{{ if $nav.login }}<li id="nav-login-link" class="nav-menu $nav.login.2"><a href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a><li>{{ endif }}
-	{{ if $nav.alogout }}<li id=nav-alogout-link" class="nav-menu $nav-alogout.2"><a href="$nav.alogout.0" title="$nav.alogout.3" >$nav.alogout.1</a></li>{{ endif }}
+	{{if $nav.login}}<li id="nav-login-link" class="nav-menu {{$nav.login.2}}"><a href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><li>{{/if}}
+	{{if $nav.alogout}}<li id=nav-alogout-link" class="nav-menu {{$nav}}-alogout.2"><a href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" >{{$nav.alogout.1}}</a></li>{{/if}}
 
-	{{ 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>
+	{{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}}
 
-	{{ if $nav.help }} 
-		<li id="nav-help-link" class="nav-menu $sel.help">
-			<a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
+	{{if $nav.help}} 
+		<li id="nav-help-link" class="nav-menu {{$sel.help}}">
+			<a class="{{$nav.help.2}}" target="friendika-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a>
 		</li>
-	{{ endif }}
+	{{/if}}
 
-	{{ 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>
+	{{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 }}
+			{{foreach $apps as $ap}}
+				<li>{{$ap}}</li>
+				{{/foreach}}
 			</ul>
 		</li>
-	{{ endif }}
+	{{/if}}
 
 		<li id="nav-searchbar">		
 			<form method="get" action="search">
-				<input id="nav-search-text" type="text" value="" placeholder="$nav.search.1" name="search" title="$nav.search.3" onclick="this.submit();" />
+				<input id="nav-search-text" type="text" value="" placeholder="{{$nav.search.1}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();" />
 			</form>
 		</li>
-		<img src="images/rotator.gif" id="nav-search-spinner" style="display: none;" alt="$pleasewait" />
+		<img src="images/rotator.gif" id="nav-search-spinner" style="display: none;" alt="{{$pleasewait}}" />
 
 	</ul>
 </nav>
@@ -148,5 +153,5 @@
 	<li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
 </ul>
 
-<div id="langselector" >$langselector</div>
+<div id="langselector" >{{$langselector}}</div>
 <div id="panel" style="display: none;"></div>
diff --git a/view/tpl/netfriend.tpl b/view/tpl/netfriend.tpl
index c2a92ce9e..e8658e0bc 100644..100755
--- a/view/tpl/netfriend.tpl
+++ b/view/tpl/netfriend.tpl
@@ -1,14 +1,19 @@
-<div class="intro-approve-as-friend-desc">$approve_as</div>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<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" />
+	<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"  />
+	<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/tpl/new_channel.tpl b/view/tpl/new_channel.tpl
index 0ea764621..a7aa44991 100644..100755
--- a/view/tpl/new_channel.tpl
+++ b/view/tpl/new_channel.tpl
@@ -1,29 +1,34 @@
-<h2>$title</h2>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h2>{{$title}}</h2>
 
 <form action="new_channel" method="post" id="newchannel-form">
 
-	<div id="newchannel-desc" class="descriptive-paragraph">$desc</div>
+	<div id="newchannel-desc" class="descriptive-paragraph">{{$desc}}</div>
 
-	<label for="newchannel-name" id="label-newchannel-name" class="newchannel-label" >$label_name</label>
-	<input type="text" name="name" id="newchannel-name" class="newchannel-input" value="$name" />
+	<label for="newchannel-name" id="label-newchannel-name" class="newchannel-label" >{{$label_name}}</label>
+	<input type="text" name="name" id="newchannel-name" class="newchannel-input" value="{{$name}}" />
 	<div id="newchannel-name-feedback" class="newchannel-feedback"></div>
 	<div id="newchannel-name-end"  class="newchannel-field-end"></div>
 
-	<div id="newchannel-name-help" class="descriptive-paragraph">$help_name</div>
+	<div id="newchannel-name-help" class="descriptive-paragraph">{{$help_name}}</div>
 
-	<label for="newchannel-nickname" id="label-newchannel-nickname" class="newchannel-label" >$label_nick</label>
-	<input type="text" name="nickname" id="newchannel-nickname" class="newchannel-input" value="$nickname" />
+	<label for="newchannel-nickname" id="label-newchannel-nickname" class="newchannel-label" >{{$label_nick}}</label>
+	<input type="text" name="nickname" id="newchannel-nickname" class="newchannel-input" value="{{$nickname}}" />
 	<div id="newchannel-nickname-feedback" class="newchannel-feedback"></div>
 	<div id="newchannel-nickname-end"  class="newchannel-field-end"></div>
 
-	<div id="newchannel-nick-desc" class="descriptive-paragraph">$nick_desc</div>
+	<div id="newchannel-nick-desc" class="descriptive-paragraph">{{$nick_desc}}</div>
 
 
-	<div id="newchannel-import-link" class="descriptive-paragraph" >$label_import</div>
+	<div id="newchannel-import-link" class="descriptive-paragraph" >{{$label_import}}</div>
 
 	<div id="newchannel-import-end" class="newchannel-field-end"></div>
 
-	<input type="submit" name="submit" id="newchannel-submit-button" value="$submit" />
+	<input type="submit" name="submit" id="newchannel-submit-button" value="{{$submit}}" />
 	<div id="newchannel-submit-end" class="newchannel-field-end"></div>
 
 </form>
diff --git a/view/tpl/nogroup-template.tpl b/view/tpl/nogroup-template.tpl
index dd00ed097..7d103a655 100644..100755
--- a/view/tpl/nogroup-template.tpl
+++ b/view/tpl/nogroup-template.tpl
@@ -1,11 +1,16 @@
-<h1>$header</h1>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$header}}</h1>
 
-{{ for $contacts as $contact }}
-	{{ inc contact_template.tpl }}{{ endinc }}
-{{ endfor }}
+{{foreach $contacts as $contact}}
+	{{include file="contact_template.tpl"}}
+{{/foreach}}
 <div id="contact-edit-end"></div>
 
-$paginate
+{{$paginate}}
 
 
 
diff --git a/view/tpl/notifications.tpl b/view/tpl/notifications.tpl
index 1a13b68b9..834a7a016 100644..100755
--- a/view/tpl/notifications.tpl
+++ b/view/tpl/notifications.tpl
@@ -1,8 +1,13 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
-<h1>$notif_header</h1>
+<h1>{{$notif_header}}</h1>
 
-{{ inc common_tabs.tpl }}{{ endinc }}
+{{include file="common_tabs.tpl"}}
 
 <div class="notif-network-wrapper">
-	$notif_content
+	{{$notif_content}}
 </div>
diff --git a/view/tpl/notifications_comments_item.tpl b/view/tpl/notifications_comments_item.tpl
index 73cc9f948..9913e6cf7 100644..100755
--- a/view/tpl/notifications_comments_item.tpl
+++ b/view/tpl/notifications_comments_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="notif-item">
-	<a href="$item_link" target="friendica-notifications"><img src="$item_image" class="notif-image">$item_text <span class="notif-when">$item_when</span></a>
+	<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/tpl/notifications_dislikes_item.tpl b/view/tpl/notifications_dislikes_item.tpl
index 73cc9f948..9913e6cf7 100644..100755
--- a/view/tpl/notifications_dislikes_item.tpl
+++ b/view/tpl/notifications_dislikes_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="notif-item">
-	<a href="$item_link" target="friendica-notifications"><img src="$item_image" class="notif-image">$item_text <span class="notif-when">$item_when</span></a>
+	<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/tpl/notifications_friends_item.tpl b/view/tpl/notifications_friends_item.tpl
index 73cc9f948..9913e6cf7 100644..100755
--- a/view/tpl/notifications_friends_item.tpl
+++ b/view/tpl/notifications_friends_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="notif-item">
-	<a href="$item_link" target="friendica-notifications"><img src="$item_image" class="notif-image">$item_text <span class="notif-when">$item_when</span></a>
+	<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/tpl/notifications_likes_item.tpl b/view/tpl/notifications_likes_item.tpl
index 389144d9b..792b285bc 100644..100755
--- a/view/tpl/notifications_likes_item.tpl
+++ b/view/tpl/notifications_likes_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <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>
+	<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/tpl/notifications_posts_item.tpl b/view/tpl/notifications_posts_item.tpl
index 73cc9f948..9913e6cf7 100644..100755
--- a/view/tpl/notifications_posts_item.tpl
+++ b/view/tpl/notifications_posts_item.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="notif-item">
-	<a href="$item_link" target="friendica-notifications"><img src="$item_image" class="notif-image">$item_text <span class="notif-when">$item_when</span></a>
+	<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/tpl/notify.tpl b/view/tpl/notify.tpl
index 73cc9f948..9913e6cf7 100644..100755
--- a/view/tpl/notify.tpl
+++ b/view/tpl/notify.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="notif-item">
-	<a href="$item_link" target="friendica-notifications"><img src="$item_image" class="notif-image">$item_text <span class="notif-when">$item_when</span></a>
+	<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/tpl/oauth_authorize.tpl b/view/tpl/oauth_authorize.tpl
index 31f02ac50..d7f1963d2 100644..100755
--- a/view/tpl/oauth_authorize.tpl
+++ b/view/tpl/oauth_authorize.tpl
@@ -1,10 +1,15 @@
-<h1>$title</h1>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$title}}</h1>
 
 <div class='oauthapp'>
-	<img src='$app.icon'>
-	<h4>$app.name</h4>
+	<img src='{{$app.icon}}'>
+	<h4>{{$app.name}}</h4>
 </div>
-<h3>$authorize</h3>
+<h3>{{$authorize}}</h3>
 <form method="POST">
-<div class="settings-submit-wrapper"><input  class="settings-submit"  type="submit" name="oauth_yes" value="$yes" /></div>
+<div class="settings-submit-wrapper"><input  class="settings-submit"  type="submit" name="oauth_yes" value="{{$yes}}" /></div>
 </form>
diff --git a/view/tpl/oauth_authorize_done.tpl b/view/tpl/oauth_authorize_done.tpl
index 51eaea248..12d4c6f48 100644..100755
--- a/view/tpl/oauth_authorize_done.tpl
+++ b/view/tpl/oauth_authorize_done.tpl
@@ -1,4 +1,9 @@
-<h1>$title</h1>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$title}}</h1>
 
-<p>$info</p>
-<code>$code</code>
+<p>{{$info}}</p>
+<code>{{$code}}</code>
diff --git a/view/tpl/oembed_video.tpl b/view/tpl/oembed_video.tpl
index d3a9a9311..bdfa11509 100755
--- a/view/tpl/oembed_video.tpl
+++ b/view/tpl/oembed_video.tpl
@@ -1,4 +1,9 @@
-<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>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<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/tpl/oexchange_xrd.tpl b/view/tpl/oexchange_xrd.tpl
index c7e6df498..04a8e1847 100644..100755
--- a/view/tpl/oexchange_xrd.tpl
+++ b/view/tpl/oexchange_xrd.tpl
@@ -1,7 +1,12 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?xml version='1.0' encoding='UTF-8'?>
 <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
         
-    <Subject>$base</Subject>
+    <Subject>{{$base}}</Subject>
 
     <Property 
         type="http://www.oexchange.org/spec/0.8/prop/vendor">Friendika</Property>
@@ -14,19 +19,19 @@
 
     <Link 
         rel="icon" 
-        href="$base/images/friendika-16.png"
+        href="{{$base}}/images/friendika-16.png"
         type="image/png" 
         />
 
     <Link 
         rel="icon32" 
-        href="$base/images/friendika-32.png"
+        href="{{$base}}/images/friendika-32.png"
         type="image/png" 
         />
 
     <Link 
         rel= "http://www.oexchange.org/spec/0.8/rel/offer" 
-        href="$base/oexchange"
+        href="{{$base}}/oexchange"
         type="text/html" 
         />
 </XRD>
diff --git a/view/tpl/opensearch.tpl b/view/tpl/opensearch.tpl
index 374fcaac9..63d2a1752 100644..100755
--- a/view/tpl/opensearch.tpl
+++ b/view/tpl/opensearch.tpl
@@ -1,13 +1,18 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?xml version="1.0" encoding="UTF-8"?>
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
-	<ShortName>Friendika@$nodename</ShortName>
-	<Description>Search in Friendika@$nodename</Description>
+	<ShortName>Friendika@{{$nodename}}</ShortName>
+	<Description>Search in Friendika@{{$nodename}}</Description>
 	<Contact>http://bugs.friendika.com/</Contact>
-	<Image height="16" width="16" type="image/png">$baseurl/images/friendika-16.png</Image>
-	<Image height="64" width="64" type="image/png">$baseurl/images/friendika-64.png</Image>
+	<Image height="16" width="16" type="image/png">{{$baseurl}}/images/friendika-16.png</Image>
+	<Image height="64" width="64" type="image/png">{{$baseurl}}/images/friendika-64.png</Image>
 	<Url type="text/html" 
-        template="$baseurl/search?search={searchTerms}"/>
+        template="{{$baseurl}}/search?search={searchTerms}"/>
 	<Url type="application/opensearchdescription+xml"
       	rel="self"
-      	template="$baseurl/opensearch" />        
+      	template="{{$baseurl}}/opensearch" />        
 </OpenSearchDescription>
\ No newline at end of file
diff --git a/view/tpl/page_display.tpl b/view/tpl/page_display.tpl
index c34747364..e61a86fc9 100644..100755
--- a/view/tpl/page_display.tpl
+++ b/view/tpl/page_display.tpl
@@ -1,7 +1,12 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class=page">
-	<h3 class="page-title">$title</h3>
+	<h3 class="page-title">{{$title}}</h3>
 
-	<div class="page-author"><a class=="page-author-link" href="$auth_url">$author</a></div>
-	<div class="page-date">$date</div>
-	<div class="page-body">$body</div>
+	<div class="page-author"><a class=="page-author-link" href="{{$auth_url}}">{{$author}}</a></div>
+	<div class="page-date">{{$date}}</div>
+	<div class="page-body">{{$body}}</div>
 </div>
diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl
index 7f8f22b2a..3a51bb0a8 100644..100755
--- a/view/tpl/peoplefind.tpl
+++ b/view/tpl/peoplefind.tpl
@@ -1,14 +1,19 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="peoplefind-sidebar" class="widget">
-	<h3>$findpeople</h3>
-	<div id="peoplefind-desc">$desc</div>
+	<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" />
+		<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" >$random</a></div>
-	{{ if $inv }} 
-	<div class="side-link" id="side-invite-link" ><a href="invite" >$inv</a></div>
-	{{ endif }}
+	<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" >{{$random}}</a></div>
+	{{if $inv}} 
+	<div class="side-link" id="side-invite-link" ><a href="invite" >{{$inv}}</a></div>
+	{{/if}}
 </div>
 
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index 53392e709..33ab84df7 100644..100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -1,13 +1,18 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script type="text/javascript" charset="utf-8">
   $(document).ready(function(){
     $("a[rel^='prettyPhoto']").prettyPhoto();
   });
 </script>
 
-<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" rel="$rel">
-		<img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-album-photo lframe resize$twist" id="photo-album-photo-$id" />
-		<p class='caption'>$desc</p>		
+<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}}" rel="{{$rel}}">
+		<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/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl
index a2e305df5..b74c73fd3 100644..100755
--- a/view/tpl/photo_albums.tpl
+++ b/view/tpl/photo_albums.tpl
@@ -1,13 +1,18 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="side-bar-photos-albums" class="widget">
-<h3><a href="$baseurl/photos/$nick" title="$title" >$title</a></h3>
-{{ if $albums }}
+<h3><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$title}}</a></h3>
+{{if $albums}}
 <ul>
-{{ for $albums as $al }}
-<li><a href="$baseurl/photos/$nick/album/$al.bin2hex">$al.album</a></li>
-{{ endfor }}
+{{foreach $albums as $al}}
+<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}">{{$al.album}}</a></li>
+{{/foreach}}
 </ul>
-{{ endif }}
-{{ if $upload }}
-<div id="photo-albums-upload-link"><a href="$baseurl/photos/$nick/upload" title="$upload">$upload</a></div>
-{{ endif }}
+{{/if}}
+{{if $upload}}
+<div id="photo-albums-upload-link"><a href="{{$baseurl}}/photos/{{$nick}}/upload" title="{{$upload}}">{{$upload}}</a></div>
+{{/if}}
 </div>
diff --git a/view/tpl/photo_drop.tpl b/view/tpl/photo_drop.tpl
index b4ea62b45..ed500fd0a 100644..100755
--- a/view/tpl/photo_drop.tpl
+++ b/view/tpl/photo_drop.tpl
@@ -1,4 +1,9 @@
-<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>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$id}}" >
+	<a href="item/drop/{{$id}}" 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/tpl/photo_edit.tpl b/view/tpl/photo_edit.tpl
index 53b69caae..fefe7f10b 100644..100755
--- a/view/tpl/photo_edit.tpl
+++ b/view/tpl/photo_edit.tpl
@@ -1,26 +1,31 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
-<form action="photos/$nickname/$resource_id" method="post" id="photo_edit_form" >
+<form action="photos/{{$nickname}}/{{$resource_id}}" method="post" id="photo_edit_form" >
 
-	<input type="hidden" name="item_id" value="$item_id" />
+	<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" />
+	<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" />
+	<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" />
+	<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
+			{{$rotatecw}}<br>
+			{{$rotateccw}}
 		</div>
 		<input type="radio" name="rotate" value="1" /><br>
 		<input type="radio" name="rotate" value="2" />
@@ -28,21 +33,21 @@
 	<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 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
+				{{$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()"; />
+	<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/tpl/photo_item.tpl b/view/tpl/photo_item.tpl
index 22884e848..7d6ac96ee 100644..100755
--- a/view/tpl/photo_item.tpl
+++ b/view/tpl/photo_item.tpl
@@ -1,22 +1,27 @@
-<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>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<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 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 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
+	{{$drop}}
 	<div class="wall-item-wrapper-end"></div>
 	<div class="wall-item-comment-separator"></div>
-	$comment
+	{{$comment}}
 
-<div class="wall-item-outside-wrapper-end$indent" ></div>
+<div class="wall-item-outside-wrapper-end{{$indent}}" ></div>
 </div>
 
diff --git a/view/tpl/photo_top.tpl b/view/tpl/photo_top.tpl
index 155cab51d..b34e1e639 100644..100755
--- a/view/tpl/photo_top.tpl
+++ b/view/tpl/photo_top.tpl
@@ -1,8 +1,13 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
-<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" />
+<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 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/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index f724b419b..fe090409a 100644..100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script type="text/javascript" charset="utf-8">
   $(document).ready(function(){
     $("a[rel^='prettyPhoto']").prettyPhoto();
@@ -5,39 +10,39 @@
 </script>
 
 <div id="live-display"></div>
-<h3><a href="$album.0">$album.1</a></h3>
+<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>
+{{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 }}
+<a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a>
+{{/if}}
+{{if $lock}} | <img src="images/lock_icon.gif" class="lockview" alt="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');" /> {{/if}}
 </div>
 
-{{ 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" rel="prettyPhoto"><img src="$photo.src" /></a></div>
-{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
+{{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}">{{$prevlink.1}}</a></div>{{/if}}
+<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" rel="prettyPhoto"><img src="{{$photo.src}}" /></a></div>
+{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}">{{$nextlink.1}}</a></div>{{/if}}
 <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 }}
+<div id="photo-caption">{{$desc}}</div>
+{{if $tags}}
+<div id="in-this-photo-text">{{$tags.0}}</div>
+<div id="in-this-photo">{{$tags.1}}</div>
+{{/if}}
+{{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}}
 
-{{ if $edit }}$edit{{ endif }}
+{{if $edit}}{{$edit}}{{/if}}
 
-{{ if $likebuttons }}
+{{if $likebuttons}}
 <div id="photo-like-div">
-	$likebuttons
-	$like
-	$dislike	
+	{{$likebuttons}}
+	{{$like}}
+	{{$dislike}}	
 </div>
-{{ endif }}
+{{/if}}
 
-$comments
+{{$comments}}
 
-$paginate
+{{$paginate}}
 
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl
index 1df78cb7b..cb2411df3 100644..100755
--- a/view/tpl/photos_recent.tpl
+++ b/view/tpl/photos_recent.tpl
@@ -1,11 +1,16 @@
-<h3>$title</h3>
-{{ if $can_post }}
-<a id="photo-top-upload-link" href="$upload.1">$upload.0</a>
-{{ endif }}
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$title}}</h3>
+{{if $can_post}}
+<a id="photo-top-upload-link" href="{{$upload.1}}">{{$upload.0}}</a>
+{{/if}}
 
 <div class="photos">
-{{ for $photos as $photo }}
-	{{ inc photo_top.tpl }}{{ endinc }}
-{{ endfor }}
+{{foreach $photos as $photo}}
+	{{include file="photo_top.tpl"}}
+{{/foreach}}
 </div>
 <div class="photos-end"></div>
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
index 6d3692897..1f9532224 100644..100755
--- a/view/tpl/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
@@ -1,46 +1,51 @@
-<h3>$pagename</h3>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$pagename}}</h3>
 
-<div id="photos-usage-message">$usage</div>
+<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" >
+<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" >
 	<input type="hidden" id-"photos-upload-source" name="source" value="photos" />
 	<div id="photos-upload-new-wrapper" >
 		<div id="photos-upload-newalbum-div">
-			<label id="photos-upload-newalbum-text" for="photos-upload-newalbum" >$newalbum</label>
+			<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>
-		$albumselect
+		<div id="photos-upload-existing-album-text">{{$existalbumtext}}</div>
+		{{$albumselect}}
 	</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>
+		<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
+		<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
+			{{$aclselect}}
 		</div>
 	</div>
 
 	<div id="photos-upload-spacer"></div>
 
-	$uploader
+	{{$uploader}}
 
-	$default
+	{{$default}}
 
 	<div class="photos-upload-end" ></div>
 </form>
diff --git a/view/tpl/poco_entry_xml.tpl b/view/tpl/poco_entry_xml.tpl
index 4d84cee41..d6e139cb5 100644..100755
--- a/view/tpl/poco_entry_xml.tpl
+++ b/view/tpl/poco_entry_xml.tpl
@@ -1,7 +1,12 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <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 }}
+{{if $entry.id}}<id>{{$entry.id}}</id>{{/if}}
+{{if $entry.displayName}}<displayName>{{$entry.displayName}}</displayName>{{/if}}
+{{if $entry.preferredUsername}}<preferredUsername>{{$entry.preferredUsername}}</preferredUsername>{{/if}}
+{{if $entry.urls}}{{foreach $entry.urls as $url}}<urls><value>{{$url.value}}</value><type>{{$url.type}}</type></urls>{{/foreach}}{{/if}}
+{{if $entry.photos}}{{foreach $entry.photos as $photo}}<photos><value>{{$photo.value}}</value><type>{{$photo.type}}</type></photos>{{/foreach}}{{/if}}
 </entry>
diff --git a/view/tpl/poco_xml.tpl b/view/tpl/poco_xml.tpl
index 9549b695d..b8cd8fc08 100644..100755
--- a/view/tpl/poco_xml.tpl
+++ b/view/tpl/poco_xml.tpl
@@ -1,18 +1,23 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?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.sorted}}<sorted>{{$response.sorted}}</sorted>{{/if}}
+{{if $response.filtered}}<filtered>{{$response.filtered}}</filtered>{{/if}}
+{{if $response.updatedSince}}<updatedSince>{{$response.updatedSince}}</updatedSince>{{/if}}
+<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 }}
+{{if $response.totalResults}}
+{{foreach $response.entry as $entry}}
+{{include file="poco_entry_xml.tpl"}}
+{{/foreach}}
+{{else}}
 <entry></entry>
-{{ endif }}
+{{/if}}
 </response>
diff --git a/view/tpl/poke_content.tpl b/view/tpl/poke_content.tpl
index b9e089f5b..6235aca0c 100644..100755
--- a/view/tpl/poke_content.tpl
+++ b/view/tpl/poke_content.tpl
@@ -1,32 +1,37 @@
-<h3>$title</h3>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$title}}</h3>
 
-<div id="poke-desc">$desc</div>
+<div id="poke-desc">{{$desc}}</div>
 
 <form action="poke" method="get">
 <br />
 <br />
 
-<div id="poke-recip-label">$clabel</div>
+<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" />
+<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>
+<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 }}
+{{foreach $verbs as $v}}
+<option value="{{$v.0}}">{{$v.1}}</option>
+{{/foreach}}
 </select>
 <br />
 <br />
-<div id="poke-private-desc">$prv_desc</div>
-<input type="checkbox" name="private" {{ if $parent }}disabled="disabled"{{ endif }} value="1" />
+<div id="poke-private-desc">{{$prv_desc}}</div>
+<input type="checkbox" name="private" {{if $parent}}disabled="disabled"{{/if}} value="1" />
 <br />
 <br />
-<input type="submit" name="submit" value="$submit" />
+<input type="submit" name="submit" value="{{$submit}}" />
 </form>
 
diff --git a/view/tpl/posted_date_widget.tpl b/view/tpl/posted_date_widget.tpl
index 3e2ee5a3e..2f5838edb 100644..100755
--- a/view/tpl/posted_date_widget.tpl
+++ b/view/tpl/posted_date_widget.tpl
@@ -1,9 +1,14 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="datebrowse-sidebar" class="widget">
-	<h3>$title</h3>
+	<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 id="posted-date-selector" name="posted-date-select" onchange="dateSubmit($(this).val());" size="{{$size}}">
+{{foreach $dates as $d}}
+<option value="{{$url}}/{{$d.1}}/{{$d.2}}" >{{$d.0}}</option>
+{{/foreach}}
 </select>
 </div>
diff --git a/view/tpl/profed_head.tpl b/view/tpl/profed_head.tpl
index 2477654b3..37a038d4f 100644..100755
--- a/view/tpl/profed_head.tpl
+++ b/view/tpl/profed_head.tpl
@@ -1,11 +1,16 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <script language="javascript" type="text/javascript"
-          src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+          src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
           <script language="javascript" type="text/javascript">
 
 
 tinyMCE.init({
 	theme : "advanced",
-	mode : "$editselect",
+	mode : "{{$editselect}}",
 	plugins : "bbcode,paste",
 	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
 	theme_advanced_buttons2 : "",
@@ -21,7 +26,7 @@ tinyMCE.init({
 	force_p_newlines : false,
 	force_br_newlines : true,
 	forced_root_block : '',
-	content_css: "$baseurl/view/custom_tinymce.css",
+	content_css: "{{$baseurl}}/view/custom_tinymce.css",
 	theme_advanced_path : false,
 	setup : function(ed) {
 		ed.onInit.add(function(ed) {
diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl
index 0bc4d3fd3..f8743c011 100644..100755
--- a/view/tpl/profile_advanced.tpl
+++ b/view/tpl/profile_advanced.tpl
@@ -1,169 +1,174 @@
-<h2>$title</h2>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h2>{{$title}}</h2>
 
 <dl id="aprofile-fullname" class="aprofile">
- <dt>$profile.fullname.0</dt>
- <dd>$profile.fullname.1</dd>
+ <dt>{{$profile.fullname.0}}</dt>
+ <dd>{{$profile.fullname.1}}</dd>
 </dl>
 
-{{ if $profile.gender }}
+{{if $profile.gender}}
 <dl id="aprofile-gender" class="aprofile">
- <dt>$profile.gender.0</dt>
- <dd>$profile.gender.1</dd>
+ <dt>{{$profile.gender.0}}</dt>
+ <dd>{{$profile.gender.1}}</dd>
 </dl>
-{{ endif }}
+{{/if}}
 
-{{ if $profile.birthday }}
+{{if $profile.birthday}}
 <dl id="aprofile-birthday" class="aprofile">
- <dt>$profile.birthday.0</dt>
- <dd>$profile.birthday.1</dd>
+ <dt>{{$profile.birthday.0}}</dt>
+ <dd>{{$profile.birthday.1}}</dd>
 </dl>
-{{ endif }}
+{{/if}}
 
-{{ if $profile.age }}
+{{if $profile.age}}
 <dl id="aprofile-age" class="aprofile">
- <dt>$profile.age.0</dt>
- <dd>$profile.age.1</dd>
+ <dt>{{$profile.age.0}}</dt>
+ <dd>{{$profile.age.1}}</dd>
 </dl>
-{{ endif }}
+{{/if}}
 
-{{ if $profile.marital }}
+{{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>
+ <dt><span class="heart">&hearts;</span>  {{$profile.marital.0}}</dt>
+ <dd>{{$profile.marital.1}}{{if $profile.marital.with}} ({{$profile.marital.with}}){{/if}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}</dd>
 </dl>
-{{ endif }}
+{{/if}}
 
-{{ if $profile.sexual }}
+{{if $profile.sexual}}
 <dl id="aprofile-sexual" class="aprofile">
- <dt>$profile.sexual.0</dt>
- <dd>$profile.sexual.1</dd>
+ <dt>{{$profile.sexual.0}}</dt>
+ <dd>{{$profile.sexual.1}}</dd>
 </dl>
-{{ endif }}
+{{/if}}
 
-{{ if $profile.keywords }}
+{{if $profile.keywords}}
 <dl id="aprofile-tags" class="aprofile">
- <dt>$profile.keywords.0</dt>
- <dd>$profile.keywords.1</dd>
+ <dt>{{$profile.keywords.0}}</dt>
+ <dd>{{$profile.keywords.1}}</dd>
 </dl>
-{{ endif }}
+{{/if}}
 
-{{ if $profile.homepage }}
+{{if $profile.homepage}}
 <dl id="aprofile-homepage" class="aprofile">
- <dt>$profile.homepage.0</dt>
- <dd>$profile.homepage.1</dd>
+ <dt>{{$profile.homepage.0}}</dt>
+ <dd>{{$profile.homepage.1}}</dd>
 </dl>
-{{ endif }}
+{{/if}}
 
-{{ if $profile.hometown }}
+{{if $profile.hometown}}
 <dl id="aprofile-hometown" class="aprofile">
- <dt>$profile.hometown.0</dt>
- <dd>$profile.hometown.1</dd>
+ <dt>{{$profile.hometown.0}}</dt>
+ <dd>{{$profile.hometown.1}}</dd>
 </dl>
-{{ endif }}
+{{/if}}
 
-{{ if $profile.politic }}
+{{if $profile.politic}}
 <dl id="aprofile-politic" class="aprofile">
- <dt>$profile.politic.0</dt>
- <dd>$profile.politic.1</dd>
+ <dt>{{$profile.politic.0}}</dt>
+ <dd>{{$profile.politic.1}}</dd>
 </dl>
-{{ endif }}
+{{/if}}
 
-{{ if $profile.religion }}
+{{if $profile.religion}}
 <dl id="aprofile-religion" class="aprofile">
- <dt>$profile.religion.0</dt>
- <dd>$profile.religion.1</dd>
+ <dt>{{$profile.religion.0}}</dt>
+ <dd>{{$profile.religion.1}}</dd>
 </dl>
-{{ endif }}
+{{/if}}
 
-{{ if $profile.about }}
+{{if $profile.about}}
 <dl id="aprofile-about" class="aprofile">
- <dt>$profile.about.0</dt>
- <dd>$profile.about.1</dd>
+ <dt>{{$profile.about.0}}</dt>
+ <dd>{{$profile.about.1}}</dd>
 </dl>
-{{ endif }}
+{{/if}}
 
-{{ if $profile.interest }}
+{{if $profile.interest}}
 <dl id="aprofile-interest" class="aprofile">
- <dt>$profile.interest.0</dt>
- <dd>$profile.interest.1</dd>
+ <dt>{{$profile.interest.0}}</dt>
+ <dd>{{$profile.interest.1}}</dd>
 </dl>
-{{ endif }}
+{{/if}}
 
-{{ if $profile.likes }}
+{{if $profile.likes}}
 <dl id="aprofile-likes" class="aprofile">
- <dt>$profile.likes.0</dt>
- <dd>$profile.likes.1</dd>
+ <dt>{{$profile.likes.0}}</dt>
+ <dd>{{$profile.likes.1}}</dd>
 </dl>
-{{ endif }}
+{{/if}}
 
-{{ if $profile.dislikes }}
+{{if $profile.dislikes}}
 <dl id="aprofile-dislikes" class="aprofile">
- <dt>$profile.dislikes.0</dt>
- <dd>$profile.dislikes.1</dd>
+ <dt>{{$profile.dislikes.0}}</dt>
+ <dd>{{$profile.dislikes.1}}</dd>
 </dl>
-{{ endif }}
+{{/if}}
 
-{{ if $profile.contact }}
+{{if $profile.contact}}
 <dl id="aprofile-contact" class="aprofile">
- <dt>$profile.contact.0</dt>
- <dd>$profile.contact.1</dd>
+ <dt>{{$profile.contact.0}}</dt>
+ <dd>{{$profile.contact.1}}</dd>
 </dl>
-{{ endif }}
+{{/if}}
 
 
-{{ if $profile.music }}
+{{if $profile.music}}
 <dl id="aprofile-music" class="aprofile">
- <dt>$profile.music.0</dt>
- <dd>$profile.music.1</dd>
+ <dt>{{$profile.music.0}}</dt>
+ <dd>{{$profile.music.1}}</dd>
 </dl>
-{{ endif }}
+{{/if}}
 
 
-{{ if $profile.book }}
+{{if $profile.book}}
 <dl id="aprofile-book" class="aprofile">
- <dt>$profile.book.0</dt>
- <dd>$profile.book.1</dd>
+ <dt>{{$profile.book.0}}</dt>
+ <dd>{{$profile.book.1}}</dd>
 </dl>
-{{ endif }}
+{{/if}}
 
 
-{{ if $profile.tv }}
+{{if $profile.tv}}
 <dl id="aprofile-tv" class="aprofile">
- <dt>$profile.tv.0</dt>
- <dd>$profile.tv.1</dd>
+ <dt>{{$profile.tv.0}}</dt>
+ <dd>{{$profile.tv.1}}</dd>
 </dl>
-{{ endif }}
+{{/if}}
 
 
-{{ if $profile.film }}
+{{if $profile.film}}
 <dl id="aprofile-film" class="aprofile">
- <dt>$profile.film.0</dt>
- <dd>$profile.film.1</dd>
+ <dt>{{$profile.film.0}}</dt>
+ <dd>{{$profile.film.1}}</dd>
 </dl>
-{{ endif }}
+{{/if}}
 
 
-{{ if $profile.romance }}
+{{if $profile.romance}}
 <dl id="aprofile-romance" class="aprofile">
- <dt>$profile.romance.0</dt>
- <dd>$profile.romance.1</dd>
+ <dt>{{$profile.romance.0}}</dt>
+ <dd>{{$profile.romance.1}}</dd>
 </dl>
-{{ endif }}
+{{/if}}
 
 
-{{ if $profile.work }}
+{{if $profile.work}}
 <dl id="aprofile-work" class="aprofile">
- <dt>$profile.work.0</dt>
- <dd>$profile.work.1</dd>
+ <dt>{{$profile.work.0}}</dt>
+ <dd>{{$profile.work.1}}</dd>
 </dl>
-{{ endif }}
+{{/if}}
 
-{{ if $profile.education }}
+{{if $profile.education}}
 <dl id="aprofile-education" class="aprofile">
- <dt>$profile.education.0</dt>
- <dd>$profile.education.1</dd>
+ <dt>{{$profile.education.0}}</dt>
+ <dd>{{$profile.education.1}}</dd>
 </dl>
-{{ endif }}
+{{/if}}
 
 
 
diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl
index 6ff4cf8c1..864599244 100644..100755
--- a/view/tpl/profile_edit.tpl
+++ b/view/tpl/profile_edit.tpl
@@ -1,14 +1,19 @@
-$default
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$default}}
 
-<h1>$banner</h1>
+<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><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>
+<li><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" {{$disabled}} >{{$del_prof}}</a></li>
 
 </ul>
 </div>
@@ -17,147 +22,147 @@ $default
 
 
 <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'>
+<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>
+<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" />
+<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" />
+<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
+<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>
+<label id="profile-edit-dob-label" for="dob-select" >{{$lbl_bd}} </label>
 <div id="profile-edit-dob" >
-$dob $age
+{{$dob}} {{$age}}
 </div>
 </div>
 <div id="profile-edit-dob-end"></div>
 
-$hide_friends
+{{$hide_friends}}
 
 <div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
+<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" />
+<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" />
+<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" />
+<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-region-wrapper" >
-<label id="profile-edit-region-label" for="profile-edit-region" >$lbl_region </label>
-<input type="text" size="32" name="region" id="profile-edit-region" value="$region" />
+<label id="profile-edit-region-label" for="profile-edit-region" >{{$lbl_region}} </label>
+<input type="text" size="32" name="region" id="profile-edit-region" value="{{$region}}" />
 </div>
 <div id="profile-edit-region-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="32" name="country_name" id="profile-edit-country-name" value="$country_name" />
+<label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$lbl_country}} </label>
+<input type="text" size="32" name="country_name" id="profile-edit-country-name" value="{{$country_name}}" />
 </div>
 <div id="profile-edit-country-name-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" />
+<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" />
+<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
+<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" />
+<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
+<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" />
+<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" />
+<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" />
+<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="keywords" id="profile-edit-pubkeywords" title="$lbl_ex2" value="$keywords" />
-</div><div id="profile-edit-pubkeywords-desc">$lbl_pubdsc</div>
+<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$lbl_pubkey}} </label>
+<input type="text" size="32" name="keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$keywords}}" />
+</div><div id="profile-edit-pubkeywords-desc">{{$lbl_pubdsc}}</div>
 <div id="profile-edit-pubkeywords-end"></div>
 
 <div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
+<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
+{{$lbl_about}}
 </p>
 
-<textarea rows="10" cols="72" id="profile-about-text" name="about" >$about</textarea>
+<textarea rows="10" cols="72" id="profile-about-text" name="about" >{{$about}}</textarea>
 
 </div>
 <div id="about-jot-end"></div>
@@ -165,10 +170,10 @@ $lbl_about
 
 <div id="interest-jot-wrapper" >
 <p id="interest-jot-desc" >
-$lbl_hobbies
+{{$lbl_hobbies}}
 </p>
 
-<textarea rows="10" cols="72" id="interest-jot-text" name="interest" >$interest</textarea>
+<textarea rows="10" cols="72" id="interest-jot-text" name="interest" >{{$interest}}</textarea>
 
 </div>
 <div id="interest-jot-end"></div>
@@ -176,10 +181,10 @@ $lbl_hobbies
 
 <div id="likes-jot-wrapper" >
 <p id="likes-jot-desc" >
-$lbl_likes
+{{$lbl_likes}}
 </p>
 
-<textarea rows="10" cols="72" id="likes-jot-text" name="likes" >$likes</textarea>
+<textarea rows="10" cols="72" id="likes-jot-text" name="likes" >{{$likes}}</textarea>
 
 </div>
 <div id="likes-jot-end"></div>
@@ -187,10 +192,10 @@ $lbl_likes
 
 <div id="dislikes-jot-wrapper" >
 <p id="dislikes-jot-desc" >
-$lbl_dislikes
+{{$lbl_dislikes}}
 </p>
 
-<textarea rows="10" cols="72" id="dislikes-jot-text" name="dislikes" >$dislikes</textarea>
+<textarea rows="10" cols="72" id="dislikes-jot-text" name="dislikes" >{{$dislikes}}</textarea>
 
 </div>
 <div id="dislikes-jot-end"></div>
@@ -198,46 +203,46 @@ $lbl_dislikes
 
 <div id="contact-jot-wrapper" >
 <p id="contact-jot-desc" >
-$lbl_social
+{{$lbl_social}}
 </p>
 
-<textarea rows="10" cols="72" id="contact-jot-text" name="contact" >$contact</textarea>
+<textarea rows="10" cols="72" id="contact-jot-text" name="contact" >{{$contact}}</textarea>
 
 </div>
 <div id="contact-jot-end"></div>
 
 <div id="channels-jot-wrapper" >
 <p id="channels-jot-desc" >
-$lbl_channels
+{{$lbl_channels}}
 </p>
 
-<textarea rows="10" cols="72" id="channels-jot-text" name="channels" >$channels</textarea>
+<textarea rows="10" cols="72" id="channels-jot-text" name="channels" >{{$channels}}</textarea>
 
 </div>
 <div id="channels-jot-end"></div>
 
 <div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
+<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
+{{$lbl_music}}
 </p>
 
-<textarea rows="10" cols="72" id="music-jot-text" name="music" >$music</textarea>
+<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
+{{$lbl_book}}
 </p>
 
-<textarea rows="10" cols="72" id="book-jot-text" name="book" >$book</textarea>
+<textarea rows="10" cols="72" id="book-jot-text" name="book" >{{$book}}</textarea>
 
 </div>
 <div id="book-jot-end"></div>
@@ -246,10 +251,10 @@ $lbl_book
 
 <div id="tv-jot-wrapper" >
 <p id="tv-jot-desc" >
-$lbl_tv 
+{{$lbl_tv}} 
 </p>
 
-<textarea rows="10" cols="72" id="tv-jot-text" name="tv" >$tv</textarea>
+<textarea rows="10" cols="72" id="tv-jot-text" name="tv" >{{$tv}}</textarea>
 
 </div>
 <div id="tv-jot-end"></div>
@@ -258,27 +263,27 @@ $lbl_tv
 
 <div id="film-jot-wrapper" >
 <p id="film-jot-desc" >
-$lbl_film
+{{$lbl_film}}
 </p>
 
-<textarea rows="10" cols="72" id="film-jot-text" name="film" >$film</textarea>
+<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" />
+<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
+{{$lbl_love}}
 </p>
 
-<textarea rows="10" cols="72" id="romance-jot-text" name="romance" >$romance</textarea>
+<textarea rows="10" cols="72" id="romance-jot-text" name="romance" >{{$romance}}</textarea>
 
 </div>
 <div id="romance-jot-end"></div>
@@ -287,10 +292,10 @@ $lbl_love
 
 <div id="work-jot-wrapper" >
 <p id="work-jot-desc" >
-$lbl_work
+{{$lbl_work}}
 </p>
 
-<textarea rows="10" cols="72" id="work-jot-text" name="work" >$work</textarea>
+<textarea rows="10" cols="72" id="work-jot-text" name="work" >{{$work}}</textarea>
 
 </div>
 <div id="work-jot-end"></div>
@@ -299,10 +304,10 @@ $lbl_work
 
 <div id="education-jot-wrapper" >
 <p id="education-jot-desc" >
-$lbl_school 
+{{$lbl_school}} 
 </p>
 
-<textarea rows="10" cols="72" id="education-jot-text" name="education" >$education</textarea>
+<textarea rows="10" cols="72" id="education-jot-text" name="education" >{{$education}}</textarea>
 
 </div>
 <div id="education-jot-end"></div>
@@ -310,7 +315,7 @@ $lbl_school
 
 
 <div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
 </div>
 <div class="profile-edit-submit-end"></div>
 
diff --git a/view/tpl/profile_edlink.tpl b/view/tpl/profile_edlink.tpl
index ea787b9f5..9424bcc3d 100644..100755
--- a/view/tpl/profile_edlink.tpl
+++ b/view/tpl/profile_edlink.tpl
@@ -1,2 +1,7 @@
-<div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="$editprofile" href="profiles/$profid" ></a></div>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<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/tpl/profile_entry.tpl b/view/tpl/profile_entry.tpl
index 7ff6d685b..4774fd11b 100644..100755
--- a/view/tpl/profile_entry.tpl
+++ b/view/tpl/profile_entry.tpl
@@ -1,11 +1,16 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <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>
+<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 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/tpl/profile_listing_header.tpl b/view/tpl/profile_listing_header.tpl
index 61a273792..f77bdcc80 100644..100755
--- a/view/tpl/profile_listing_header.tpl
+++ b/view/tpl/profile_listing_header.tpl
@@ -1,8 +1,13 @@
-<h1>$header</h1>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$header}}</h1>
 <p id="profile-listing-desc" class="button" >
-<a href="profile_photo" >$chg_photo</a>
+<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>
+<a href="{{$cr_new_link}}" id="profile-listing-new-link" title="{{$cr_new}}" >{{$cr_new}}</a>
 </div>
 
diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl
index 05952afa4..8c4fbfafa 100644..100755
--- a/view/tpl/profile_photo.tpl
+++ b/view/tpl/profile_photo.tpl
@@ -1,29 +1,34 @@
-<h1>$title</h1>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$title}}</h1>
 
 <form enctype="multipart/form-data" action="profile_photo" method="post">
-<input type='hidden' name='form_security_token' value='$form_security_token'>
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
 <div id="profile-photo-upload-wrapper">
 
-<label id="profile-photo-upload-label" class="form-label" for="profile-photo-upload">$lbl_upfile</label>
+<label id="profile-photo-upload-label" class="form-label" for="profile-photo-upload">{{$lbl_upfile}}</label>
 <input name="userfile" class="form-input" type="file" id="profile-photo-upload" size="48" />
 <div class="clear"></div>
 
-<label id="profile-photo-profiles-label" class="form-label" for="profile-photo-profiles">$lbl_profiles</label>
+<label id="profile-photo-profiles-label" class="form-label" for="profile-photo-profiles">{{$lbl_profiles}}</label>
 <select name="profile" id="profile-photo-profiles" class="form-input" >
-{{ for $profiles as $p }}
-<option value="$p.id" {{ if $p.is_default }}selected="selected"{{ endif }}>$p.name</option>
-{{ endfor }}
+{{foreach $profiles as $p}}
+<option value="{{$p.id}}" {{if $p.is_default}}selected="selected"{{/if}}>{{$p.name}}</option>
+{{/foreach}}
 </select>
 <div class="clear"></div>
 
 <div id="profile-photo-submit-wrapper">
-<input type="submit" name="submit" id="profile-photo-submit" value="$submit">
+<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}">
 </div>
 </div>
 
 </form>
 
 <div id="profile-photo-link-select-wrapper">
-$select
+{{$select}}
 </div>
\ No newline at end of file
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index 323658463..422b43720 100644..100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -1,52 +1,57 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="vcard">
 
-	{{ if $profile.edit }}
+	{{if $profile.edit}}
 	<div class="action">
-	<a class="profile-edit-side-link icon edit" rel="#profiles-menu" title="$profile.edit.3" href="#" ><span>$profile.edit.1</span></a>
+	<a class="profile-edit-side-link icon edit" rel="#profiles-menu" title="{{$profile.edit.3}}" href="#" ><span>{{$profile.edit.1}}</span></a>
 	<ul id="profiles-menu" class="menu-popup">
-		{{ for $profile.menu.entries as $e }}
+		{{foreach $profile.menu.entries as $e}}
 		<li>
-			<a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
+			<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>
+		{{/foreach}}
+		<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 }}
+	{{/if}}
 
-	<div class="fn label">$profile.name</div>
+	<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 $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
+	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
 
 
 
-	{{ if $location }}
-		<dl class="location"><dt class="location-label">$location</dt> 
+	{{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 }}
+			{{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
 			<span class="city-state-zip">
-				<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-				<span class="region">$profile.region</span>
-				<span class="postal-code">$profile.postal_code</span>
+				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+				<span class="region">{{$profile.region}}</span>
+				<span class="postal-code">{{$profile.postal_code}}</span>
 			</span>
-			{{ if $profile.country_name }}<span class="country-name">$profile.country_name</span>{{ endif }}
+			{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
 		</dd>
 		</dl>
-	{{ endif }}
+	{{/if}}
 
-	{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
+	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
 	
 
-	{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ 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>{{/if}}
 
-	{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" >$profile.homepage</a></dd></dl>{{ endif }}
+	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" >{{$profile.homepage}}</a></dd></dl>{{/if}}
 
 	
 </div>
 <div id="vcard-end"></div>
-$contact_block
+{{$contact_block}}
 
 
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
index 3f0bd937f..1f41d2662 100644..100755
--- a/view/tpl/prv_message.tpl
+++ b/view/tpl/prv_message.tpl
@@ -1,37 +1,42 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
-<h3>$header</h3>
+<h3>{{$header}}</h3>
 
 <div id="prvmail-wrapper" >
 <form id="prvmail-form" action="message" method="post" >
 
-$parent
+{{$parent}}
 
-<div id="prvmail-to-label">$to</div>
+<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 }}
+{{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}}
+{{/if}}
 
-<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-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-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" />
+	<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 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 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;" />
+		<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
 	</div> 
 </div>
 <div id="prvmail-end"></div>
diff --git a/view/tpl/pwdreset.tpl b/view/tpl/pwdreset.tpl
index 497b93396..e86e1227f 100644..100755
--- a/view/tpl/pwdreset.tpl
+++ b/view/tpl/pwdreset.tpl
@@ -1,17 +1,22 @@
-<h3>$lbl1</h3>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$lbl1}}</h3>
 
 <p>
-$lbl2
+{{$lbl2}}
 </p>
 <p>
-$lbl3
+{{$lbl3}}
 </p>
 <p>
-$newpass
+{{$newpass}}
 </p>
 <p>
-$lbl4 $lbl5
+{{$lbl4}} {{$lbl5}}
 </p>
 <p>
-$lbl6
+{{$lbl6}}
 </p>
diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl
index 4b565718d..98d888f08 100644..100755
--- a/view/tpl/register.tpl
+++ b/view/tpl/register.tpl
@@ -1,45 +1,50 @@
-<h2>$title</h2>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h2>{{$title}}</h2>
 
 <form action="register" method="post" id="register-form">
 
-{{ if $registertext }}
-<div id="register-desc" class="descriptive-paragraph">$registertext</div>
-{{ endif }}
+{{if $registertext}}
+<div id="register-desc" class="descriptive-paragraph">{{$registertext}}</div>
+{{/if}}
 
-{{ if $invitations }}
-	<p id="register-invite-desc">$invite_desc</p>
+{{if $invitations}}
+	<p id="register-invite-desc">{{$invite_desc}}</p>
 
-	<label for="register-invite" id="label-register-invite" class="register-label">$label_invite</label>
-	<input type="text" maxlength="72" size="32" name="invite_code" id="register-invite" class="register-input" value="$invite_code" />
+	<label for="register-invite" id="label-register-invite" class="register-label">{{$label_invite}}</label>
+	<input type="text" maxlength="72" size="32" name="invite_code" id="register-invite" class="register-input" value="{{$invite_code}}" />
 	<div id="register-invite-feedback" class="register-feedback"></div>
 	<div id="register-invite-end" class="register-field-end"></div>
-{{ endif }}
+{{/if}}
 
-	<label for="register-email" id="label-register-email" class="register-label" >$label_email</label>
-	<input type="text" maxlength="72" size="32" name="email" id="register-email" class="register-input" value="$email" />
+	<label for="register-email" id="label-register-email" class="register-label" >{{$label_email}}</label>
+	<input type="text" maxlength="72" size="32" name="email" id="register-email" class="register-input" value="{{$email}}" />
 	<div id="register-email-feedback" class="register-feedback"></div>
 	<div id="register-email-end"  class="register-field-end"></div>
 
-	<label for="register-password" id="label-register-password" class="register-label" >$label_pass1</label>
-	<input type="password" maxlength="72" size="32" name="password" id="register-password" class="register-input" value="$pass1" />
+	<label for="register-password" id="label-register-password" class="register-label" >{{$label_pass1}}</label>
+	<input type="password" maxlength="72" size="32" name="password" id="register-password" class="register-input" value="{{$pass1}}" />
 	<div id="register-password-feedback" class="register-feedback"></div>
 	<div id="register-password-end"  class="register-field-end"></div>
 
-	<label for="register-password2" id="label-register-password2" class="register-label" >$label_pass2</label>
-	<input type="password" maxlength="72" size="32" name="password2" id="register-password2" class="register-input" value="$pass2" />
+	<label for="register-password2" id="label-register-password2" class="register-label" >{{$label_pass2}}</label>
+	<input type="password" maxlength="72" size="32" name="password2" id="register-password2" class="register-input" value="{{$pass2}}" />
 	<div id="register-password2-feedback" class="register-feedback"></div>
 	<div id="register-password2-end"  class="register-field-end"></div>
 
-	{{ if $enable_tos }}
+	{{if $enable_tos}}
 	<input type="checkbox" name="tos" id="register-tos" value="1" />
-	<label for="register-tos" id="label-register-tos">$label_tos</label>
+	<label for="register-tos" id="label-register-tos">{{$label_tos}}</label>
 	<div id="register-tos-feedback" class="register-feedback"></div>
 	<div id="register-tos-end"  class="register-field-end"></div>
-	{{ else }}
+	{{else}}
 	<input type="hidden" name="tos" value="1" />
-	{{ endif }}
+	{{/if}}
 
-	<input type="submit" name="submit" id="register-submit-button" value="$submit" />
+	<input type="submit" name="submit" id="register-submit-button" value="{{$submit}}" />
 	<div id="register-submit-end" class="register-field-end"></div>
 
 </form>
diff --git a/view/tpl/remote_friends_common.tpl b/view/tpl/remote_friends_common.tpl
index 48bdd548f..8416b053a 100644..100755
--- a/view/tpl/remote_friends_common.tpl
+++ b/view/tpl/remote_friends_common.tpl
@@ -1,21 +1,26 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div id="remote-friends-in-common" class="bigwidget">
-	<div id="rfic-desc">$desc &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ if $linkmore }}<a href="$base/common/$uid">$more</a>{{ endif }}</div>
-	{{ if $items }}
-	{{ for $items as $item }}
+	<div id="rfic-desc">{{$desc}} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{if $linkmore}}<a href="{{$base}}/common/{{$uid}}">{{$more}}</a>{{/if}}</div>
+	{{if $items}}
+	{{foreach $items as $item}}
 	<div class="profile-match-wrapper">
 		<div class="profile-match-photo">
-			<a href="$base/chanview?f=&url=$item.xchan_url">
-				<img src="$item.xchan_photo_m" width="80" height="80" alt="$item.xchan_name" title="$item.xchan_name" />
+			<a href="{{$base}}/chanview?f=&url={{$item.xchan_url}}">
+				<img src="{{$item.xchan_photo_m}}" width="80" height="80" alt="{{$item.xchan_name}}" title="{{$item.xchan_name}}" />
 			</a>
 		</div>
 		<div class="profile-match-break"></div>
 		<div class="profile-match-name">
-			<a href="$base/chanview?f=&url=$item.xchan_url" title="$item.xchan_name">$item.xchan_name</a>
+			<a href="{{$base}}/chanview?f=&url={{$item.xchan_url}}" title="{{$item.xchan_name}}">{{$item.xchan_name}}</a>
 		</div>
 		<div class="profile-match-end"></div>
 	</div>
-	{{ endfor }}
-	{{ endif }}
+	{{/foreach}}
+	{{/if}}
 	<div id="rfic-end" class="clear"></div>
 </div>
 
diff --git a/view/tpl/removeme.tpl b/view/tpl/removeme.tpl
index a3ca8d4cf..3fe12a223 100644..100755
--- a/view/tpl/removeme.tpl
+++ b/view/tpl/removeme.tpl
@@ -1,19 +1,24 @@
-<h1>$title</h1>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$title}}</h1>
 
 <div id="remove-account-wrapper">
 
-<div id="remove-account-desc">$desc</div>
+<div id="remove-account-desc">{{$desc}}</div>
 
-<form action="$basedir/removeme" autocomplete="off" method="post" >
-<input type="hidden" name="verify" value="$hash" />
+<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>
+<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" />
+<input type="submit" name="submit" value="{{$submit}}" />
 
 </form>
 </div>
diff --git a/view/tpl/rmagic.tpl b/view/tpl/rmagic.tpl
index f16abe975..7e4e563d9 100644..100755
--- a/view/tpl/rmagic.tpl
+++ b/view/tpl/rmagic.tpl
@@ -1,11 +1,16 @@
-<h3>$title</h3>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$title}}</h3>
 
 <form action="rmagic" method="post" >
 
-	<label for="rmagic-address" id="label-rmagic-address" class="rmagic-label">$desc</label>
+	<label for="rmagic-address" id="label-rmagic-address" class="rmagic-label">{{$desc}}</label>
 	<input type="text" maxlength="255" size="32" name="address" id="rmagic-address" class="rmagic-input" value="" />
 
-	<input type="submit" name="submit" id="rmagic-submit-button" value="$submit" />
+	<input type="submit" name="submit" id="rmagic-submit-button" value="{{$submit}}" />
 	<div id="rmagic-submit-end" class="rmagic-field-end"></div>
 
 </form>
diff --git a/view/tpl/saved_searches_aside.tpl b/view/tpl/saved_searches_aside.tpl
index a204c48ff..034d1f6db 100644..100755
--- a/view/tpl/saved_searches_aside.tpl
+++ b/view/tpl/saved_searches_aside.tpl
@@ -1,14 +1,19 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="widget" id="saved-search-list">
-	<h3 id="search">$title</h3>
-	$searchbox
+	<h3 id="search">{{$title}}</h3>
+	{{$searchbox}}
 	
 	<ul id="saved-search-ul">
-		{{ for $saved as $search }}
+		{{foreach $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.displayterm</a>
+			<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.displayterm}}</a>
 		</li>
-		{{ endfor }}
+		{{/foreach}}
 	</ul>
 	<div class="clear"></div>
 </div>
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
index 70c278cf4..debc1d89d 100644..100755
--- a/view/tpl/search_item.tpl
+++ b/view/tpl/search_item.tpl
@@ -1,62 +1,67 @@
-<div id="thread-wrapper-$item.id" class="thread-wrapper $item.toplevel">
-<a name="$item.id" ></a>
-<div class="wall-item-outside-wrapper $item.indent$item.previewing" 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"  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">
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper {{$item.toplevel}}">
+<a name="{{$item.id}}" ></a>
+<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" 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}}"  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
+						{{$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 class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
+				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
+				{{else}}<div class="wall-item-lock"></div>{{/if}}	
+				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
 			</div>
 		</div>
 		<div class="wall-item-author">
-				<a href="$item.profile_url"  title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
+				<a href="{{$item.profile_url}}"  title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
 
-				<div id="wall-item-ago-$item.id" class="wall-item-ago"><abbr class="wall-item-ago-time" title="$item.isotime">$item.localtime</abbr>{{ if $item.app }}<span class="item.app">$item.str_app</span>{{ endif }}</div>
+				<div id="wall-item-ago-{{$item.id}}" class="wall-item-ago"><abbr class="wall-item-ago-time" title="{{$item.isotime}}">{{$item.localtime}}</abbr>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</div>
 				
 		</div>			
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
-			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
+		<div class="wall-item-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="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 }}
+				{{foreach $item.tags as $tag}}
+					<span class='tag'>{{$tag}}</span>
+				{{/foreach}}
 				</div>
 			</div>
 		</div>
-		<div class="wall-item-tools" id="wall-item-tools-$item.id">
-			<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 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>{{/if}}
 			</div>
-				{{ if $item.drop.pagedropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
+				{{if $item.drop.pagedropping}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
 			<div class="wall-item-delete-end"></div>
 		</div>
 	</div>
 	<div class="wall-item-wrapper-end"></div>
 
 
-	<div class="wall-item-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 class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
+	{{if $item.conv}}
+			<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
+	{{/if}}
 	</div>
 
-<div class="wall-item-outside-wrapper-end $item.indent" ></div>
+<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
 
 </div>
 </div>
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index ea44c1240..251fa9be4 100644..100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -1,71 +1,76 @@
-<h1>$ptitle</h1>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$ptitle}}</h1>
 
-$nickname_block
+{{$nickname_block}}
 
 <form action="settings" id="settings-form" method="post" autocomplete="off" >
-<input type='hidden' name='form_security_token' value='$form_security_token'>
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
-<h3 class="settings-heading">$h_basic</h3>
+<h3 class="settings-heading">{{$h_basic}}</h3>
 
-{{inc field_input.tpl with $field=$username }}{{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}}
+{{include file="field_input.tpl" field=$username}}
+{{include file="field_custom.tpl" field=$timezone}}
+{{include file="field_input.tpl" field=$defloc}}
+{{include file="field_checkbox.tpl" field=$allowloc}}
 
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 </div>
 
 
-<h3 class="settings-heading">$h_prv</h3>
+<h3 class="settings-heading">{{$h_prv}}</h3>
 
 
 <div id="settings-permissions-wrapper">
-{{ for $permiss_arr as $permit }}
-{{inc field_select.tpl with $field=$permit }}{{endinc}}
-{{ endfor }}
+{{foreach $permiss_arr as $permit}}
+{{include file="field_select.tpl" field=$permit}}
+{{/foreach}}
 </div>
 
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 </div>
 
 
-$profile_in_dir
+{{$profile_in_dir}}
 
-$suggestme
+{{$suggestme}}
 
-{{inc field_input.tpl with $field=$maxreq }}{{endinc}}
+{{include file="field_input.tpl" field=$maxreq}}
 
-{{inc field_input.tpl with $field=$cntunkmail }}{{endinc}}
+{{include file="field_input.tpl" field=$cntunkmail}}
 
-{{inc field_input.tpl with $field=$expire.days }}{{endinc}}
+{{include file="field_input.tpl" field=$expire.days}}
 
 
 <div class="field input">
-	<span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span>
+	<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.starred }}{{endinc}}
-			{{ inc field_yesno.tpl with $field=$expire.network_only }}{{endinc}}
+			<h3>{{$expire.advanced}}</h3>
+			{{include file="field_yesno.tpl" field=$expire.items}}
+			{{include file="field_yesno.tpl" field=$expire.starred}}
+			{{include file="field_yesno.tpl" field=$expire.network_only}}
 		</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>
+	<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
+			{{$aclselect}}
 		</div>
 	</div>
 
@@ -74,41 +79,41 @@ $suggestme
 <br/>
 <div id="settings-default-perms-end"></div>
 
-$group_select
+{{$group_select}}
 
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 </div>
 
 
 
-<h3 class="settings-heading">$h_not</h3>
+<h3 class="settings-heading">{{$h_not}}</h3>
 <div id="settings-notifications">
 
-<div id="settings-activity-desc">$activity_options</div>
+<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}}
+{{include file="field_checkbox.tpl" field=$post_newfriend}}
+{{include file="field_checkbox.tpl" field=$post_joingroup}}
+{{include file="field_checkbox.tpl" field=$post_profilechange}}
 
 
-<div id="settings-notify-desc">$lbl_not</div>
+<div 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}}
+{{include file="field_intcheckbox.tpl" field=$notify1}}
+{{include file="field_intcheckbox.tpl" field=$notify2}}
+{{include file="field_intcheckbox.tpl" field=$notify3}}
+{{include file="field_intcheckbox.tpl" field=$notify4}}
+{{include file="field_intcheckbox.tpl" field=$notify5}}
+{{include file="field_intcheckbox.tpl" field=$notify6}}
+{{include file="field_intcheckbox.tpl" field=$notify7}}
+{{include file="field_intcheckbox.tpl" field=$notify8}}
 </div>
 
 </div>
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 </div>
 
diff --git a/view/tpl/settings_account.tpl b/view/tpl/settings_account.tpl
index d1a635f91..a12283ff2 100644..100755
--- a/view/tpl/settings_account.tpl
+++ b/view/tpl/settings_account.tpl
@@ -1,28 +1,33 @@
-<h1>$title</h1>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$title}}</h1>
 
 
 <div id="settings-remove-account-link">
-<a href="removeme" title="$permanent" >$removeme</a>
+<a href="removeme" title="{{$permanent}}" >{{$removeme}}</a>
 </div>
 
 
 <form action="settings/account" id="settings-account-form" method="post" autocomplete="off" >
-<input type='hidden' name='form_security_token' value='$form_security_token'>
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
-{{inc field_input.tpl with $field=$email }}{{endinc}}
+{{include file="field_input.tpl" field=$email}}
 
 
-<h3 class="settings-heading">$h_pass</h3>
+<h3 class="settings-heading">{{$h_pass}}</h3>
 
-{{inc field_password.tpl with $field=$password1 }}{{endinc}}
-{{inc field_password.tpl with $field=$password2 }}{{endinc}}
+{{include file="field_password.tpl" field=$password1}}
+{{include file="field_password.tpl" field=$password2}}
 
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 </div>
 
-$account_settings
+{{$account_settings}}
 
 
 
diff --git a/view/tpl/settings_addons.tpl b/view/tpl/settings_addons.tpl
index 9a4f95341..b8613bec6 100644..100755
--- a/view/tpl/settings_addons.tpl
+++ b/view/tpl/settings_addons.tpl
@@ -1,10 +1,15 @@
-<h1>$title</h1>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$title}}</h1>
 
 
 <form action="settings/featured" method="post" autocomplete="off">
-<input type='hidden' name='form_security_token' value='$form_security_token'>
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
-$settings_addons
+{{$settings_addons}}
 
 </form>
 
diff --git a/view/tpl/settings_connectors.tpl b/view/tpl/settings_connectors.tpl
index 07a86e4fe..5df839411 100644..100755
--- a/view/tpl/settings_connectors.tpl
+++ b/view/tpl/settings_connectors.tpl
@@ -1,9 +1,14 @@
-<h1>$title</h1>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$title}}</h1>
 
 <form action="settings/connectors" method="post" autocomplete="off">
-<input type='hidden' name='form_security_token' value='$form_security_token'>
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
-$settings_connectors
+{{$settings_connectors}}
 
 </form>
 
diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl
index 2aac64515..3558e5cc9 100644..100755
--- a/view/tpl/settings_display.tpl
+++ b/view/tpl/settings_display.tpl
@@ -1,22 +1,27 @@
-<h1>$ptitle</h1>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<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'>
+<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 }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$nosmile}}{{endinc}}
+{{include file="field_themeselect.tpl" field=$theme}}
+{{include file="field_themeselect.tpl" field=$mobile_theme}}
+{{include file="field_input.tpl" field=$ajaxint}}
+{{include file="field_input.tpl" field=$itemspage}}
+{{include file="field_checkbox.tpl" field=$nosmile}}
 
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="$submit" />
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 </div>
 
-{{ if $theme_config }}
+{{if $theme_config}}
 <h2>Theme settings</h2>
-$theme_config
-{{ endif }}
+{{$theme_config}}
+{{/if}}
 
 </form>
diff --git a/view/tpl/settings_features.tpl b/view/tpl/settings_features.tpl
index fd65abebb..797d3da2c 100644..100755
--- a/view/tpl/settings_features.tpl
+++ b/view/tpl/settings_features.tpl
@@ -1,19 +1,24 @@
-<h1>$title</h1>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$title}}</h1>
 
 
 <form action="settings/features" method="post" autocomplete="off">
-<input type='hidden' name='form_security_token' value='$form_security_token'>
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
-{{ for $features as $f }}
-<h3 class="settings-heading">$f.0</h3>
+{{foreach $features as $f}}
+<h3 class="settings-heading">{{$f.0}}</h3>
 
-{{ for $f.1 as $fcat }}
-    {{ inc $field_yesno with $field=$fcat }}{{endinc}}
-{{ endfor }}
-{{ endfor }}
+{{foreach $f.1 as $fcat}}
+    {{include file="{{$field_yesno}}" field=$fcat}}
+{{/foreach}}
+{{/foreach}}
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-features-submit" value="$submit" />
+<input type="submit" name="submit" class="settings-features-submit" value="{{$submit}}" />
 </div>
 
 </form>
diff --git a/view/tpl/settings_nick_set.tpl b/view/tpl/settings_nick_set.tpl
index eb4721d50..fb886695e 100644..100755
--- a/view/tpl/settings_nick_set.tpl
+++ b/view/tpl/settings_nick_set.tpl
@@ -1,5 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <div id="settings-nick-wrapper" >
-<div id="settings-nickname-desc" class="info-message">$desc <strong>'$nickname@$basepath'</strong>$subdir</div>
+<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/tpl/settings_oauth.tpl b/view/tpl/settings_oauth.tpl
index 890c4ee6c..feab78210 100644..100755
--- a/view/tpl/settings_oauth.tpl
+++ b/view/tpl/settings_oauth.tpl
@@ -1,31 +1,36 @@
-<h1>$title</h1>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$title}}</h1>
 
 
 <form action="settings/oauth" method="post" autocomplete="off">
-<input type='hidden' name='form_security_token' value='$form_security_token'>
+<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>
+				<a id="profile-edit-view-link" href="{{$baseurl}}/settings/oauth/add">{{$add}}</a>
 			</li>
 		</ul>
 	</div>
 
-	{{ for $apps as $app }}
+	{{foreach $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 }}		
+		<img src='{{$app.icon}}' class="{{if $app.icon}} {{else}}noicon{{/if}}">
+		{{if $app.name}}<h4>{{$app.name}}</h4>{{else}}<h4>{{$noname}}</h4>{{/if}}
+		{{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>
+			{{/if}}
+		{{/if}}
+		{{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>
+		{{/if}}		
 	</div>
-	{{ endfor }}
+	{{/foreach}}
 
 </form>
diff --git a/view/tpl/settings_oauth_edit.tpl b/view/tpl/settings_oauth_edit.tpl
index e6f2abdc2..e3960bf75 100644..100755
--- a/view/tpl/settings_oauth_edit.tpl
+++ b/view/tpl/settings_oauth_edit.tpl
@@ -1,17 +1,22 @@
-<h1>$title</h1>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$title}}</h1>
 
 <form method="POST">
-<input type='hidden' name='form_security_token' value='$form_security_token'>
+<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 }}
+{{include file="field_input.tpl" field=$name}}
+{{include file="field_input.tpl" field=$key}}
+{{include file="field_input.tpl" field=$secret}}
+{{include file="field_input.tpl" field=$redirect}}
+{{include file="field_input.tpl" field=$icon}}
 
 <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" />
+<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/tpl/siteinfo.tpl b/view/tpl/siteinfo.tpl
index 4931cc3a7..3720c9629 100644..100755
--- a/view/tpl/siteinfo.tpl
+++ b/view/tpl/siteinfo.tpl
@@ -1,14 +1,19 @@
-<h3>$title</h3>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$title}}</h3>
 <p></p>
-<p>$description</p>
-{{ if $version }}
-<p>$version</p>
-{{ endif }}
-<p>$web_location</p>
-<p>$visit</p>
-<p>$bug_text <a href="$bug_link_url">$bug_link_text</a></p>
-<p>$contact</p>
-<p>$plugins_text</p>
-{{ if $plugins_list }}
-   <div style="margin-left: 25px; margin-right: 25px;">$plugins_list</div>
-{{ endif }}
+<p>{{$description}}</p>
+{{if $version}}
+<p>{{$version}}</p>
+{{/if}}
+<p>{{$web_location}}</p>
+<p>{{$visit}}</p>
+<p>{{$bug_text}} <a href="{{$bug_link_url}}">{{$bug_link_text}}</a></p>
+<p>{{$contact}}</p>
+<p>{{$plugins_text}}</p>
+{{if $plugins_list}}
+   <div style="margin-left: 25px; margin-right: 25px;">{{$plugins_list}}</div>
+{{/if}}
diff --git a/view/tpl/smarty3/404.tpl b/view/tpl/smarty3/404.tpl
deleted file mode 100644
index 2d581ab8d..000000000
--- a/view/tpl/smarty3/404.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h1>{{$message}}</h1>
diff --git a/view/tpl/smarty3/abook_edit.tpl b/view/tpl/smarty3/abook_edit.tpl
deleted file mode 100644
index 9f6556842..000000000
--- a/view/tpl/smarty3/abook_edit.tpl
+++ /dev/null
@@ -1,79 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<h2>{{$header}}</h2>
-
-<h3>{{$addr}}</h3>
-
-{{if $notself}}
-<div id="connection-flag-tabs">
-{{$tabs}}
-</div>
-{{/if}}
-
-{{if $self}}
-<div id="autoperm-desc" class="descriptive-paragraph">{{$autolbl}}</div>
-{{/if}}
-
-
-<div id="contact-edit-wrapper">
-
-{{if $notself}}
-{{if $slide}}
-<h3>{{$lbl_slider}}</h3>
-
-{{$slide}}
-
-{{/if}}
-{{/if}}
-
-
-
-<h3>{{$permlbl}}</h3>
-
-<form id="abook-edit-form" action="connections/{{$contact_id}}" method="post" >
-<input type="hidden" name="contact_id" value="{{$contact_id}}">
-<input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" />
-
-{{if $noperms}}
-<div id="noperm-desc" class="descriptive-paragraph">{{$noperms}}</div>
-{{/if}}
-
-
-{{if $is_pending}}
-{{include file="field_checkbox.tpl" field=$unapproved}}
-{{/if}}
-
-<br />
-<b>{{$quick}}</b>
-<ul>
-{{if $self}}
-<li><span class="fakelink" onclick="connectForum(); $('#abook-edit-form').submit();">{{$forum}}</span></li>
-<li><span class="fakelink" onclick="connectSoapBox(); $('#abook-edit-form').submit();">{{$soapbox}}</span></li>
-{{/if}}
-<li><span class="fakelink" onclick="connectFullShare(); $('#abook-edit-form').submit();">{{$full}}</span></li>
-<li><span class="fakelink" onclick="connectCautiousShare(); $('#abook-edit-form').submit();">{{$cautious}}</span></li>
-<li><span class="fakelink" onclick="connectFollowOnly(); $('#abook-edit-form').submit();">{{$follow}}</span></li>
-</ul>
-
-<div id="abook-advanced" class="fakelink" onclick="openClose('abook-advanced-panel');">{{$advanced}}</div>
-
-<div id="abook-advanced-panel" style="display: none;">
-
-<span class="abook-them">{{$them}}</span><span class="abook-me">{{$me}}</span>
-<br />
-<br />
-{{foreach $perms as $prm}}
-{{include file="field_acheckbox.tpl" field=$prm}}
-{{/foreach}}
-<br />
-
-</div>
-
-<input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" />
-
-</form>
-</div>
diff --git a/view/tpl/smarty3/acl_selector.tpl b/view/tpl/smarty3/acl_selector.tpl
deleted file mode 100644
index aebef71ee..000000000
--- a/view/tpl/smarty3/acl_selector.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div id="acl-wrapper">
-	<input id="acl-search">
-	<a href="#" id="acl-showall">{{$showall}}</a>
-	<div id="acl-list">
-		<div id="acl-list-content">
-		</div>
-	</div>
-	<span id="acl-fields"></span>
-</div>
-
-<div class="acl-list-item" rel="acl-template" style="display:none">
-	<img 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() {
-	setTimeout( function () {
-		if(typeof acl=="undefined"){
-			acl = new ACL(
-				baseurl+"/acl",
-				[ {{$allowcid}},{{$allowgid}},{{$denycid}},{{$denygid}} ]
-			);
-		}
-	}, 5000 );
-});
-</script>
diff --git a/view/tpl/smarty3/admin_aside.tpl b/view/tpl/smarty3/admin_aside.tpl
deleted file mode 100644
index 69445d3b1..000000000
--- a/view/tpl/smarty3/admin_aside.tpl
+++ /dev/null
@@ -1,47 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<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") { reigster=""; 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>
-{{/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>
-</ul>
-
diff --git a/view/tpl/smarty3/admin_logs.tpl b/view/tpl/smarty3/admin_logs.tpl
deleted file mode 100644
index 6a2259500..000000000
--- a/view/tpl/smarty3/admin_logs.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<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}}'>
-
-	{{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}}" /></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/tpl/smarty3/admin_plugins.tpl b/view/tpl/smarty3/admin_plugins.tpl
deleted file mode 100644
index 307814e87..000000000
--- a/view/tpl/smarty3/admin_plugins.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div id='adminpage'>
-	<h1>{{$title}} - {{$page}}</h1>
-	
-		<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>
-</div>
diff --git a/view/tpl/smarty3/admin_plugins_details.tpl b/view/tpl/smarty3/admin_plugins_details.tpl
deleted file mode 100644
index e81701732..000000000
--- a/view/tpl/smarty3/admin_plugins_details.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<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/tpl/smarty3/admin_site.tpl b/view/tpl/smarty3/admin_site.tpl
deleted file mode 100644
index eaf067c27..000000000
--- a/view/tpl/smarty3/admin_site.tpl
+++ /dev/null
@@ -1,89 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<script>
-	$(function(){
-		
-		$("#cnftheme").fancybox({
-			width: 800,
-			autoDimensions: false,
-			onStart: function(){
-				var theme = $("#id_theme :selected").val();
-				$("#cnftheme").attr('href',"{{$baseurl}}/admin/themes/"+theme);
-			}, 
-			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();
-						$.fancybox.close();
-					})
-					
-					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_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=$theme_accessibility}}
-	{{include file="field_select.tpl" field=$ssl_policy}}
-	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
-	
-	<h3>{{$registration}}</h3>
-	{{include file="field_input.tpl" field=$register_text}}
-	{{include file="field_select.tpl" field=$register_policy}}
-	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
-
-	<h3>{{$upload}}</h3>
-	{{include file="field_input.tpl" field=$maximagesize}}
-	
-	<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_input.tpl" field=$global_directory}}
-	
-	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
-	
-	<h3>{{$advanced}}</h3>
-	{{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/tpl/smarty3/admin_summary.tpl b/view/tpl/smarty3/admin_summary.tpl
deleted file mode 100644
index 76ac23d29..000000000
--- a/view/tpl/smarty3/admin_summary.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div id='adminpage'>
-	<h1>{{$title}} - {{$page}}</h1>
-
-	<dl>
-		<dt>{{$queues.label}}</dt>
-		<dd>{{$queues.queue}}</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>{{$p}}</dd>
-		{{/foreach}}
-		
-	</dl>
-
-	<dl>
-		<dt>{{$version.0}}</dt>
-		<dd>{{$version.1}} - {{$build}}</dt>
-	</dl>
-
-
-</div>
diff --git a/view/tpl/smarty3/admin_users.tpl b/view/tpl/smarty3/admin_users.tpl
deleted file mode 100644
index 136ce3c3e..000000000
--- a/view/tpl/smarty3/admin_users.tpl
+++ /dev/null
@@ -1,92 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<script>
-	function confirm_delete(uname){
-		return confirm( "{{$confirm_delete}}".format(uname));
-	}
-	function confirm_delete_multi(){
-		return confirm("{{$confirm_delete_multi}}");
-	}
-	function selectall(cls){
-		$("."+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>
-			{{/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='email'>{{$u.account_email}}</td>
-						<td class='register_date'>{{$u.account_created}}</td>
-						<td class='login_date'>{{$u.account_lastlog}}</td>
-						<td class='service_class'>{{$u.account_service_class}}</td>
-						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
-						<td class="tools">
-							<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>
-						</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/tpl/smarty3/album_edit.tpl b/view/tpl/smarty3/album_edit.tpl
deleted file mode 100644
index 36c07a9f0..000000000
--- a/view/tpl/smarty3/album_edit.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div id="photo-album-edit-wrapper">
-<form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/{{$nickname}}/album/{{$hexalbum}}" method="post" >
-
-
-<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/tpl/smarty3/api_config_xml.tpl b/view/tpl/smarty3/api_config_xml.tpl
deleted file mode 100644
index 09aa00ac4..000000000
--- a/view/tpl/smarty3/api_config_xml.tpl
+++ /dev/null
@@ -1,71 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<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/tpl/smarty3/api_friends_xml.tpl b/view/tpl/smarty3/api_friends_xml.tpl
deleted file mode 100644
index e9c40293b..000000000
--- a/view/tpl/smarty3/api_friends_xml.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<users type="array">
-	{{foreach $users as $user}}
-	{{include file="api_user_xml.tpl"}}
-	{{/foreach}}
-</users>
diff --git a/view/tpl/smarty3/api_ratelimit_xml.tpl b/view/tpl/smarty3/api_ratelimit_xml.tpl
deleted file mode 100644
index a34eb6723..000000000
--- a/view/tpl/smarty3/api_ratelimit_xml.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<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/tpl/smarty3/api_status_xml.tpl b/view/tpl/smarty3/api_status_xml.tpl
deleted file mode 100644
index e3e80d2b1..000000000
--- a/view/tpl/smarty3/api_status_xml.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<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>
-{{/if}}</status>
diff --git a/view/tpl/smarty3/api_test_xml.tpl b/view/tpl/smarty3/api_test_xml.tpl
deleted file mode 100644
index df5009af5..000000000
--- a/view/tpl/smarty3/api_test_xml.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<ok>{{$ok}}</ok>
diff --git a/view/tpl/smarty3/api_timeline_atom.tpl b/view/tpl/smarty3/api_timeline_atom.tpl
deleted file mode 100644
index 00a28e390..000000000
--- a/view/tpl/smarty3/api_timeline_atom.tpl
+++ /dev/null
@@ -1,95 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<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>Friendika</title>
- <subtitle>Friendika 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:obj_type>http://activitystrea.ms/schema/1.0/person</activity:obj_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:obj_type>http://activitystrea.ms/schema/1.0/person</activity:obj_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>
- 
- 
-  	{{foreach $statuses as $status}}
-	<entry>
-		<activity:obj_type>{{$status.objecttype}}</activity:obj_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:obj_type>http://activitystrea.ms/schema/1.0/person</activity:obj_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>    
-    {{/foreach}}
-</feed>
diff --git a/view/tpl/smarty3/api_timeline_rss.tpl b/view/tpl/smarty3/api_timeline_rss.tpl
deleted file mode 100644
index afad50aab..000000000
--- a/view/tpl/smarty3/api_timeline_rss.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<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>Friendika</title>
-    <link>{{$rss.alternate}}</link>
-    <atom:link type="application/rss+xml" rel="self" href="{{$rss.self}}"/>
-    <description>Friendika 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>
-	
-{{foreach $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>
-{{/foreach}}
-  </channel>
-</rss>
diff --git a/view/tpl/smarty3/api_timeline_xml.tpl b/view/tpl/smarty3/api_timeline_xml.tpl
deleted file mode 100644
index 84148d17f..000000000
--- a/view/tpl/smarty3/api_timeline_xml.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<statuses type="array" xmlns:statusnet="http://status.net/schema/api/1/">
-{{foreach $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>
-{{include file="api_user_xml.tpl" user=$status.user}}  <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>
-{{/foreach}}</statuses>
diff --git a/view/tpl/smarty3/api_user_xml.tpl b/view/tpl/smarty3/api_user_xml.tpl
deleted file mode 100644
index d7efcf3fb..000000000
--- a/view/tpl/smarty3/api_user_xml.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-  <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>
-  {{/if}}</status>
-  </user>
diff --git a/view/tpl/smarty3/apps.tpl b/view/tpl/smarty3/apps.tpl
deleted file mode 100644
index 01d9bb8c8..000000000
--- a/view/tpl/smarty3/apps.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h3>{{$title}}</h3>
-
-<ul>
-	{{foreach $apps as $ap}}
-	<li>{{$ap}}</li>
-	{{/foreach}}
-</ul>
diff --git a/view/tpl/smarty3/atom_feed.tpl b/view/tpl/smarty3/atom_feed.tpl
deleted file mode 100644
index db553d99f..000000000
--- a/view/tpl/smarty3/atom_feed.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<?xml version="1.0" encoding="utf-8" ?>
-<feed xmlns="http://www.w3.org/2005/Atom"
-      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/tpl/smarty3/atom_feed_dfrn.tpl b/view/tpl/smarty3/atom_feed_dfrn.tpl
deleted file mode 100644
index 87d78a518..000000000
--- a/view/tpl/smarty3/atom_feed_dfrn.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<?xml version="1.0" encoding="utf-8" ?>
-<feed xmlns="http://www.w3.org/2005/Atom"
-      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/tpl/smarty3/birthdays_reminder.tpl b/view/tpl/smarty3/birthdays_reminder.tpl
deleted file mode 100644
index 56749cd12..000000000
--- a/view/tpl/smarty3/birthdays_reminder.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{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>
-{{foreach $events as $event}}
-<div class="birthday-list" id="birthday-{{$event.id}}"></a> <a href="{{$event.link}}">{{$event.title}}</a> {{$event.date}} </div>
-{{/foreach}}
-</div>
-{{/if}}
-
diff --git a/view/tpl/smarty3/build_query.tpl b/view/tpl/smarty3/build_query.tpl
deleted file mode 100644
index a84f09031..000000000
--- a/view/tpl/smarty3/build_query.tpl
+++ /dev/null
@@ -1,57 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<script> 
-
-	var bParam_cmd = "{{$baseurl}}/update_{{$pgtype}}";
-
-
-	var bParam_uid = {{$uid}};
-	var bParam_gid = {{$gid}};
-	var bParam_cid = {{$cid}};
-	var bParam_cmin = {{$cmin}};
-	var bParam_cmax = {{$cmax}};
-	var bParam_star = {{$star}};
-	var bParam_liked = {{$liked}};
-	var bParam_conv = {{$conv}};
-	var bParam_spam = {{$spam}};
-	var bParam_new = {{$nouveau}};
-	var bParam_page = {{$page}};
-	var bParam_wall = {{$wall}};
-
-	var bParam_search = "{{$search}}";
-	var bParam_order = "{{$order}}";
-	var bParam_file = "{{$file}}";
-	var bParam_cats = "{{$cats}}";
-	var bParam_dend = "{{$dend}}";
-	var bParam_dbegin = "{{$dbegin}}";
-	var bParam_mid = "{{$mid}}";
-
-	function buildCmd() {
-		var udargs = ((page_load) ? "/load" : "");
-		var bCmd = bParam_cmd + udargs + "?f=" ;
-		if(bParam_uid) bCmd = bCmd + "&p=" + bParam_uid;
-		if(bParam_cmin != 0) bCmd = bCmd + "&cmin=" + bParam_cmin;
-		if(bParam_cmax != 99) bCmd = bCmd + "&cmax=" + bParam_cmax;
-		if(bParam_gid != 0) { bCmd = bCmd + "&gid=" + bParam_gid; } else
-		if(bParam_cid != 0) { bCmd = bCmd + "&cid=" + bParam_cid; }
-		if(bParam_star != 0) bCmd = bCmd + "&star=" + bParam_star;
-		if(bParam_liked != 0) bCmd = bCmd + "&liked=" + bParam_liked;
-		if(bParam_conv!= 0) bCmd = bCmd + "&conv=" + bParam_conv;
-		if(bParam_spam != 0) bCmd = bCmd + "&spam=" + bParam_spam;
-		if(bParam_new != 0) bCmd = bCmd + "&new=" + bParam_new;
-		if(bParam_wall != 0) bCmd = bCmd + "&wall=" + bParam_wall;
-		if(bParam_search != "") bCmd = bCmd + "&search=" + bParam_search;
-		if(bParam_file != "") bCmd = bCmd + "&file=" + bParam_file;
-		if(bParam_cats != "") bCmd = bCmd + "&cats=" + bParam_cats;
-		if(bParam_dend != "") bCmd = bCmd + "&dend=" + bParam_dend;
-		if(bParam_dbegin != "") bCmd = bCmd + "&dbegin=" + bParam_dbegin;
-		if(bParam_mid != "") bCmd = bCmd + "&mid=" + bParam_mid;
-		if(bParam_page != 1) bCmd = bCmd + "&page=" + bParam_page;
-		return(bCmd);
-	}
-
-</script>
-
diff --git a/view/tpl/smarty3/categories_widget.tpl b/view/tpl/smarty3/categories_widget.tpl
deleted file mode 100644
index 75da9fc43..000000000
--- a/view/tpl/smarty3/categories_widget.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div id="categories-sidebar" class="widget">
-	<h3>{{$title}}</h3>
-	<div id="categories-sidebar-desc">{{$desc}}</div>
-	
-	<ul class="categories-ul">
-		<li class="tool"><a href="{{$base}}" class="categories-link categories-all{{if $sel_all}} categories-selected{{/if}}">{{$all}}</a></li>
-		{{foreach $terms as $term}}
-			<li class="tool"><a href="{{$base}}?f=&cat={{$term.name}}" class="categories-link{{if $term.selected}} categories-selected{{/if}}">{{$term.name}}</a></li>
-		{{/foreach}}
-	</ul>
-	
-</div>
diff --git a/view/tpl/smarty3/channel.tpl b/view/tpl/smarty3/channel.tpl
deleted file mode 100644
index b49cf19cc..000000000
--- a/view/tpl/smarty3/channel.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="channel-selection">
-{{if $channel.default_links}}
-{{if $channel.default}}
-<div class="channel-selection-default default">{{$msg_default}}</div>
-{{else}}
-<div class="channel-selection-default"><a href="manage/{{$channel.channel_id}}/default">{{$msg_make_default}}</a></div>
-{{/if}}
-{{/if}}
-<a href="{{$channel.link}}" class="channel-selection-photo-link" title="{{$channel.channel_name}}"><img class="channel-photo" src="{{$channel.xchan_photo_m}}" alt="{{$channel.channel_name}}" /></a>
-<a href="{{$channel.link}}" class="channel-selection-name-link" title="{{$channel.channel_name}}"><div class="channel-name">{{$channel.channel_name}}</div></a>
-</div>
-<div class="channel-selection-end"></div>
diff --git a/view/tpl/smarty3/channel_import.tpl b/view/tpl/smarty3/channel_import.tpl
deleted file mode 100644
index 872f039b7..000000000
--- a/view/tpl/smarty3/channel_import.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h2>{{$title}}</h2>
-
-<form action="import" method="post" id="import-channel-form">
-
-	<div id="import-desc" class="descriptive-paragraph">{{$desc}}</div>
-
-	<label for="import-filename" id="label-import-filename" class="import-label" >{{$label_filename}}</label>
-	<input type="file" name="filename" id="import-filename" class="import-input" value="" />
-	<div id="import-filename-end" class="import-field-end"></div>
-
-	<div id="import-choice" class="descriptive-paragraph">{{$choice}}</div>
-
-	<label for="import-old-address" id="label-import-old-address" class="import-label" >{{$label_old_address}}</label>
-	<input type="text" name="old_address" id="import-old-address" class="import-input" value="" />
-	<div id="import-old-address-end" class="import-field-end"></div>
-
-	<label for="import-old-email" id="label-import-old-email" class="import-label" >{{$label_old_email}}</label>
-	<input type="text" name="email" id="import-old-email" class="import-input" value="{{$email}}" />
-	<div id="import-old-email-end" class="import-field-end"></div>
-
-	<label for="import-old-pass" id="label-import-old-pass" class="import-label" >{{$label_old_pass}}</label>
-	<input type="password" name="password" id="import-old-pass" class="import-input" value="{{$pass}}" />
-	<div id="import-old-pass-end" class="import-field-end"></div>
-
-	<div id="import-common-desc" class="descriptive-paragraph">{{$common}}</div>
-
-	<input type="checkbox" name="make_primary" id="import-make-primary" value="1" />
-	<label for="import-make-primary" id="label-import-make-primary">{{$label_import_primary}}</label>
-	<div id="import-make-primary-end" class="import-field-end"></div>
-
-	<input type="submit" name="submit" id="import-submit-button" value="{{$submit}}" />
-	<div id="import-submit-end" class="import-field-end"></div>
-
-</form>
-
diff --git a/view/tpl/smarty3/channels.tpl b/view/tpl/smarty3/channels.tpl
deleted file mode 100644
index cfb66401b..000000000
--- a/view/tpl/smarty3/channels.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h3>{{$header}}</h3>
-
-
-{{if $links}}
-{{foreach $links as $l}}
-<a class="channels-links" href="{{$l.0}}" title="{{$l.1}}">{{$l.2}}</a>
-{{/foreach}}
-{{/if}} 
-
-{{if $selected}}
-<div id="channels-selected">{{$msg_selected}}</div>
-{{include file="channel.tpl" channel=$selected}}
-<div class="channels-end selected"></div>
-{{/if}}
-
-<div id="channels-desc" class="descriptive-text">{{$desc}}</div>
-
-{{foreach $all_channels as $chn}}
-{{include file="channel.tpl" channel=$chn}}
-{{/foreach}} 
-
-<div class="channels-end all"></div>
diff --git a/view/tpl/smarty3/chanview.tpl b/view/tpl/smarty3/chanview.tpl
deleted file mode 100644
index 4b0f29f6c..000000000
--- a/view/tpl/smarty3/chanview.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div id="chanview-iframe-border" class="fakelink" onclick="chanviewFull(); return true;" title="{{$full}}" >&#x2610;</div>
-<iframe id="remote-channel" width="100%" src="{{$url}}" onload="resize_iframe()"></iframe>
diff --git a/view/tpl/smarty3/comment_item.tpl b/view/tpl/smarty3/comment_item.tpl
deleted file mode 100644
index d15009d7f..000000000
--- a/view/tpl/smarty3/comment_item.tpl
+++ /dev/null
@@ -1,72 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-		{{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;">
-		{{/if}}
-			<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" />
-
-				<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>
-				{{foreach $qcomment as $qc}}
-					<option value="{{$qc}}">{{$qc}}</option>				
-				{{/foreach}}
-					</select>
-				{{/if}}
-
-				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" 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}}" />
-					{{if $preview}}
-					<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>
-					{{/if}}
-				</div>
-
-				<div class="comment-edit-end"></div>
-			</form>
-
-		</div>
diff --git a/view/tpl/smarty3/common_friends.tpl b/view/tpl/smarty3/common_friends.tpl
deleted file mode 100644
index 499cfe626..000000000
--- a/view/tpl/smarty3/common_friends.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="profile-match-wrapper">
-	<div class="profile-match-photo">
-		<a href="{{$url}}">
-			<img src="{{$photo}}" alt="{{$name}}" width="80" height="80" title="{{$name}} [{{$url}}]" />
-		</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/tpl/smarty3/common_tabs.tpl b/view/tpl/smarty3/common_tabs.tpl
deleted file mode 100644
index 07c501499..000000000
--- a/view/tpl/smarty3/common_tabs.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<ul class="tabs">
-	{{foreach $tabs as $tab}}
-		<li {{if $tab.id}}id="{{$tab.id}}"{{/if}}><a href="{{$tab.url}}" class="tab button {{$tab.sel}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
-	{{/foreach}}
-</ul>
-<div class="tabs-end"></div>
\ No newline at end of file
diff --git a/view/tpl/smarty3/contact_block.tpl b/view/tpl/smarty3/contact_block.tpl
deleted file mode 100644
index 3b07a1ea3..000000000
--- a/view/tpl/smarty3/contact_block.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div id="contact-block">
-<div id="contact-block-numcontacts">{{$contacts}}</div>
-{{if $micropro}}
-		<a class="allcontact-link" href="viewconnections/{{$nickname}}">{{$viewconnections}}</a>
-		<div class='contact-block-content'>
-		{{foreach $micropro as $m}}
-			{{$m}}
-		{{/foreach}}
-		</div>
-{{/if}}
-</div>
-<div class="clear"></div>
diff --git a/view/tpl/smarty3/contact_head.tpl b/view/tpl/smarty3/contact_head.tpl
deleted file mode 100644
index 27bc286b1..000000000
--- a/view/tpl/smarty3/contact_head.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<script language="javascript" type="text/javascript"
-          src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
-          <script language="javascript" type="text/javascript">
-
-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 : '',
-	content_css: "{{$baseurl}}/view/custom_tinymce.css"
-
-
-});
-
-
-</script>
-
diff --git a/view/tpl/smarty3/contact_slider.tpl b/view/tpl/smarty3/contact_slider.tpl
deleted file mode 100644
index 80fa6f056..000000000
--- a/view/tpl/smarty3/contact_slider.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div id="contact-slider" class="slider" style="height: 32px; position: relative; left: 5%; width: 90%;"><input id="contact-range" type="text" name="fake-closeness" value="{{$val}}" /></div>
-<script>
-	$("#contact-range").slider({ from: 0, to: 99, step: 1, scale: ['{{$me}}', '|', '{{$intimate}}', '|', '{{$friends}}', '|', '{{$oldfriends}}', '|', '{{$acquaintances}}', '|', '{{$world}}' ], onstatechange: function(v) { $("#contact-closeness-mirror").val(v); }  });
-</script>
diff --git a/view/tpl/smarty3/contact_template.tpl b/view/tpl/smarty3/contact_template.tpl
deleted file mode 100644
index 2f3ef645c..000000000
--- a/view/tpl/smarty3/contact_template.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}" >
-	<div class="contact-entry-photo-wrapper" >
-		<a href="{{$contact.link}}" title="{{$contact.img_hover}}" /><img class="contact-block-img" src="{{$contact.thumb}}" alt="{{$contact.name}}" /></a>
-	</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/tpl/smarty3/contacts-template.tpl b/view/tpl/smarty3/contacts-template.tpl
deleted file mode 100644
index 66f3f5c87..000000000
--- a/view/tpl/smarty3/contacts-template.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h1>{{$header}}{{if $total}} ({{$total}}){{/if}}</h1>
-
-{{if $finding}}<h4>{{$finding}}</h4>{{/if}}
-
-<div id="contacts-search-wrapper">
-<form id="contacts-search-form" action="{{$cmd}}" method="get" >
-<span class="contacts-search-desc">{{$desc}}</span>
-<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="{{$search}}" />
-<input type="submit" name="submit" id="contacts-search-submit" value="{{$submit}}" />
-</form>
-</div>
-<div id="contacts-search-end"></div>
-
-{{$tabs}}
-
-
-{{foreach $contacts as $contact}}
-	{{include file="contact_template.tpl"}}
-{{/foreach}}
-<div id="contact-edit-end"></div>
-
-{{$paginate}}
-
-
-
-
diff --git a/view/tpl/smarty3/conv.tpl b/view/tpl/smarty3/conv.tpl
deleted file mode 100644
index c91ab635a..000000000
--- a/view/tpl/smarty3/conv.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{foreach $threads as $thread}}
-<div id="thread-wrapper-{{$thread.id}}" class="thread-wrapper">
-	{{foreach $thread.items as $item}}
-		{{if $item.comment_firstcollapsed}}
-			<div class="hide-comments-outer">
-			<span id="hide-comments-total-{{$thread.id}}" class="hide-comments-total">{{$thread.num_comments}}</span> <span id="hide-comments-{{$thread.id}}" class="hide-comments fakelink" onclick="showHideComments({{$thread.id}});">{{$thread.hide_text}}</span>
-			</div>
-			<div id="collapsed-comments-{{$thread.id}}" class="collapsed-comments" style="display: none;">
-		{{/if}}
-		{{if $item.comment_lastcollapsed}}</div>{{/if}}
-		
-		{{include file="{{$item.template}}"}}
-		
-		
-	{{/foreach}}
-</div>
-{{/foreach}}
diff --git a/view/tpl/smarty3/conv_frame.tpl b/view/tpl/smarty3/conv_frame.tpl
deleted file mode 100644
index 81d655be2..000000000
--- a/view/tpl/smarty3/conv_frame.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div id="threads-begin"></div>
-<div id="threads-end"></div>
-<div id="conversation-end"></div>
-
-{{if $dropping}}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
-  <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
-  <div id="item-delete-selected-desc" >{{$dropping}}</div>
-</div>
-<div id="item-delete-selected-end"></div>
-{{/if}}
-
-<img id="page-spinner" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
-
diff --git a/view/tpl/smarty3/conv_item.tpl b/view/tpl/smarty3/conv_item.tpl
deleted file mode 100644
index a03b79a90..000000000
--- a/view/tpl/smarty3/conv_item.tpl
+++ /dev/null
@@ -1,120 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{if $item.comment_firstcollapsed}}
-	<div class="hide-comments-outer">
-	<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> <span id="hide-comments-{{$item.id}}" class="hide-comments fakelink" onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
-	</div>
-	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
-{{/if}}
-<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper {{$item.toplevel}}">
-<a name="{{$item.id}}" ></a>
-<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" >
-	<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" >
-		<div class="wall-item-info{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}">
-			{{if $item.owner_url}}
-			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
-				<a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
-				<img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" /></a>
-			</div>
-			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
-			{{/if}}
-			<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}" 
-				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
-                onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
-				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
-                <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
-                    <ul>
-                        {{$item.item_photo_menu}}
-                    </ul>
-                </div>
-
-			</div>
-			<div class="wall-item-photo-end"></div>
-			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
-				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
-				{{else}}<div class="wall-item-lock"></div>{{/if}}	
-				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
-			</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}{{/if}}<br />
-				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.isotime}}">{{$item.localtime}}</div>				
-		</div>			
-		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
-			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}
-					<div class="body-tag">
-						{{foreach $item.tags as $tag}}
-							<span class='tag'>{{$tag}}</span>
-						{{/foreach}}
-					</div>
-			{{if $item.has_cats}}
-			<div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
-			</div>
-			{{/if}}
-
-			{{if $item.has_folders}}
-			<div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
-			</div>
-			{{/if}}
-			</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
-			{{if $item.like}}
-				<a href="#" class="icon like item-tool" title="{{$item.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></a>
-			{{/if}}
-			{{if $item.dislike}}
-				<a href="#" class="icon dislike item-tool" title="{{$item.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>
-			{{/if}}
-			{{if $item.share}}
-				<a href="#" class="icon recycle item-tool" title="{{$item.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>
-			{{/if}}
-			{{if $item.plink}}
-				<a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="icon item-tool remote-link{{$item.sparkle}}"></a>
-			{{/if}}
-			{{if $item.edpost}}
-				<a class="editpost icon pencil item-tool" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
-			{{/if}}			 
-			{{if $item.star}}
-			<a href="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon item-tool {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></a>
-			{{/if}}
-			{{if $item.tagger}}
-			<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon item-tool tagged" title="{{$item.tagger.tagit}}"></a>
-			{{/if}}
-			{{if $item.filer}}
-			<a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon item-tool" title="{{$item.filer}}"></a>
-			{{/if}}			
-			<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
-
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
-				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
-			</div>
-				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
-			<div class="wall-item-delete-end"></div>
-		</div>
-	</div>	
-	<div class="wall-item-wrapper-end"></div>
-	<div class="wall-item-like {{$item.indent}}" id="wall-item-like-{{$item.id}}">{{$item.showlike}}</div>
-	<div class="wall-item-dislike {{$item.indent}}" id="wall-item-dislike-{{$item.id}}">{{$item.showdislike}}</div>
-
-<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
-</div>
-{{if $item.toplevel}}
-{{foreach $item.children as $child}}
-	{{include file="{{$child.template}}" item=$child}}
-{{/foreach}}
-{{/if}}
-
-<div class="wall-item-comment-wrapper" >
-	{{$item.comment}}
-</div>
-
-
-</div>
-{{if $item.comment_lastcollapsed}}</div>{{/if}}
diff --git a/view/tpl/smarty3/conversation.tpl b/view/tpl/smarty3/conversation.tpl
deleted file mode 100644
index 837fbc11f..000000000
--- a/view/tpl/smarty3/conversation.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div id="threads-begin"></div>
-{{foreach $threads as $thread}}
-<div id="thread-wrapper-{{$thread.id}}" class="thread-wrapper">
-	{{foreach $thread.items as $item}}
-		{{if $item.comment_firstcollapsed}}
-			<div class="hide-comments-outer">
-			<span id="hide-comments-total-{{$thread.id}}" class="hide-comments-total">{{$thread.num_comments}}</span> <span id="hide-comments-{{$thread.id}}" class="hide-comments fakelink" onclick="showHideComments({{$thread.id}});">{{$thread.hide_text}}</span>
-			</div>
-			<div id="collapsed-comments-{{$thread.id}}" class="collapsed-comments" style="display: none;">
-		{{/if}}
-		{{if $item.comment_lastcollapsed}}</div>{{/if}}
-		
-		{{include file="{{$item.template}}"}}
-		
-		
-	{{/foreach}}
-</div>
-{{/foreach}}
-<div id="threads-end"></div>
-<div id="conversation-end"></div>
-
-{{if $dropping}}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
-  <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
-  <div id="item-delete-selected-desc" >{{$dropping}}</div>
-</div>
-<div id="item-delete-selected-end"></div>
-{{/if}}
diff --git a/view/tpl/smarty3/convobj.tpl b/view/tpl/smarty3/convobj.tpl
deleted file mode 100644
index 2a714c100..000000000
--- a/view/tpl/smarty3/convobj.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{foreach $threads as $item}}
-{{include file="{{$item.template}}"}}
-{{/foreach}}
-
diff --git a/view/tpl/smarty3/crepair.tpl b/view/tpl/smarty3/crepair.tpl
deleted file mode 100644
index 8d3ed7df8..000000000
--- a/view/tpl/smarty3/crepair.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<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/tpl/smarty3/cropbody.tpl b/view/tpl/smarty3/cropbody.tpl
deleted file mode 100644
index e6fcd355f..000000000
--- a/view/tpl/smarty3/cropbody.tpl
+++ /dev/null
@@ -1,63 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h1>{{$title}}</h1>
-<p id="cropimage-desc">
-{{$desc}}
-</p>
-<div id="cropimage-wrapper">
-<img src="{{$image_url}}" id="croppa" class="imgCrop" alt="{{$title}}" />
-</div>
-<div id="cropimage-preview-wrapper" >
-<div id="previewWrap" ></div>
-</div>
-
-<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/tpl/smarty3/crophead.tpl b/view/tpl/smarty3/crophead.tpl
deleted file mode 100644
index d51b87d12..000000000
--- a/view/tpl/smarty3/crophead.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-      <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
-      <script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
-      <script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>
-      <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />
diff --git a/view/tpl/smarty3/delegate.tpl b/view/tpl/smarty3/delegate.tpl
deleted file mode 100644
index 7aa85cf39..000000000
--- a/view/tpl/smarty3/delegate.tpl
+++ /dev/null
@@ -1,62 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h3>{{$header}}</h3>
-
-<div id="delegate-desc" class="delegate-desc">{{$desc}}</div>
-
-{{if $managers}}
-<h3>{{$head_managers}}</h3>
-
-{{foreach $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>
-
-{{/foreach}}
-<div class="clear"></div>
-<hr />
-{{/if}}
-
-
-<h3>{{$head_delegates}}</h3>
-
-{{if $delegates}}
-{{foreach $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>
-
-{{/foreach}}
-<div class="clear"></div>
-{{else}}
-{{$none}}
-{{/if}}
-<hr />
-
-
-<h3>{{$head_potentials}}</h3>
-{{if $potentials}}
-{{foreach $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>
-
-{{/foreach}}
-<div class="clear"></div>
-{{else}}
-{{$none}}
-{{/if}}
-<hr />
-
diff --git a/view/tpl/smarty3/directory_header.tpl b/view/tpl/smarty3/directory_header.tpl
deleted file mode 100644
index 293e65be2..000000000
--- a/view/tpl/smarty3/directory_header.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h1>{{$dirlbl}}</h1>
-
-{{if $search}}
-<h4>{{$finddsc}} {{$safetxt}}</h4> 
-{{/if}}
-
-{{foreach $entries as $entry}}
-
-{{include file="direntry.tpl"}}
-
-{{/foreach}}
-
-
-
-<div class="directory-end"></div>
-
diff --git a/view/tpl/smarty3/direntry.tpl b/view/tpl/smarty3/direntry.tpl
deleted file mode 100644
index c1009efc7..000000000
--- a/view/tpl/smarty3/direntry.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<div class="directory-item lframe" id="directory-item-{{$entry.id}}" >
-	<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$entry.id}}" > 
-		<div class="contact-photo" id="directory-photo-{{$entry.id}}" >
-			<a href="{{$entry.profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$entry.id}}" ><img class="directory-photo-img" src="{{$entry.photo}}" alt="{{$entry.alttext}}" title="{{$entry.alttext}}" /></a>
-		</div>
-	</div>
-
-	<div class="contact-name" id="directory-name-{{$entry.id}}">{{$entry.name}}</div>
-	<div class="contact-details">{{$entry.details}}</div>
-</div>
diff --git a/view/tpl/smarty3/display-head.tpl b/view/tpl/smarty3/display-head.tpl
deleted file mode 100644
index 7750b655e..000000000
--- a/view/tpl/smarty3/display-head.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<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/tpl/smarty3/edpost_head.tpl b/view/tpl/smarty3/edpost_head.tpl
deleted file mode 100644
index 2bf28002d..000000000
--- a/view/tpl/smarty3/edpost_head.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h2>{{$title}}</h2>
diff --git a/view/tpl/smarty3/email_notify_html.tpl b/view/tpl/smarty3/email_notify_html.tpl
deleted file mode 100644
index 18f7132db..000000000
--- a/view/tpl/smarty3/email_notify_html.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<!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:#ff0000; 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/r!.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>
-
-
-	<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>
-	<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/tpl/smarty3/email_notify_text.tpl b/view/tpl/smarty3/email_notify_text.tpl
deleted file mode 100644
index e164f3023..000000000
--- a/view/tpl/smarty3/email_notify_text.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-{{$preamble}}
-	
-{{$title}}
-
-{{$textversion}}
-				
-{{$tsitelink}}
-{{$titemlink}}
-
-{{$thanks}}
-{{$site_admin}}
-
diff --git a/view/tpl/smarty3/event.tpl b/view/tpl/smarty3/event.tpl
deleted file mode 100644
index 76c9433fd..000000000
--- a/view/tpl/smarty3/event.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{foreach $events as $event}}
-	<div class="event">
-	
-	{{if $event.item.author.xchan_name}}<a href="{{$event.item.author.xchan_url}}" ><img src="{{$event.item.author.xchan_photo_s}}" height="32" width="32" />{{$event.item.author.xchan_name}}</a>{{/if}}
-	{{$event.html}}
-	{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}"  class="plink-event-link icon s22 remote-link"></a>{{/if}}
-	{{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link icon s22 pencil"></a>{{/if}}
-	</div>
-	<div class="clear"></div>
-{{/foreach}}
diff --git a/view/tpl/smarty3/event_form.tpl b/view/tpl/smarty3/event_form.tpl
deleted file mode 100644
index 96b7a3c2f..000000000
--- a/view/tpl/smarty3/event_form.tpl
+++ /dev/null
@@ -1,54 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<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="mid" value="{{$mid}}" />
-
-<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/tpl/smarty3/event_head.tpl b/view/tpl/smarty3/event_head.tpl
deleted file mode 100644
index 6cbb98ae7..000000000
--- a/view/tpl/smarty3/event_head.tpl
+++ /dev/null
@@ -1,144 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<link rel='stylesheet' type='text/css' href='{{$baseurl}}/library/fullcalendar/fullcalendar.css' />
-<script language="javascript" type="text/javascript"
-          src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script>
-
-<script>
-	function showEvent(eventid) {
-		$.get(
-			'{{$baseurl}}/events/?id='+eventid,
-			function(data){
-				$.fancybox(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']['xchan_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']['xchan_photo_s'],
-							event.item['author']['xchan_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']['xchan_photo_s'],
-							event.item['author']['xchan_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']['xchan_photo_s'],
-							event.item['author']['xchan_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 : '',
-		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/tpl/smarty3/events-js.tpl b/view/tpl/smarty3/events-js.tpl
deleted file mode 100644
index 5fa046f5a..000000000
--- a/view/tpl/smarty3/events-js.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{$tabs}}
-<h2>{{$title}}</h2>
-
-<div id="new-event-link"><a href="{{$new_event.0}}" >{{$new_event.1}}</a></div>
-
-<div id="events-calendar"></div>
diff --git a/view/tpl/smarty3/events_reminder.tpl b/view/tpl/smarty3/events_reminder.tpl
deleted file mode 100644
index d8e8ceb2a..000000000
--- a/view/tpl/smarty3/events_reminder.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{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>
-{{foreach $events as $event}}
-<div class="event-list" id="event-{{$event.id}}"></a> <a href="events/{{$event.link}}">{{$event.title}}</a> {{$event.date}} </div>
-{{/foreach}}
-</div>
-{{/if}}
-
diff --git a/view/tpl/smarty3/failed_updates.tpl b/view/tpl/smarty3/failed_updates.tpl
deleted file mode 100644
index 8161ff2ef..000000000
--- a/view/tpl/smarty3/failed_updates.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h2>{{$banner}}</h2>
-
-<div id="failed_updates_desc">{{$desc}}</div>
-
-{{if $failed}}
-{{foreach $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 />
-{{/foreach}}
-{{/if}}
-
diff --git a/view/tpl/smarty3/field.tpl b/view/tpl/smarty3/field.tpl
deleted file mode 100644
index 1bf36d84e..000000000
--- a/view/tpl/smarty3/field.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
- {{if $field.0==select}}
- {{include file="field_select.tpl"}}
- {{/if}}
diff --git a/view/tpl/smarty3/field_acheckbox.tpl b/view/tpl/smarty3/field_acheckbox.tpl
deleted file mode 100644
index da0d44ea6..000000000
--- a/view/tpl/smarty3/field_acheckbox.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	
-	<div class='field acheckbox'>
-		<label for='id_{{$field.0}}'>{{$field.1}}</label>
-		<input type="checkbox" class="abook-edit-them" name='{{$field.0}}' id='them_id_{{$field.0}}' value="1" disabled="disabled" {{if $field.2}}checked="checked"{{/if}} />
-		<input type="checkbox" class="abook-edit-me" name='{{$field.0}}' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} {{if $field.5}} disabled="disabled" {{/if}}/>
-		<span class='field_abook_help'>{{$field.6}}</span>
-	</div>
diff --git a/view/tpl/smarty3/field_checkbox.tpl b/view/tpl/smarty3/field_checkbox.tpl
deleted file mode 100644
index a4ec3dbba..000000000
--- a/view/tpl/smarty3/field_checkbox.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	
-	<div class='field checkbox'>
-		<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"{{/if}}>
-		<span class='field_help'>{{$field.3}}</span>
-	</div>
diff --git a/view/tpl/smarty3/field_combobox.tpl b/view/tpl/smarty3/field_combobox.tpl
deleted file mode 100644
index d3cc75635..000000000
--- a/view/tpl/smarty3/field_combobox.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	
-	<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}}" >
-		   {{foreach $field.4 as $opt=>$val}}<option value="{{$val}}">{{/foreach}}
-		</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>
-			{{foreach $field.4 as $opt=>$val}}<option value="{{$val}}">{{$val}}</option>{{/foreach}}
-		</select>
-		
-		<span class='field_help'>{{$field.3}}</span>
-	</div>
-
diff --git a/view/tpl/smarty3/field_custom.tpl b/view/tpl/smarty3/field_custom.tpl
deleted file mode 100644
index c2d73275c..000000000
--- a/view/tpl/smarty3/field_custom.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	
-	<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/tpl/smarty3/field_input.tpl b/view/tpl/smarty3/field_input.tpl
deleted file mode 100644
index 696ebbad7..000000000
--- a/view/tpl/smarty3/field_input.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	
-	<div class='field input'>
-		<label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label>
-		<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
-		<span id='help_{{$field.0}}' class='field_help'>{{$field.3}}</span>
-		<div id='end_{{$field.0}}' class='field_end'></div>
-	</div>
diff --git a/view/tpl/smarty3/field_intcheckbox.tpl b/view/tpl/smarty3/field_intcheckbox.tpl
deleted file mode 100644
index 54967feab..000000000
--- a/view/tpl/smarty3/field_intcheckbox.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	
-	<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"{{/if}}>
-		<span class='field_help'>{{$field.4}}</span>
-	</div>
diff --git a/view/tpl/smarty3/field_password.tpl b/view/tpl/smarty3/field_password.tpl
deleted file mode 100644
index 5889d2e9c..000000000
--- a/view/tpl/smarty3/field_password.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	
-	<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/tpl/smarty3/field_radio.tpl b/view/tpl/smarty3/field_radio.tpl
deleted file mode 100644
index 1d7b56ec6..000000000
--- a/view/tpl/smarty3/field_radio.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	
-	<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"{{/if}}>
-		<span class='field_help'>{{$field.3}}</span>
-	</div>
diff --git a/view/tpl/smarty3/field_richtext.tpl b/view/tpl/smarty3/field_richtext.tpl
deleted file mode 100644
index 38992f0f8..000000000
--- a/view/tpl/smarty3/field_richtext.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	
-	<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/tpl/smarty3/field_select.tpl b/view/tpl/smarty3/field_select.tpl
deleted file mode 100644
index 2a4117a70..000000000
--- a/view/tpl/smarty3/field_select.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	
-	<div class='field select'>
-		<label for='id_{{$field.0}}'>{{$field.1}}</label>
-		<select name='{{$field.0}}' id='id_{{$field.0}}'>
-			{{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
-		</select>
-		<span class='field_help'>{{$field.3}}</span>
-	</div>
diff --git a/view/tpl/smarty3/field_select_raw.tpl b/view/tpl/smarty3/field_select_raw.tpl
deleted file mode 100644
index 50e34985f..000000000
--- a/view/tpl/smarty3/field_select_raw.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	
-	<div class='field select'>
-		<label for='id_{{$field.0}}'>{{$field.1}}</label>
-		<select name='{{$field.0}}' id='id_{{$field.0}}'>
-			{{$field.4}}
-		</select>
-		<span class='field_help'>{{$field.3}}</span>
-	</div>
diff --git a/view/tpl/smarty3/field_textarea.tpl b/view/tpl/smarty3/field_textarea.tpl
deleted file mode 100644
index 5d71999d4..000000000
--- a/view/tpl/smarty3/field_textarea.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	
-	<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/tpl/smarty3/field_themeselect.tpl b/view/tpl/smarty3/field_themeselect.tpl
deleted file mode 100644
index be24ff2c6..000000000
--- a/view/tpl/smarty3/field_themeselect.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	<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=='preview'}}onchange="previewTheme(this);"{{/if}} >
-			{{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
-		</select>
-		<span class='field_help'>{{$field.3}}</span>
-		<div id="theme-preview"></div>
-	</div>
diff --git a/view/tpl/smarty3/field_yesno.tpl b/view/tpl/smarty3/field_yesno.tpl
deleted file mode 100644
index e982c2f05..000000000
--- a/view/tpl/smarty3/field_yesno.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-	<div class='field yesno'>
-		<label for='id_{{$field.0}}'>{{$field.1}}</label>
-		<div class='onoff' id="id_{{$field.0}}_onoff">
-			<input  type="hidden" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
-			<a href="#" class='off'>
-				{{if $field.4}}{{$field.4.0}}{{else}}OFF{{/if}}
-			</a>
-			<a href="#" class='on'>
-				{{if $field.4}}{{$field.4.1}}{{else}}ON{{/if}}
-			</a>
-		</div>
-		<span class='field_help'>{{$field.3}}</span>
-	</div>
diff --git a/view/tpl/smarty3/fileas_widget.tpl b/view/tpl/smarty3/fileas_widget.tpl
deleted file mode 100644
index f03f169a2..000000000
--- a/view/tpl/smarty3/fileas_widget.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<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{{/if}}">{{$all}}</a></li>
-		{{foreach $terms as $term}}
-			<li class="tool"><a href="{{$base}}?f=&file={{$term.name}}" class="fileas-link{{if $term.selected}} fileas-selected{{/if}}">{{$term.name}}</a></li>
-		{{/foreach}}
-	</ul>
-	
-</div>
diff --git a/view/tpl/smarty3/filebrowser.tpl b/view/tpl/smarty3/filebrowser.tpl
deleted file mode 100644
index b408ca687..000000000
--- a/view/tpl/smarty3/filebrowser.tpl
+++ /dev/null
@@ -1,89 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<!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">
-				{{foreach $path as $p}}<a href="{{$p.0}}">{{$p.1}}</a>{{/foreach}}
-			</div>
-			<div class="filebrowser folders">
-				<ul>
-					{{foreach $folders as $f}}<li><a href="{{$f.0}}/">{{$f.1}}</a></li>{{/foreach}}
-				</ul>
-			</div>
-			<div class="filebrowser files {{$type}}">
-				<ul>
-				{{foreach $files as $f}}
-					<li><a href="#" onclick="FileBrowserDialogue.mySubmit('{{$f.0}}'); return false;"><img src="{{$f.2}}"><span>{{$f.1}}</span></a></li>
-				{{/foreach}}
-				</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/tpl/smarty3/filer_dialog.tpl b/view/tpl/smarty3/filer_dialog.tpl
deleted file mode 100644
index f17a06766..000000000
--- a/view/tpl/smarty3/filer_dialog.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{include file="field_combobox.tpl"}}
-<div class="settings-submit-wrapper" >
-	<input id="filer_save" type="button" class="settings-submit" value="{{$submit}}" />
-</div>
diff --git a/view/tpl/smarty3/follow.tpl b/view/tpl/smarty3/follow.tpl
deleted file mode 100644
index 2c3b451b3..000000000
--- a/view/tpl/smarty3/follow.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<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/tpl/smarty3/generic_links_widget.tpl b/view/tpl/smarty3/generic_links_widget.tpl
deleted file mode 100644
index c12273c7b..000000000
--- a/view/tpl/smarty3/generic_links_widget.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="widget{{if $class}} {{$class}}{{/if}}">
-	{{if $title}}<h3>{{$title}}</h3>{{/if}}
-	{{if $desc}}<div class="desc">{{$desc}}</div>{{/if}}
-	
-	<ul>
-		{{foreach $items as $item}}
-			<li class="tool"><a href="{{$item.url}}" class="{{if $item.selected}}selected{{/if}}">{{$item.label}}</a></li>
-		{{/foreach}}
-	</ul>
-	
-</div>
diff --git a/view/tpl/smarty3/group_drop.tpl b/view/tpl/smarty3/group_drop.tpl
deleted file mode 100644
index 84d380e30..000000000
--- a/view/tpl/smarty3/group_drop.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="group-delete-wrapper button" id="group-delete-wrapper-{{$id}}" >
-	<a href="group/drop/{{$id}}?t={{$form_security_token}}" 
-		onclick="return confirmDelete();" 
-		id="group-delete-icon-{{$id}}" 
-		class="icon drophide group-delete-icon" 
-		onmouseover="imgbright(this);" 
-		onmouseout="imgdull(this);" ></a>
-</div>
-<div class="group-delete-end"></div>
diff --git a/view/tpl/smarty3/group_edit.tpl b/view/tpl/smarty3/group_edit.tpl
deleted file mode 100644
index b7b14eba3..000000000
--- a/view/tpl/smarty3/group_edit.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<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}}'>
-		
-		{{include file="field_input.tpl" field=$gname}}
-		{{if $drop}}{{$drop}}{{/if}}
-		<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">
-		{{include file="groupeditor.tpl"}}
-	</div>
-{{/if}}
-{{if $desc}}<div id="group-edit-desc">{{$desc}}</div>{{/if}}
diff --git a/view/tpl/smarty3/group_selection.tpl b/view/tpl/smarty3/group_selection.tpl
deleted file mode 100644
index f16bb5159..000000000
--- a/view/tpl/smarty3/group_selection.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="field custom">
-<label for="group-selection" id="group-selection-lbl">{{$label}}</label>
-<select name="group-selection" id="group-selection" >
-{{foreach $groups as $group}}
-<option value="{{$group.id}}" {{if $group.selected}}selected="selected"{{/if}} >{{$group.name}}</option>
-{{/foreach}}
-</select>
-</div>
diff --git a/view/tpl/smarty3/group_side.tpl b/view/tpl/smarty3/group_side.tpl
deleted file mode 100644
index b6532fb6d..000000000
--- a/view/tpl/smarty3/group_side.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="widget" id="group-sidebar">
-<h3>{{$title}}</h3>
-
-<div id="sidebar-group-list">
-	<ul id="sidebar-group-ul">
-		{{foreach $groups as $group}}
-			<li class="sidebar-group-li">
-				{{if $group.cid}}
-					<input type="checkbox" 
-						class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action" 
-						onclick="contactgroupChangeMember('{{$group.id}}','{{$group.cid}}');return true;"
-						{{if $group.ismember}}checked="checked"{{/if}}
-					/>
-				{{/if}}			
-				{{if $group.edit}}
-					<a class="groupsideedit" href="{{$group.edit.href}}" title="{{$edittext}}"><span id="edit-sidebar-group-element-{{$group.id}}" class="group-edit-icon iconspacer small-pencil"></span></a>
-				{{/if}}
-				<a id="sidebar-group-element-{{$group.id}}" class="sidebar-group-element {{if $group.selected}}group-selected{{/if}}" href="{{$group.href}}">{{$group.text}}</a>
-			</li>
-		{{/foreach}}
-	</ul>
-	</div>
-  <div id="sidebar-new-group">
-  <a href="group/new">{{$createtext}}</a>
-  </div>
-  {{if $ungrouped}}
-  <div id="sidebar-ungrouped">
-  <a href="nogroup">{{$ungrouped}}</a>
-  </div>
-  {{/if}}
-</div>
-
-
diff --git a/view/tpl/smarty3/groupeditor.tpl b/view/tpl/smarty3/groupeditor.tpl
deleted file mode 100644
index 4fad30d5a..000000000
--- a/view/tpl/smarty3/groupeditor.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div id="group">
-<h3>{{$groupeditor.label_members}}</h3>
-<div id="group-members" class="contact_list">
-{{foreach $groupeditor.members as $c}} {{$c}} {{/foreach}}
-</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">
-{{foreach $groupeditor.contacts as $m}} {{$m}} {{/foreach}}
-</div>
-<div id="group-all-contacts-end"></div>
-</div>
diff --git a/view/tpl/smarty3/head.tpl b/view/tpl/smarty3/head.tpl
deleted file mode 100644
index d6a06775e..000000000
--- a/view/tpl/smarty3/head.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<base href="{{$baseurl}}/" />
-<meta name="generator" content="{{$generator}}" />
-
-<!--[if IE]>
-<script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-<![endif]-->
-
-{{$head_css}}
-
-{{$js_strings}}
-
-{{$head_js}}
-
-<link rel="shortcut icon" href="{{$baseurl}}/images/r!.png" />
-<link rel="search"
-         href="{{$baseurl}}/opensearch" 
-         type="application/opensearchdescription+xml" 
-         title="Search in Red" />
-
-
-<script>
-
-	var updateInterval = {{$update_interval}};
-	var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}};
-
-</script>
-
-
-
diff --git a/view/tpl/smarty3/hide_comments.tpl b/view/tpl/smarty3/hide_comments.tpl
deleted file mode 100644
index 50a354122..000000000
--- a/view/tpl/smarty3/hide_comments.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<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/tpl/smarty3/install.tpl b/view/tpl/smarty3/install.tpl
deleted file mode 100644
index cfb90e61f..000000000
--- a/view/tpl/smarty3/install.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<h1>{{$title}}</h1>
-<h2>{{$pass}}</h2>
-
-
-{{if $status}}
-<h3 class="error-message">{{$status}}</h3>
-{{/if}}
-
-{{$text}}
diff --git a/view/tpl/smarty3/install_checks.tpl b/view/tpl/smarty3/install_checks.tpl
deleted file mode 100644
index 9d5ce0eeb..000000000
--- a/view/tpl/smarty3/install_checks.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h1>{{$title}}</h1>
-<h2>{{$pass}}</h2>
-<form  action="{{$baseurl}}/index.php?q=setup" method="post">
-<table>
-{{foreach $checks as $check}}
-	<tr><td>{{$check.title}} </td><td><span class="icon s22 {{if $check.status}}on{{else}}{{if $check.required}}off{{else}}yellow{{/if}}{{/if}}"></td><td>{{if $check.required}}(required){{/if}}</td></tr>
-	{{if $check.help}}
-	<tr><td colspan="3"><blockquote>{{$check.help}}</blockquote></td></tr>
-	{{/if}}
-{{/foreach}}
-</table>
-
-{{if $phpath}}
-	<input type="hidden" name="phpath" value="{{$phpath}}">
-{{/if}}
-
-{{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}}">
-{{/if}}
-</form>
diff --git a/view/tpl/smarty3/install_db.tpl b/view/tpl/smarty3/install_db.tpl
deleted file mode 100644
index fe8aee85b..000000000
--- a/view/tpl/smarty3/install_db.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<h1>{{$title}}</h1>
-<h2>{{$pass}}</h2>
-
-
-<p>
-{{$info_01}}<br>
-{{$info_02}}<br>
-{{$info_03}}
-</p>
-
-{{if $status}}
-<h3 class="error-message">{{$status}}</h3>
-{{/if}}
-
-<form id="install-form" action="{{$baseurl}}/setup" method="post">
-
-<input type="hidden" name="phpath" value="{{$phpath}}" />
-<input type="hidden" name="pass" value="3" />
-
-{{include file="field_input.tpl" field=$dbhost}}
-{{include file="field_input.tpl" field=$dbuser}}
-{{include file="field_password.tpl" field=$dbpass}}
-{{include file="field_input.tpl" field=$dbdata}}
-
-
-<input id="install-submit" type="submit" name="submit" value="{{$submit}}" /> 
-
-</form>
-
diff --git a/view/tpl/smarty3/install_settings.tpl b/view/tpl/smarty3/install_settings.tpl
deleted file mode 100644
index f91122737..000000000
--- a/view/tpl/smarty3/install_settings.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<h1>{{$title}}</h1>
-<h2>{{$pass}}</h2>
-
-
-{{if $status}}
-<h3 class="error-message">{{$status}}</h3>
-{{/if}}
-
-<form id="install-form" action="{{$baseurl}}/setup" 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" />
-
-{{include file="field_input.tpl" field=$adminmail}}
-{{include file="field_input.tpl" field=$siteurl}}
-
-{{$timezone}}
-
-<input id="install-submit" type="submit" name="submit" value="{{$submit}}" /> 
-
-</form>
-
diff --git a/view/tpl/smarty3/intros.tpl b/view/tpl/smarty3/intros.tpl
deleted file mode 100644
index 4fd27d370..000000000
--- a/view/tpl/smarty3/intros.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<div class="intro-wrapper" id="intro-{{$contact_id}}" >
-
-<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-wrapper-end" id="intro-wrapper-end-{{$contact_id}}"></div>
-<form class="intro-form" action="intro" method="post">
-<input class="intro-submit-ignore" type="submit" name="submit" value="{{$ignore}}" />
-<input class="intro-submit-block" type="submit" name="submit" value="{{$block}}" />
-<input class="intro-submit-discard" type="submit" name="submit" value="{{$discard}}" />
-{{include file="field_checkbox.tpl" field=$hidden}}
-{{* {{include file="field_checkbox.tpl" field=$activity}} *}}
-<input type="hidden" name="contact_id" value="{{$contact_id}}" >
-
-<input class="intro-submit-approve" type="submit" name="submit" value="{{$approve}}" />
-</form>
-</div>
-<div class="intro-end"></div>
diff --git a/view/tpl/smarty3/intros_header.tpl b/view/tpl/smarty3/intros_header.tpl
deleted file mode 100644
index 2dbf065d7..000000000
--- a/view/tpl/smarty3/intros_header.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h3>{{$title}}</h3>
diff --git a/view/tpl/smarty3/invite.tpl b/view/tpl/smarty3/invite.tpl
deleted file mode 100644
index e699f1f0e..000000000
--- a/view/tpl/smarty3/invite.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<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/tpl/smarty3/jot-header.tpl b/view/tpl/smarty3/jot-header.tpl
deleted file mode 100644
index ae0ccc8e8..000000000
--- a/view/tpl/smarty3/jot-header.tpl
+++ /dev/null
@@ -1,305 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<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 : '',
-			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;');
-					}	 
-
-				});
-
-				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: '{{$baseurl}}/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: '{{$baseurl}}/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('{{$baseurl}}/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('{{$baseurl}}/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('{{$baseurl}}/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('{{$baseurl}}/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('{{$baseurl}}/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/tpl/smarty3/jot.tpl b/view/tpl/smarty3/jot.tpl
deleted file mode 100644
index 4f52cff20..000000000
--- a/view/tpl/smarty3/jot.tpl
+++ /dev/null
@@ -1,92 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<div id="profile-jot-wrapper" >
-
-	<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="webpage" value="{{$webpage}}" />
-		<input type="hidden" name="preview" id="jot-preview" value="0" />
-		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none"></div>
-		{{if $catsenabled}}
-		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" /></div>
-		{{/if}}
-		{{if $webpage}}
-		<div id="jot-pagetitle-wrap"><input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}" class="jothidden" style="display:none" /></div>
-		{{/if}}
-		<div id="jot-text-wrap">
-		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}</textarea>
-		</div>
-
-<div id="profile-jot-submit-wrapper" class="jothidden">
-	<input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" />
-
-	<div id="profile-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> 
-
-	{{if $showacl}}
-	<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>
-	{{/if}}
-
-	{{if $preview}}<span onclick="preview_post();" id="jot-preview-link" class="fakelink">{{$preview}}</span>{{/if}}
-
-
-	<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"/>
-			{{$jotnets}}
-		</div>
-	</div>
-
-
-</div>
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
-		{{if $content}}<script>initEditor();</script>{{/if}}
diff --git a/view/tpl/smarty3/jot_geotag.tpl b/view/tpl/smarty3/jot_geotag.tpl
deleted file mode 100644
index 1ed2367aa..000000000
--- a/view/tpl/smarty3/jot_geotag.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-	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/tpl/smarty3/js_strings.tpl b/view/tpl/smarty3/js_strings.tpl
deleted file mode 100644
index 34337e5bb..000000000
--- a/view/tpl/smarty3/js_strings.tpl
+++ /dev/null
@@ -1,39 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<script>
-
-	var aStr = {
-
-		'delitem'   : '{{$delitem}}',
-		'comment'   : '{{$comment}}',
-		'showmore'  : '{{$showmore}}',
-		'showfewer' : '{{$showfewer}}',
-		'pwshort'   : '{{$pwshort}}',
-		'pwnomatch' : '{{$pwnomatch}}',
-		'everybody' : '{{$everybody}}',
-
-		't01' :  {{$t01}},
-		't02' :  {{$t02}},
-		't03' : '{{$t03}}',
-		't04' : '{{$t04}}',
-		't05' : '{{$t05}}',
-		't06' : '{{$t06}}',
-		't07' : '{{$t07}}',
-		't08' : '{{$t08}}',
-		't09' : '{{$t09}}',
-		't10' : '{{$t10}}',
-		't11' : '{{$t11}}',
-		't12' : '{{$t12}}',
-		't13' : '{{$t13}}',
-		't14' : '{{$t14}}',
-		't15' : '{{$t15}}',
-		't16' : '{{$t16}}',
-		't17' : '{{$t17}}',
-	};
-
-</script>
-		
diff --git a/view/tpl/smarty3/lang_selector.tpl b/view/tpl/smarty3/lang_selector.tpl
deleted file mode 100644
index a1aee8277..000000000
--- a/view/tpl/smarty3/lang_selector.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div id="lang-select-icon" class="icon s22 language" title="{{$title}}" onclick="openClose('language-selector');" ></div>
-<div id="language-selector" style="display: none;" >
-	<form action="#" method="post" >
-		<select name="system_language" onchange="this.form.submit();" >
-			{{foreach $langs.0 as $v=>$l}}
-				<option value="{{$v}}" {{if $v==$langs.1}}selected="selected"{{/if}}>{{$l}}</option>
-			{{/foreach}}
-		</select>
-	</form>
-</div>
diff --git a/view/tpl/smarty3/like_noshare.tpl b/view/tpl/smarty3/like_noshare.tpl
deleted file mode 100644
index b8258d64a..000000000
--- a/view/tpl/smarty3/like_noshare.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$id}}">
-	<a href="#" class="icon like" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false"></a>
-	<a href="#" class="icon dislike" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false"></a>
-	<img id="like-rotator-{{$id}}" class="like-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
-</div>
diff --git a/view/tpl/smarty3/login.tpl b/view/tpl/smarty3/login.tpl
deleted file mode 100644
index e530429b2..000000000
--- a/view/tpl/smarty3/login.tpl
+++ /dev/null
@@ -1,36 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<form action="{{$dest_url}}" id="{{$form_id}}" method="post" >
-	<input type="hidden" name="auth-params" value="login" />
-
-	<div id="login_standard">
-	{{include file="field_input.tpl" field=$lname}}
-	{{include file="field_password.tpl" field=$lpassword}}
-	</div>
-	
-	<div id="login-extra-links">
-		{{if $register}}<a href="{{$register.link}}" title="{{$register.title}}" id="register-link">{{$register.desc}}</a>{{/if}}
-        <a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
-	</div>
-
-	{{include file="field_checkbox.tpl" field=$remember}}
-	
-	<div id="login-standard-end"></div>
-
-	<div id="login-submit-wrapper" >
-		<input type="submit" name="submit" id="login-submit-button" value="{{$login}}" />
-	</div>
-	
-	{{foreach $hiddens as $k=>$v}}
-		<input type="hidden" name="{{$k}}" value="{{$v}}" />
-	{{/foreach}}
-	
-	
-</form>
-
-
-<script type="text/javascript"> $(document).ready(function() { $("#id_{{$lname.0}}").focus();} );</script>
diff --git a/view/tpl/smarty3/logout.tpl b/view/tpl/smarty3/logout.tpl
deleted file mode 100644
index 582d77ed6..000000000
--- a/view/tpl/smarty3/logout.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<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/tpl/smarty3/lostpass.tpl b/view/tpl/smarty3/lostpass.tpl
deleted file mode 100644
index 0e437ca48..000000000
--- a/view/tpl/smarty3/lostpass.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<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/tpl/smarty3/mail_conv.tpl b/view/tpl/smarty3/mail_conv.tpl
deleted file mode 100644
index 8587efbb5..000000000
--- a/view/tpl/smarty3/mail_conv.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="mail-conv-outside-wrapper">
-	<div class="mail-conv-sender" >
-		<a href="{{$mail.from_url}}" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo{{$mail.sparkle}}" src="{{$mail.from_photo}}" heigth="80" width="80" alt="{{$mail.from_name}}" /></a>
-		<div class="mail-conv-sender-name" >{{$mail.from_name}}</div>
-	</div>
-	<div class="mail-conv-detail" >
-		<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/tpl/smarty3/mail_display.tpl b/view/tpl/smarty3/mail_display.tpl
deleted file mode 100644
index e14d55478..000000000
--- a/view/tpl/smarty3/mail_display.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-{{foreach $mails as $mail}}
-	{{include file="mail_conv.tpl"}}
-{{/foreach}}
-
-{{if $canreply}}
-{{include file="prv_message.tpl"}}
-{{else}}
-{{$unknown_text}}
-{{/if}}
\ No newline at end of file
diff --git a/view/tpl/smarty3/mail_head.tpl b/view/tpl/smarty3/mail_head.tpl
deleted file mode 100644
index f7a39fa8b..000000000
--- a/view/tpl/smarty3/mail_head.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h3>{{$messages}}</h3>
-
-{{$tab_content}}
diff --git a/view/tpl/smarty3/mail_list.tpl b/view/tpl/smarty3/mail_list.tpl
deleted file mode 100644
index 717df51d5..000000000
--- a/view/tpl/smarty3/mail_list.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="mail-list-wrapper">
-	<a href="{{$from_url}}" class="mail-list-sender-url" ><img class="mail-list-sender-photo" src="{{$from_photo}}" alt="{{$from_name}}" /></a>
-	<span class="mail-from">{{$from_name}}</span>
-	<span class="mail-subject {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span>
-	<span class="mail-date" title="{{$date}}">{{$date}}</span>
-	<span class="mail-delete"><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></span>
-</div>
diff --git a/view/tpl/smarty3/main_slider.tpl b/view/tpl/smarty3/main_slider.tpl
deleted file mode 100644
index fe4495f77..000000000
--- a/view/tpl/smarty3/main_slider.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div id="main-slider" class="slider" ><input id="main-range" type="text" name="cminmax" value="{{$val}}" /></div>
-<script>
-	var old_cmin = 0;
-	var old_cmax = 99;
-	$("#main-range").slider({ from: 0, to: 99, step: 1, scale: ['{{$me}}', '|', '{{$intimate}}', '|', '{{$friends}}', '|', '{{$oldfriends}}', '|', '{{$acquaintances}}', '|', '{{$world}}' ], onstatechange: function(v) { 
-		var carr = v.split(";");
-		if(carr[0] != bParam_cmin) {
-			old_cmin = bParam_cmin;
-	 		bParam_cmin = carr[0];
-		}
-		if(carr[1] != bParam_cmax) {
-			old_cmax = bParam_cmax; 
-			bParam_cmax = carr[1];
-		}
-		networkRefresh();
- 	} });
-
-	var slideTimer = null;
-	function networkRefresh() {
-		if((document.readyState !== "complete") || (slideTimer !== null))
-			return;
-		if((bParam_cmin == old_cmin) && (bParam_cmax == old_cmax))
-			return;
-		setTimeout(function() { $("#profile-jot-text-loading").show(); }, 1000 );
-		slideTimer = setTimeout(networkTimerRefresh,2000);
-	}
-
-	function networkTimerRefresh() {
-		slideTimer = null;
-		page_load = true;
-		liveUpdate();
-	}
-</script>
diff --git a/view/tpl/smarty3/match.tpl b/view/tpl/smarty3/match.tpl
deleted file mode 100644
index 14b725466..000000000
--- a/view/tpl/smarty3/match.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="profile-match-wrapper">
-	<div class="profile-match-photo">
-		<a href="{{$url}}">
-			<img src="{{$photo}}" alt="{{$name}}" 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>
-	{{/if}}
-
-</div>
diff --git a/view/tpl/smarty3/message_side.tpl b/view/tpl/smarty3/message_side.tpl
deleted file mode 100644
index 7da22ee3e..000000000
--- a/view/tpl/smarty3/message_side.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div id="message-sidebar" class="widget">
-	<div id="message-new"><a href="{{$new.url}}" class="{{if $new.sel}}newmessage-selected{{/if}}">{{$new.label}}</a> </div>
-	
-	<ul class="message-ul">
-		{{foreach $tabs as $t}}
-			<li class="tool"><a href="{{$t.url}}" class="message-link{{if $t.sel}}message-selected{{/if}}">{{$t.label}}</a></li>
-		{{/foreach}}
-	</ul>
-	
-</div>
diff --git a/view/tpl/smarty3/micropro_img.tpl b/view/tpl/smarty3/micropro_img.tpl
deleted file mode 100644
index de134adba..000000000
--- a/view/tpl/smarty3/micropro_img.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="contact-block-div{{if $class}} {{$class}}{{/if}}"><a class="contact-block-link{{if $class}} {{$class}}{{/if}}{{if $click}} fakelink{{/if}}" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}}><img class="contact-block-img{{if $class}} {{$class}}{{/if}}" src="{{$photo}}" title="{{$title}}" alt="{{$name}}" /></a></div>
diff --git a/view/tpl/smarty3/micropro_txt.tpl b/view/tpl/smarty3/micropro_txt.tpl
deleted file mode 100644
index a6438812b..000000000
--- a/view/tpl/smarty3/micropro_txt.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="contact-block-textdiv{{if $class}} {{$class}}{{/if}}"><a class="contact-block-link{{if $class}} {{$class}}{{/if}}{{if $click}} fakelink{{/if}}" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}} title="{{$title}}">{{$name}}</a></div>
diff --git a/view/tpl/smarty3/mood_content.tpl b/view/tpl/smarty3/mood_content.tpl
deleted file mode 100644
index 461303318..000000000
--- a/view/tpl/smarty3/mood_content.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<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" >
-{{foreach $verbs as $v}}
-<option value="{{$v.0}}">{{$v.1}}</option>
-{{/foreach}}
-</select>
-<br />
-<br />
-<input type="submit" name="submit" value="{{$submit}}" />
-</form>
-
diff --git a/view/tpl/smarty3/msg-header.tpl b/view/tpl/smarty3/msg-header.tpl
deleted file mode 100644
index 4c47e1d6d..000000000
--- a/view/tpl/smarty3/msg-header.tpl
+++ /dev/null
@@ -1,102 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
-<script language="javascript" type="text/javascript">
-
-var plaintext = '{{$editselect}}';
-
-if(plaintext != 'none') {
-	tinyMCE.init({
-		theme : "advanced",
-		mode : "specific_textareas",
-		editor_selector: /(profile-jot-text|prvmail-text)/,
-		plugins : "bbcode,paste",
-		theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
-		theme_advanced_buttons2 : "",
-		theme_advanced_buttons3 : "",
-		theme_advanced_toolbar_location : "top",
-		theme_advanced_toolbar_align : "center",
-		theme_advanced_blockformats : "blockquote,code",
-		gecko_spellcheck : true,
-		paste_text_sticky : true,
-		entity_encoding : "raw",
-		add_unload_trigger : false,
-		remove_linebreaks : false,
-		force_p_newlines : false,
-		force_br_newlines : true,
-		forced_root_block : '',
-		convert_urls: false,
-		content_css: "{{$baseurl}}/view/custom_tinymce.css",
-		     //Character count
-		theme_advanced_path : false,
-		setup : function(ed) {
-			ed.onInit.add(function(ed) {
-				ed.pasteAsPlainText = true;
-				var editorId = ed.editorId;
-				var textarea = $('#'+editorId);
-				if (typeof(textarea.attr('tabindex')) != "undefined") {
-					$('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
-					textarea.attr('tabindex', null);
-				}
-			});
-		}
-	});
-}
-else
-	$("#prvmail-text").contact_autocomplete(baseurl+"/acl");
-
-
-</script>
-<script 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/tpl/smarty3/nav.tpl b/view/tpl/smarty3/nav.tpl
deleted file mode 100644
index beddc9109..000000000
--- a/view/tpl/smarty3/nav.tpl
+++ /dev/null
@@ -1,157 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<header>
-	<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="{{$userinfo.name}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"></a>
-		{{if $localuser}}
-			<ul id="nav-user-menu" class="menu-popup">
-				{{foreach $nav.usermenu as $usermenu}}
-					<li><a class="{{$usermenu.2}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}">{{$usermenu.1}}</a></li>
-				{{/foreach}}
-				{{if $nav.profiles}}<li><a class="{{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}">{{$nav.profiles.1}}</a></li>{{/if}}
-				{{if $nav.manage}}<li><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a></li>{{/if}}	
-				{{if $nav.contacts}}<li><a class="{{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a></li>{{/if}}
-				{{if $nav.settings}}<li><a class="{{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>{{/if}}
-
-				{{if $nav.admin}}<li><a class="{{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a></li>{{/if}}
-
-				{{if $nav.logout}}<li><a class="menu-sep {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>{{/if}}
-
-			</ul>
-		{{/if}}
-		</li>
-	{{/if}}
-
-
-	{{if $nav.lock}}
-		<li id="nav-rmagic-link" class="nav-menu-icon" >
-			<a class="icon {{$nav.lock.2}}" href="{{$nav.lock.0}}" title="{{$nav.lock.3}}" >{{$nav.lock.1}}</a>
-		</li>
-	{{/if}}
-
-		
-	{{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 fakelink" rel="#nav-network-menu"></span>
-			<ul id="nav-network-menu" class="menu-popup notify-menus" rel="network">
-				<li id="nav-network-see-all"><a href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a></li>
-				<li id="nav-network-mark-all"><a href="#" onclick="markRead('network'); return false;">{{$nav.network.mark.1}}</a></li>
-				<li class="empty">{{$emptynotifications}}</li>
-			</ul>
-			</li>
-	{{/if}}
-
-	{{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 fakelink" rel="#nav-home-menu"></span>
-			<ul id="nav-home-menu" class="menu-popup notify-menus" rel="home">
-				<li id="nav-home-see-all"><a href="{{$nav.home.all.0}}">{{$nav.home.all.1}}</a></li>
-				<li id="nav-home-mark-all"><a href="#" onclick="markRead('home'); return false;">{{$nav.home.mark.1}}</a></li>
-				<li class="empty">{{$emptynotifications}}</li>
-			</ul>
-		</li>
-	{{/if}}
-
-   {{if $nav.register}}<li id="nav-register-link" class="nav-menu {{$nav.register.2}}"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a><li>{{/if}}
-
-
-	{{if $nav.messages}}
-		<li id="nav-mail-link" class="nav-menu {{$sel.messages}}">
-			<a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>
-			<span id="mail-update" class="nav-notify fakelink" rel="#nav-messages-menu"></span>
-			<ul id="nav-messages-menu" class="menu-popup notify-menus" rel="messages">
-				<li id="nav-messages-see-all"><a href="{{$nav.messages.all.0}}">{{$nav.messages.all.1}}</a></li>
-				<li id="nav-messages-mark-all"><a href="#" onclick="markRead('messages'); return false;">{{$nav.messages.mark.1}}</a></li>
-				<li class="empty">{{$emptynotifications}}</li>
-			</ul>
-		</li>
-	{{/if}}
-
-	{{if $nav.all_events}}
-		<li id="nav-all_events-link" class="nav-menu {{$sel.all_events}}">
-			<a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" >{{$nav.all_events.1}}</a>
-			<span id="all_events-update" class="nav-notify fakelink" rel="#nav-all_events-menu"></span>
-			<ul id="nav-all_events-menu" class="menu-popup notify-menus" rel="all_events">
-				<li id="nav-all_events-see-all"><a href="{{$nav.all_events.all.0}}">{{$nav.all_events.all.1}}</a></li>
-				<li id="nav-all_events-mark-all"><a href="#" onclick="markRead('all_events'); return false;">{{$nav.all_events.mark.1}}</a></li>
-				<li class="empty">{{$emptynotifications}}</li>
-			</ul>
-		</li>
-	{{/if}}
-
-	{{if $nav.intros}}
-		<li id="nav-intros-link" class="nav-menu {{$sel.intros}}">
-			<a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" >{{$nav.intros.1}}</a>
-			<span id="intro-update" class="nav-notify fakelink" rel="#nav-intros-menu"></span>
-			<ul id="nav-intros-menu" class="menu-popup notify-menus" rel="intros">
-				<li id="nav-intros-see-all"><a href="{{$nav.intros.all.0}}">{{$nav.intros.all.1}}</a></li>
-				<li class="empty">{{$emptynotifications}}</li>
-			</ul>
-		</li>
-	{{/if}}
-		
-	{{if $nav.notifications}}
-		<li id="nav-notify-linkmenu" class="nav-menu fakelink">
-			<a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a>
-			<span id="notify-update" class="nav-notify fakelink" rel="#nav-notify-menu"></span>
-			<ul id="nav-notify-menu" class="menu-popup notify-menus" rel="notify">
-				<li id="nav-notify-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
-				<li id="nav-notify-mark-all"><a href="#" onclick="markRead('notify'); return false;">{{$nav.notifications.mark.1}}</a></li>
-				<li class="empty">{{$emptynotifications}}</li>
-			</ul>
-		</li>
-	{{/if}}		
-	
-	{{if $nav.login}}<li id="nav-login-link" class="nav-menu {{$nav.login.2}}"><a href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><li>{{/if}}
-	{{if $nav.alogout}}<li id=nav-alogout-link" class="nav-menu {{$nav}}-alogout.2"><a href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" >{{$nav.alogout.1}}</a></li>{{/if}}
-
-	{{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>
-	{{/if}}
-
-	{{if $nav.help}} 
-		<li id="nav-help-link" class="nav-menu {{$sel.help}}">
-			<a class="{{$nav.help.2}}" target="friendika-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a>
-		</li>
-	{{/if}}
-
-	{{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">
-			{{foreach $apps as $ap}}
-				<li>{{$ap}}</li>
-				{{/foreach}}
-			</ul>
-		</li>
-	{{/if}}
-
-		<li id="nav-searchbar">		
-			<form method="get" action="search">
-				<input id="nav-search-text" type="text" value="" placeholder="{{$nav.search.1}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();" />
-			</form>
-		</li>
-		<img src="images/rotator.gif" id="nav-search-spinner" style="display: none;" alt="{{$pleasewait}}" />
-
-	</ul>
-</nav>
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-	<li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
-</ul>
-
-<div id="langselector" >{{$langselector}}</div>
-<div id="panel" style="display: none;"></div>
diff --git a/view/tpl/smarty3/netfriend.tpl b/view/tpl/smarty3/netfriend.tpl
deleted file mode 100644
index e8658e0bc..000000000
--- a/view/tpl/smarty3/netfriend.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<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/tpl/smarty3/new_channel.tpl b/view/tpl/smarty3/new_channel.tpl
deleted file mode 100644
index a7aa44991..000000000
--- a/view/tpl/smarty3/new_channel.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h2>{{$title}}</h2>
-
-<form action="new_channel" method="post" id="newchannel-form">
-
-	<div id="newchannel-desc" class="descriptive-paragraph">{{$desc}}</div>
-
-	<label for="newchannel-name" id="label-newchannel-name" class="newchannel-label" >{{$label_name}}</label>
-	<input type="text" name="name" id="newchannel-name" class="newchannel-input" value="{{$name}}" />
-	<div id="newchannel-name-feedback" class="newchannel-feedback"></div>
-	<div id="newchannel-name-end"  class="newchannel-field-end"></div>
-
-	<div id="newchannel-name-help" class="descriptive-paragraph">{{$help_name}}</div>
-
-	<label for="newchannel-nickname" id="label-newchannel-nickname" class="newchannel-label" >{{$label_nick}}</label>
-	<input type="text" name="nickname" id="newchannel-nickname" class="newchannel-input" value="{{$nickname}}" />
-	<div id="newchannel-nickname-feedback" class="newchannel-feedback"></div>
-	<div id="newchannel-nickname-end"  class="newchannel-field-end"></div>
-
-	<div id="newchannel-nick-desc" class="descriptive-paragraph">{{$nick_desc}}</div>
-
-
-	<div id="newchannel-import-link" class="descriptive-paragraph" >{{$label_import}}</div>
-
-	<div id="newchannel-import-end" class="newchannel-field-end"></div>
-
-	<input type="submit" name="submit" id="newchannel-submit-button" value="{{$submit}}" />
-	<div id="newchannel-submit-end" class="newchannel-field-end"></div>
-
-</form>
diff --git a/view/tpl/smarty3/nogroup-template.tpl b/view/tpl/smarty3/nogroup-template.tpl
deleted file mode 100644
index 7d103a655..000000000
--- a/view/tpl/smarty3/nogroup-template.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h1>{{$header}}</h1>
-
-{{foreach $contacts as $contact}}
-	{{include file="contact_template.tpl"}}
-{{/foreach}}
-<div id="contact-edit-end"></div>
-
-{{$paginate}}
-
-
-
-
diff --git a/view/tpl/smarty3/notifications.tpl b/view/tpl/smarty3/notifications.tpl
deleted file mode 100644
index 834a7a016..000000000
--- a/view/tpl/smarty3/notifications.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<h1>{{$notif_header}}</h1>
-
-{{include file="common_tabs.tpl"}}
-
-<div class="notif-network-wrapper">
-	{{$notif_content}}
-</div>
diff --git a/view/tpl/smarty3/notifications_comments_item.tpl b/view/tpl/smarty3/notifications_comments_item.tpl
deleted file mode 100644
index 9913e6cf7..000000000
--- a/view/tpl/smarty3/notifications_comments_item.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="notif-item">
-	<a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
-</div>
\ No newline at end of file
diff --git a/view/tpl/smarty3/notifications_dislikes_item.tpl b/view/tpl/smarty3/notifications_dislikes_item.tpl
deleted file mode 100644
index 9913e6cf7..000000000
--- a/view/tpl/smarty3/notifications_dislikes_item.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="notif-item">
-	<a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
-</div>
\ No newline at end of file
diff --git a/view/tpl/smarty3/notifications_friends_item.tpl b/view/tpl/smarty3/notifications_friends_item.tpl
deleted file mode 100644
index 9913e6cf7..000000000
--- a/view/tpl/smarty3/notifications_friends_item.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="notif-item">
-	<a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
-</div>
\ No newline at end of file
diff --git a/view/tpl/smarty3/notifications_likes_item.tpl b/view/tpl/smarty3/notifications_likes_item.tpl
deleted file mode 100644
index 792b285bc..000000000
--- a/view/tpl/smarty3/notifications_likes_item.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="notif-item">
-	<a href="{{$item_link}}" target="friendica-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/tpl/smarty3/notifications_posts_item.tpl b/view/tpl/smarty3/notifications_posts_item.tpl
deleted file mode 100644
index 9913e6cf7..000000000
--- a/view/tpl/smarty3/notifications_posts_item.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="notif-item">
-	<a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
-</div>
\ No newline at end of file
diff --git a/view/tpl/smarty3/notify.tpl b/view/tpl/smarty3/notify.tpl
deleted file mode 100644
index 9913e6cf7..000000000
--- a/view/tpl/smarty3/notify.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="notif-item">
-	<a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
-</div>
\ No newline at end of file
diff --git a/view/tpl/smarty3/oauth_authorize.tpl b/view/tpl/smarty3/oauth_authorize.tpl
deleted file mode 100644
index d7f1963d2..000000000
--- a/view/tpl/smarty3/oauth_authorize.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<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/tpl/smarty3/oauth_authorize_done.tpl b/view/tpl/smarty3/oauth_authorize_done.tpl
deleted file mode 100644
index 12d4c6f48..000000000
--- a/view/tpl/smarty3/oauth_authorize_done.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h1>{{$title}}</h1>
-
-<p>{{$info}}</p>
-<code>{{$code}}</code>
diff --git a/view/tpl/smarty3/oembed_video.tpl b/view/tpl/smarty3/oembed_video.tpl
deleted file mode 100644
index bdfa11509..000000000
--- a/view/tpl/smarty3/oembed_video.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<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/tpl/smarty3/oexchange_xrd.tpl b/view/tpl/smarty3/oexchange_xrd.tpl
deleted file mode 100644
index 04a8e1847..000000000
--- a/view/tpl/smarty3/oexchange_xrd.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<?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">Friendika</Property>
-    <Property 
-        type="http://www.oexchange.org/spec/0.8/prop/title">Friendika Social Network</Property>
-    <Property 
-        type="http://www.oexchange.org/spec/0.8/prop/name">Friendika</Property>
-    <Property 
-        type="http://www.oexchange.org/spec/0.8/prop/prompt">Send to Friendika</Property>
-
-    <Link 
-        rel="icon" 
-        href="{{$base}}/images/friendika-16.png"
-        type="image/png" 
-        />
-
-    <Link 
-        rel="icon32" 
-        href="{{$base}}/images/friendika-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/tpl/smarty3/opensearch.tpl b/view/tpl/smarty3/opensearch.tpl
deleted file mode 100644
index 63d2a1752..000000000
--- a/view/tpl/smarty3/opensearch.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<?xml version="1.0" encoding="UTF-8"?>
-<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
-	<ShortName>Friendika@{{$nodename}}</ShortName>
-	<Description>Search in Friendika@{{$nodename}}</Description>
-	<Contact>http://bugs.friendika.com/</Contact>
-	<Image height="16" width="16" type="image/png">{{$baseurl}}/images/friendika-16.png</Image>
-	<Image height="64" width="64" type="image/png">{{$baseurl}}/images/friendika-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/tpl/smarty3/page_display.tpl b/view/tpl/smarty3/page_display.tpl
deleted file mode 100644
index e61a86fc9..000000000
--- a/view/tpl/smarty3/page_display.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class=page">
-	<h3 class="page-title">{{$title}}</h3>
-
-	<div class="page-author"><a class=="page-author-link" href="{{$auth_url}}">{{$author}}</a></div>
-	<div class="page-date">{{$date}}</div>
-	<div class="page-body">{{$body}}</div>
-</div>
diff --git a/view/tpl/smarty3/peoplefind.tpl b/view/tpl/smarty3/peoplefind.tpl
deleted file mode 100644
index 3a51bb0a8..000000000
--- a/view/tpl/smarty3/peoplefind.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<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" >{{$random}}</a></div>
-	{{if $inv}} 
-	<div class="side-link" id="side-invite-link" ><a href="invite" >{{$inv}}</a></div>
-	{{/if}}
-</div>
-
diff --git a/view/tpl/smarty3/photo_album.tpl b/view/tpl/smarty3/photo_album.tpl
deleted file mode 100644
index 33ab84df7..000000000
--- a/view/tpl/smarty3/photo_album.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<script type="text/javascript" charset="utf-8">
-  $(document).ready(function(){
-    $("a[rel^='prettyPhoto']").prettyPhoto();
-  });
-</script>
-
-<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}}" rel="{{$rel}}">
-		<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/tpl/smarty3/photo_albums.tpl b/view/tpl/smarty3/photo_albums.tpl
deleted file mode 100644
index b74c73fd3..000000000
--- a/view/tpl/smarty3/photo_albums.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div id="side-bar-photos-albums" class="widget">
-<h3><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$title}}</a></h3>
-{{if $albums}}
-<ul>
-{{foreach $albums as $al}}
-<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}">{{$al.album}}</a></li>
-{{/foreach}}
-</ul>
-{{/if}}
-{{if $upload}}
-<div id="photo-albums-upload-link"><a href="{{$baseurl}}/photos/{{$nick}}/upload" title="{{$upload}}">{{$upload}}</a></div>
-{{/if}}
-</div>
diff --git a/view/tpl/smarty3/photo_drop.tpl b/view/tpl/smarty3/photo_drop.tpl
deleted file mode 100644
index ed500fd0a..000000000
--- a/view/tpl/smarty3/photo_drop.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$id}}" >
-	<a href="item/drop/{{$id}}" 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/tpl/smarty3/photo_edit.tpl b/view/tpl/smarty3/photo_edit.tpl
deleted file mode 100644
index fefe7f10b..000000000
--- a/view/tpl/smarty3/photo_edit.tpl
+++ /dev/null
@@ -1,55 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<form action="photos/{{$nickname}}/{{$resource_id}}" method="post" id="photo_edit_form" >
-
-	<input type="hidden" name="item_id" value="{{$item_id}}" />
-
-	<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/tpl/smarty3/photo_item.tpl b/view/tpl/smarty3/photo_item.tpl
deleted file mode 100644
index 7d6ac96ee..000000000
--- a/view/tpl/smarty3/photo_item.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<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/tpl/smarty3/photo_top.tpl b/view/tpl/smarty3/photo_top.tpl
deleted file mode 100644
index b34e1e639..000000000
--- a/view/tpl/smarty3/photo_top.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<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/tpl/smarty3/photo_view.tpl b/view/tpl/smarty3/photo_view.tpl
deleted file mode 100644
index fe090409a..000000000
--- a/view/tpl/smarty3/photo_view.tpl
+++ /dev/null
@@ -1,48 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<script type="text/javascript" charset="utf-8">
-  $(document).ready(function(){
-    $("a[rel^='prettyPhoto']").prettyPhoto();
-  });
-</script>
-
-<div id="live-display"></div>
-<h3><a href="{{$album.0}}">{{$album.1}}</a></h3>
-
-<div id="photo-edit-link-wrap">
-{{if $tools}}
-<a id="photo-edit-link" href="{{$tools.edit.0}}">{{$tools.edit.1}}</a>
-|
-<a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a>
-{{/if}}
-{{if $lock}} | <img src="images/lock_icon.gif" class="lockview" alt="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');" /> {{/if}}
-</div>
-
-{{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}">{{$prevlink.1}}</a></div>{{/if}}
-<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" rel="prettyPhoto"><img src="{{$photo.src}}" /></a></div>
-{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}">{{$nextlink.1}}</a></div>{{/if}}
-<div id="photo-photo-end"></div>
-<div id="photo-caption">{{$desc}}</div>
-{{if $tags}}
-<div id="in-this-photo-text">{{$tags.0}}</div>
-<div id="in-this-photo">{{$tags.1}}</div>
-{{/if}}
-{{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}}
-
-{{if $edit}}{{$edit}}{{/if}}
-
-{{if $likebuttons}}
-<div id="photo-like-div">
-	{{$likebuttons}}
-	{{$like}}
-	{{$dislike}}	
-</div>
-{{/if}}
-
-{{$comments}}
-
-{{$paginate}}
-
diff --git a/view/tpl/smarty3/photos_recent.tpl b/view/tpl/smarty3/photos_recent.tpl
deleted file mode 100644
index cb2411df3..000000000
--- a/view/tpl/smarty3/photos_recent.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h3>{{$title}}</h3>
-{{if $can_post}}
-<a id="photo-top-upload-link" href="{{$upload.1}}">{{$upload.0}}</a>
-{{/if}}
-
-<div class="photos">
-{{foreach $photos as $photo}}
-	{{include file="photo_top.tpl"}}
-{{/foreach}}
-</div>
-<div class="photos-end"></div>
diff --git a/view/tpl/smarty3/photos_upload.tpl b/view/tpl/smarty3/photos_upload.tpl
deleted file mode 100644
index 1f9532224..000000000
--- a/view/tpl/smarty3/photos_upload.tpl
+++ /dev/null
@@ -1,52 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h3>{{$pagename}}</h3>
-
-<div id="photos-usage-message">{{$usage}}</div>
-
-<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" >
-	<input type="hidden" id-"photos-upload-source" name="source" value="photos" />
-	<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>
-		{{$albumselect}}
-	</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>
-
-	{{$uploader}}
-
-	{{$default}}
-
-	<div class="photos-upload-end" ></div>
-</form>
-
diff --git a/view/tpl/smarty3/poco_entry_xml.tpl b/view/tpl/smarty3/poco_entry_xml.tpl
deleted file mode 100644
index d6e139cb5..000000000
--- a/view/tpl/smarty3/poco_entry_xml.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<entry>
-{{if $entry.id}}<id>{{$entry.id}}</id>{{/if}}
-{{if $entry.displayName}}<displayName>{{$entry.displayName}}</displayName>{{/if}}
-{{if $entry.preferredUsername}}<preferredUsername>{{$entry.preferredUsername}}</preferredUsername>{{/if}}
-{{if $entry.urls}}{{foreach $entry.urls as $url}}<urls><value>{{$url.value}}</value><type>{{$url.type}}</type></urls>{{/foreach}}{{/if}}
-{{if $entry.photos}}{{foreach $entry.photos as $photo}}<photos><value>{{$photo.value}}</value><type>{{$photo.type}}</type></photos>{{/foreach}}{{/if}}
-</entry>
diff --git a/view/tpl/smarty3/poco_xml.tpl b/view/tpl/smarty3/poco_xml.tpl
deleted file mode 100644
index b8cd8fc08..000000000
--- a/view/tpl/smarty3/poco_xml.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<?xml version="1.0" encoding="utf-8"?>
-<response>
-{{if $response.sorted}}<sorted>{{$response.sorted}}</sorted>{{/if}}
-{{if $response.filtered}}<filtered>{{$response.filtered}}</filtered>{{/if}}
-{{if $response.updatedSince}}<updatedSince>{{$response.updatedSince}}</updatedSince>{{/if}}
-<startIndex>{{$response.startIndex}}</startIndex>
-<itemsPerPage>{{$response.itemsPerPage}}</itemsPerPage>
-<totalResults>{{$response.totalResults}}</totalResults>
-
-
-{{if $response.totalResults}}
-{{foreach $response.entry as $entry}}
-{{include file="poco_entry_xml.tpl"}}
-{{/foreach}}
-{{else}}
-<entry></entry>
-{{/if}}
-</response>
diff --git a/view/tpl/smarty3/poke_content.tpl b/view/tpl/smarty3/poke_content.tpl
deleted file mode 100644
index 6235aca0c..000000000
--- a/view/tpl/smarty3/poke_content.tpl
+++ /dev/null
@@ -1,37 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<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" >
-{{foreach $verbs as $v}}
-<option value="{{$v.0}}">{{$v.1}}</option>
-{{/foreach}}
-</select>
-<br />
-<br />
-<div id="poke-private-desc">{{$prv_desc}}</div>
-<input type="checkbox" name="private" {{if $parent}}disabled="disabled"{{/if}} value="1" />
-<br />
-<br />
-<input type="submit" name="submit" value="{{$submit}}" />
-</form>
-
diff --git a/view/tpl/smarty3/posted_date_widget.tpl b/view/tpl/smarty3/posted_date_widget.tpl
deleted file mode 100644
index 2f5838edb..000000000
--- a/view/tpl/smarty3/posted_date_widget.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<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}}">
-{{foreach $dates as $d}}
-<option value="{{$url}}/{{$d.1}}/{{$d.2}}" >{{$d.0}}</option>
-{{/foreach}}
-</select>
-</div>
diff --git a/view/tpl/smarty3/profed_head.tpl b/view/tpl/smarty3/profed_head.tpl
deleted file mode 100644
index 37a038d4f..000000000
--- a/view/tpl/smarty3/profed_head.tpl
+++ /dev/null
@@ -1,41 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<script language="javascript" type="text/javascript"
-          src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
-          <script language="javascript" type="text/javascript">
-
-
-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 : '',
-	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/tpl/smarty3/profile_advanced.tpl b/view/tpl/smarty3/profile_advanced.tpl
deleted file mode 100644
index f8743c011..000000000
--- a/view/tpl/smarty3/profile_advanced.tpl
+++ /dev/null
@@ -1,175 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<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>
-{{/if}}
-
-{{if $profile.birthday}}
-<dl id="aprofile-birthday" class="aprofile">
- <dt>{{$profile.birthday.0}}</dt>
- <dd>{{$profile.birthday.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.age}}
-<dl id="aprofile-age" class="aprofile">
- <dt>{{$profile.age.0}}</dt>
- <dd>{{$profile.age.1}}</dd>
-</dl>
-{{/if}}
-
-{{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}}){{/if}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.sexual}}
-<dl id="aprofile-sexual" class="aprofile">
- <dt>{{$profile.sexual.0}}</dt>
- <dd>{{$profile.sexual.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.keywords}}
-<dl id="aprofile-tags" class="aprofile">
- <dt>{{$profile.keywords.0}}</dt>
- <dd>{{$profile.keywords.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.homepage}}
-<dl id="aprofile-homepage" class="aprofile">
- <dt>{{$profile.homepage.0}}</dt>
- <dd>{{$profile.homepage.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.hometown}}
-<dl id="aprofile-hometown" class="aprofile">
- <dt>{{$profile.hometown.0}}</dt>
- <dd>{{$profile.hometown.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.politic}}
-<dl id="aprofile-politic" class="aprofile">
- <dt>{{$profile.politic.0}}</dt>
- <dd>{{$profile.politic.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.religion}}
-<dl id="aprofile-religion" class="aprofile">
- <dt>{{$profile.religion.0}}</dt>
- <dd>{{$profile.religion.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.about}}
-<dl id="aprofile-about" class="aprofile">
- <dt>{{$profile.about.0}}</dt>
- <dd>{{$profile.about.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.interest}}
-<dl id="aprofile-interest" class="aprofile">
- <dt>{{$profile.interest.0}}</dt>
- <dd>{{$profile.interest.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.likes}}
-<dl id="aprofile-likes" class="aprofile">
- <dt>{{$profile.likes.0}}</dt>
- <dd>{{$profile.likes.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.dislikes}}
-<dl id="aprofile-dislikes" class="aprofile">
- <dt>{{$profile.dislikes.0}}</dt>
- <dd>{{$profile.dislikes.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.contact}}
-<dl id="aprofile-contact" class="aprofile">
- <dt>{{$profile.contact.0}}</dt>
- <dd>{{$profile.contact.1}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.music}}
-<dl id="aprofile-music" class="aprofile">
- <dt>{{$profile.music.0}}</dt>
- <dd>{{$profile.music.1}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.book}}
-<dl id="aprofile-book" class="aprofile">
- <dt>{{$profile.book.0}}</dt>
- <dd>{{$profile.book.1}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.tv}}
-<dl id="aprofile-tv" class="aprofile">
- <dt>{{$profile.tv.0}}</dt>
- <dd>{{$profile.tv.1}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.film}}
-<dl id="aprofile-film" class="aprofile">
- <dt>{{$profile.film.0}}</dt>
- <dd>{{$profile.film.1}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.romance}}
-<dl id="aprofile-romance" class="aprofile">
- <dt>{{$profile.romance.0}}</dt>
- <dd>{{$profile.romance.1}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.work}}
-<dl id="aprofile-work" class="aprofile">
- <dt>{{$profile.work.0}}</dt>
- <dd>{{$profile.work.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.education}}
-<dl id="aprofile-education" class="aprofile">
- <dt>{{$profile.education.0}}</dt>
- <dd>{{$profile.education.1}}</dd>
-</dl>
-{{/if}}
-
-
-
-
diff --git a/view/tpl/smarty3/profile_edit.tpl b/view/tpl/smarty3/profile_edit.tpl
deleted file mode 100644
index 864599244..000000000
--- a/view/tpl/smarty3/profile_edit.tpl
+++ /dev/null
@@ -1,325 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{$default}}
-
-<h1>{{$banner}}</h1>
-
-<div id="profile-edit-links">
-<ul>
-<li><a href="profile_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-region-wrapper" >
-<label id="profile-edit-region-label" for="profile-edit-region" >{{$lbl_region}} </label>
-<input type="text" size="32" name="region" id="profile-edit-region" value="{{$region}}" />
-</div>
-<div id="profile-edit-region-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="32" name="country_name" id="profile-edit-country-name" value="{{$country_name}}" />
-</div>
-<div id="profile-edit-country-name-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="keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$keywords}}" />
-</div><div id="profile-edit-pubkeywords-desc">{{$lbl_pubdsc}}</div>
-<div id="profile-edit-pubkeywords-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 id="channels-jot-wrapper" >
-<p id="channels-jot-desc" >
-{{$lbl_channels}}
-</p>
-
-<textarea rows="10" cols="72" id="channels-jot-text" name="channels" >{{$channels}}</textarea>
-
-</div>
-<div id="channels-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>
-
diff --git a/view/tpl/smarty3/profile_edlink.tpl b/view/tpl/smarty3/profile_edlink.tpl
deleted file mode 100644
index 9424bcc3d..000000000
--- a/view/tpl/smarty3/profile_edlink.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<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/tpl/smarty3/profile_entry.tpl b/view/tpl/smarty3/profile_entry.tpl
deleted file mode 100644
index 4774fd11b..000000000
--- a/view/tpl/smarty3/profile_entry.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<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/tpl/smarty3/profile_listing_header.tpl b/view/tpl/smarty3/profile_listing_header.tpl
deleted file mode 100644
index f77bdcc80..000000000
--- a/view/tpl/smarty3/profile_listing_header.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<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/tpl/smarty3/profile_photo.tpl b/view/tpl/smarty3/profile_photo.tpl
deleted file mode 100644
index 8c4fbfafa..000000000
--- a/view/tpl/smarty3/profile_photo.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h1>{{$title}}</h1>
-
-<form enctype="multipart/form-data" action="profile_photo" method="post">
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-<div id="profile-photo-upload-wrapper">
-
-<label id="profile-photo-upload-label" class="form-label" for="profile-photo-upload">{{$lbl_upfile}}</label>
-<input name="userfile" class="form-input" type="file" id="profile-photo-upload" size="48" />
-<div class="clear"></div>
-
-<label id="profile-photo-profiles-label" class="form-label" for="profile-photo-profiles">{{$lbl_profiles}}</label>
-<select name="profile" id="profile-photo-profiles" class="form-input" >
-{{foreach $profiles as $p}}
-<option value="{{$p.id}}" {{if $p.is_default}}selected="selected"{{/if}}>{{$p.name}}</option>
-{{/foreach}}
-</select>
-<div class="clear"></div>
-
-<div id="profile-photo-submit-wrapper">
-<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}">
-</div>
-</div>
-
-</form>
-
-<div id="profile-photo-link-select-wrapper">
-{{$select}}
-</div>
\ No newline at end of file
diff --git a/view/tpl/smarty3/profile_vcard.tpl b/view/tpl/smarty3/profile_vcard.tpl
deleted file mode 100644
index 422b43720..000000000
--- a/view/tpl/smarty3/profile_vcard.tpl
+++ /dev/null
@@ -1,57 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="vcard">
-
-	{{if $profile.edit}}
-	<div class="action">
-	<a class="profile-edit-side-link icon edit" rel="#profiles-menu" title="{{$profile.edit.3}}" href="#" ><span>{{$profile.edit.1}}</span></a>
-	<ul id="profiles-menu" class="menu-popup">
-		{{foreach $profile.menu.entries as $e}}
-		<li>
-			<a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a>
-		</li>
-		{{/foreach}}
-		<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>
-	{{/if}}
-
-	<div class="fn label">{{$profile.name}}</div>
-		
-	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
-	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
-
-
-
-	{{if $location}}
-		<dl class="location"><dt class="location-label">{{$location}}</dt> 
-		<dd class="adr">
-			{{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
-			<span class="city-state-zip">
-				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-				<span class="region">{{$profile.region}}</span>
-				<span class="postal-code">{{$profile.postal_code}}</span>
-			</span>
-			{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
-		</dd>
-		</dl>
-	{{/if}}
-
-	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
-	
-
-	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
-
-	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" >{{$profile.homepage}}</a></dd></dl>{{/if}}
-
-	
-</div>
-<div id="vcard-end"></div>
-{{$contact_block}}
-
-
diff --git a/view/tpl/smarty3/prv_message.tpl b/view/tpl/smarty3/prv_message.tpl
deleted file mode 100644
index 1f41d2662..000000000
--- a/view/tpl/smarty3/prv_message.tpl
+++ /dev/null
@@ -1,44 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<h3>{{$header}}</h3>
-
-<div id="prvmail-wrapper" >
-<form id="prvmail-form" action="message" method="post" >
-
-{{$parent}}
-
-<div id="prvmail-to-label">{{$to}}</div>
-
-{{if $showinputs}}
-<input type="text" id="recip" name="messagerecip" value="{{$prefill}}" maxlength="255" size="64" tabindex="10" />
-<input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
-{{else}}
-{{$select}}
-{{/if}}
-
-<div id="prvmail-subject-label">{{$subject}}</div>
-<input type="text" size="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/tpl/smarty3/pwdreset.tpl b/view/tpl/smarty3/pwdreset.tpl
deleted file mode 100644
index e86e1227f..000000000
--- a/view/tpl/smarty3/pwdreset.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h3>{{$lbl1}}</h3>
-
-<p>
-{{$lbl2}}
-</p>
-<p>
-{{$lbl3}}
-</p>
-<p>
-{{$newpass}}
-</p>
-<p>
-{{$lbl4}} {{$lbl5}}
-</p>
-<p>
-{{$lbl6}}
-</p>
diff --git a/view/tpl/smarty3/register.tpl b/view/tpl/smarty3/register.tpl
deleted file mode 100644
index 98d888f08..000000000
--- a/view/tpl/smarty3/register.tpl
+++ /dev/null
@@ -1,50 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h2>{{$title}}</h2>
-
-<form action="register" method="post" id="register-form">
-
-{{if $registertext}}
-<div id="register-desc" class="descriptive-paragraph">{{$registertext}}</div>
-{{/if}}
-
-{{if $invitations}}
-	<p id="register-invite-desc">{{$invite_desc}}</p>
-
-	<label for="register-invite" id="label-register-invite" class="register-label">{{$label_invite}}</label>
-	<input type="text" maxlength="72" size="32" name="invite_code" id="register-invite" class="register-input" value="{{$invite_code}}" />
-	<div id="register-invite-feedback" class="register-feedback"></div>
-	<div id="register-invite-end" class="register-field-end"></div>
-{{/if}}
-
-	<label for="register-email" id="label-register-email" class="register-label" >{{$label_email}}</label>
-	<input type="text" maxlength="72" size="32" name="email" id="register-email" class="register-input" value="{{$email}}" />
-	<div id="register-email-feedback" class="register-feedback"></div>
-	<div id="register-email-end"  class="register-field-end"></div>
-
-	<label for="register-password" id="label-register-password" class="register-label" >{{$label_pass1}}</label>
-	<input type="password" maxlength="72" size="32" name="password" id="register-password" class="register-input" value="{{$pass1}}" />
-	<div id="register-password-feedback" class="register-feedback"></div>
-	<div id="register-password-end"  class="register-field-end"></div>
-
-	<label for="register-password2" id="label-register-password2" class="register-label" >{{$label_pass2}}</label>
-	<input type="password" maxlength="72" size="32" name="password2" id="register-password2" class="register-input" value="{{$pass2}}" />
-	<div id="register-password2-feedback" class="register-feedback"></div>
-	<div id="register-password2-end"  class="register-field-end"></div>
-
-	{{if $enable_tos}}
-	<input type="checkbox" name="tos" id="register-tos" value="1" />
-	<label for="register-tos" id="label-register-tos">{{$label_tos}}</label>
-	<div id="register-tos-feedback" class="register-feedback"></div>
-	<div id="register-tos-end"  class="register-field-end"></div>
-	{{else}}
-	<input type="hidden" name="tos" value="1" />
-	{{/if}}
-
-	<input type="submit" name="submit" id="register-submit-button" value="{{$submit}}" />
-	<div id="register-submit-end" class="register-field-end"></div>
-
-</form>
diff --git a/view/tpl/smarty3/remote_friends_common.tpl b/view/tpl/smarty3/remote_friends_common.tpl
deleted file mode 100644
index 8416b053a..000000000
--- a/view/tpl/smarty3/remote_friends_common.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div id="remote-friends-in-common" class="bigwidget">
-	<div id="rfic-desc">{{$desc}} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{if $linkmore}}<a href="{{$base}}/common/{{$uid}}">{{$more}}</a>{{/if}}</div>
-	{{if $items}}
-	{{foreach $items as $item}}
-	<div class="profile-match-wrapper">
-		<div class="profile-match-photo">
-			<a href="{{$base}}/chanview?f=&url={{$item.xchan_url}}">
-				<img src="{{$item.xchan_photo_m}}" width="80" height="80" alt="{{$item.xchan_name}}" title="{{$item.xchan_name}}" />
-			</a>
-		</div>
-		<div class="profile-match-break"></div>
-		<div class="profile-match-name">
-			<a href="{{$base}}/chanview?f=&url={{$item.xchan_url}}" title="{{$item.xchan_name}}">{{$item.xchan_name}}</a>
-		</div>
-		<div class="profile-match-end"></div>
-	</div>
-	{{/foreach}}
-	{{/if}}
-	<div id="rfic-end" class="clear"></div>
-</div>
-
diff --git a/view/tpl/smarty3/removeme.tpl b/view/tpl/smarty3/removeme.tpl
deleted file mode 100644
index 3fe12a223..000000000
--- a/view/tpl/smarty3/removeme.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<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/tpl/smarty3/rmagic.tpl b/view/tpl/smarty3/rmagic.tpl
deleted file mode 100644
index 7e4e563d9..000000000
--- a/view/tpl/smarty3/rmagic.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h3>{{$title}}</h3>
-
-<form action="rmagic" method="post" >
-
-	<label for="rmagic-address" id="label-rmagic-address" class="rmagic-label">{{$desc}}</label>
-	<input type="text" maxlength="255" size="32" name="address" id="rmagic-address" class="rmagic-input" value="" />
-
-	<input type="submit" name="submit" id="rmagic-submit-button" value="{{$submit}}" />
-	<div id="rmagic-submit-end" class="rmagic-field-end"></div>
-
-</form>
diff --git a/view/tpl/smarty3/saved_searches_aside.tpl b/view/tpl/smarty3/saved_searches_aside.tpl
deleted file mode 100644
index 034d1f6db..000000000
--- a/view/tpl/smarty3/saved_searches_aside.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="widget" id="saved-search-list">
-	<h3 id="search">{{$title}}</h3>
-	{{$searchbox}}
-	
-	<ul id="saved-search-ul">
-		{{foreach $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.displayterm}}</a>
-		</li>
-		{{/foreach}}
-	</ul>
-	<div class="clear"></div>
-</div>
diff --git a/view/tpl/smarty3/search_item.tpl b/view/tpl/smarty3/search_item.tpl
deleted file mode 100644
index debc1d89d..000000000
--- a/view/tpl/smarty3/search_item.tpl
+++ /dev/null
@@ -1,68 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper {{$item.toplevel}}">
-<a name="{{$item.id}}" ></a>
-<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" 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}}"  title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
-				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
-				<div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
-					<ul>
-						{{$item.item_photo_menu}}
-					</ul>
-				</div>
-			</div>
-			<div class="wall-item-photo-end"></div>	
-			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
-				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
-				{{else}}<div class="wall-item-lock"></div>{{/if}}	
-				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
-			</div>
-		</div>
-		<div class="wall-item-author">
-				<a href="{{$item.profile_url}}"  title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
-
-				<div id="wall-item-ago-{{$item.id}}" class="wall-item-ago"><abbr class="wall-item-ago-time" title="{{$item.isotime}}">{{$item.localtime}}</abbr>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</div>
-				
-		</div>			
-		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
-			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}
-				<div class="body-tag">
-				{{foreach $item.tags as $tag}}
-					<span class='tag'>{{$tag}}</span>
-				{{/foreach}}
-				</div>
-			</div>
-		</div>
-		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
-			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
-				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
-			</div>
-				{{if $item.drop.pagedropping}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
-			<div class="wall-item-delete-end"></div>
-		</div>
-	</div>
-	<div class="wall-item-wrapper-end"></div>
-
-
-	<div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
-	{{if $item.conv}}
-			<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
-	{{/if}}
-	</div>
-
-<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
-
-</div>
-</div>
-
diff --git a/view/tpl/smarty3/settings.tpl b/view/tpl/smarty3/settings.tpl
deleted file mode 100644
index 251fa9be4..000000000
--- a/view/tpl/smarty3/settings.tpl
+++ /dev/null
@@ -1,119 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h1>{{$ptitle}}</h1>
-
-{{$nickname_block}}
-
-<form action="settings" id="settings-form" method="post" autocomplete="off" >
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-<h3 class="settings-heading">{{$h_basic}}</h3>
-
-{{include file="field_input.tpl" field=$username}}
-{{include file="field_custom.tpl" field=$timezone}}
-{{include file="field_input.tpl" field=$defloc}}
-{{include file="field_checkbox.tpl" field=$allowloc}}
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
-</div>
-
-
-<h3 class="settings-heading">{{$h_prv}}</h3>
-
-
-<div id="settings-permissions-wrapper">
-{{foreach $permiss_arr as $permit}}
-{{include file="field_select.tpl" field=$permit}}
-{{/foreach}}
-</div>
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
-</div>
-
-
-{{$profile_in_dir}}
-
-{{$suggestme}}
-
-{{include file="field_input.tpl" field=$maxreq}}
-
-{{include file="field_input.tpl" field=$cntunkmail}}
-
-{{include file="field_input.tpl" field=$expire.days}}
-
-
-<div class="field input">
-	<span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="{{$expire.advanced}}">{{$expire.label}}</a></span>
-	<div style="display: none;">
-		<div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
-			<h3>{{$expire.advanced}}</h3>
-			{{include file="field_yesno.tpl" field=$expire.items}}
-			{{include file="field_yesno.tpl" field=$expire.starred}}
-			{{include file="field_yesno.tpl" field=$expire.network_only}}
-		</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>
-
-{{include file="field_checkbox.tpl" field=$post_newfriend}}
-{{include file="field_checkbox.tpl" field=$post_joingroup}}
-{{include file="field_checkbox.tpl" field=$post_profilechange}}
-
-
-<div id="settings-notify-desc">{{$lbl_not}}</div>
-
-<div class="group">
-{{include file="field_intcheckbox.tpl" field=$notify1}}
-{{include file="field_intcheckbox.tpl" field=$notify2}}
-{{include file="field_intcheckbox.tpl" field=$notify3}}
-{{include file="field_intcheckbox.tpl" field=$notify4}}
-{{include file="field_intcheckbox.tpl" field=$notify5}}
-{{include file="field_intcheckbox.tpl" field=$notify6}}
-{{include file="field_intcheckbox.tpl" field=$notify7}}
-{{include file="field_intcheckbox.tpl" field=$notify8}}
-</div>
-
-</div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
-</div>
-
diff --git a/view/tpl/smarty3/settings_account.tpl b/view/tpl/smarty3/settings_account.tpl
deleted file mode 100644
index a12283ff2..000000000
--- a/view/tpl/smarty3/settings_account.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h1>{{$title}}</h1>
-
-
-<div id="settings-remove-account-link">
-<a href="removeme" title="{{$permanent}}" >{{$removeme}}</a>
-</div>
-
-
-<form action="settings/account" id="settings-account-form" method="post" autocomplete="off" >
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-{{include file="field_input.tpl" field=$email}}
-
-
-<h3 class="settings-heading">{{$h_pass}}</h3>
-
-{{include file="field_password.tpl" field=$password1}}
-{{include file="field_password.tpl" field=$password2}}
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
-</div>
-
-{{$account_settings}}
-
-
-
diff --git a/view/tpl/smarty3/settings_addons.tpl b/view/tpl/smarty3/settings_addons.tpl
deleted file mode 100644
index b8613bec6..000000000
--- a/view/tpl/smarty3/settings_addons.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h1>{{$title}}</h1>
-
-
-<form action="settings/featured" method="post" autocomplete="off">
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-{{$settings_addons}}
-
-</form>
-
diff --git a/view/tpl/smarty3/settings_connectors.tpl b/view/tpl/smarty3/settings_connectors.tpl
deleted file mode 100644
index 5df839411..000000000
--- a/view/tpl/smarty3/settings_connectors.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h1>{{$title}}</h1>
-
-<form action="settings/connectors" method="post" autocomplete="off">
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-{{$settings_connectors}}
-
-</form>
-
diff --git a/view/tpl/smarty3/settings_display.tpl b/view/tpl/smarty3/settings_display.tpl
deleted file mode 100644
index 3558e5cc9..000000000
--- a/view/tpl/smarty3/settings_display.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<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}}'>
-
-{{include file="field_themeselect.tpl" field=$theme}}
-{{include file="field_themeselect.tpl" field=$mobile_theme}}
-{{include file="field_input.tpl" field=$ajaxint}}
-{{include file="field_input.tpl" field=$itemspage}}
-{{include file="field_checkbox.tpl" field=$nosmile}}
-
-
-<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}}
-{{/if}}
-
-</form>
diff --git a/view/tpl/smarty3/settings_features.tpl b/view/tpl/smarty3/settings_features.tpl
deleted file mode 100644
index 797d3da2c..000000000
--- a/view/tpl/smarty3/settings_features.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h1>{{$title}}</h1>
-
-
-<form action="settings/features" method="post" autocomplete="off">
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-{{foreach $features as $f}}
-<h3 class="settings-heading">{{$f.0}}</h3>
-
-{{foreach $f.1 as $fcat}}
-    {{include file="{{$field_yesno}}" field=$fcat}}
-{{/foreach}}
-{{/foreach}}
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-features-submit" value="{{$submit}}" />
-</div>
-
-</form>
-
diff --git a/view/tpl/smarty3/settings_nick_set.tpl b/view/tpl/smarty3/settings_nick_set.tpl
deleted file mode 100644
index fb886695e..000000000
--- a/view/tpl/smarty3/settings_nick_set.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<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/tpl/smarty3/settings_oauth.tpl b/view/tpl/smarty3/settings_oauth.tpl
deleted file mode 100644
index feab78210..000000000
--- a/view/tpl/smarty3/settings_oauth.tpl
+++ /dev/null
@@ -1,36 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<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>
-
-	{{foreach $apps as $app}}
-	<div class='oauthapp'>
-		<img src='{{$app.icon}}' class="{{if $app.icon}} {{else}}noicon{{/if}}">
-		{{if $app.name}}<h4>{{$app.name}}</h4>{{else}}<h4>{{$noname}}</h4>{{/if}}
-		{{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>
-			{{/if}}
-		{{/if}}
-		{{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>
-		{{/if}}		
-	</div>
-	{{/foreach}}
-
-</form>
diff --git a/view/tpl/smarty3/settings_oauth_edit.tpl b/view/tpl/smarty3/settings_oauth_edit.tpl
deleted file mode 100644
index e3960bf75..000000000
--- a/view/tpl/smarty3/settings_oauth_edit.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h1>{{$title}}</h1>
-
-<form method="POST">
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
-{{include file="field_input.tpl" field=$name}}
-{{include file="field_input.tpl" field=$key}}
-{{include file="field_input.tpl" field=$secret}}
-{{include file="field_input.tpl" field=$redirect}}
-{{include file="field_input.tpl" field=$icon}}
-
-<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/tpl/smarty3/siteinfo.tpl b/view/tpl/smarty3/siteinfo.tpl
deleted file mode 100644
index 3720c9629..000000000
--- a/view/tpl/smarty3/siteinfo.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h3>{{$title}}</h3>
-<p></p>
-<p>{{$description}}</p>
-{{if $version}}
-<p>{{$version}}</p>
-{{/if}}
-<p>{{$web_location}}</p>
-<p>{{$visit}}</p>
-<p>{{$bug_text}} <a href="{{$bug_link_url}}">{{$bug_link_text}}</a></p>
-<p>{{$contact}}</p>
-<p>{{$plugins_text}}</p>
-{{if $plugins_list}}
-   <div style="margin-left: 25px; margin-right: 25px;">{{$plugins_list}}</div>
-{{/if}}
diff --git a/view/tpl/smarty3/suggest_friends.tpl b/view/tpl/smarty3/suggest_friends.tpl
deleted file mode 100644
index 4445a4693..000000000
--- a/view/tpl/smarty3/suggest_friends.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="profile-match-wrapper">
-	<a href="{{$entry.ignlnk}}" title="{{$entry.ignore}}" class="icon drophide smalldrop profile-match-ignore" onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" ></a>
-	<div class="profile-match-photo">
-		<a href="{{$entry.url}}">
-			<img src="{{$entry.photo}}" alt="{{$entry.name}}" width="80" height="80" title="{{$entry.name}} [{{$entry.url}}]" />
-		</a>
-	</div>
-	<div class="profile-match-break"></div>
-	<div class="profile-match-name">
-		<a href="{{$entry.url}}" title="{{$entry.name}}">{{$entry.name}}</a>
-	</div>
-	<div class="profile-match-end"></div>
-	{{if $entry.connlnk}}
-	<div class="profile-match-connect"><a href="{{$entry.connlnk}}" title="{{$entry.conntxt}}">{{$entry.conntxt}}</a></div>
-	{{/if}}
-</div>
\ No newline at end of file
diff --git a/view/tpl/smarty3/suggest_page.tpl b/view/tpl/smarty3/suggest_page.tpl
deleted file mode 100644
index 07999abfd..000000000
--- a/view/tpl/smarty3/suggest_page.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h3>{{$title}}</h3>
-
-{{if $entries}}
-{{foreach $entries as $child}}
-{{include file="suggest_friends.tpl" entry=$child}}
-{{/foreach}}
-{{/if}}
-
-<div class="clear"></div>
diff --git a/view/tpl/smarty3/suggestions.tpl b/view/tpl/smarty3/suggestions.tpl
deleted file mode 100644
index b4f0cbbe5..000000000
--- a/view/tpl/smarty3/suggestions.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-
-<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">
-{{include file="field_checkbox.tpl" field=$hidden}}
-<input class="intro-submit-approve" type="submit" name="submit" value="{{$approve}}" />
-</form>
-</div>
-<div class="intro-end"></div>
diff --git a/view/tpl/smarty3/threaded_conversation.tpl b/view/tpl/smarty3/threaded_conversation.tpl
deleted file mode 100644
index a2885ddc3..000000000
--- a/view/tpl/smarty3/threaded_conversation.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{foreach $threads as $thread_item}}
-{{include file="{{$thread_item.template}}" item=$thread_item}}
-{{/foreach}}
-
-<div id="conversation-end"></div>
-
-{{if $dropping}}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
-  <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
-  <div id="item-delete-selected-desc" >{{$dropping}}</div>
-</div>
-<div id="item-delete-selected-end"></div>
-{{/if}}
diff --git a/view/tpl/smarty3/toggle_mobile_footer.tpl b/view/tpl/smarty3/toggle_mobile_footer.tpl
deleted file mode 100644
index 008d69663..000000000
--- a/view/tpl/smarty3/toggle_mobile_footer.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<a id="toggle_mobile_link" href="{{$toggle_link}}">{{$toggle_text}}</a>
-
diff --git a/view/tpl/smarty3/viewcontact_template.tpl b/view/tpl/smarty3/viewcontact_template.tpl
deleted file mode 100644
index a9837c7f9..000000000
--- a/view/tpl/smarty3/viewcontact_template.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<h3>{{$title}}</h3>
-
-{{foreach $contacts as $contact}}
-	{{include file="contact_template.tpl"}}
-{{/foreach}}
-
-<div id="view-contact-end"></div>
-
-{{$paginate}}
diff --git a/view/tpl/smarty3/xchan_vcard.tpl b/view/tpl/smarty3/xchan_vcard.tpl
deleted file mode 100644
index 8878a773a..000000000
--- a/view/tpl/smarty3/xchan_vcard.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<div class="vcard">
-<div class="fn">{{$name}}</div>
-<div id="profile-photo-wrapper"><img class="vcard-photo photo" src="{{$photo}}" alt="name" /></div>
-</div>
-
-
-	
-<div id="profile-extra-links">
-<ul>
-{{if $connect}}
-	<li><a id="follow-link" href="follow?f=&url={{$follow}}">{{$connect}}</a></li>
-{{/if}}
-{{if $newwin}}
-	<li><a id="visit-chan-link" href="{{$url}}" title="{{$newtit}}" target="_blank" >{{$newwin}}</a></li>
-{{/if}}
-</ul>
-
-
-</div>
-
diff --git a/view/tpl/smarty3/xrd_host.tpl b/view/tpl/smarty3/xrd_host.tpl
deleted file mode 100644
index 1f273e010..000000000
--- a/view/tpl/smarty3/xrd_host.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<?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/tpl/smarty3/xrd_person.tpl b/view/tpl/smarty3/xrd_person.tpl
deleted file mode 100644
index 2b914fa34..000000000
--- a/view/tpl/smarty3/xrd_person.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-{{*
- *	AUTOMATICALLY GENERATED TEMPLATE
- *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-<?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}}" />
- 
-	<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/tpl/suggest_friends.tpl b/view/tpl/suggest_friends.tpl
index 47b74fee4..4445a4693 100644..100755
--- a/view/tpl/suggest_friends.tpl
+++ b/view/tpl/suggest_friends.tpl
@@ -1,16 +1,21 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="profile-match-wrapper">
-	<a href="$entry.ignlnk" title="$entry.ignore" class="icon drophide smalldrop profile-match-ignore" onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" ></a>
+	<a href="{{$entry.ignlnk}}" title="{{$entry.ignore}}" class="icon drophide smalldrop profile-match-ignore" onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" ></a>
 	<div class="profile-match-photo">
-		<a href="$entry.url">
-			<img src="$entry.photo" alt="$entry.name" width="80" height="80" title="$entry.name [$entry.url]" />
+		<a href="{{$entry.url}}">
+			<img src="{{$entry.photo}}" alt="{{$entry.name}}" width="80" height="80" title="{{$entry.name}} [{{$entry.url}}]" />
 		</a>
 	</div>
 	<div class="profile-match-break"></div>
 	<div class="profile-match-name">
-		<a href="$entry.url" title="$entry.name">$entry.name</a>
+		<a href="{{$entry.url}}" title="{{$entry.name}}">{{$entry.name}}</a>
 	</div>
 	<div class="profile-match-end"></div>
-	{{ if $entry.connlnk }}
-	<div class="profile-match-connect"><a href="$entry.connlnk" title="$entry.conntxt">$entry.conntxt</a></div>
-	{{ endif }}
+	{{if $entry.connlnk}}
+	<div class="profile-match-connect"><a href="{{$entry.connlnk}}" title="{{$entry.conntxt}}">{{$entry.conntxt}}</a></div>
+	{{/if}}
 </div>
\ No newline at end of file
diff --git a/view/tpl/suggest_page.tpl b/view/tpl/suggest_page.tpl
index ab9150138..07999abfd 100644..100755
--- a/view/tpl/suggest_page.tpl
+++ b/view/tpl/suggest_page.tpl
@@ -1,9 +1,14 @@
-<h3>$title</h3>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$title}}</h3>
 
-{{ if $entries }}
-{{ for $entries as $child }}
-{{ inc suggest_friends.tpl with $entry=$child }}{{ endinc }}
-{{ endfor }}
-{{ endif }}
+{{if $entries}}
+{{foreach $entries as $child}}
+{{include file="suggest_friends.tpl" entry=$child}}
+{{/foreach}}
+{{/if}}
 
 <div class="clear"></div>
diff --git a/view/tpl/suggestions.tpl b/view/tpl/suggestions.tpl
index 656336496..b4f0cbbe5 100644..100755
--- a/view/tpl/suggestions.tpl
+++ b/view/tpl/suggestions.tpl
@@ -1,21 +1,26 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 
 <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>
+<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 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 class="intro-approve-form" action="{{$request}}" method="get">
+{{include file="field_checkbox.tpl" field=$hidden}}
+<input class="intro-submit-approve" type="submit" name="submit" value="{{$approve}}" />
 </form>
 </div>
 <div class="intro-end"></div>
diff --git a/view/tpl/threaded_conversation.tpl b/view/tpl/threaded_conversation.tpl
index 098e399b7..a2885ddc3 100644..100755
--- a/view/tpl/threaded_conversation.tpl
+++ b/view/tpl/threaded_conversation.tpl
@@ -1,13 +1,18 @@
-{{ for $threads as $thread_item }}
-{{ inc $thread_item.template with $item=$thread_item }}{{ endinc }}
-{{ endfor }}
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{foreach $threads as $thread_item}}
+{{include file="{{$thread_item.template}}" item=$thread_item}}
+{{/foreach}}
 
 <div id="conversation-end"></div>
 
-{{ if $dropping }}
+{{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 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 }}
+{{/if}}
diff --git a/view/tpl/toggle_mobile_footer.tpl b/view/tpl/toggle_mobile_footer.tpl
index 58695f4df..008d69663 100644..100755
--- a/view/tpl/toggle_mobile_footer.tpl
+++ b/view/tpl/toggle_mobile_footer.tpl
@@ -1,2 +1,7 @@
-<a id="toggle_mobile_link" href="$toggle_link">$toggle_text</a>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<a id="toggle_mobile_link" href="{{$toggle_link}}">{{$toggle_text}}</a>
 
diff --git a/view/tpl/viewcontact_template.tpl b/view/tpl/viewcontact_template.tpl
index d6f01643e..a9837c7f9 100644..100755
--- a/view/tpl/viewcontact_template.tpl
+++ b/view/tpl/viewcontact_template.tpl
@@ -1,9 +1,14 @@
-<h3>$title</h3>
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$title}}</h3>
 
-{{ for $contacts as $contact }}
-	{{ inc contact_template.tpl }}{{ endinc }}
-{{ endfor }}
+{{foreach $contacts as $contact}}
+	{{include file="contact_template.tpl"}}
+{{/foreach}}
 
 <div id="view-contact-end"></div>
 
-$paginate
+{{$paginate}}
diff --git a/view/tpl/xchan_vcard.tpl b/view/tpl/xchan_vcard.tpl
index f0b623927..8878a773a 100644..100755
--- a/view/tpl/xchan_vcard.tpl
+++ b/view/tpl/xchan_vcard.tpl
@@ -1,18 +1,23 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <div class="vcard">
-<div class="fn">$name</div>
-<div id="profile-photo-wrapper"><img class="vcard-photo photo" src="$photo" alt="name" /></div>
+<div class="fn">{{$name}}</div>
+<div id="profile-photo-wrapper"><img class="vcard-photo photo" src="{{$photo}}" alt="name" /></div>
 </div>
 
 
 	
 <div id="profile-extra-links">
 <ul>
-{{ if $connect }}
-	<li><a id="follow-link" href="follow?f=&url=$follow">$connect</a></li>
-{{ endif }}
-{{ if $newwin }}
-	<li><a id="visit-chan-link" href="$url" title="$newtit" target="_blank" >$newwin</a></li>
-{{ endif }}
+{{if $connect}}
+	<li><a id="follow-link" href="follow?f=&url={{$follow}}">{{$connect}}</a></li>
+{{/if}}
+{{if $newwin}}
+	<li><a id="visit-chan-link" href="{{$url}}" title="{{$newtit}}" target="_blank" >{{$newwin}}</a></li>
+{{/if}}
 </ul>
 
 
diff --git a/view/tpl/xrd_host.tpl b/view/tpl/xrd_host.tpl
index 94e3c2146..1f273e010 100644..100755
--- a/view/tpl/xrd_host.tpl
+++ b/view/tpl/xrd_host.tpl
@@ -1,18 +1,23 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?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>
+    <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='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" />
+        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>
+        mk:key_id="1">{{$bigkey}}</Property>
 
 
 </XRD>
diff --git a/view/tpl/xrd_person.tpl b/view/tpl/xrd_person.tpl
index 3a6ca7ba7..2b914fa34 100644..100755
--- a/view/tpl/xrd_person.tpl
+++ b/view/tpl/xrd_person.tpl
@@ -1,29 +1,34 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <?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>
+    <Subject>{{$accturi}}</Subject>
+	<Alias>{{$accturi}}</Alias>
+    <Alias>{{$profile_url}}</Alias>
  
     <Link rel="http://purl.org/macgirvin/dfrn/1.0"
-          href="$profile_url" />
+          href="{{$profile_url}}" />
     <Link rel="http://schemas.google.com/g/2010#updates-from" 
           type="application/atom+xml" 
-          href="$atom" />
+          href="{{$atom}}" />
     <Link rel="http://webfinger.net/rel/profile-page"
           type="text/html"
-          href="$profile_url" />
+          href="{{$profile_url}}" />
     <Link rel="http://microformats.org/profile/hcard"
           type="text/html"
-          href="$hcard_url" />
+          href="{{$hcard_url}}" />
     <Link rel="http://portablecontacts.net/spec/1.0"
-          href="$poco_url" />
+          href="{{$poco_url}}" />
     <Link rel="http://webfinger.net/rel/avatar"
           type="image/jpeg"
-          href="$photo" />
+          href="{{$photo}}" />
  
 	<Property xmlns:mk="http://salmon-protocol.org/ns/magic-key"
           type="http://salmon-protocol.org/ns/magic-key"
-          mk:key_id="1">$bigkey</Property>
+          mk:key_id="1">{{$bigkey}}</Property>
 
 </XRD>