diff --git a/view/templates/404.tpl b/view/templates/404.tpl
new file mode 100644
index 000000000..2d581ab8d
--- /dev/null
+++ b/view/templates/404.tpl
@@ -0,0 +1,6 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$message}}</h1>
diff --git a/view/templates/acl_selector.tpl b/view/templates/acl_selector.tpl
new file mode 100644
index 000000000..5fd11e756
--- /dev/null
+++ b/view/templates/acl_selector.tpl
@@ -0,0 +1,31 @@
+{{*
+ *	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 data-src="{0}"><p>{1}</p>
+	<a href="#" class='acl-button-show'>{{$show}}</a>
+	<a href="#" class='acl-button-hide'>{{$hide}}</a>
+</div>
+
+<script>
+$(document).ready(function() {
+	if(typeof acl=="undefined"){
+		acl = new ACL(
+			baseurl+"/acl",
+			[ {{$allowcid}},{{$allowgid}},{{$denycid}},{{$denygid}} ]
+		);
+	}
+});
+</script>
diff --git a/view/templates/admin_aside.tpl b/view/templates/admin_aside.tpl
new file mode 100644
index 000000000..24f07e28e
--- /dev/null
+++ b/view/templates/admin_aside.tpl
@@ -0,0 +1,47 @@
+{{*
+ *	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") { register=""; elm.hide();} else { elm.show(); }
+			elm.html(register);
+		});
+	});
+</script>
+<h4><a href="{{$admurl}}">{{$admtxt}}</a></h4>
+<ul class='admin linklist'>
+	<li class='admin link button {{$admin.site.2}}'><a href='{{$admin.site.0}}'>{{$admin.site.1}}</a></li>
+	<li class='admin link button {{$admin.users.2}}'><a href='{{$admin.users.0}}'>{{$admin.users.1}}</a><span id='pending-update' title='{{$h_pending}}'></span></li>
+	<li class='admin link button {{$admin.plugins.2}}'><a href='{{$admin.plugins.0}}'>{{$admin.plugins.1}}</a></li>
+	<li class='admin link button {{$admin.themes.2}}'><a href='{{$admin.themes.0}}'>{{$admin.themes.1}}</a></li>
+	<li class='admin link button {{$admin.dbsync.2}}'><a href='{{$admin.dbsync.0}}'>{{$admin.dbsync.1}}</a></li>
+</ul>
+
+{{if $admin.update}}
+<ul class='admin linklist'>
+	<li class='admin link button {{$admin.update.2}}'><a href='{{$admin.update.0}}'>{{$admin.update.1}}</a></li>
+	<li class='admin link button {{$admin.update.2}}'><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li>
+</ul>
+{{/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/templates/admin_logs.tpl b/view/templates/admin_logs.tpl
new file mode 100644
index 000000000..6a2259500
--- /dev/null
+++ b/view/templates/admin_logs.tpl
@@ -0,0 +1,24 @@
+{{*
+ *	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/templates/admin_plugins.tpl b/view/templates/admin_plugins.tpl
new file mode 100644
index 000000000..307814e87
--- /dev/null
+++ b/view/templates/admin_plugins.tpl
@@ -0,0 +1,20 @@
+{{*
+ *	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/templates/admin_plugins_details.tpl b/view/templates/admin_plugins_details.tpl
new file mode 100644
index 000000000..e81701732
--- /dev/null
+++ b/view/templates/admin_plugins_details.tpl
@@ -0,0 +1,41 @@
+{{*
+ *	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/templates/admin_remoteupdate.tpl b/view/templates/admin_remoteupdate.tpl
new file mode 100644
index 000000000..cee0ef9b8
--- /dev/null
+++ b/view/templates/admin_remoteupdate.tpl
@@ -0,0 +1,103 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script src="js/jquery.htmlstream.js"></script>
+<script>
+	/* ajax updater */
+	function updateEnd(data){
+		//$("#updatepopup .panel_text").html(data);
+		$("#remoteupdate_form").find("input").removeAttr('disabled');
+		$(".panel_action_close").fadeIn()	
+	}
+	function updateOn(data){
+		
+		var patt=/§([^§]*)§/g; 
+		var matches = data.match(patt);
+		$(matches).each(function(id,data){
+			data = data.replace(/§/g,"");
+			d = data.split("@");
+			console.log(d);
+			elm = $("#updatepopup .panel_text #"+d[0]);
+			html = "<div id='"+d[0]+"' class='progress'>"+d[1]+"<span>"+d[2]+"</span></div>";
+			if (elm.length==0){
+				$("#updatepopup .panel_text").append(html);
+			} else {
+				$(elm).replaceWith(html);
+			}
+		});
+		
+		
+	}
+	
+	$(function(){
+		$("#remoteupdate_form").submit(function(){
+			var data={};
+			$(this).find("input").each(function(i, e){
+				name = $(e).attr('name');
+				value = $(e).val();
+				e.disabled = true;
+				data[name]=value;
+			});
+
+			$("#updatepopup .panel_text").html("");
+			$("#updatepopup").show();
+			$("#updatepopup .panel").hide().slideDown(500);
+			$(".panel_action_close").hide().click(function(){
+				$("#updatepopup .panel").slideUp(500, function(){
+					$("#updatepopup").hide();
+				});				
+			});
+
+			$.post(
+				$(this).attr('action'), 
+				data, 
+				updateEnd,
+				'text',
+				updateOn
+			);
+
+			
+			return false;
+		})
+	});
+</script>
+<div id="updatepopup" class="popup">
+	<div class="background"></div>
+	<div class="panel">
+		<div class="panel_in">
+			<h1>Friendica Update</h1>
+			<div class="panel_text"></div>
+			<div class="panel_actions">
+				<input type="button" value="{{$close}}" class="panel_action_close">
+			</div>
+		</div>
+	</div>
+</div>
+<div id="adminpage">
+	<dl> <dt>Your version:</dt><dd>{{$localversion}}</dd> </dl>
+{{if $needupdate}}
+	<dl> <dt>New version:</dt><dd>{{$remoteversion}}</dd> </dl>
+
+	<form id="remoteupdate_form" method="POST" action="{{$baseurl}}/admin/update">
+	<input type="hidden" name="{{$remotefile.0}}" value="{{$remotefile.2}}">
+
+	{{if $canwrite}}
+		<div class="submit"><input type="submit" name="remoteupdate" value="{{$submit}}" /></div>
+	{{else}}
+		<h3>Your friendica installation is not writable by web server.</h3>
+		{{if $canftp}}
+			<p>You can try to update via FTP</p>
+			{{include file="field_input.tpl" field=$ftphost}}
+			{{include file="field_input.tpl" field=$ftppath}}
+			{{include file="field_input.tpl" field=$ftpuser}}
+			{{include file="field_password.tpl" field=$ftppwd}}
+			<div class="submit"><input type="submit" name="remoteupdate" value="{{$submit}}" /></div>
+		{{/if}}
+	{{/if}}
+	</form>
+{{else}}
+<h4>No updates</h4>
+{{/if}}
+</div>
diff --git a/view/templates/admin_site.tpl b/view/templates/admin_site.tpl
new file mode 100644
index 000000000..c33897c36
--- /dev/null
+++ b/view/templates/admin_site.tpl
@@ -0,0 +1,121 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script>
+	$(function(){
+		
+		$("#cnftheme").click(function(){
+			$.colorbox({
+				width: 800,
+				height: '90%',
+				/*onOpen: function(){
+					var theme = $("#id_theme :selected").val();
+					$("#cnftheme").attr('href',"{{$baseurl}}/admin/themes/"+theme);
+				},*/
+				href: "{{$baseurl}}/admin/themes/" + $("#id_theme :selected").val(),
+				onComplete: function(){
+					$("div#fancybox-content form").submit(function(e){
+						var url = $(this).attr('action');
+						// can't get .serialize() to work...
+						var data={};
+						$(this).find("input").each(function(){
+							data[$(this).attr('name')] = $(this).val();
+						});
+						$(this).find("select").each(function(){
+							data[$(this).attr('name')] = $(this).children(":selected").val();
+						});
+						console.log(":)", url, data);
+					
+						$.post(url, data, function(data) {
+							if(timer) clearTimeout(timer);
+							NavUpdate();
+							$.colorbox.close();
+						})
+					
+						return false;
+					});
+				
+				}
+			});
+			return false;
+		});
+	});
+</script>
+<div id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+	
+	<form action="{{$baseurl}}/admin/site" method="post">
+    <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+	{{include file="field_input.tpl" field=$sitename}}
+	{{include file="field_textarea.tpl" field=$banner}}
+	{{include file="field_select.tpl" field=$language}}
+	{{include file="field_select.tpl" field=$theme}}
+	{{include file="field_select.tpl" field=$theme_mobile}}
+	{{include file="field_select.tpl" field=$ssl_policy}}
+	{{include file="field_checkbox.tpl" field=$new_share}}
+	{{include file="field_checkbox.tpl" field=$hide_help}}
+	{{include file="field_select.tpl" field=$singleuser}}
+
+	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	
+	<h3>{{$registration}}</h3>
+	{{include file="field_input.tpl" field=$register_text}}
+	{{include file="field_select.tpl" field=$register_policy}}
+	{{include file="field_input.tpl" field=$daily_registrations}}
+	{{include file="field_checkbox.tpl" field=$no_multi_reg}}
+	{{include file="field_checkbox.tpl" field=$no_openid}}
+	{{include file="field_checkbox.tpl" field=$no_regfullname}}
+	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+
+	<h3>{{$upload}}</h3>
+	{{include file="field_input.tpl" field=$maximagesize}}
+	{{include file="field_input.tpl" field=$maximagelength}}
+	{{include file="field_input.tpl" field=$jpegimagequality}}
+	
+	<h3>{{$corporate}}</h3>
+	{{include file="field_input.tpl" field=$allowed_sites}}
+	{{include file="field_input.tpl" field=$allowed_email}}
+	{{include file="field_checkbox.tpl" field=$block_public}}
+	{{include file="field_checkbox.tpl" field=$force_publish}}
+	{{include file="field_checkbox.tpl" field=$no_community_page}}
+	{{include file="field_checkbox.tpl" field=$ostatus_disabled}}
+	{{include file="field_select.tpl" field=$ostatus_poll_interval}}
+	{{include file="field_checkbox.tpl" field=$diaspora_enabled}}
+	{{include file="field_checkbox.tpl" field=$dfrn_only}}
+	{{include file="field_input.tpl" field=$global_directory}}
+	{{include file="field_checkbox.tpl" field=$thread_allow}}
+	{{include file="field_checkbox.tpl" field=$newuser_private}}
+	{{include file="field_checkbox.tpl" field=$enotify_no_content}}
+	{{include file="field_checkbox.tpl" field=$private_addons}}	
+	{{include file="field_checkbox.tpl" field=$disable_embedded}}
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	
+	<h3>{{$advanced}}</h3>
+	{{include file="field_checkbox.tpl" field=$no_utf}}
+	{{include file="field_checkbox.tpl" field=$verifyssl}}
+	{{include file="field_input.tpl" field=$proxy}}
+	{{include file="field_input.tpl" field=$proxyuser}}
+	{{include file="field_input.tpl" field=$timeout}}
+	{{include file="field_input.tpl" field=$delivery_interval}}
+	{{include file="field_input.tpl" field=$poll_interval}}
+	{{include file="field_input.tpl" field=$maxloadavg}}
+	{{include file="field_input.tpl" field=$abandon_days}}
+	{{include file="field_input.tpl" field=$lockpath}}
+	{{include file="field_input.tpl" field=$temppath}}
+	{{include file="field_input.tpl" field=$basepath}}
+
+	<h3>{{$performance}}</h3>
+	{{include file="field_checkbox.tpl" field=$use_fulltext_engine}}
+	{{include file="field_input.tpl" field=$itemcache}}
+	{{include file="field_input.tpl" field=$itemcache_duration}}
+
+	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	
+	</form>
+</div>
diff --git a/view/templates/admin_summary.tpl b/view/templates/admin_summary.tpl
new file mode 100644
index 000000000..b3b42a139
--- /dev/null
+++ b/view/templates/admin_summary.tpl
@@ -0,0 +1,45 @@
+{{*
+ *	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.deliverq}} - {{$queues.queue}}</dd>
+	</dl>
+	<dl>
+		<dt>{{$pending.0}}</dt>
+		<dd>{{$pending.1}}</dt>
+	</dl>
+
+	<dl>
+		<dt>{{$users.0}}</dt>
+		<dd>{{$users.1}}</dd>
+	</dl>
+	{{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/templates/admin_users.tpl b/view/templates/admin_users.tpl
new file mode 100644
index 000000000..80345b78b
--- /dev/null
+++ b/view/templates/admin_users.tpl
@@ -0,0 +1,103 @@
+{{*
+ *	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='name'><a href="{{$u.url}}" title="{{$u.nickname}}" >{{$u.name}}</a></td>
+						<td class='email'>{{$u.email}}</td>
+						<td class='register_date'>{{$u.register_date}}</td>
+						<td class='login_date'>{{$u.login_date}}</td>
+						<td class='lastitem_date'>{{$u.lastitem_date}}</td>
+						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}</td>
+						<td class="checkbox"> 
+                                    {{if $u.is_admin}}
+                                        &nbsp;
+                                    {{else}}
+                                        <input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
+                                    {{/if}}
+						<td class="tools">
+                                    {{if $u.is_admin}}
+                                        &nbsp;
+                                    {{else}}
+                                        <a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><span class='icon block {{if $u.blocked==0}}dim{{/if}}'></span></a>
+                                        <a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><span class='icon drop'></span></a>
+                                    {{/if}}
+						</td>
+					</tr>
+				{{/foreach}}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">{{$select_all}}</a></div>
+			<div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div>						
+		{{else}}
+			NO USERS?!?
+		{{/if}}
+	</form>
+</div>
diff --git a/view/templates/album_edit.tpl b/view/templates/album_edit.tpl
new file mode 100644
index 000000000..36c07a9f0
--- /dev/null
+++ b/view/templates/album_edit.tpl
@@ -0,0 +1,20 @@
+{{*
+ *	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/templates/api_config_xml.tpl b/view/templates/api_config_xml.tpl
new file mode 100644
index 000000000..09aa00ac4
--- /dev/null
+++ b/view/templates/api_config_xml.tpl
@@ -0,0 +1,71 @@
+{{*
+ *	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/templates/api_friends_xml.tpl b/view/templates/api_friends_xml.tpl
new file mode 100644
index 000000000..c89b96de5
--- /dev/null
+++ b/view/templates/api_friends_xml.tpl
@@ -0,0 +1,12 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<!-- TEMPLATE APPEARS UNUSED -->
+
+<users type="array">
+	{{foreach $users as $u}}
+	{{include file="api_user_xml.tpl" user=$u}}
+	{{/foreach}}
+</users>
diff --git a/view/templates/api_ratelimit_xml.tpl b/view/templates/api_ratelimit_xml.tpl
new file mode 100644
index 000000000..a34eb6723
--- /dev/null
+++ b/view/templates/api_ratelimit_xml.tpl
@@ -0,0 +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>
+</hash>
diff --git a/view/templates/api_status_xml.tpl b/view/templates/api_status_xml.tpl
new file mode 100644
index 000000000..e3e80d2b1
--- /dev/null
+++ b/view/templates/api_status_xml.tpl
@@ -0,0 +1,51 @@
+{{*
+ *	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/templates/api_test_xml.tpl b/view/templates/api_test_xml.tpl
new file mode 100644
index 000000000..df5009af5
--- /dev/null
+++ b/view/templates/api_test_xml.tpl
@@ -0,0 +1,6 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<ok>{{$ok}}</ok>
diff --git a/view/templates/api_timeline_atom.tpl b/view/templates/api_timeline_atom.tpl
new file mode 100644
index 000000000..b23acacb3
--- /dev/null
+++ b/view/templates/api_timeline_atom.tpl
@@ -0,0 +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>
+ <title>Friendica</title>
+ <subtitle>Friendica API feed</subtitle>
+ <logo>{{$rss.logo}}</logo>
+ <updated>{{$rss.atom_updated}}</updated>
+ <link type="text/html" rel="alternate" href="{{$rss.alternate}}"/>
+ <link type="application/atom+xml" rel="self" href="{{$rss.self}}"/>
+ 
+ 
+ <author>
+	<activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
+	<uri>{{$user.url}}</uri>
+	<name>{{$user.name}}</name>
+	<link rel="alternate" type="text/html" href="{{$user.url}}"/>
+	<link rel="avatar" type="image/jpeg" media:width="106" media:height="106" href="{{$user.profile_image_url}}"/>
+	<link rel="avatar" type="image/jpeg" media:width="96" media:height="96" href="{{$user.profile_image_url}}"/>
+	<link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="{{$user.profile_image_url}}"/>
+	<link rel="avatar" type="image/jpeg" media:width="24" media:height="24" href="{{$user.profile_image_url}}"/>
+	<georss:point></georss:point>
+	<poco:preferredUsername>{{$user.screen_name}}</poco:preferredUsername>
+	<poco:displayName>{{$user.name}}</poco:displayName>
+	<poco:urls>
+		<poco:type>homepage</poco:type>
+		<poco:value>{{$user.url}}</poco:value>
+		<poco:primary>true</poco:primary>
+	</poco:urls>
+	<statusnet:profile_info local_id="{{$user.id}}"></statusnet:profile_info>
+ </author>
+
+ <!--Deprecation warning: activity:subject is present only for backward compatibility. It will be removed in the next version of StatusNet.-->
+ <activity:subject>
+	<activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
+	<id>{{$user.contact_url}}</id>
+	<title>{{$user.name}}</title>
+	<link rel="alternate" type="text/html" href="{{$user.url}}"/>
+	<link rel="avatar" type="image/jpeg" media:width="106" media:height="106" href="{{$user.profile_image_url}}"/>
+	<link rel="avatar" type="image/jpeg" media:width="96" media:height="96" href="{{$user.profile_image_url}}"/>
+	<link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="{{$user.profile_image_url}}"/>
+	<link rel="avatar" type="image/jpeg" media:width="24" media:height="24" href="{{$user.profile_image_url}}"/>
+	<poco:preferredUsername>{{$user.screen_name}}</poco:preferredUsername>
+	<poco:displayName>{{$user.name}}</poco:displayName>
+	<poco:urls>
+		<poco:type>homepage</poco:type>
+		<poco:value>{{$user.url}}</poco:value>
+		<poco:primary>true</poco:primary>
+	</poco:urls>
+	<statusnet:profile_info local_id="{{$user.id}}"></statusnet:profile_info>
+ </activity:subject>
+ 
+ 
+  	{{foreach $statuses as $status}}
+	<entry>
+		<activity:object-type>{{$status.objecttype}}</activity:object-type>
+		<id>{{$status.message_id}}</id>
+		<title>{{$status.text}}</title>
+		<content type="html">{{$status.statusnet_html}}</content>
+		<link rel="alternate" type="text/html" href="{{$status.url}}"/>
+		<activity:verb>{{$status.verb}}</activity:verb>
+		<published>{{$status.published}}</published>
+		<updated>{{$status.updated}}</updated>
+
+		<link rel="self" type="application/atom+xml" href="{{$status.self}}"/>
+		<link rel="edit" type="application/atom+xml" href="{{$status.edit}}"/>
+		<statusnet:notice_info local_id="{{$status.id}}" source="{{$status.source}}" >
+		</statusnet:notice_info>
+
+		<author>
+			<activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
+			<uri>{{$status.user.url}}</uri>
+			<name>{{$status.user.name}}</name>
+			<link rel="alternate" type="text/html" href="{{$status.user.url}}"/>
+			<link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="{{$status.user.profile_image_url}}"/>
+
+			<georss:point/>
+			<poco:preferredUsername>{{$status.user.screen_name}}</poco:preferredUsername>
+			<poco:displayName>{{$status.user.name}}</poco:displayName>
+			<poco:address/>
+			<poco:urls>
+				<poco:type>homepage</poco:type>
+				<poco:value>{{$status.user.url}}</poco:value>
+				<poco:primary>true</poco:primary>
+			</poco:urls>
+		</author>
+		<link rel="ostatus:conversation" type="text/html" href="{{$status.url}}"/> 
+
+	</entry>    
+    {{/foreach}}
+</feed>
diff --git a/view/templates/api_timeline_rss.tpl b/view/templates/api_timeline_rss.tpl
new file mode 100644
index 000000000..e89c7d080
--- /dev/null
+++ b/view/templates/api_timeline_rss.tpl
@@ -0,0 +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>Friendica</title>
+    <link>{{$rss.alternate}}</link>
+    <atom:link type="application/rss+xml" rel="self" href="{{$rss.self}}"/>
+    <description>Friendica timeline</description>
+    <language>{{$rss.language}}</language>
+    <ttl>40</ttl>
+	<image>
+		<link>{{$user.link}}</link>
+		<title>{{$user.name}}'s items</title>
+		<url>{{$user.profile_image_url}}</url>
+	</image>
+	
+{{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/templates/api_timeline_xml.tpl b/view/templates/api_timeline_xml.tpl
new file mode 100644
index 000000000..84148d17f
--- /dev/null
+++ b/view/templates/api_timeline_xml.tpl
@@ -0,0 +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/">
+{{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/templates/api_user_xml.tpl b/view/templates/api_user_xml.tpl
new file mode 100644
index 000000000..d7efcf3fb
--- /dev/null
+++ b/view/templates/api_user_xml.tpl
@@ -0,0 +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>
+  {{/if}}</status>
+  </user>
diff --git a/view/templates/apps.tpl b/view/templates/apps.tpl
new file mode 100644
index 000000000..01d9bb8c8
--- /dev/null
+++ b/view/templates/apps.tpl
@@ -0,0 +1,12 @@
+{{*
+ *	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/templates/atom_feed.tpl b/view/templates/atom_feed.tpl
new file mode 100644
index 000000000..db553d99f
--- /dev/null
+++ b/view/templates/atom_feed.tpl
@@ -0,0 +1,34 @@
+{{*
+ *	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/templates/atom_feed_dfrn.tpl b/view/templates/atom_feed_dfrn.tpl
new file mode 100644
index 000000000..87d78a518
--- /dev/null
+++ b/view/templates/atom_feed_dfrn.tpl
@@ -0,0 +1,34 @@
+{{*
+ *	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/templates/atom_mail.tpl b/view/templates/atom_mail.tpl
new file mode 100644
index 000000000..adf75a3e7
--- /dev/null
+++ b/view/templates/atom_mail.tpl
@@ -0,0 +1,22 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<dfrn:mail>
+
+	<dfrn:sender>
+		<dfrn:name>{{$name}}</dfrn:name>
+		<dfrn:uri>{{$profile_page}}</dfrn:uri>
+		<dfrn:avatar>{{$thumb}}</dfrn:avatar>
+	</dfrn:sender>
+
+	<dfrn:id>{{$item_id}}</dfrn:id>
+	<dfrn:in-reply-to>{{$parent_id}}</dfrn:in-reply-to>
+	<dfrn:sentdate>{{$created}}</dfrn:sentdate>
+	<dfrn:subject>{{$subject}}</dfrn:subject>
+	<dfrn:content>{{$content}}</dfrn:content>
+
+</dfrn:mail>
+
diff --git a/view/templates/atom_relocate.tpl b/view/templates/atom_relocate.tpl
new file mode 100644
index 000000000..073edeaf5
--- /dev/null
+++ b/view/templates/atom_relocate.tpl
@@ -0,0 +1,22 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<dfrn:relocate>
+
+	<dfrn:url>{{$url}}</dfrn:url>
+	<dfrn:name>{{$name}}</dfrn:name>
+	<dfrn:photo>{{$photo}}</dfrn:photo>
+	<dfrn:thumb>{{$thumb}}</dfrn:thumb>
+	<dfrn:micro>{{$micro}}</dfrn:micro>
+	<dfrn:request>{{$request}}</dfrn:request>
+	<dfrn:confirm>{{$confirm}}</dfrn:confirm>
+	<dfrn:notify>{{$notify}}</dfrn:notify>
+	<dfrn:poll>{{$poll}}</dfrn:poll>
+	<dfrn:sitepubkey>{{$sitepubkey}}</dfrn:sitepubkey>
+
+
+</dfrn:relocate>
+
diff --git a/view/templates/atom_suggest.tpl b/view/templates/atom_suggest.tpl
new file mode 100644
index 000000000..c0d1a1b3c
--- /dev/null
+++ b/view/templates/atom_suggest.tpl
@@ -0,0 +1,16 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<dfrn:suggest>
+
+	<dfrn:url>{{$url}}</dfrn:url>
+	<dfrn:name>{{$name}}</dfrn:name>
+	<dfrn:photo>{{$photo}}</dfrn:photo>
+	<dfrn:request>{{$request}}</dfrn:request>
+	<dfrn:note>{{$note}}</dfrn:note>
+
+</dfrn:suggest>
+
diff --git a/view/templates/auto_request.tpl b/view/templates/auto_request.tpl
new file mode 100644
index 000000000..662ca2447
--- /dev/null
+++ b/view/templates/auto_request.tpl
@@ -0,0 +1,42 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h1>{{$header}}</h1>
+
+<p id="dfrn-request-intro">
+{{$page_desc}}<br />
+<ul id="dfrn-request-networks">
+<li><a href="http://friendica.com" title="{{$friendica}}">{{$friendica}}</a></li>
+<li><a href="http://joindiaspora.com" title="{{$diaspora}}">{{$diaspora}}</a> {{$diasnote}}</li>
+<li><a href="http://ostatus.org" title="{{$public_net}}" >{{$statusnet}}</a></li>
+{{if $emailnet}}<li>{{$emailnet}}</li>{{/if}}
+</ul>
+</p>
+<p>
+{{$invite_desc}}
+</p>
+<p>
+{{$desc}}
+</p>
+
+<form action="dfrn_request/{{$nickname}}" method="post" />
+
+<div id="dfrn-request-url-wrapper" >
+	<label id="dfrn-url-label" for="dfrn-url" >{{$your_address}}</label>
+	<input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}" />
+	<div id="dfrn-request-url-end"></div>
+</div>
+
+
+<div id="dfrn-request-info-wrapper" >
+
+</div>
+
+	<div id="dfrn-request-submit-wrapper">
+		<input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}" />
+		<input type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}" />
+	</div>
+</form>
diff --git a/view/templates/birthdays_reminder.tpl b/view/templates/birthdays_reminder.tpl
new file mode 100644
index 000000000..695364cda
--- /dev/null
+++ b/view/templates/birthdays_reminder.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	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 href="{{$event.link}}">{{$event.title}}</a> {{$event.date}} </div>
+{{/foreach}}
+</div>
+{{/if}}
+
diff --git a/view/templates/categories_widget.tpl b/view/templates/categories_widget.tpl
new file mode 100644
index 000000000..ab10ef928
--- /dev/null
+++ b/view/templates/categories_widget.tpl
@@ -0,0 +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="nets-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=&category={{$term.name}}" class="categories-link{{if $term.selected}} categories-selected{{/if}}">{{$term.name}}</a></li>
+		{{/foreach}}
+	</ul>
+	
+</div>
diff --git a/view/templates/comment_item.tpl b/view/templates/comment_item.tpl
new file mode 100644
index 000000000..caf98168d
--- /dev/null
+++ b/view/templates/comment_item.tpl
@@ -0,0 +1,44 @@
+{{*
+ *	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" />
+				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
+					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>
+				{{if $qcomment}}
+					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
+					<option value=""></option>
+				{{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}}" />
+					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
+					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/templates/common_friends.tpl b/view/templates/common_friends.tpl
new file mode 100644
index 000000000..499cfe626
--- /dev/null
+++ b/view/templates/common_friends.tpl
@@ -0,0 +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>
+	</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/templates/common_tabs.tpl b/view/templates/common_tabs.tpl
new file mode 100644
index 000000000..69fa377bc
--- /dev/null
+++ b/view/templates/common_tabs.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<ul class="tabs">
+	{{foreach $tabs as $tab}}
+		<li id="{{$tab.id}}"><a href="{{$tab.url}}" class="tab button {{$tab.sel}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
+	{{/foreach}}
+</ul>
diff --git a/view/templates/confirm.tpl b/view/templates/confirm.tpl
new file mode 100644
index 000000000..df8d26eaa
--- /dev/null
+++ b/view/templates/confirm.tpl
@@ -0,0 +1,19 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<center>
+<form action="{{$confirm_url}}" id="confirm-form" method="{{$method}}">
+
+	<span id="confirm-message">{{$message}}</span>
+	{{foreach $extra_inputs as $input}}
+	<input type="hidden" name="{{$input.name}}" value="{{$input.value}}" />
+	{{/foreach}}
+
+	<input class="confirm-button" id="confirm-submit-button" type="submit" name="{{$confirm_name}}" value="{{$confirm}}" />
+	<input class="confirm-button" id="confirm-cancel-button" type="submit" name="canceled" value="{{$cancel}}" />
+
+</form>
+</center>
+
diff --git a/view/templates/contact_block.tpl b/view/templates/contact_block.tpl
new file mode 100644
index 000000000..e1d98c3bb
--- /dev/null
+++ b/view/templates/contact_block.tpl
@@ -0,0 +1,17 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id="contact-block">
+<h4 class="contact-block-h4">{{$contacts}}</h4>
+{{if $micropro}}
+		<a class="allcontact-link" href="viewcontacts/{{$nickname}}">{{$viewcontacts}}</a>
+		<div class='contact-block-content'>
+		{{foreach $micropro as $m}}
+			{{$m}}
+		{{/foreach}}
+		</div>
+{{/if}}
+</div>
+<div class="clear"></div>
diff --git a/view/templates/contact_edit.tpl b/view/templates/contact_edit.tpl
new file mode 100644
index 000000000..6d65288e4
--- /dev/null
+++ b/view/templates/contact_edit.tpl
@@ -0,0 +1,93 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h2>{{$header}}</h2>
+
+<div id="contact-edit-wrapper" >
+
+	{{$tab_str}}
+
+	<div id="contact-edit-drop-link" >
+		<a href="contacts/{{$contact_id}}/drop" class="icon drophide" id="contact-edit-drop-link" onclick="return confirmDelete();"  title="{{$delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);"></a>
+	</div>
+
+	<div id="contact-edit-drop-link-end"></div>
+
+
+	<div id="contact-edit-nav-wrapper" >
+		<div id="contact-edit-links">
+			<ul>
+				<li><div id="contact-edit-rel">{{$relation_text}}</div></li>
+				<li><div id="contact-edit-nettype">{{$nettype}}</div></li>
+				{{if $lost_contact}}
+					<li><div id="lost-contact-message">{{$lost_contact}}</div></li>
+				{{/if}}
+				{{if $insecure}}
+					<li><div id="insecure-message">{{$insecure}}</div></li>
+				{{/if}}
+				{{if $blocked}}
+					<li><div id="block-message">{{$blocked}}</div></li>
+				{{/if}}
+				{{if $ignored}}
+					<li><div id="ignore-message">{{$ignored}}</div></li>
+				{{/if}}
+				{{if $archived}}
+					<li><div id="archive-message">{{$archived}}</div></li>
+				{{/if}}
+
+				<li>&nbsp;</li>
+
+				{{if $common_text}}
+					<li><div id="contact-edit-common"><a href="{{$common_link}}">{{$common_text}}</a></div></li>
+				{{/if}}
+				{{if $all_friends}}
+					<li><div id="contact-edit-allfriends"><a href="allfriends/{{$contact_id}}">{{$all_friends}}</a></div></li>
+				{{/if}}
+
+
+				<li><a href="network/0?nets=all&cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li>
+				{{if $lblsuggest}}
+					<li><a href="fsuggest/{{$contact_id}}" id="contact-edit-suggest">{{$lblsuggest}}</a></li>
+				{{/if}}
+
+			</ul>
+		</div>
+	</div>
+	<div id="contact-edit-nav-end"></div>
+
+
+<form action="contacts/{{$contact_id}}" method="post" >
+<input type="hidden" name="contact_id" value="{{$contact_id}}">
+
+	{{if $poll_enabled}}
+		<div id="contact-edit-poll-wrapper">
+			<div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
+			<span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval}} <span id="contact-edit-update-now" class="button"><a href="contacts/{{$contact_id}}/update" >{{$udnow}}</a></span>
+		</div>
+	{{/if}}
+	<div id="contact-edit-end" ></div>
+
+	{{include file="field_checkbox.tpl" field=$hidden}}
+
+<div id="contact-edit-info-wrapper">
+<h4>{{$lbl_info1}}</h4>
+	<textarea id="contact-edit-info" rows="8" cols="60" name="info">{{$info}}</textarea>
+	<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
+</div>
+<div id="contact-edit-info-end"></div>
+
+
+<div id="contact-edit-profile-select-text">
+<h4>{{$lbl_vis1}}</h4>
+<p>{{$lbl_vis2}}</p> 
+</div>
+{{$profile_select}}
+<div id="contact-edit-profile-select-end"></div>
+
+<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
+
+</form>
+</div>
diff --git a/view/templates/contact_end.tpl b/view/templates/contact_end.tpl
new file mode 100644
index 000000000..a7fb96108
--- /dev/null
+++ b/view/templates/contact_end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/templates/contact_head.tpl b/view/templates/contact_head.tpl
new file mode 100644
index 000000000..e20f4937a
--- /dev/null
+++ b/view/templates/contact_head.tpl
@@ -0,0 +1,35 @@
+{{*
+ *	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 : 'div',
+	content_css: "{{$baseurl}}/view/custom_tinymce.css"
+
+
+});
+
+
+</script>
+
diff --git a/view/templates/contact_template.tpl b/view/templates/contact_template.tpl
new file mode 100644
index 000000000..8e0e1acc7
--- /dev/null
+++ b/view/templates/contact_template.tpl
@@ -0,0 +1,36 @@
+{{*
+ *	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" >
+		<div class="contact-entry-photo mframe" id="contact-entry-photo-{{$contact.id}}"
+		onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}}); openMenu('contact-photo-menu-button-{{$contact.id}}')" 
+		onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$contact.id}}\'); closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)" >
+
+			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>
+
+			{{if $contact.photo_menu}}
+			<span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">menu</span>
+                <div class="contact-photo-menu" id="contact-photo-menu-{{$contact.id}}">
+                    <ul>
+						{{foreach $contact.photo_menu as $c}}
+						{{if $c.2}}
+						<li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+						{{else}}
+						<li><a href="{{$c.1}}">{{$c.0}}</a></li>
+						{{/if}}
+						{{/foreach}}
+                    </ul>
+                </div>
+			{{/if}}
+		</div>
+			
+	</div>
+	<div class="contact-entry-photo-end" ></div>
+		<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div>
+
+	<div class="contact-entry-end" ></div>
+</div>
diff --git a/view/templates/contacts-end.tpl b/view/templates/contacts-end.tpl
new file mode 100644
index 000000000..a7fb96108
--- /dev/null
+++ b/view/templates/contacts-end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/templates/contacts-head.tpl b/view/templates/contacts-head.tpl
new file mode 100644
index 000000000..d525e834f
--- /dev/null
+++ b/view/templates/contacts-head.tpl
@@ -0,0 +1,22 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script src="{{$baseurl}}/library/jquery_ac/friendica.complete.js" ></script>
+
+<script>
+$(document).ready(function() { 
+	var a; 
+	a = $("#contacts-search").autocomplete({ 
+		serviceUrl: '{{$base}}/acl',
+		minChars: 2,
+		width: 350,
+	});
+	a.setOptions({ params: { type: 'a' }});
+
+}); 
+
+</script>
+
diff --git a/view/templates/contacts-template.tpl b/view/templates/contacts-template.tpl
new file mode 100644
index 000000000..66f3f5c87
--- /dev/null
+++ b/view/templates/contacts-template.tpl
@@ -0,0 +1,31 @@
+{{*
+ *	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/templates/contacts-widget-sidebar.tpl b/view/templates/contacts-widget-sidebar.tpl
new file mode 100644
index 000000000..c4697a91c
--- /dev/null
+++ b/view/templates/contacts-widget-sidebar.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$vcard_widget}}
+{{$follow_widget}}
+{{$groups_widget}}
+{{$findpeople_widget}}
+{{$networks_widget}}
+
diff --git a/view/templates/content.tpl b/view/templates/content.tpl
new file mode 100644
index 000000000..811f92dd5
--- /dev/null
+++ b/view/templates/content.tpl
@@ -0,0 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id="content-begin"></div>
+<div id="content-end"></div>
diff --git a/view/templates/conversation.tpl b/view/templates/conversation.tpl
new file mode 100644
index 000000000..24f0d120d
--- /dev/null
+++ b/view/templates/conversation.tpl
@@ -0,0 +1,34 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$live_update}}
+
+{{foreach $threads as $thread}}
+<div id="tread-wrapper-{{$thread.id}}" class="tread-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="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/templates/crepair.tpl b/view/templates/crepair.tpl
new file mode 100644
index 000000000..8d3ed7df8
--- /dev/null
+++ b/view/templates/crepair.tpl
@@ -0,0 +1,51 @@
+{{*
+ *	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/templates/cropbody.tpl b/view/templates/cropbody.tpl
new file mode 100644
index 000000000..e6fcd355f
--- /dev/null
+++ b/view/templates/cropbody.tpl
@@ -0,0 +1,63 @@
+{{*
+ *	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/templates/cropend.tpl b/view/templates/cropend.tpl
new file mode 100644
index 000000000..a7fb96108
--- /dev/null
+++ b/view/templates/cropend.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/templates/crophead.tpl b/view/templates/crophead.tpl
new file mode 100644
index 000000000..d51b87d12
--- /dev/null
+++ b/view/templates/crophead.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	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/templates/delegate.tpl b/view/templates/delegate.tpl
new file mode 100644
index 000000000..7aa85cf39
--- /dev/null
+++ b/view/templates/delegate.tpl
@@ -0,0 +1,62 @@
+{{*
+ *	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/templates/dfrn_req_confirm.tpl b/view/templates/dfrn_req_confirm.tpl
new file mode 100644
index 000000000..c941a201d
--- /dev/null
+++ b/view/templates/dfrn_req_confirm.tpl
@@ -0,0 +1,26 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<p id="dfrn-request-homecoming" >
+{{$welcome}}
+<br />
+{{$please}}
+
+</p>
+<form id="dfrn-request-homecoming-form" action="dfrn_request/{{$nickname}}" method="post"> 
+<input type="hidden" name="dfrn_url" value="{{$dfrn_url}}" />
+<input type="hidden" name="confirm_key" value="{{$confirm_key}}" />
+<input type="hidden" name="localconfirm" value="1" />
+{{$aes_allow}}
+
+<label id="dfrn-request-homecoming-hide-label" for="dfrn-request-homecoming-hide">{{$hidethem}}</label>
+<input type="checkbox" name="hidden-contact" value="1" {{if $hidechecked}}checked="checked" {{/if}} />
+
+
+<div id="dfrn-request-homecoming-submit-wrapper" >
+<input id="dfrn-request-homecoming-submit" type="submit" name="submit" value="{{$submit}}" />
+</div>
+</form>
\ No newline at end of file
diff --git a/view/templates/dfrn_request.tpl b/view/templates/dfrn_request.tpl
new file mode 100644
index 000000000..29173a1d7
--- /dev/null
+++ b/view/templates/dfrn_request.tpl
@@ -0,0 +1,70 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h1>{{$header}}</h1>
+
+<p id="dfrn-request-intro">
+{{$page_desc}}<br />
+<ul id="dfrn-request-networks">
+<li><a href="http://friendica.com" title="{{$friendica}}">{{$friendica}}</a></li>
+<li><a href="http://joindiaspora.com" title="{{$diaspora}}">{{$diaspora}}</a> {{$diasnote}}</li>
+<li><a href="http://ostatus.org" title="{{$public_net}}" >{{$statusnet}}</a></li>
+{{if $emailnet}}<li>{{$emailnet}}</li>{{/if}}
+</ul>
+{{$invite_desc}}
+</p>
+<p>
+{{$desc}}
+</p>
+
+<form action="dfrn_request/{{$nickname}}" method="post" />
+
+<div id="dfrn-request-url-wrapper" >
+	<label id="dfrn-url-label" for="dfrn-url" >{{$your_address}}</label>
+	<input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}" />
+	<div id="dfrn-request-url-end"></div>
+</div>
+
+<p id="dfrn-request-options">
+{{$pls_answer}}
+</p>
+
+<div id="dfrn-request-info-wrapper" >
+
+
+<p id="doiknowyou">
+{{$does_know}}
+</p>
+
+		<div id="dfrn-request-know-yes-wrapper">
+		<label id="dfrn-request-knowyou-yes-label" for="dfrn-request-knowyouyes">{{$yes}}</label>
+		<input type="radio" name="knowyou" id="knowyouyes" value="1" />
+
+		<div id="dfrn-request-knowyou-break" ></div>	
+		</div>
+		<div id="dfrn-request-know-no-wrapper">
+		<label id="dfrn-request-knowyou-no-label" for="dfrn-request-knowyouno">{{$no}}</label>
+		<input type="radio" name="knowyou" id="knowyouno" value="0" checked="checked" />
+
+		<div id="dfrn-request-knowyou-end"></div>
+		</div>
+
+
+<p id="dfrn-request-message-desc">
+{{$add_note}}
+</p>
+	<div id="dfrn-request-message-wrapper">
+	<textarea name="dfrn-request-message" rows="4" cols="64" ></textarea>
+	</div>
+
+
+</div>
+
+	<div id="dfrn-request-submit-wrapper">
+		<input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}" />
+		<input type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}" />
+	</div>
+</form>
diff --git a/view/templates/diasp_dec_hdr.tpl b/view/templates/diasp_dec_hdr.tpl
new file mode 100644
index 000000000..c3305ecd0
--- /dev/null
+++ b/view/templates/diasp_dec_hdr.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<decrypted_hdeader>
+  <iv>{{$inner_iv}}</iv>
+  <aes_key>{{$inner_key}}</aes_key>
+  <author>
+    <name>{{$author_name}}</name>
+    <uri>{{$author_uri}}</uri>
+  </author>
+</decrypted_header>
diff --git a/view/templates/diaspora_comment.tpl b/view/templates/diaspora_comment.tpl
new file mode 100644
index 000000000..8df3842d0
--- /dev/null
+++ b/view/templates/diaspora_comment.tpl
@@ -0,0 +1,16 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<XML>
+  <post>
+    <comment>
+      <guid>{{$guid}}</guid>
+      <parent_guid>{{$parent_guid}}</parent_guid>
+      <author_signature>{{$authorsig}}</author_signature>
+      <text>{{$body}}</text>
+      <diaspora_handle>{{$handle}}</diaspora_handle>
+    </comment>
+  </post>
+</XML>
\ No newline at end of file
diff --git a/view/templates/diaspora_comment_relay.tpl b/view/templates/diaspora_comment_relay.tpl
new file mode 100644
index 000000000..c01441e3c
--- /dev/null
+++ b/view/templates/diaspora_comment_relay.tpl
@@ -0,0 +1,17 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<XML>
+  <post>
+    <comment>
+      <guid>{{$guid}}</guid>
+      <parent_guid>{{$parent_guid}}</parent_guid>
+      <parent_author_signature>{{$parentsig}}</parent_author_signature>
+      <author_signature>{{$authorsig}}</author_signature>
+      <text>{{$body}}</text>
+      <diaspora_handle>{{$handle}}</diaspora_handle>
+    </comment>
+  </post>
+</XML>
\ No newline at end of file
diff --git a/view/templates/diaspora_conversation.tpl b/view/templates/diaspora_conversation.tpl
new file mode 100644
index 000000000..fd11b826a
--- /dev/null
+++ b/view/templates/diaspora_conversation.tpl
@@ -0,0 +1,34 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<XML>
+  <post>
+    <conversation>
+      <guid>{{$conv.guid}}</guid>
+      <subject>{{$conv.subject}}</subject>
+      <created_at>{{$conv.created_at}}</created_at>
+
+      {{foreach $conv.messages as $msg}}
+
+      <message>
+        <guid>{{$msg.guid}}</guid>
+        <parent_guid>{{$msg.parent_guid}}</parent_guid>
+        {{if $msg.parent_author_signature}}
+        <parent_author_signature>{{$msg.parent_author_signature}}</parent_author_signature>
+        {{/if}}
+        <author_signature>{{$msg.author_signature}}</author_signature>
+        <text>{{$msg.text}}</text>
+        <created_at>{{$msg.created_at}}</created_at>
+        <diaspora_handle>{{$msg.diaspora_handle}}</diaspora_handle>
+        <conversation_guid>{{$msg.conversation_guid}}</conversation_guid>
+      </message>
+
+      {{/foreach}}
+
+      <diaspora_handle>{{$conv.diaspora_handle}}</diaspora_handle>
+      <participant_handles>{{$conv.participant_handles}}</participant_handles>
+    </conversation>
+  </post>
+</XML>
diff --git a/view/templates/diaspora_like.tpl b/view/templates/diaspora_like.tpl
new file mode 100644
index 000000000..1d58d5d3f
--- /dev/null
+++ b/view/templates/diaspora_like.tpl
@@ -0,0 +1,17 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<XML>
+  <post>
+    <like>
+      <target_type>{{$target_type}}</target_type>
+      <guid>{{$guid}}</guid>
+      <parent_guid>{{$parent_guid}}</parent_guid>
+      <author_signature>{{$authorsig}}</author_signature>
+      <positive>{{$positive}}</positive>
+      <diaspora_handle>{{$handle}}</diaspora_handle>
+    </like>
+  </post>
+</XML>
diff --git a/view/templates/diaspora_like_relay.tpl b/view/templates/diaspora_like_relay.tpl
new file mode 100644
index 000000000..7a55d8b20
--- /dev/null
+++ b/view/templates/diaspora_like_relay.tpl
@@ -0,0 +1,18 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<XML>
+  <post>
+    <like>
+      <guid>{{$guid}}</guid>
+      <target_type>{{$target_type}}</target_type>
+      <parent_guid>{{$parent_guid}}</parent_guid>
+      <parent_author_signature>{{$parentsig}}</parent_author_signature>
+      <author_signature>{{$authorsig}}</author_signature>
+      <positive>{{$positive}}</positive>
+      <diaspora_handle>{{$handle}}</diaspora_handle>
+    </like>
+  </post>
+</XML>
diff --git a/view/templates/diaspora_message.tpl b/view/templates/diaspora_message.tpl
new file mode 100644
index 000000000..e1690734f
--- /dev/null
+++ b/view/templates/diaspora_message.tpl
@@ -0,0 +1,18 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<XML>
+  <post>
+      <message>
+        <guid>{{$msg.guid}}</guid>
+        <parent_guid>{{$msg.parent_guid}}</parent_guid>
+        <author_signature>{{$msg.author_signature}}</author_signature>
+        <text>{{$msg.text}}</text>
+        <created_at>{{$msg.created_at}}</created_at>
+        <diaspora_handle>{{$msg.diaspora_handle}}</diaspora_handle>
+        <conversation_guid>{{$msg.conversation_guid}}</conversation_guid>
+      </message>
+  </post>
+</XML>
diff --git a/view/templates/diaspora_photo.tpl b/view/templates/diaspora_photo.tpl
new file mode 100644
index 000000000..b6220346c
--- /dev/null
+++ b/view/templates/diaspora_photo.tpl
@@ -0,0 +1,18 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<XML>
+  <post>
+    <photo>
+      <remote_photo_path>{{$path}}</remote_photo_path>
+      <remote_photo_name>{{$filename}}</remote_photo_name>
+      <status_message_guid>{{$msg_guid}}</status_message_guid>
+      <guid>{{$guid}}</guid>
+      <diaspora_handle>{{$handle}}</diaspora_handle>
+      <public>{{$public}}</public>
+      <created_at>{{$created_at}}</created_at>
+    </photo>
+  </post>
+</XML>
\ No newline at end of file
diff --git a/view/templates/diaspora_post.tpl b/view/templates/diaspora_post.tpl
new file mode 100644
index 000000000..2817f7d4a
--- /dev/null
+++ b/view/templates/diaspora_post.tpl
@@ -0,0 +1,16 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<XML>
+  <post>
+    <status_message>
+      <raw_message>{{$body}}</raw_message>
+      <guid>{{$guid}}</guid>
+      <diaspora_handle>{{$handle}}</diaspora_handle>
+      <public>{{$public}}</public>
+      <created_at>{{$created}}</created_at>
+    </status_message>
+  </post>
+</XML>
\ No newline at end of file
diff --git a/view/templates/diaspora_profile.tpl b/view/templates/diaspora_profile.tpl
new file mode 100644
index 000000000..11aaf1055
--- /dev/null
+++ b/view/templates/diaspora_profile.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<XML>
+ <post><profile>
+  <diaspora_handle>{{$handle}}</diaspora_handle>
+  <first_name>{{$first}}</first_name>
+  <last_name>{{$last}}</last_name>
+  <image_url>{{$large}}</image_url>
+  <image_url_small>{{$small}}</image_url_small>
+  <image_url_medium>{{$medium}}</image_url_medium>
+  <birthday>{{$dob}}</birthday>
+  <gender>{{$gender}}</gender>
+  <bio>{{$about}}</bio>
+  <location>{{$location}}</location>
+  <searchable>{{$searchable}}</searchable>
+  <tag_string>{{$tags}}</tag_string>
+</profile></post>
+      </XML>
diff --git a/view/templates/diaspora_relay_retraction.tpl b/view/templates/diaspora_relay_retraction.tpl
new file mode 100644
index 000000000..97a1344c9
--- /dev/null
+++ b/view/templates/diaspora_relay_retraction.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<XML>
+  <post>
+    <relayable_retraction>
+      <target_type>{{$type}}</target_type>
+      <target_guid>{{$guid}}</target_guid>
+      <target_author_signature>{{$signature}}</target_author_signature>
+      <sender_handle>{{$handle}}</sender_handle>
+    </relayable_retraction>
+  </post>
+</XML>
diff --git a/view/templates/diaspora_relayable_retraction.tpl b/view/templates/diaspora_relayable_retraction.tpl
new file mode 100644
index 000000000..138cbdb31
--- /dev/null
+++ b/view/templates/diaspora_relayable_retraction.tpl
@@ -0,0 +1,16 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<XML>
+  <post>
+    <relayable_retraction>
+      <target_type>{{$target_type}}</target_type>
+      <target_guid>{{$guid}}</target_guid>
+      <parent_author_signature>{{$parentsig}}</parent_author_signature>
+      <target_author_signature>{{$authorsig}}</target_author_signature>
+      <sender_handle>{{$handle}}</sender_handle>
+    </relayable_retraction>
+  </post>
+</XML>
diff --git a/view/templates/diaspora_retract.tpl b/view/templates/diaspora_retract.tpl
new file mode 100644
index 000000000..103bfc9d5
--- /dev/null
+++ b/view/templates/diaspora_retract.tpl
@@ -0,0 +1,14 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<XML>
+  <post>
+    <retraction>
+      <post_guid>{{$guid}}</post_guid>
+      <type>{{$type}}</type>
+      <diaspora_handle>{{$handle}}</diaspora_handle>
+    </retraction>
+  </post>
+</XML>
\ No newline at end of file
diff --git a/view/templates/diaspora_share.tpl b/view/templates/diaspora_share.tpl
new file mode 100644
index 000000000..5ff04440d
--- /dev/null
+++ b/view/templates/diaspora_share.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<XML>
+  <post>
+    <request>
+      <sender_handle>{{$sender}}</sender_handle>
+      <recipient_handle>{{$recipient}}</recipient_handle>
+    </request>
+  </post>
+</XML>
\ No newline at end of file
diff --git a/view/templates/diaspora_signed_retract.tpl b/view/templates/diaspora_signed_retract.tpl
new file mode 100644
index 000000000..58c5cc237
--- /dev/null
+++ b/view/templates/diaspora_signed_retract.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<XML>
+  <post>
+    <signed_retraction>
+      <target_guid>{{$guid}}</target_guid>
+      <target_type>{{$type}}</target_type>
+      <sender_handle>{{$handle}}</sender_handle>
+      <target_author_signature>{{$signature}}</target_author_signature>
+    </signed_retraction>
+  </post>
+</XML>
diff --git a/view/templates/diaspora_vcard.tpl b/view/templates/diaspora_vcard.tpl
new file mode 100644
index 000000000..5ea6335a8
--- /dev/null
+++ b/view/templates/diaspora_vcard.tpl
@@ -0,0 +1,62 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div style="display:none;">
+	<dl class='entity_nickname'>
+		<dt>Nickname</dt>
+		<dd>		
+			<a class="nickname url uid" href="{{$diaspora.podloc}}/" rel="me">{{$diaspora.nickname}}</a>
+		</dd>
+	</dl>
+	<dl class='entity_fn'>
+		<dt>Full name</dt>
+		<dd>
+			<span class='fn'>{{$diaspora.fullname}}</span>
+		</dd>
+	</dl>
+
+	<dl class='entity_given_name'>
+		<dt>First name</dt>
+		<dd>
+		<span class='given_name'>{{$diaspora.firstname}}</span>
+		</dd>
+	</dl>
+	<dl class='entity_family_name'>
+		<dt>Family name</dt>
+		<dd>
+		<span class='family_name'>{{$diaspora.lastname}}</span>
+		</dd>
+	</dl>
+	<dl class="entity_url">
+		<dt>URL</dt>
+		<dd>
+			<a class="url" href="{{$diaspora.podloc}}/" id="pod_location" rel="me">{{$diaspora.podloc}}/</a>
+		</dd>
+	</dl>
+	<dl class="entity_photo">
+		<dt>Photo</dt>
+		<dd>
+			<img class="photo avatar" height="300" width="300" src="{{$diaspora.photo300}}">
+		</dd>
+	</dl>
+	<dl class="entity_photo_medium">
+		<dt>Photo</dt>
+		<dd> 
+			<img class="photo avatar" height="100" width="100" src="{{$diaspora.photo100}}">
+		</dd>
+	</dl>
+	<dl class="entity_photo_small">
+		<dt>Photo</dt>
+		<dd>
+			<img class="photo avatar" height="50" width="50" src="{{$diaspora.photo50}}">
+		</dd>
+	</dl>
+	<dl class="entity_searchable">
+		<dt>Searchable</dt>
+		<dd>
+			<span class="searchable">{{$diaspora.searchable}}</span>
+		</dd>
+	</dl>
+</div>
diff --git a/view/templates/directory_header.tpl b/view/templates/directory_header.tpl
new file mode 100644
index 000000000..ed1115de9
--- /dev/null
+++ b/view/templates/directory_header.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$sitedir}}</h1>
+
+{{$globaldir}}
+{{$admin}}
+
+{{$finding}}
+
+<div id="directory-search-wrapper">
+<form id="directory-search-form" action="directory" method="get" >
+<span class="dirsearch-desc">{{$desc}}</span>
+<input type="text" name="search" id="directory-search" class="search-input" onfocus="this.select();" value="{{$search}}" />
+<input type="submit" name="submit" id="directory-search-submit" value="{{$submit}}" class="button" />
+</form>
+</div>
+<div id="directory-search-end"></div>
+
diff --git a/view/templates/directory_item.tpl b/view/templates/directory_item.tpl
new file mode 100644
index 000000000..ae52646b8
--- /dev/null
+++ b/view/templates/directory_item.tpl
@@ -0,0 +1,16 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div class="directory-item lframe" id="directory-item-{{$id}}" >
+	<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$id}}" > 
+		<div class="contact-photo" id="directory-photo-{{$id}}" >
+			<a href="{{$profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$id}}" ><img class="directory-photo-img" src="{{$photo}}" alt="{{$alt_text}}" title="{{$alt_text}}" /></a>
+		</div>
+	</div>
+
+	<div class="contact-name" id="directory-name-{{$id}}">{{$name}}</div>
+	<div class="contact-details">{{$details}}</div>
+</div>
diff --git a/view/templates/display-head.tpl b/view/templates/display-head.tpl
new file mode 100644
index 000000000..7750b655e
--- /dev/null
+++ b/view/templates/display-head.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	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/templates/email_notify_html.tpl b/view/templates/email_notify_html.tpl
new file mode 100644
index 000000000..7143adbaf
--- /dev/null
+++ b/view/templates/email_notify_html.tpl
@@ -0,0 +1,35 @@
+{{*
+ *	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:#084769; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='{{$siteurl}}/images/friendica-32.png'><div style="padding:7px; margin-left: 5px; float:left; font-size:18px;letter-spacing:1px;">{{$product}}</div><div style="clear: both;"></div></td></tr>
+
+
+	<tr><td style="padding-top:22px;" colspan="2">{{$preamble}}</td></tr>
+
+
+	{{if $content_allowed}}
+	<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="{{$source_link}}"><img style="border:0px;width:48px;height:48px;" src="{{$source_photo}}"></a></td>
+		<td style="padding-top:22px;"><a href="{{$source_link}}">{{$source_name}}</a></td></tr>
+	<tr><td style="font-weight:bold;padding-bottom:5px;">{{$title}}</td></tr>
+	<tr><td style="padding-right:22px;">{{$htmlversion}}</td></tr>
+	{{/if}}
+	<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/templates/email_notify_text.tpl b/view/templates/email_notify_text.tpl
new file mode 100644
index 000000000..054a9e1b0
--- /dev/null
+++ b/view/templates/email_notify_text.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+{{$preamble}}
+
+{{if $content_allowed}}
+{{$title}}
+
+{{$textversion}}
+
+{{/if}}
+{{$tsitelink}}
+{{$titemlink}}
+
+{{$thanks}}
+{{$site_admin}}
+
+
diff --git a/view/templates/end.tpl b/view/templates/end.tpl
new file mode 100644
index 000000000..a7fb96108
--- /dev/null
+++ b/view/templates/end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/templates/event.tpl b/view/templates/event.tpl
new file mode 100644
index 000000000..4788dcb38
--- /dev/null
+++ b/view/templates/event.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{foreach $events as $event}}
+	<div class="event">
+	
+	{{if $event.item.author_name}}<a href="{{$event.item.author_link}}" ><img src="{{$event.item.author_avatar}}" height="32" width="32" />{{$event.item.author_name}}</a>{{/if}}
+	{{$event.html}}
+	{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" target="external-link" class="plink-event-link icon s22 remote-link"></a>{{/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/templates/event_end.tpl b/view/templates/event_end.tpl
new file mode 100644
index 000000000..a7fb96108
--- /dev/null
+++ b/view/templates/event_end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/templates/event_form.tpl b/view/templates/event_form.tpl
new file mode 100644
index 000000000..335a9480b
--- /dev/null
+++ b/view/templates/event_form.tpl
@@ -0,0 +1,54 @@
+{{*
+ *	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="uri" value="{{$uri}}" />
+
+<div id="event-start-text">{{$s_text}}</div>
+{{$s_dsel}} {{$s_tsel}}
+
+<div id="event-finish-text">{{$f_text}}</div>
+{{$f_dsel}} {{$f_tsel}}
+
+<div id="event-datetime-break"></div>
+
+<input type="checkbox" name="nofinish" value="1" id="event-nofinish-checkbox" {{$n_checked}} /> <div id="event-nofinish-text">{{$n_text}}</div>
+
+<div id="event-nofinish-break"></div>
+
+<input type="checkbox" name="adjust" value="1" id="event-adjust-checkbox" {{$a_checked}} /> <div id="event-adjust-text">{{$a_text}}</div>
+
+<div id="event-adjust-break"></div>
+
+<div id="event-summary-text">{{$t_text}}</div>
+<input type="text" id="event-summary" name="summary" value="{{$t_orig}}" />
+
+
+<div id="event-desc-text">{{$d_text}}</div>
+<textarea id="event-desc-textarea" name="desc">{{$d_orig}}</textarea>
+
+
+<div id="event-location-text">{{$l_text}}</div>
+<textarea id="event-location-textarea" name="location">{{$l_orig}}</textarea>
+
+<input type="checkbox" name="share" value="1" id="event-share-checkbox" {{$sh_checked}} /> <div id="event-share-text">{{$sh_text}}</div>
+<div id="event-share-break"></div>
+
+{{$acl}}
+
+<div class="clear"></div>
+<input id="event-submit" type="submit" name="submit" value="{{$submit}}" />
+</form>
+
+
diff --git a/view/templates/event_head.tpl b/view/templates/event_head.tpl
new file mode 100644
index 000000000..3d7091fb7
--- /dev/null
+++ b/view/templates/event_head.tpl
@@ -0,0 +1,144 @@
+{{*
+ *	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){
+				$.colorbox({html:data});
+			}
+		);			
+	}
+	
+	$(document).ready(function() {
+		$('#events-calendar').fullCalendar({
+			events: '{{$baseurl}}/events/json/',
+			header: {
+				left: 'prev,next today',
+				center: 'title',
+				right: 'month,agendaWeek,agendaDay'
+			},			
+			timeFormat: 'H(:mm)',
+			eventClick: function(calEvent, jsEvent, view) {
+				showEvent(calEvent.id);
+			},
+			
+			eventRender: function(event, element, view) {
+				//console.log(view.name);
+				if (event.item['author-name']==null) return;
+				switch(view.name){
+					case "month":
+					element.find(".fc-event-title").html(
+						"<img src='{0}' style='height:10px;width:10px'>{1} : {2}".format(
+							event.item['author-avatar'],
+							event.item['author-name'],
+							event.title
+					));
+					break;
+					case "agendaWeek":
+					element.find(".fc-event-title").html(
+						"<img src='{0}' style='height:12px; width:12px'>{1}<p>{2}</p><p>{3}</p>".format(
+							event.item['author-avatar'],
+							event.item['author-name'],
+							event.item.desc,
+							event.item.location
+					));
+					break;
+					case "agendaDay":
+					element.find(".fc-event-title").html(
+						"<img src='{0}' style='height:24px;width:24px'>{1}<p>{2}</p><p>{3}</p>".format(
+							event.item['author-avatar'],
+							event.item['author-name'],
+							event.item.desc,
+							event.item.location
+					));
+					break;
+				}
+			}
+			
+		})
+		
+		// center on date
+		var args=location.href.replace(baseurl,"").split("/");
+		if (args.length>=4) {
+			$("#events-calendar").fullCalendar('gotoDate',args[2] , args[3]-1);
+		} 
+		
+		// show event popup
+		var hash = location.hash.split("-")
+		if (hash.length==2 && hash[0]=="#link") showEvent(hash[1]);
+		
+	});
+</script>
+
+
+<script language="javascript" type="text/javascript"
+          src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+<script language="javascript" type="text/javascript">
+
+
+	tinyMCE.init({
+		theme : "advanced",
+		mode : "textareas",
+		plugins : "bbcode,paste",
+		theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
+		theme_advanced_buttons2 : "",
+		theme_advanced_buttons3 : "",
+		theme_advanced_toolbar_location : "top",
+		theme_advanced_toolbar_align : "center",
+		theme_advanced_blockformats : "blockquote,code",
+		gecko_spellcheck : true,
+		paste_text_sticky : true,
+		entity_encoding : "raw",
+		add_unload_trigger : false,
+		remove_linebreaks : false,
+		//force_p_newlines : false,
+		//force_br_newlines : true,
+		forced_root_block : 'div',
+		content_css: "{{$baseurl}}/view/custom_tinymce.css",
+		theme_advanced_path : false,
+		setup : function(ed) {
+			ed.onInit.add(function(ed) {
+				ed.pasteAsPlainText = true;
+			});
+		}
+
+	});
+
+
+	$(document).ready(function() { 
+
+		$('#event-share-checkbox').change(function() {
+
+			if ($('#event-share-checkbox').is(':checked')) { 
+				$('#acl-wrapper').show();
+			}
+			else {
+				$('#acl-wrapper').hide();
+			}
+		}).trigger('change');
+
+
+		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
+			var selstr;
+			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
+				selstr = $(this).text();
+				$('#jot-public').hide();
+			});
+			if(selstr == null) {
+				$('#jot-public').show();
+			}
+
+		}).trigger('change');
+
+	});
+
+</script>
+
diff --git a/view/templates/events-js.tpl b/view/templates/events-js.tpl
new file mode 100644
index 000000000..5fa046f5a
--- /dev/null
+++ b/view/templates/events-js.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	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/templates/events.tpl b/view/templates/events.tpl
new file mode 100644
index 000000000..054200ca2
--- /dev/null
+++ b/view/templates/events.tpl
@@ -0,0 +1,29 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$tabs}}
+<h2>{{$title}}</h2>
+
+<div id="new-event-link"><a href="{{$new_event.0}}" >{{$new_event.1}}</a></div>
+
+<div id="event-calendar-wrapper">
+	<a href="{{$previus.0}}" class="prevcal {{$previus.2}}"><div id="event-calendar-prev" class="icon s22 prev" title="{{$previus.1}}"></div></a>
+	{{$calendar}}
+	<a href="{{$next.0}}" class="nextcal {{$next.2}}"><div id="event-calendar-prev" class="icon s22 next" title="{{$next.1}}"></div></a>
+</div>
+<div class="event-calendar-end"></div>
+
+
+{{foreach $events as $event}}
+	<div class="event">
+	{{if $event.is_first}}<hr /><a name="link-{{$event.j}}" ><div class="event-list-date">{{$event.d}}</div></a>{{/if}}
+	{{if $event.item.author_name}}<a href="{{$event.item.author_link}}" ><img src="{{$event.item.author_avatar}}" height="32" width="32" />{{$event.item.author_name}}</a>{{/if}}
+	{{$event.html}}
+	{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" target="external-link" 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/templates/events_reminder.tpl b/view/templates/events_reminder.tpl
new file mode 100644
index 000000000..3448ea45c
--- /dev/null
+++ b/view/templates/events_reminder.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	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 href="events/{{$event.link}}">{{$event.title}}</a> {{$event.date}} </div>
+{{/foreach}}
+</div>
+{{/if}}
+
diff --git a/view/templates/failed_updates.tpl b/view/templates/failed_updates.tpl
new file mode 100644
index 000000000..8161ff2ef
--- /dev/null
+++ b/view/templates/failed_updates.tpl
@@ -0,0 +1,22 @@
+{{*
+ *	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/templates/fake_feed.tpl b/view/templates/fake_feed.tpl
new file mode 100644
index 000000000..fd875de71
--- /dev/null
+++ b/view/templates/fake_feed.tpl
@@ -0,0 +1,18 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<?xml version="1.0" encoding="utf-8" ?>
+<feed xmlns="http://www.w3.org/2005/Atom" >
+
+  <id>fake feed</id>
+  <title>fake title</title>
+
+  <updated>1970-01-01T00:00:00Z</updated>
+
+  <author>
+    <name>Fake Name</name>
+    <uri>http://example.com</uri>
+  </author>
+
diff --git a/view/templates/field.tpl b/view/templates/field.tpl
new file mode 100644
index 000000000..1bf36d84e
--- /dev/null
+++ b/view/templates/field.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	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/templates/field_checkbox.tpl b/view/templates/field_checkbox.tpl
new file mode 100644
index 000000000..694bce6b5
--- /dev/null
+++ b/view/templates/field_checkbox.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	
+	<div class='field checkbox' id='div_id_{{$field.0}}'>
+		<label for='id_{{$field.0}}'>{{$field.1}}</label>
+		<input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}}>
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/templates/field_combobox.tpl b/view/templates/field_combobox.tpl
new file mode 100644
index 000000000..d3cc75635
--- /dev/null
+++ b/view/templates/field_combobox.tpl
@@ -0,0 +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}}" >
+		   {{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/templates/field_custom.tpl b/view/templates/field_custom.tpl
new file mode 100644
index 000000000..c2d73275c
--- /dev/null
+++ b/view/templates/field_custom.tpl
@@ -0,0 +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>
+	</div>
diff --git a/view/templates/field_input.tpl b/view/templates/field_input.tpl
new file mode 100644
index 000000000..3c400b5ad
--- /dev/null
+++ b/view/templates/field_input.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	
+	<div class='field input'>
+		<label for='id_{{$field.0}}'>{{$field.1}}</label>
+		<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/templates/field_intcheckbox.tpl b/view/templates/field_intcheckbox.tpl
new file mode 100644
index 000000000..54967feab
--- /dev/null
+++ b/view/templates/field_intcheckbox.tpl
@@ -0,0 +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"{{/if}}>
+		<span class='field_help'>{{$field.4}}</span>
+	</div>
diff --git a/view/templates/field_openid.tpl b/view/templates/field_openid.tpl
new file mode 100644
index 000000000..b00ddabcd
--- /dev/null
+++ b/view/templates/field_openid.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	
+	<div class='field input openid'>
+		<label for='id_{{$field.0}}'>{{$field.1}}</label>
+		<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/templates/field_password.tpl b/view/templates/field_password.tpl
new file mode 100644
index 000000000..5889d2e9c
--- /dev/null
+++ b/view/templates/field_password.tpl
@@ -0,0 +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>
+	</div>
diff --git a/view/templates/field_radio.tpl b/view/templates/field_radio.tpl
new file mode 100644
index 000000000..1d7b56ec6
--- /dev/null
+++ b/view/templates/field_radio.tpl
@@ -0,0 +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"{{/if}}>
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/templates/field_richtext.tpl b/view/templates/field_richtext.tpl
new file mode 100644
index 000000000..38992f0f8
--- /dev/null
+++ b/view/templates/field_richtext.tpl
@@ -0,0 +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>
+	</div>
diff --git a/view/templates/field_select.tpl b/view/templates/field_select.tpl
new file mode 100644
index 000000000..2a4117a70
--- /dev/null
+++ b/view/templates/field_select.tpl
@@ -0,0 +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}}'>
+			{{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/templates/field_select_raw.tpl b/view/templates/field_select_raw.tpl
new file mode 100644
index 000000000..50e34985f
--- /dev/null
+++ b/view/templates/field_select_raw.tpl
@@ -0,0 +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}}
+		</select>
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/templates/field_textarea.tpl b/view/templates/field_textarea.tpl
new file mode 100644
index 000000000..5d71999d4
--- /dev/null
+++ b/view/templates/field_textarea.tpl
@@ -0,0 +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>
+	</div>
diff --git a/view/templates/field_themeselect.tpl b/view/templates/field_themeselect.tpl
new file mode 100644
index 000000000..cde744594
--- /dev/null
+++ b/view/templates/field_themeselect.tpl
@@ -0,0 +1,14 @@
+{{*
+ *	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}}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/templates/field_yesno.tpl b/view/templates/field_yesno.tpl
new file mode 100644
index 000000000..e982c2f05
--- /dev/null
+++ b/view/templates/field_yesno.tpl
@@ -0,0 +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}}">
+			<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/templates/fileas_widget.tpl b/view/templates/fileas_widget.tpl
new file mode 100644
index 000000000..f03f169a2
--- /dev/null
+++ b/view/templates/fileas_widget.tpl
@@ -0,0 +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>
+	
+	<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/templates/filebrowser.tpl b/view/templates/filebrowser.tpl
new file mode 100644
index 000000000..b408ca687
--- /dev/null
+++ b/view/templates/filebrowser.tpl
@@ -0,0 +1,89 @@
+{{*
+ *	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/templates/filer_dialog.tpl b/view/templates/filer_dialog.tpl
new file mode 100644
index 000000000..f17a06766
--- /dev/null
+++ b/view/templates/filer_dialog.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	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/templates/follow.tpl b/view/templates/follow.tpl
new file mode 100644
index 000000000..7ea961780
--- /dev/null
+++ b/view/templates/follow.tpl
@@ -0,0 +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>
+	<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/templates/follow_slap.tpl b/view/templates/follow_slap.tpl
new file mode 100644
index 000000000..554853f19
--- /dev/null
+++ b/view/templates/follow_slap.tpl
@@ -0,0 +1,30 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	<entry>
+		<author>
+			<name>{{$name}}</name>
+			<uri>{{$profile_page}}</uri>
+			<link rel="photo"  type="image/jpeg" media:width="80" media:height="80" href="{{$thumb}}" />
+			<link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="{{$thumb}}" />
+		</author>
+
+		<id>{{$item_id}}</id>
+		<title>{{$title}}</title>
+		<published>{{$published}}</published>
+		<content type="{{$type}}" >{{$content}}</content>
+
+		<as:actor>
+		<as:object-type>http://activitystrea.ms/schema/1.0/person</as:object-type>
+		<id>{{$profile_page}}</id>
+		<title></title>
+ 		<link rel="avatar" type="image/jpeg" media:width="175" media:height="175" href="{{$photo}}"/>
+		<link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="{{$thumb}}"/>
+		<poco:preferredUsername>{{$nick}}</poco:preferredUsername>
+		<poco:displayName>{{$name}}</poco:displayName>
+		</as:actor>
+ 		<as:verb>{{$verb}}</as:verb>
+		{{$ostat_follow}}
+	</entry>
diff --git a/view/templates/generic_links_widget.tpl b/view/templates/generic_links_widget.tpl
new file mode 100644
index 000000000..c12273c7b
--- /dev/null
+++ b/view/templates/generic_links_widget.tpl
@@ -0,0 +1,16 @@
+{{*
+ *	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/templates/group_drop.tpl b/view/templates/group_drop.tpl
new file mode 100644
index 000000000..84d380e30
--- /dev/null
+++ b/view/templates/group_drop.tpl
@@ -0,0 +1,14 @@
+{{*
+ *	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/templates/group_edit.tpl b/view/templates/group_edit.tpl
new file mode 100644
index 000000000..b7b14eba3
--- /dev/null
+++ b/view/templates/group_edit.tpl
@@ -0,0 +1,28 @@
+{{*
+ *	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/templates/group_selection.tpl b/view/templates/group_selection.tpl
new file mode 100644
index 000000000..f16bb5159
--- /dev/null
+++ b/view/templates/group_selection.tpl
@@ -0,0 +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>
+<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/templates/group_side.tpl b/view/templates/group_side.tpl
new file mode 100644
index 000000000..b6532fb6d
--- /dev/null
+++ b/view/templates/group_side.tpl
@@ -0,0 +1,38 @@
+{{*
+ *	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/templates/groupeditor.tpl b/view/templates/groupeditor.tpl
new file mode 100644
index 000000000..4fad30d5a
--- /dev/null
+++ b/view/templates/groupeditor.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	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/templates/head.tpl b/view/templates/head.tpl
new file mode 100644
index 000000000..1b01b71a0
--- /dev/null
+++ b/view/templates/head.tpl
@@ -0,0 +1,117 @@
+{{*
+ *	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}}" />
+{{*<!--<link rel="stylesheet" href="{{$baseurl}}/library/fancybox/jquery.fancybox.css" type="text/css" media="screen" />-->*}}
+<link rel="stylesheet" href="{{$baseurl}}/library/colorbox/colorbox.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="{{$baseurl}}/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
+
+<link rel="stylesheet" type="text/css" href="{{$stylesheet}}" media="all" />
+
+<link rel="shortcut icon" href="{{$baseurl}}/images/friendica-32.png" />
+
+<link rel="apple-touch-icon" href="{{$baseurl}}/images/friendica-128.png"/>
+<meta name="apple-mobile-web-app-capable" content="yes" /> 
+
+
+<link rel="search"
+         href="{{$baseurl}}/opensearch" 
+         type="application/opensearchdescription+xml" 
+         title="Search in Friendica" />
+
+<!--[if IE]>
+<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+<![endif]-->
+<script type="text/javascript" src="{{$baseurl}}/js/jquery.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/js/jquery.textinputs.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/js/fk.autocomplete.js" ></script>
+{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/fancybox/jquery.fancybox.pack.js"></script>-->*}}
+<script type="text/javascript" src="{{$baseurl}}/library/colorbox/jquery.colorbox-min.js"></script>
+<script type="text/javascript" src="{{$baseurl}}/library/jgrowl/jquery.jgrowl_minimized.js"></script>
+<script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/js/acl.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/js/webtoolkit.base64.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/js/main.js" ></script>
+<script>
+
+	var updateInterval = {{$update_interval}};
+	var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}};
+
+	function confirmDelete() { return confirm("{{$delitem}}"); }
+	function commentOpen(obj,id) {
+		if(obj.value == '{{$comment}}') {
+			obj.value = '';
+			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+			$("#mod-cmnt-wrap-" + id).show();
+			openMenu("comment-edit-submit-wrapper-" + id);
+			return true;
+		}
+		return false;
+	}
+	function commentClose(obj,id) {
+		if(obj.value == '') {
+			obj.value = '{{$comment}}';
+			$("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
+			$("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
+			$("#mod-cmnt-wrap-" + id).hide();
+			closeMenu("comment-edit-submit-wrapper-" + id);
+			return true;
+		}
+		return false;
+	}
+
+
+	function commentInsert(obj,id) {
+		var tmpStr = $("#comment-edit-text-" + id).val();
+		if(tmpStr == '{{$comment}}') {
+			tmpStr = '';
+			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+			openMenu("comment-edit-submit-wrapper-" + id);
+		}
+		var ins = $(obj).html();
+		ins = ins.replace('&lt;','<');
+		ins = ins.replace('&gt;','>');
+		ins = ins.replace('&amp;','&');
+		ins = ins.replace('&quot;','"');
+		$("#comment-edit-text-" + id).val(tmpStr + ins);
+	}
+
+	function qCommentInsert(obj,id) {
+		var tmpStr = $("#comment-edit-text-" + id).val();
+		if(tmpStr == '{{$comment}}') {
+			tmpStr = '';
+			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+			openMenu("comment-edit-submit-wrapper-" + id);
+		}
+		var ins = $(obj).val();
+		ins = ins.replace('&lt;','<');
+		ins = ins.replace('&gt;','>');
+		ins = ins.replace('&amp;','&');
+		ins = ins.replace('&quot;','"');
+		$("#comment-edit-text-" + id).val(tmpStr + ins);
+		$(obj).val('');
+	}
+
+	window.showMore = "{{$showmore}}";
+	window.showFewer = "{{$showfewer}}";
+
+	function showHideCommentBox(id) {
+		if( $('#comment-edit-form-' + id).is(':visible')) {
+			$('#comment-edit-form-' + id).hide();
+		}
+		else {
+			$('#comment-edit-form-' + id).show();
+		}
+	}
+
+
+</script>
+
+
diff --git a/view/templates/hide_comments.tpl b/view/templates/hide_comments.tpl
new file mode 100644
index 000000000..50a354122
--- /dev/null
+++ b/view/templates/hide_comments.tpl
@@ -0,0 +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>
+</div>
+<div id="collapsed-comments-{{$id}}" class="collapsed-comments" style="display: {{$display}};">
diff --git a/view/templates/install.tpl b/view/templates/install.tpl
new file mode 100644
index 000000000..cfb90e61f
--- /dev/null
+++ b/view/templates/install.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	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/templates/install_checks.tpl b/view/templates/install_checks.tpl
new file mode 100644
index 000000000..44852b410
--- /dev/null
+++ b/view/templates/install_checks.tpl
@@ -0,0 +1,29 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$title}}</h1>
+<h2>{{$pass}}</h2>
+<form  action="{{$baseurl}}/index.php?q=install" 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/templates/install_db.tpl b/view/templates/install_db.tpl
new file mode 100644
index 000000000..944666c6a
--- /dev/null
+++ b/view/templates/install_db.tpl
@@ -0,0 +1,35 @@
+{{*
+ *	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}}/install" 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/templates/install_settings.tpl b/view/templates/install_settings.tpl
new file mode 100644
index 000000000..2e97d0696
--- /dev/null
+++ b/view/templates/install_settings.tpl
@@ -0,0 +1,30 @@
+{{*
+ *	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}}/install" method="post">
+
+<input type="hidden" name="phpath" value="{{$phpath}}" />
+<input type="hidden" name="dbhost" value="{{$dbhost}}" />
+<input type="hidden" name="dbuser" value="{{$dbuser}}" />
+<input type="hidden" name="dbpass" value="{{$dbpass}}" />
+<input type="hidden" name="dbdata" value="{{$dbdata}}" />
+<input type="hidden" name="pass" value="4" />
+
+{{include file="field_input.tpl" field=$adminmail}}
+{{$timezone}}
+
+<input id="install-submit" type="submit" name="submit" value="{{$submit}}" /> 
+
+</form>
+
diff --git a/view/templates/intros.tpl b/view/templates/intros.tpl
new file mode 100644
index 000000000..bafdb07a0
--- /dev/null
+++ b/view/templates/intros.tpl
@@ -0,0 +1,33 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div class="intro-wrapper" id="intro-{{$contact_id}}" >
+
+<p class="intro-desc">{{$str_notifytype}} {{$notify_type}}</p>
+<div class="intro-fullname" id="intro-fullname-{{$contact_id}}" >{{$fullname}}</div>
+<a class="intro-url-link" id="intro-url-link-{{$contact_id}}" href="{{$url}}" ><img id="photo-{{$contact_id}}" class="intro-photo" src="{{$photo}}" width="175" height=175" title="{{$fullname}}" alt="{{$fullname}}" /></a>
+<div class="intro-knowyou">{{$knowyou}}</div>
+<div class="intro-note" id="intro-note-{{$contact_id}}">{{$note}}</div>
+<div class="intro-wrapper-end" id="intro-wrapper-end-{{$contact_id}}"></div>
+<form class="intro-form" action="notifications/{{$intro_id}}" method="post">
+<input class="intro-submit-ignore" type="submit" name="submit" value="{{$ignore}}" />
+<input class="intro-submit-discard" type="submit" name="submit" value="{{$discard}}" />
+</form>
+<div class="intro-form-end"></div>
+
+<form class="intro-approve-form" action="dfrn_confirm" method="post">
+{{include file="field_checkbox.tpl" field=$hidden}}
+{{include file="field_checkbox.tpl" field=$activity}}
+<input type="hidden" name="dfrn_id" value="{{$dfrn_id}}" >
+<input type="hidden" name="intro_id" value="{{$intro_id}}" >
+<input type="hidden" name="contact_id" value="{{$contact_id}}" >
+
+{{$dfrn_text}}
+
+<input class="intro-submit-approve" type="submit" name="submit" value="{{$approve}}" />
+</form>
+</div>
+<div class="intro-end"></div>
diff --git a/view/templates/invite.tpl b/view/templates/invite.tpl
new file mode 100644
index 000000000..e699f1f0e
--- /dev/null
+++ b/view/templates/invite.tpl
@@ -0,0 +1,35 @@
+{{*
+ *	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/templates/jot-end.tpl b/view/templates/jot-end.tpl
new file mode 100644
index 000000000..a7fb96108
--- /dev/null
+++ b/view/templates/jot-end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/templates/jot-header.tpl b/view/templates/jot-header.tpl
new file mode 100644
index 000000000..ce7dcf2a4
--- /dev/null
+++ b/view/templates/jot-header.tpl
@@ -0,0 +1,327 @@
+{{*
+ *	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 : 'div',
+			convert_urls: false,
+			content_css: "{{$baseurl}}/view/custom_tinymce.css",
+			theme_advanced_path : false,
+			file_browser_callback : "fcFileBrowser",
+			setup : function(ed) {
+				cPopup = null;
+				ed.onKeyDown.add(function(ed,e) {
+					if(cPopup !== null)
+						cPopup.onkey(e);
+				});
+
+				ed.onKeyUp.add(function(ed, e) {
+					var txt = tinyMCE.activeEditor.getContent();
+					match = txt.match(/@([^ \n]+)$/);
+					if(match!==null) {
+						if(cPopup === null) {
+							cPopup = new ACPopup(this,baseurl+"/acl");
+						}
+						if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
+						if(! cPopup.ready) cPopup = null;
+					}
+					else {
+						if(cPopup !== null) { cPopup.close(); cPopup = null; }
+					}
+
+					textlen = txt.length;
+					if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
+						$('#profile-jot-desc').html(ispublic);
+					}
+					else {
+						$('#profile-jot-desc').html('&nbsp;');
+					}	 
+
+				 //Character count
+
+					if(textlen <= 140) {
+						$('#character-counter').removeClass('red');
+						$('#character-counter').removeClass('orange');
+						$('#character-counter').addClass('grey');
+					}
+					if((textlen > 140) && (textlen <= 420)) {
+						$('#character-counter').removeClass('grey');
+						$('#character-counter').removeClass('red');
+						$('#character-counter').addClass('orange');
+					}
+					if(textlen > 420) {
+						$('#character-counter').removeClass('grey');
+						$('#character-counter').removeClass('orange');
+						$('#character-counter').addClass('red');
+					}
+					$('#character-counter').text(textlen);
+				});
+
+				ed.onInit.add(function(ed) {
+					ed.pasteAsPlainText = true;
+					$("#profile-jot-text-loading").hide();
+					$(".jothidden").show();
+					if (typeof cb!="undefined") cb();
+				});
+
+			}
+		});
+		editor = true;
+		// setup acl popup
+		$("a#jot-perms-icon").colorbox({
+			'inline' : true,
+			'transition' : 'elastic'
+		}); 
+	} else {
+		if (typeof cb!="undefined") cb();
+	}
+}
+
+function enableOnUser(){
+	if (editor) return;
+	$(this).val("");
+	initEditor();
+}
+
+</script>
+<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js" ></script>
+<script>
+	var ispublic = '{{$ispublic}}';
+
+	$(document).ready(function() {
+		
+		/* enable tinymce on focus and click */
+		$("#profile-jot-text").focus(enableOnUser);
+		$("#profile-jot-text").click(enableOnUser);
+
+		var uploader = new window.AjaxUpload(
+			'wall-image-upload',
+			{ action: 'wall_upload/{{$nickname}}',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					addeditortext(response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);
+		var file_uploader = new window.AjaxUpload(
+			'wall-file-upload',
+			{ action: 'wall_attach/{{$nickname}}',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					addeditortext(response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);
+
+
+	});
+
+	function deleteCheckedItems() {
+		if(confirm('{{$delitems}}')) {
+			var checkedstr = '';
+
+			$("#item-delete-selected").hide();
+			$('#item-delete-selected-rotator').show();
+
+			$('.item-select').each( function() {
+				if($(this).is(':checked')) {
+					if(checkedstr.length != 0) {
+						checkedstr = checkedstr + ',' + $(this).val();
+					}
+					else {
+						checkedstr = $(this).val();
+					}
+				}	
+			});
+			$.post('item', { dropitems: checkedstr }, function(data) {
+				window.location.reload();
+			});
+		}
+	}
+
+	function jotGetLink() {
+		reply = prompt("{{$linkurl}}");
+		if(reply && reply.length) {
+			reply = bin2hex(reply);
+			$('#profile-rotator').show();
+			$.get('parse_url?binurl=' + reply, function(data) {
+				addeditortext(data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+	function jotVideoURL() {
+		reply = prompt("{{$vidurl}}");
+		if(reply && reply.length) {
+			addeditortext('[video]' + reply + '[/video]');
+		}
+	}
+
+	function jotAudioURL() {
+		reply = prompt("{{$audurl}}");
+		if(reply && reply.length) {
+			addeditortext('[audio]' + reply + '[/audio]');
+		}
+	}
+
+
+	function jotGetLocation() {
+		reply = prompt("{{$whereareu}}", $('#jot-location').val());
+		if(reply && reply.length) {
+			$('#jot-location').val(reply);
+		}
+	}
+
+	function jotShare(id) {
+		if ($('#jot-popup').length != 0) $('#jot-popup').show();
+
+		$('#like-rotator-' + id).show();
+		$.get('share/' + id, function(data) {
+			if (!editor) $("#profile-jot-text").val("");
+			initEditor(function(){
+				addeditortext(data);
+				$('#like-rotator-' + id).hide();
+				$(window).scrollTop(0);
+			});
+
+		});
+	}
+
+	function linkdropper(event) {
+		var linkFound = event.dataTransfer.types.contains("text/uri-list");
+		if(linkFound)
+			event.preventDefault();
+	}
+
+	function linkdrop(event) {
+		var reply = event.dataTransfer.getData("text/uri-list");
+		event.target.textContent = reply;
+		event.preventDefault();
+		if(reply && reply.length) {
+			reply = bin2hex(reply);
+			$('#profile-rotator').show();
+			$.get('parse_url?binurl=' + reply, function(data) {
+				if (!editor) $("#profile-jot-text").val("");
+				initEditor(function(){
+					addeditortext(data);
+					$('#profile-rotator').hide();
+				});
+			});
+		}
+	}
+
+	function itemTag(id) {
+		reply = prompt("{{$term}}");
+		if(reply && reply.length) {
+			reply = reply.replace('#','');
+			if(reply.length) {
+
+				commentBusy = true;
+				$('body').css('cursor', 'wait');
+
+				$.get('tagger/' + id + '?term=' + reply);
+				if(timer) clearTimeout(timer);
+				timer = setTimeout(NavUpdate,3000);
+				liking = 1;
+			}
+		}
+	}
+
+	function itemFiler(id) {
+		
+		var bordercolor = $("input").css("border-color");
+		
+		$.get('filer/', function(data){
+			$.colorbox({html:data});
+			$("#id_term").keypress(function(){
+				$(this).css("border-color",bordercolor);
+			})
+			$("#select_term").change(function(){
+				$("#id_term").css("border-color",bordercolor);
+			})
+			
+			$("#filer_save").click(function(e){
+				e.preventDefault();
+				reply = $("#id_term").val();
+				if(reply && reply.length) {
+					commentBusy = true;
+					$('body').css('cursor', 'wait');
+					$.get('filer/' + id + '?term=' + reply, NavUpdate);
+//					if(timer) clearTimeout(timer);
+//					timer = setTimeout(NavUpdate,3000);
+					liking = 1;
+					$.colorbox.close();
+				} else {
+					$("#id_term").css("border-color","#FF0000");
+				}
+				return false;
+			});
+		});
+		
+	}
+
+	function jotClearLocation() {
+		$('#jot-coord').val('');
+		$('#profile-nolocation-wrapper').hide();
+	}
+
+	function addeditortext(data) {
+		if(plaintext == 'none') {
+			var currentText = $("#profile-jot-text").val();
+			$("#profile-jot-text").val(currentText + data);
+		}
+		else
+			tinyMCE.execCommand('mceInsertRawHTML',false,data);
+	}	
+
+	{{$geotag}}
+
+</script>
+
diff --git a/view/templates/jot.tpl b/view/templates/jot.tpl
new file mode 100644
index 000000000..bd9902159
--- /dev/null
+++ b/view/templates/jot.tpl
@@ -0,0 +1,93 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div id="profile-jot-wrapper" >
+	<div id="profile-jot-banner-wrapper">
+		<div id="profile-jot-desc" >&nbsp;</div>
+		<div id="character-counter" class="grey"></div>
+	</div>
+	<div id="profile-jot-banner-end"></div>
+
+	<form id="profile-jot-form" action="{{$action}}" method="post" >
+		<input type="hidden" name="type" value="{{$ptyp}}" />
+		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+		<input type="hidden" name="return" value="{{$return_path}}" />
+		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
+		<input type="hidden" name="coord" id="jot-coord" value="" />
+		<input type="hidden" name="post_id" value="{{$post_id}}" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none"></div>
+		{{if $placeholdercategory}}
+		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" /></div>
+		{{/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> 
+
+	<div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" >
+		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}}"  title="{{$permset}}" ></a>{{$bang}}
+	</div>
+
+	<span onclick="preview_post();" id="jot-preview-link" class="fakelink">{{$preview}}</span>
+
+	<div id="profile-jot-perms-end"></div>
+
+
+	<div id="profile-jot-plugin-wrapper">
+  	{{$jotplugins}}
+	</div>
+
+	<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
+		<img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+	</div> 
+	
+	<div id="jot-preview-content" style="display:none;"></div>
+
+	<div style="display: none;">
+		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+			{{$acl}}
+			<hr style="clear:both"/>
+			<div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
+			<div id="profile-jot-email-end"></div>
+			{{$jotnets}}
+		</div>
+	</div>
+
+
+</div>
+
+<div id="profile-jot-end"></div>
+</form>
+</div>
+		{{if $content}}<script>initEditor();</script>{{/if}}
diff --git a/view/templates/jot_geotag.tpl b/view/templates/jot_geotag.tpl
new file mode 100644
index 000000000..1ed2367aa
--- /dev/null
+++ b/view/templates/jot_geotag.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	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/templates/lang_selector.tpl b/view/templates/lang_selector.tpl
new file mode 100644
index 000000000..0b4224d7b
--- /dev/null
+++ b/view/templates/lang_selector.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	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');" >lang</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/templates/like_noshare.tpl b/view/templates/like_noshare.tpl
new file mode 100644
index 000000000..62a16227d
--- /dev/null
+++ b/view/templates/like_noshare.tpl
@@ -0,0 +1,12 @@
+{{*
+ *	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>
+	{{if $nolike}}
+	<a href="#" class="icon dislike" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false"></a>
+	{{/if}}
+	<img id="like-rotator-{{$id}}" class="like-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+</div>
diff --git a/view/templates/login.tpl b/view/templates/login.tpl
new file mode 100644
index 000000000..5d9b5f4f9
--- /dev/null
+++ b/view/templates/login.tpl
@@ -0,0 +1,40 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<form action="{{$dest_url}}" 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>
+	
+	{{if $openid}}
+			<div id="login_openid">
+			{{include file="field_openid.tpl" field=$lopenid}}
+			</div>
+	{{/if}}
+
+	{{include file="field_checkbox.tpl" field=$lremember}}
+
+	<div id="login-extra-links">
+		{{if $register}}<a href="register" title="{{$register.title}}" id="register-link">{{$register.desc}}</a>{{/if}}
+        <a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
+	</div>
+	
+	<div id="login-submit-wrapper" >
+		<input type="submit" name="submit" id="login-submit-button" value="{{$login}}" />
+	</div>
+	
+	{{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/templates/login_head.tpl b/view/templates/login_head.tpl
new file mode 100644
index 000000000..a7fb96108
--- /dev/null
+++ b/view/templates/login_head.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/templates/logout.tpl b/view/templates/logout.tpl
new file mode 100644
index 000000000..582d77ed6
--- /dev/null
+++ b/view/templates/logout.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	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/templates/lostpass.tpl b/view/templates/lostpass.tpl
new file mode 100644
index 000000000..0e437ca48
--- /dev/null
+++ b/view/templates/lostpass.tpl
@@ -0,0 +1,23 @@
+{{*
+ *	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/templates/magicsig.tpl b/view/templates/magicsig.tpl
new file mode 100644
index 000000000..af8dbb5bc
--- /dev/null
+++ b/view/templates/magicsig.tpl
@@ -0,0 +1,14 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<?xml version="1.0" encoding="UTF-8"?>
+<me:env xmlns:me="http://salmon-protocol.org/ns/magic-env">
+<me:data type="application/atom+xml">
+{{$data}}
+</me:data>
+<me:encoding>{{$encoding}}</me:encoding>
+<me:alg>{{$algorithm}}</me:alg>
+<me:sig key_id="{{$keyhash}}">{{$signature}}</me:sig>
+</me:env>
diff --git a/view/templates/mail_conv.tpl b/view/templates/mail_conv.tpl
new file mode 100644
index 000000000..5083fdb25
--- /dev/null
+++ b/view/templates/mail_conv.tpl
@@ -0,0 +1,19 @@
+{{*
+ *	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>
+	<div class="mail-conv-detail" >
+		<div class="mail-conv-sender-name" >{{$mail.from_name}}</div>
+		<div class="mail-conv-date">{{$mail.date}}</div>
+		<div class="mail-conv-subject">{{$mail.subject}}</div>
+		<div class="mail-conv-body">{{$mail.body}}</div>
+	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
+	<div class="mail-conv-outside-wrapper-end"></div>
+</div>
+</div>
+<hr class="mail-conv-break" />
diff --git a/view/templates/mail_display.tpl b/view/templates/mail_display.tpl
new file mode 100644
index 000000000..23d05bdeb
--- /dev/null
+++ b/view/templates/mail_display.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	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}}
diff --git a/view/templates/mail_head.tpl b/view/templates/mail_head.tpl
new file mode 100644
index 000000000..f7a39fa8b
--- /dev/null
+++ b/view/templates/mail_head.tpl
@@ -0,0 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$messages}}</h3>
+
+{{$tab_content}}
diff --git a/view/templates/mail_list.tpl b/view/templates/mail_list.tpl
new file mode 100644
index 000000000..9dbfb6a14
--- /dev/null
+++ b/view/templates/mail_list.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="mail-list-outside-wrapper">
+	<div class="mail-list-sender" >
+		<a href="{{$from_url}}" class="mail-list-sender-url" ><img class="mail-list-sender-photo{{$sparkle}}" src="{{$from_photo}}" height="80" width="80" alt="{{$from_name}}" /></a>
+	</div>
+	<div class="mail-list-detail">
+		<div class="mail-list-sender-name" >{{$from_name}}</div>
+		<div class="mail-list-date">{{$date}}</div>
+		<div class="mail-list-subject"><a href="message/{{$id}}" class="mail-list-link">{{$subject}}</a></div>
+	<div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-{{$id}}" >
+		<a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="icon drophide mail-list-delete	delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
+	</div>
+</div>
+</div>
+<div class="mail-list-delete-end"></div>
+
+<div class="mail-list-outside-wrapper-end"></div>
diff --git a/view/templates/maintenance.tpl b/view/templates/maintenance.tpl
new file mode 100644
index 000000000..f0ea0849c
--- /dev/null
+++ b/view/templates/maintenance.tpl
@@ -0,0 +1,6 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id="maintenance-message">{{$sysdown}}</div>
diff --git a/view/templates/manage.tpl b/view/templates/manage.tpl
new file mode 100644
index 000000000..857402c04
--- /dev/null
+++ b/view/templates/manage.tpl
@@ -0,0 +1,22 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$title}}</h3>
+<div id="identity-manage-desc">{{$desc}}</div>
+<div id="identity-manage-choose">{{$choose}}</div>
+<div id="identity-selector-wrapper">
+	<form action="manage" method="post" >
+	<select name="identity" size="4" onchange="this.form.submit();" >
+
+	{{foreach $identities as $id}}
+		<option {{$id.selected}} value="{{$id.uid}}">{{$id.username}} ({{$id.nickname}})</option>
+	{{/foreach}}
+
+	</select>
+	<div id="identity-select-break"></div>
+
+	{{*<!--<input id="identity-submit" type="submit" name="submit" value="{{$submit}}" />-->*}}
+</div></form>
+
diff --git a/view/templates/match.tpl b/view/templates/match.tpl
new file mode 100644
index 000000000..14b725466
--- /dev/null
+++ b/view/templates/match.tpl
@@ -0,0 +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>
+	</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/templates/message-end.tpl b/view/templates/message-end.tpl
new file mode 100644
index 000000000..a7fb96108
--- /dev/null
+++ b/view/templates/message-end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/templates/message-head.tpl b/view/templates/message-head.tpl
new file mode 100644
index 000000000..ffc6affa4
--- /dev/null
+++ b/view/templates/message-head.tpl
@@ -0,0 +1,22 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script src="{{$baseurl}}/library/jquery_ac/friendica.complete.js" ></script>
+
+<script>$(document).ready(function() { 
+	var a; 
+	a = $("#recip").autocomplete({ 
+		serviceUrl: '{{$base}}/acl',
+		minChars: 2,
+		width: 350,
+		onSelect: function(value,data) {
+			$("#recip-complete").val(data);
+		}			
+	});
+
+}); 
+
+</script>
+
diff --git a/view/templates/message_side.tpl b/view/templates/message_side.tpl
new file mode 100644
index 000000000..7da22ee3e
--- /dev/null
+++ b/view/templates/message_side.tpl
@@ -0,0 +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{{/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/templates/moderated_comment.tpl b/view/templates/moderated_comment.tpl
new file mode 100644
index 000000000..1e4e9b6d4
--- /dev/null
+++ b/view/templates/moderated_comment.tpl
@@ -0,0 +1,39 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
+			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
+				<input type="hidden" name="type" value="{{$type}}" />
+				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+				<input type="hidden" name="parent" value="{{$parent}}" />
+				<input type="hidden" name="return" value="{{$return_path}}" />
+				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
+				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
+					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<div id="mod-cmnt-wrap-{{$id}}" class="mod-cmnt-wrap" style="display:none">
+					<div id="mod-cmnt-name-lbl-{{$id}}" class="mod-cmnt-name-lbl">{{$lbl_modname}}</div>
+					<input type="text" id="mod-cmnt-name-{{$id}}" class="mod-cmnt-name" name="mod-cmnt-name" value="{{$modname}}" />
+					<div id="mod-cmnt-email-lbl-{{$id}}" class="mod-cmnt-email-lbl">{{$lbl_modemail}}</div>
+					<input type="text" id="mod-cmnt-email-{{$id}}" class="mod-cmnt-email" name="mod-cmnt-email" value="{{$modemail}}" />
+					<div id="mod-cmnt-url-lbl-{{$id}}" class="mod-cmnt-url-lbl">{{$lbl_modurl}}</div>
+					<input type="text" id="mod-cmnt-url-{{$id}}" class="mod-cmnt-url" name="mod-cmnt-url" value="{{$modurl}}" />
+				</div>
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
+					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
+					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
+					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/templates/mood_content.tpl b/view/templates/mood_content.tpl
new file mode 100644
index 000000000..461303318
--- /dev/null
+++ b/view/templates/mood_content.tpl
@@ -0,0 +1,25 @@
+{{*
+ *	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/templates/msg-end.tpl b/view/templates/msg-end.tpl
new file mode 100644
index 000000000..a7fb96108
--- /dev/null
+++ b/view/templates/msg-end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/templates/msg-header.tpl b/view/templates/msg-header.tpl
new file mode 100644
index 000000000..0f047f5cd
--- /dev/null
+++ b/view/templates/msg-header.tpl
@@ -0,0 +1,102 @@
+{{*
+ *	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 : 'div',
+		convert_urls: false,
+		content_css: "{{$baseurl}}/view/custom_tinymce.css",
+		     //Character count
+		theme_advanced_path : false,
+		setup : function(ed) {
+			ed.onInit.add(function(ed) {
+				ed.pasteAsPlainText = true;
+				var editorId = ed.editorId;
+				var textarea = $('#'+editorId);
+				if (typeof(textarea.attr('tabindex')) != "undefined") {
+					$('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
+					textarea.attr('tabindex', null);
+				}
+			});
+		}
+	});
+}
+else
+	$("#prvmail-text").contact_autocomplete(baseurl+"/acl");
+
+
+</script>
+<script type="text/javascript" src="js/ajaxupload.js" ></script>
+<script>
+	$(document).ready(function() {
+		var uploader = new window.AjaxUpload(
+			'prvmail-upload',
+			{ action: 'wall_upload/{{$nickname}}',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					tinyMCE.execCommand('mceInsertRawHTML',false,response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);
+
+	});
+
+	function jotGetLink() {
+		reply = prompt("{{$linkurl}}");
+		if(reply && reply.length) {
+			$('#profile-rotator').show();
+			$.get('parse_url?url=' + reply, function(data) {
+				tinyMCE.execCommand('mceInsertRawHTML',false,data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+	function linkdropper(event) {
+		var linkFound = event.dataTransfer.types.contains("text/uri-list");
+		if(linkFound)
+			event.preventDefault();
+	}
+
+	function linkdrop(event) {
+		var reply = event.dataTransfer.getData("text/uri-list");
+		event.target.textContent = reply;
+		event.preventDefault();
+		if(reply && reply.length) {
+			$('#profile-rotator').show();
+			$.get('parse_url?url=' + reply, function(data) {
+				tinyMCE.execCommand('mceInsertRawHTML',false,data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+</script>
+
diff --git a/view/templates/nav.tpl b/view/templates/nav.tpl
new file mode 100644
index 000000000..6119a1a93
--- /dev/null
+++ b/view/templates/nav.tpl
@@ -0,0 +1,73 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<nav>
+	{{$langselector}}
+
+	<div id="site-location">{{$sitelocation}}</div>
+
+	{{if $nav.logout}}<a id="nav-logout-link" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a> {{/if}}
+	{{if $nav.login}}<a id="nav-login-link" class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a> {{/if}}
+
+	<span id="nav-link-wrapper" >
+
+	{{if $nav.register}}<a id="nav-register-link" class="nav-commlink {{$nav.register.2}} {{$sel.register}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a>{{/if}}
+		
+	{{if $nav.help}} <a id="nav-help-link" class="nav-link {{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a>{{/if}}
+		
+	{{if $nav.apps}}<a id="nav-apps-link" class="nav-link {{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a>{{/if}}
+
+	<a id="nav-search-link" class="nav-link {{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a>
+	<a id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a>
+
+	{{if $nav.admin}}<a id="nav-admin-link" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a>{{/if}}
+
+	{{if $nav.network}}
+	<a id="nav-network-link" class="nav-commlink {{$nav.network.2}} {{$sel.network}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
+	<span id="net-update" class="nav-ajax-left"></span>
+	{{/if}}
+	{{if $nav.home}}
+	<a id="nav-home-link" class="nav-commlink {{$nav.home.2}} {{$sel.home}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a>
+	<span id="home-update" class="nav-ajax-left"></span>
+	{{/if}}
+	{{if $nav.community}}
+	<a id="nav-community-link" class="nav-commlink {{$nav.community.2}} {{$sel.community}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
+	{{/if}}
+	{{if $nav.introductions}}
+	<a id="nav-notify-link" class="nav-commlink {{$nav.introductions.2}} {{$sel.introductions}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a>
+	<span id="intro-update" class="nav-ajax-left"></span>
+	{{/if}}
+	{{if $nav.messages}}
+	<a id="nav-messages-link" class="nav-commlink {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>
+	<span id="mail-update" class="nav-ajax-left"></span>
+	{{/if}}
+
+
+
+	{{if $nav.manage}}<a id="nav-manage-link" class="nav-commlink {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a>{{/if}}
+
+
+		{{if $nav.notifications}}
+			<a id="nav-notifications-linkmenu" class="nav-commlink" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a>
+				<span id="notify-update" class="nav-ajax-left"></span>
+				<ul id="nav-notifications-menu" class="menu-popup">
+					<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
+					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
+					<li class="empty">{{$emptynotifications}}</li>
+				</ul>
+		{{/if}}		
+
+	{{if $nav.settings}}<a id="nav-settings-link" class="nav-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a>{{/if}}
+	{{if $nav.profiles}}<a id="nav-profiles-link" class="nav-link {{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a>{{/if}}
+
+	{{if $nav.contacts}}<a id="nav-contacts-link" class="nav-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a>{{/if}}
+	</span>
+	<span id="nav-end"></span>
+	<span id="banner">{{$banner}}</span>
+</nav>
+
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
+</ul>
diff --git a/view/templates/navigation.tpl b/view/templates/navigation.tpl
new file mode 100644
index 000000000..28229c569
--- /dev/null
+++ b/view/templates/navigation.tpl
@@ -0,0 +1,108 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*
+ # LOGIN/REGISTER
+ *}}
+<center>
+{{* Use nested if's since the Friendica template engine doesn't support AND or OR in if statements *}}
+{{if $nav.login}}
+<div id="navigation-login-wrapper" >
+{{else}}
+{{if $nav.register}}
+<div id="navigation-login-wrapper" >
+{{/if}}
+{{/if}}
+{{if $nav.login}}<a id="navigation-login-link" class="navigation-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><br/> {{/if}}
+{{if $nav.register}}<a id="navigation-register-link" class="navigation-link {{$nav.register.2}} {{$sel.register}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a><br/>{{/if}}
+{{if $nav.login}}
+</div>
+{{else}}
+{{if $nav.register}}
+</div>
+{{/if}}
+{{/if}}
+
+{{*
+ # NETWORK/HOME
+ *}}
+{{if $nav.network}}
+<div id="navigation-network-wrapper" >
+{{else}}
+{{if $nav.home}}
+<div id="navigation-network-wrapper" >
+{{else}}
+{{if $nav.community}}
+<div id="navigation-network-wrapper" >
+{{/if}}
+{{/if}}
+{{/if}}
+{{if $nav.network}}
+<a id="navigation-network-link" class="navigation-link navigation-commlink {{$nav.network.2}} {{$sel.network}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a><br/>
+<a class="navigation-link navigation-commlink" href="{{$nav.net_reset.0}}" title="{{$nav.net_reset.3}}">{{$nav.net_reset.1}}</a><br/>
+{{/if}}
+{{if $nav.home}}
+<a id="navigation-home-link" class="navigation-link navigation-commlink {{$nav.home.2}} {{$sel.home}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a><br/>
+{{/if}}
+{{if $nav.community}}
+<a id="navigation-community-link" class="navigation-link navigation-commlink {{$nav.community.2}} {{$sel.community}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a><br/>
+{{/if}}
+{{if $nav.network}}
+</div>
+{{else}}
+{{if $nav.home}}
+</div>
+{{else}}
+{{if $nav.community}}
+</div>
+{{/if}}
+{{/if}}
+{{/if}}
+
+{{*
+ # PRIVATE MESSAGES
+ *}}
+{{if $nav.messages}}
+<div id="navigation-messages-wrapper">
+<a id="navigation-messages-link" class="navigation-link navigation-commlink {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a><br/>
+</div>
+{{/if}}
+
+	
+{{*
+ # CONTACTS
+ *}}
+<div id="navigation-contacts-wrapper">
+{{if $nav.contacts}}<a id="navigation-contacts-link" class="navigation-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a><br/>{{/if}}
+<a id="navigation-directory-link" class="navigation-link {{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a><br/>
+{{if $nav.introductions}}
+<a id="navigation-notify-link" class="navigation-link navigation-commlink {{$nav.introductions.2}} {{$sel.introductions}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a><br/>
+{{/if}}
+</div>
+
+{{*
+ # NOTIFICATIONS
+ *}}
+{{if $nav.notifications}}
+<div id="navigation-notifications-wrapper">
+<a id="navigation-notifications-link" class="navigation-link navigation-commlink" href="{{$nav.notifications.0}}" rel="#navigation-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a><br/>
+</div>
+{{/if}}		
+
+{{*
+ # MISCELLANEOUS
+ *}}
+<div id="navigation-misc-wrapper">
+{{if $nav.settings}}<a id="navigation-settings-link" class="navigation-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a><br/>{{/if}}
+{{if $nav.manage}}<a id="navigation-manage-link" class="navigation-link navigation-commlink {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a><br/>{{/if}}
+{{if $nav.profiles}}<a id="navigation-profiles-link" class="navigation-link {{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a><br/>{{/if}}
+{{if $nav.admin}}<a id="navigation-admin-link" class="navigation-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a><br/>{{/if}}
+<a id="navigation-search-link" class="navigation-link {{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a><br/>
+{{if $nav.apps}}<a id="navigation-apps-link" class="navigation-link {{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a><br/>{{/if}}
+{{if $nav.help}} <a id="navigation-help-link" class="navigation-link {{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a><br/>{{/if}}
+</div>
+
+{{if $nav.logout}}<a id="navigation-logout-link" class="navigation-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a><br/>{{/if}}
+</center>
diff --git a/view/templates/netfriend.tpl b/view/templates/netfriend.tpl
new file mode 100644
index 000000000..e8658e0bc
--- /dev/null
+++ b/view/templates/netfriend.tpl
@@ -0,0 +1,19 @@
+{{*
+ *	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/templates/nets.tpl b/view/templates/nets.tpl
new file mode 100644
index 000000000..76b2a57d9
--- /dev/null
+++ b/view/templates/nets.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id="nets-sidebar" class="widget">
+	<h3>{{$title}}</h3>
+	<div id="nets-desc">{{$desc}}</div>
+	<a href="{{$base}}?nets=all" class="nets-link{{if $sel_all}} nets-selected{{/if}} nets-all">{{$all}}</a>
+	<ul class="nets-ul">
+	{{foreach $nets as $net}}
+	<li><a href="{{$base}}?nets={{$net.ref}}" class="nets-link{{if $net.selected}} nets-selected{{/if}}">{{$net.name}}</a></li>
+	{{/foreach}}
+	</ul>
+</div>
diff --git a/view/templates/nogroup-template.tpl b/view/templates/nogroup-template.tpl
new file mode 100644
index 000000000..7d103a655
--- /dev/null
+++ b/view/templates/nogroup-template.tpl
@@ -0,0 +1,17 @@
+{{*
+ *	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/templates/notifications.tpl b/view/templates/notifications.tpl
new file mode 100644
index 000000000..834a7a016
--- /dev/null
+++ b/view/templates/notifications.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	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/templates/notifications_comments_item.tpl b/view/templates/notifications_comments_item.tpl
new file mode 100644
index 000000000..9913e6cf7
--- /dev/null
+++ b/view/templates/notifications_comments_item.tpl
@@ -0,0 +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>
+</div>
\ No newline at end of file
diff --git a/view/templates/notifications_dislikes_item.tpl b/view/templates/notifications_dislikes_item.tpl
new file mode 100644
index 000000000..9913e6cf7
--- /dev/null
+++ b/view/templates/notifications_dislikes_item.tpl
@@ -0,0 +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>
+</div>
\ No newline at end of file
diff --git a/view/templates/notifications_friends_item.tpl b/view/templates/notifications_friends_item.tpl
new file mode 100644
index 000000000..9913e6cf7
--- /dev/null
+++ b/view/templates/notifications_friends_item.tpl
@@ -0,0 +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>
+</div>
\ No newline at end of file
diff --git a/view/templates/notifications_likes_item.tpl b/view/templates/notifications_likes_item.tpl
new file mode 100644
index 000000000..792b285bc
--- /dev/null
+++ b/view/templates/notifications_likes_item.tpl
@@ -0,0 +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>
+</div>
\ No newline at end of file
diff --git a/view/templates/notifications_network_item.tpl b/view/templates/notifications_network_item.tpl
new file mode 100644
index 000000000..c3381d682
--- /dev/null
+++ b/view/templates/notifications_network_item.tpl
@@ -0,0 +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>
+</div>
diff --git a/view/templates/notifications_posts_item.tpl b/view/templates/notifications_posts_item.tpl
new file mode 100644
index 000000000..9913e6cf7
--- /dev/null
+++ b/view/templates/notifications_posts_item.tpl
@@ -0,0 +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>
+</div>
\ No newline at end of file
diff --git a/view/templates/notify.tpl b/view/templates/notify.tpl
new file mode 100644
index 000000000..9913e6cf7
--- /dev/null
+++ b/view/templates/notify.tpl
@@ -0,0 +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>
+</div>
\ No newline at end of file
diff --git a/view/templates/oauth_authorize.tpl b/view/templates/oauth_authorize.tpl
new file mode 100644
index 000000000..d7f1963d2
--- /dev/null
+++ b/view/templates/oauth_authorize.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	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/templates/oauth_authorize_done.tpl b/view/templates/oauth_authorize_done.tpl
new file mode 100644
index 000000000..12d4c6f48
--- /dev/null
+++ b/view/templates/oauth_authorize_done.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	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/templates/oembed_video.tpl b/view/templates/oembed_video.tpl
new file mode 100644
index 000000000..bdfa11509
--- /dev/null
+++ b/view/templates/oembed_video.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	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/templates/oexchange_xrd.tpl b/view/templates/oexchange_xrd.tpl
new file mode 100644
index 000000000..5af749182
--- /dev/null
+++ b/view/templates/oexchange_xrd.tpl
@@ -0,0 +1,38 @@
+{{*
+ *	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">Friendica</Property>
+    <Property 
+        type="http://www.oexchange.org/spec/0.8/prop/title">Friendica Social Network</Property>
+    <Property 
+        type="http://www.oexchange.org/spec/0.8/prop/name">Friendica</Property>
+    <Property 
+        type="http://www.oexchange.org/spec/0.8/prop/prompt">Send to Friendica</Property>
+
+    <Link 
+        rel="icon" 
+        href="{{$base}}/images/friendica-16.png"
+        type="image/png" 
+        />
+
+    <Link 
+        rel="icon32" 
+        href="{{$base}}/images/friendica-32.png"
+        type="image/png" 
+        />
+
+    <Link 
+        rel= "http://www.oexchange.org/spec/0.8/rel/offer" 
+        href="{{$base}}/oexchange"
+        type="text/html" 
+        />
+</XRD>
+
diff --git a/view/templates/opensearch.tpl b/view/templates/opensearch.tpl
new file mode 100644
index 000000000..dc5cf8875
--- /dev/null
+++ b/view/templates/opensearch.tpl
@@ -0,0 +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>Friendica@{{$nodename}}</ShortName>
+	<Description>Search in Friendica@{{$nodename}}</Description>
+	<Contact>http://bugs.friendica.com/</Contact>
+	<Image height="16" width="16" type="image/png">{{$baseurl}}/images/friendica-16.png</Image>
+	<Image height="64" width="64" type="image/png">{{$baseurl}}/images/friendica-64.png</Image>
+	<Url type="text/html" 
+        template="{{$baseurl}}/search?search={searchTerms}"/>
+	<Url type="application/opensearchdescription+xml"
+      	rel="self"
+      	template="{{$baseurl}}/opensearch" />        
+</OpenSearchDescription>
\ No newline at end of file
diff --git a/view/templates/pagetypes.tpl b/view/templates/pagetypes.tpl
new file mode 100644
index 000000000..15cd3047a
--- /dev/null
+++ b/view/templates/pagetypes.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	{{include file="field_radio.tpl" field=$page_normal}}
+	{{include file="field_radio.tpl" field=$page_community}}
+	{{include file="field_radio.tpl" field=$page_prvgroup}}
+	{{include file="field_radio.tpl" field=$page_soapbox}}
+	{{include file="field_radio.tpl" field=$page_freelove}}
diff --git a/view/templates/peoplefind.tpl b/view/templates/peoplefind.tpl
new file mode 100644
index 000000000..5417ee0ed
--- /dev/null
+++ b/view/templates/peoplefind.tpl
@@ -0,0 +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>
+	<form action="dirfind" method="post" />
+		<input id="side-peoplefind-url" type="text" name="search" size="24" title="{{$hint}}" /><input id="side-peoplefind-submit" type="submit" name="submit" value="{{$findthem}}" />
+	</form>
+	<div class="side-link" id="side-match-link"><a href="match" >{{$similar}}</a></div>
+	<div class="side-link" id="side-suggest-link"><a href="suggest" >{{$suggest}}</a></div>
+	<div class="side-link" id="side-random-profile-link" ><a href="randprof" target="extlink" >{{$random}}</a></div>
+	{{if $inv}} 
+	<div class="side-link" id="side-invite-link" ><a href="invite" >{{$inv}}</a></div>
+	{{/if}}
+</div>
+
diff --git a/view/templates/photo_album.tpl b/view/templates/photo_album.tpl
new file mode 100644
index 000000000..56ee6b61c
--- /dev/null
+++ b/view/templates/photo_album.tpl
@@ -0,0 +1,12 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="photo-album-image-wrapper" id="photo-album-image-wrapper-{{$id}}">
+	<a href="{{$photolink}}" class="photo-album-photo-link" id="photo-album-photo-link-{{$id}}" title="{{$phototitle}}">
+		<img src="{{$imgsrc}}" alt="{{$imgalt}}" title="{{$phototitle}}" class="photo-album-photo lframe resize{{$twist}}" id="photo-album-photo-{{$id}}" />
+		<p class='caption'>{{$desc}}</p>		
+	</a>
+</div>
+<div class="photo-album-image-wrapper-end"></div>
diff --git a/view/templates/photo_drop.tpl b/view/templates/photo_drop.tpl
new file mode 100644
index 000000000..ed500fd0a
--- /dev/null
+++ b/view/templates/photo_drop.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	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/templates/photo_edit.tpl b/view/templates/photo_edit.tpl
new file mode 100644
index 000000000..fefe7f10b
--- /dev/null
+++ b/view/templates/photo_edit.tpl
@@ -0,0 +1,55 @@
+{{*
+ *	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/templates/photo_edit_head.tpl b/view/templates/photo_edit_head.tpl
new file mode 100644
index 000000000..50e680295
--- /dev/null
+++ b/view/templates/photo_edit_head.tpl
@@ -0,0 +1,16 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script>
+
+	$(document).keydown(function(event) {
+
+		if("{{$prevlink}}" != '') { if(event.ctrlKey && event.keyCode == 37) { event.preventDefault(); window.location.href = "{{$prevlink}}"; }}
+		if("{{$nextlink}}" != '') { if(event.ctrlKey && event.keyCode == 39) { event.preventDefault(); window.location.href = "{{$nextlink}}"; }}
+
+	});
+
+</script>
diff --git a/view/templates/photo_item.tpl b/view/templates/photo_item.tpl
new file mode 100644
index 000000000..7d6ac96ee
--- /dev/null
+++ b/view/templates/photo_item.tpl
@@ -0,0 +1,27 @@
+{{*
+ *	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/templates/photo_top.tpl b/view/templates/photo_top.tpl
new file mode 100644
index 000000000..b34e1e639
--- /dev/null
+++ b/view/templates/photo_top.tpl
@@ -0,0 +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}}" />
+	</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/templates/photo_view.tpl b/view/templates/photo_view.tpl
new file mode 100644
index 000000000..94f71bdd8
--- /dev/null
+++ b/view/templates/photo_view.tpl
@@ -0,0 +1,42 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<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}}"><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/templates/photos_default_uploader_box.tpl b/view/templates/photos_default_uploader_box.tpl
new file mode 100644
index 000000000..001d0a3db
--- /dev/null
+++ b/view/templates/photos_default_uploader_box.tpl
@@ -0,0 +1,6 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<input id="photos-upload-choose" type="file" name="userfile" />
diff --git a/view/templates/photos_default_uploader_submit.tpl b/view/templates/photos_default_uploader_submit.tpl
new file mode 100644
index 000000000..87d065d6e
--- /dev/null
+++ b/view/templates/photos_default_uploader_submit.tpl
@@ -0,0 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="photos-upload-submit-wrapper" >
+	<input type="submit" name="submit" value="{{$submit}}" id="photos-upload-submit" />
+</div>
diff --git a/view/templates/photos_head.tpl b/view/templates/photos_head.tpl
new file mode 100644
index 000000000..b90fc92bb
--- /dev/null
+++ b/view/templates/photos_head.tpl
@@ -0,0 +1,31 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script>
+
+	var ispublic = "{{$ispublic}}";
+
+
+	$(document).ready(function() {
+
+		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
+			var selstr;
+			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
+				selstr = $(this).text();
+				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
+				$('#jot-public').hide();
+			});
+			if(selstr == null) { 
+				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
+				$('#jot-public').show();
+			}
+
+		}).trigger('change');
+
+	});
+
+</script>
+
diff --git a/view/templates/photos_recent.tpl b/view/templates/photos_recent.tpl
new file mode 100644
index 000000000..cb2411df3
--- /dev/null
+++ b/view/templates/photos_recent.tpl
@@ -0,0 +1,16 @@
+{{*
+ *	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/templates/photos_upload.tpl b/view/templates/photos_upload.tpl
new file mode 100644
index 000000000..f2e95a9b1
--- /dev/null
+++ b/view/templates/photos_upload.tpl
@@ -0,0 +1,54 @@
+{{*
+ *	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" >
+	<div id="photos-upload-new-wrapper" >
+		<div id="photos-upload-newalbum-div">
+			<label id="photos-upload-newalbum-text" for="photos-upload-newalbum" >{{$newalbum}}</label>
+		</div>
+		<input id="photos-upload-newalbum" type="text" name="newalbum" />
+	</div>
+	<div id="photos-upload-new-end"></div>
+	<div id="photos-upload-exist-wrapper">
+		<div id="photos-upload-existing-album-text">{{$existalbumtext}}</div>
+		<select id="photos-upload-album-select" name="album" size="4">
+		{{$albumselect}}
+		</select>
+	</div>
+	<div id="photos-upload-exist-end"></div>
+
+	<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
+		<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" />
+		<label id="photos-upload-noshare-text" for="photos-upload-noshare" >{{$nosharetext}}</label>
+	</div>
+
+
+	<div id="photos-upload-perms" class="photos-upload-perms" >
+		<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button popupbox" />
+		<span id="jot-perms-icon" class="icon {{$lockstate}}" ></span>{{$permissions}}
+		</a>
+	</div>
+	<div id="photos-upload-perms-end"></div>
+
+	<div style="display: none;">
+		<div id="photos-upload-permissions-wrapper">
+			{{$aclselect}}
+		</div>
+	</div>
+
+	<div id="photos-upload-spacer"></div>
+
+	{{$alt_uploader}}
+
+	{{$default_upload_box}}
+	{{$default_upload_submit}}
+
+	<div class="photos-upload-end" ></div>
+</form>
+
diff --git a/view/templates/poco_entry_xml.tpl b/view/templates/poco_entry_xml.tpl
new file mode 100644
index 000000000..d6e139cb5
--- /dev/null
+++ b/view/templates/poco_entry_xml.tpl
@@ -0,0 +1,12 @@
+{{*
+ *	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/templates/poco_xml.tpl b/view/templates/poco_xml.tpl
new file mode 100644
index 000000000..b8cd8fc08
--- /dev/null
+++ b/view/templates/poco_xml.tpl
@@ -0,0 +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>{{/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/templates/poke_content.tpl b/view/templates/poke_content.tpl
new file mode 100644
index 000000000..6235aca0c
--- /dev/null
+++ b/view/templates/poke_content.tpl
@@ -0,0 +1,37 @@
+{{*
+ *	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/templates/posted_date_widget.tpl b/view/templates/posted_date_widget.tpl
new file mode 100644
index 000000000..2f5838edb
--- /dev/null
+++ b/view/templates/posted_date_widget.tpl
@@ -0,0 +1,14 @@
+{{*
+ *	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/templates/profed_end.tpl b/view/templates/profed_end.tpl
new file mode 100644
index 000000000..a7fb96108
--- /dev/null
+++ b/view/templates/profed_end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/templates/profed_head.tpl b/view/templates/profed_head.tpl
new file mode 100644
index 000000000..52b934095
--- /dev/null
+++ b/view/templates/profed_head.tpl
@@ -0,0 +1,43 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script type="text/javascript" src="js/country.js" ></script>
+
+<script language="javascript" type="text/javascript"
+          src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+          <script language="javascript" type="text/javascript">
+
+
+tinyMCE.init({
+	theme : "advanced",
+	mode : "{{$editselect}}",
+	plugins : "bbcode,paste",
+	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
+	theme_advanced_buttons2 : "",
+	theme_advanced_buttons3 : "",
+	theme_advanced_toolbar_location : "top",
+	theme_advanced_toolbar_align : "center",
+	theme_advanced_blockformats : "blockquote,code",
+	gecko_spellcheck : true,
+	paste_text_sticky : true,
+	entity_encoding : "raw",
+	add_unload_trigger : false,
+	remove_linebreaks : false,
+	//force_p_newlines : false,
+	//force_br_newlines : true,
+	forced_root_block : 'div',
+	content_css: "{{$baseurl}}/view/custom_tinymce.css",
+	theme_advanced_path : false,
+	setup : function(ed) {
+		ed.onInit.add(function(ed) {
+            ed.pasteAsPlainText = true;
+        });
+    }
+
+});
+
+
+</script>
+
diff --git a/view/templates/profile-hide-friends.tpl b/view/templates/profile-hide-friends.tpl
new file mode 100644
index 000000000..6e3d395d0
--- /dev/null
+++ b/view/templates/profile-hide-friends.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<p id="hide-friends-text">
+{{$desc}}
+</p>
+
+		<div id="hide-friends-yes-wrapper">
+		<label id="hide-friends-yes-label" for="hide-friends-yes">{{$yes_str}}</label>
+		<input type="radio" name="hide-friends" id="hide-friends-yes" {{$yes_selected}} value="1" />
+
+		<div id="hide-friends-break" ></div>	
+		</div>
+		<div id="hide-friends-no-wrapper">
+		<label id="hide-friends-no-label" for="hide-friends-no">{{$no_str}}</label>
+		<input type="radio" name="hide-friends" id="hide-friends-no" {{$no_selected}} value="0"  />
+
+		<div id="hide-friends-end"></div>
+		</div>
diff --git a/view/templates/profile-hide-wall.tpl b/view/templates/profile-hide-wall.tpl
new file mode 100644
index 000000000..755908d17
--- /dev/null
+++ b/view/templates/profile-hide-wall.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<p id="hide-wall-text">
+{{$desc}}
+</p>
+
+		<div id="hide-wall-yes-wrapper">
+		<label id="hide-wall-yes-label" for="hide-wall-yes">{{$yes_str}}</label>
+		<input type="radio" name="hidewall" id="hide-wall-yes" {{$yes_selected}} value="1" />
+
+		<div id="hide-wall-break" ></div>	
+		</div>
+		<div id="hide-wall-no-wrapper">
+		<label id="hide-wall-no-label" for="hide-wall-no">{{$no_str}}</label>
+		<input type="radio" name="hidewall" id="hide-wall-no" {{$no_selected}} value="0"  />
+
+		<div id="hide-wall-end"></div>
+		</div>
diff --git a/view/templates/profile-in-directory.tpl b/view/templates/profile-in-directory.tpl
new file mode 100644
index 000000000..0efd1bf5c
--- /dev/null
+++ b/view/templates/profile-in-directory.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<p id="profile-in-directory">
+{{$desc}}
+</p>
+
+		<div id="profile-in-dir-yes-wrapper">
+		<label id="profile-in-dir-yes-label" for="profile-in-dir-yes">{{$yes_str}}</label>
+		<input type="radio" name="profile_in_directory" id="profile-in-dir-yes" {{$yes_selected}} value="1" />
+
+		<div id="profile-in-dir-break" ></div>	
+		</div>
+		<div id="profile-in-dir-no-wrapper">
+		<label id="profile-in-dir-no-label" for="profile-in-dir-no">{{$no_str}}</label>
+		<input type="radio" name="profile_in_directory" id="profile-in-dir-no" {{$no_selected}} value="0"  />
+
+		<div id="profile-in-dir-end"></div>
+		</div>
diff --git a/view/templates/profile-in-netdir.tpl b/view/templates/profile-in-netdir.tpl
new file mode 100644
index 000000000..b9cb456ea
--- /dev/null
+++ b/view/templates/profile-in-netdir.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<p id="profile-in-directory">
+{{$desc}}
+</p>
+
+		<div id="profile-in-netdir-yes-wrapper">
+		<label id="profile-in-netdir-yes-label" for="profile-in-netdir-yes">{{$yes_str}}</label>
+		<input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-yes" {{$yes_selected}} value="1" />
+
+		<div id="profile-in-netdir-break" ></div>	
+		</div>
+		<div id="profile-in-netdir-no-wrapper">
+		<label id="profile-in-netdir-no-label" for="profile-in-netdir-no">{{$no_str}}</label>
+		<input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-no" {{$no_selected}} value="0"  />
+
+		<div id="profile-in-netdir-end"></div>
+		</div>
diff --git a/view/templates/profile_advanced.tpl b/view/templates/profile_advanced.tpl
new file mode 100644
index 000000000..b9cc57931
--- /dev/null
+++ b/view/templates/profile_advanced.tpl
@@ -0,0 +1,175 @@
+{{*
+ *	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.pub_keywords}}
+<dl id="aprofile-tags" class="aprofile">
+ <dt>{{$profile.pub_keywords.0}}</dt>
+ <dd>{{$profile.pub_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/templates/profile_edit.tpl b/view/templates/profile_edit.tpl
new file mode 100644
index 000000000..4b7c4d0b1
--- /dev/null
+++ b/view/templates/profile_edit.tpl
@@ -0,0 +1,328 @@
+{{*
+ *	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-country-name-wrapper" >
+<label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$lbl_country}} </label>
+<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('{{$region}}');">
+<option selected="selected" >{{$country_name}}</option>
+<option>temp</option>
+</select>
+</div>
+<div id="profile-edit-country-name-end"></div>
+
+<div id="profile-edit-region-wrapper" >
+<label id="profile-edit-region-label" for="profile-edit-region" >{{$lbl_region}} </label>
+<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
+<option selected="selected" >{{$region}}</option>
+<option>temp</option>
+</select>
+</div>
+<div id="profile-edit-region-end"></div>
+
+<div id="profile-edit-hometown-wrapper" >
+<label id="profile-edit-hometown-label" for="profile-edit-hometown" >{{$lbl_hometown}} </label>
+<input type="text" size="32" name="hometown" id="profile-edit-hometown" value="{{$hometown}}" />
+</div>
+<div id="profile-edit-hometown-end"></div>
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+<div id="profile-edit-marital-wrapper" >
+<label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}} </label>
+{{$marital}}
+</div>
+<label id="profile-edit-with-label" for="profile-edit-with" > {{$lbl_with}} </label>
+<input type="text" size="32" name="with" id="profile-edit-with" title="{{$lbl_ex1}}" value="{{$with}}" />
+<label id="profile-edit-howlong-label" for="profile-edit-howlong" > {{$lbl_howlong}} </label>
+<input type="text" size="32" name="howlong" id="profile-edit-howlong" title="{{$lbl_howlong}}" value="{{$howlong}}" />
+
+<div id="profile-edit-marital-end"></div>
+
+<div id="profile-edit-sexual-wrapper" >
+<label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}} </label>
+{{$sexual}}
+</div>
+<div id="profile-edit-sexual-end"></div>
+
+
+
+<div id="profile-edit-homepage-wrapper" >
+<label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$lbl_homepage}} </label>
+<input type="text" size="32" name="homepage" id="profile-edit-homepage" value="{{$homepage}}" />
+</div>
+<div id="profile-edit-homepage-end"></div>
+
+<div id="profile-edit-politic-wrapper" >
+<label id="profile-edit-politic-label" for="profile-edit-politic" >{{$lbl_politic}} </label>
+<input type="text" size="32" name="politic" id="profile-edit-politic" value="{{$politic}}" />
+</div>
+<div id="profile-edit-politic-end"></div>
+
+<div id="profile-edit-religion-wrapper" >
+<label id="profile-edit-religion-label" for="profile-edit-religion" >{{$lbl_religion}} </label>
+<input type="text" size="32" name="religion" id="profile-edit-religion" value="{{$religion}}" />
+</div>
+<div id="profile-edit-religion-end"></div>
+
+<div id="profile-edit-pubkeywords-wrapper" >
+<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$lbl_pubkey}} </label>
+<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords}}" />
+</div><div id="profile-edit-pubkeywords-desc">{{$lbl_pubdsc}}</div>
+<div id="profile-edit-pubkeywords-end"></div>
+
+<div id="profile-edit-prvkeywords-wrapper" >
+<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >{{$lbl_prvkey}} </label>
+<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords}}" />
+</div><div id="profile-edit-prvkeywords-desc">{{$lbl_prvdsc}}</div>
+<div id="profile-edit-prvkeywords-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+<div id="about-jot-wrapper" >
+<p id="about-jot-desc" >
+{{$lbl_about}}
+</p>
+
+<textarea rows="10" cols="72" id="profile-about-text" name="about" >{{$about}}</textarea>
+
+</div>
+<div id="about-jot-end"></div>
+
+
+<div id="interest-jot-wrapper" >
+<p id="interest-jot-desc" >
+{{$lbl_hobbies}}
+</p>
+
+<textarea rows="10" cols="72" id="interest-jot-text" name="interest" >{{$interest}}</textarea>
+
+</div>
+<div id="interest-jot-end"></div>
+
+
+<div id="likes-jot-wrapper" >
+<p id="likes-jot-desc" >
+{{$lbl_likes}}
+</p>
+
+<textarea rows="10" cols="72" id="likes-jot-text" name="likes" >{{$likes}}</textarea>
+
+</div>
+<div id="likes-jot-end"></div>
+
+
+<div id="dislikes-jot-wrapper" >
+<p id="dislikes-jot-desc" >
+{{$lbl_dislikes}}
+</p>
+
+<textarea rows="10" cols="72" id="dislikes-jot-text" name="dislikes" >{{$dislikes}}</textarea>
+
+</div>
+<div id="dislikes-jot-end"></div>
+
+
+<div id="contact-jot-wrapper" >
+<p id="contact-jot-desc" >
+{{$lbl_social}}
+</p>
+
+<textarea rows="10" cols="72" id="contact-jot-text" name="contact" >{{$contact}}</textarea>
+
+</div>
+<div id="contact-jot-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="music-jot-wrapper" >
+<p id="music-jot-desc" >
+{{$lbl_music}}
+</p>
+
+<textarea rows="10" cols="72" id="music-jot-text" name="music" >{{$music}}</textarea>
+
+</div>
+<div id="music-jot-end"></div>
+
+<div id="book-jot-wrapper" >
+<p id="book-jot-desc" >
+{{$lbl_book}}
+</p>
+
+<textarea rows="10" cols="72" id="book-jot-text" name="book" >{{$book}}</textarea>
+
+</div>
+<div id="book-jot-end"></div>
+
+
+
+<div id="tv-jot-wrapper" >
+<p id="tv-jot-desc" >
+{{$lbl_tv}} 
+</p>
+
+<textarea rows="10" cols="72" id="tv-jot-text" name="tv" >{{$tv}}</textarea>
+
+</div>
+<div id="tv-jot-end"></div>
+
+
+
+<div id="film-jot-wrapper" >
+<p id="film-jot-desc" >
+{{$lbl_film}}
+</p>
+
+<textarea rows="10" cols="72" id="film-jot-text" name="film" >{{$film}}</textarea>
+
+</div>
+<div id="film-jot-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="romance-jot-wrapper" >
+<p id="romance-jot-desc" >
+{{$lbl_love}}
+</p>
+
+<textarea rows="10" cols="72" id="romance-jot-text" name="romance" >{{$romance}}</textarea>
+
+</div>
+<div id="romance-jot-end"></div>
+
+
+
+<div id="work-jot-wrapper" >
+<p id="work-jot-desc" >
+{{$lbl_work}}
+</p>
+
+<textarea rows="10" cols="72" id="work-jot-text" name="work" >{{$work}}</textarea>
+
+</div>
+<div id="work-jot-end"></div>
+
+
+
+<div id="education-jot-wrapper" >
+<p id="education-jot-desc" >
+{{$lbl_school}} 
+</p>
+
+<textarea rows="10" cols="72" id="education-jot-text" name="education" >{{$education}}</textarea>
+
+</div>
+<div id="education-jot-end"></div>
+
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+</form>
+</div>
+<script type="text/javascript">Fill_Country('{{$country_name}}');Fill_States('{{$region}}');</script>
diff --git a/view/templates/profile_edlink.tpl b/view/templates/profile_edlink.tpl
new file mode 100644
index 000000000..9424bcc3d
--- /dev/null
+++ b/view/templates/profile_edlink.tpl
@@ -0,0 +1,7 @@
+{{*
+ *	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/templates/profile_entry.tpl b/view/templates/profile_entry.tpl
new file mode 100644
index 000000000..4774fd11b
--- /dev/null
+++ b/view/templates/profile_entry.tpl
@@ -0,0 +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>
+</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/templates/profile_listing_header.tpl b/view/templates/profile_listing_header.tpl
new file mode 100644
index 000000000..f77bdcc80
--- /dev/null
+++ b/view/templates/profile_listing_header.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	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/templates/profile_photo.tpl b/view/templates/profile_photo.tpl
new file mode 100644
index 000000000..8a278cdfe
--- /dev/null
+++ b/view/templates/profile_photo.tpl
@@ -0,0 +1,31 @@
+{{*
+ *	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" for="profile-photo-upload">{{$lbl_upfile}} </label>
+<input name="userfile" type="file" id="profile-photo-upload" size="48" />
+</div>
+
+<label id="profile-photo-profiles-label" for="profile-photo-profiles">{{$lbl_profiles}} </label>
+<select name="profile" id="profile-photo-profiles" />
+{{foreach $profiles as $p}}
+<option value="{{$p.id}}" {{if $p.default}}selected="selected"{{/if}}>{{$p.name}}</option>
+{{/foreach}}
+</select>
+
+<div id="profile-photo-submit-wrapper">
+<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}">
+</div>
+
+</form>
+
+<div id="profile-photo-link-select-wrapper">
+{{$select}}
+</div>
\ No newline at end of file
diff --git a/view/templates/profile_publish.tpl b/view/templates/profile_publish.tpl
new file mode 100644
index 000000000..1dc9eb7fc
--- /dev/null
+++ b/view/templates/profile_publish.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<p id="profile-publish-desc-{{$instance}}">
+{{$pubdesc}}
+</p>
+
+		<div id="profile-publish-yes-wrapper-{{$instance}}">
+		<label id="profile-publish-yes-label-{{$instance}}" for="profile-publish-yes-{{$instance}}">{{$str_yes}}</label>
+		<input type="radio" name="profile_publish_{{$instance}}" id="profile-publish-yes-{{$instance}}" {{$yes_selected}} value="1" />
+
+		<div id="profile-publish-break-{{$instance}}" ></div>	
+		</div>
+		<div id="profile-publish-no-wrapper-{{$instance}}">
+		<label id="profile-publish-no-label-{{$instance}}" for="profile-publish-no-{{$instance}}">{{$str_no}}</label>
+		<input type="radio" name="profile_publish_{{$instance}}" id="profile-publish-no-{{$instance}}" {{$no_selected}} value="0"  />
+
+		<div id="profile-publish-end-{{$instance}}"></div>
+		</div>
diff --git a/view/templates/profile_vcard.tpl b/view/templates/profile_vcard.tpl
new file mode 100644
index 000000000..3f4d3c711
--- /dev/null
+++ b/view/templates/profile_vcard.tpl
@@ -0,0 +1,55 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="vcard">
+
+	<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 $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/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}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
+
+	{{include file="diaspora_vcard.tpl"}}
+	
+	<div id="profile-extra-links">
+		<ul>
+			{{if $connect}}
+				<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
+			{{/if}}
+			{{if $wallmessage}}
+				<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
+			{{/if}}
+		</ul>
+	</div>
+</div>
+
+{{$contact_block}}
+
+
diff --git a/view/templates/prv_message.tpl b/view/templates/prv_message.tpl
new file mode 100644
index 000000000..83cf7e99c
--- /dev/null
+++ b/view/templates/prv_message.tpl
@@ -0,0 +1,38 @@
+{{*
+ *	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>
+{{$select}}
+
+<div id="prvmail-subject-label">{{$subject}}</div>
+<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
+
+<div id="prvmail-message-label">{{$yourmessage}}</div>
+<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
+
+
+<div id="prvmail-submit-wrapper" >
+	<input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" />
+	<div id="prvmail-upload-wrapper" >
+		<div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
+	</div> 
+	<div id="prvmail-link-wrapper" >
+		<div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
+	</div> 
+	<div id="prvmail-rotator-wrapper" >
+		<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+	</div> 
+</div>
+<div id="prvmail-end"></div>
+</form>
+</div>
diff --git a/view/templates/pwdreset.tpl b/view/templates/pwdreset.tpl
new file mode 100644
index 000000000..e86e1227f
--- /dev/null
+++ b/view/templates/pwdreset.tpl
@@ -0,0 +1,22 @@
+{{*
+ *	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/templates/register.tpl b/view/templates/register.tpl
new file mode 100644
index 000000000..5e655cd82
--- /dev/null
+++ b/view/templates/register.tpl
@@ -0,0 +1,70 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$regtitle}}</h3>
+
+<form action="register" method="post" id="register-form">
+
+	<input type="hidden" name="photo" value="{{$photo}}" />
+
+	{{$registertext}}
+
+	<p id="register-realpeople">{{$realpeople}}</p>
+
+	<p id="register-fill-desc">{{$fillwith}}</p>
+	<p id="register-fill-ext">{{$fillext}}</p>
+
+{{if $oidlabel}}
+	<div id="register-openid-wrapper" >
+    	<label for="register-openid" id="label-register-openid" >{{$oidlabel}}</label><input 	type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="{{$openid}}" >
+	</div>
+	<div id="register-openid-end" ></div>
+{{/if}}
+
+{{if $invitations}}
+
+	<p id="register-invite-desc">{{$invite_desc}}</p>
+	<div id="register-invite-wrapper" >
+		<label for="register-invite" id="label-register-invite" >{{$invite_label}}</label>
+		<input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" value="{{$invite_id}}" >
+	</div>
+	<div id="register-name-end" ></div>
+
+{{/if}}
+
+
+	<div id="register-name-wrapper" >
+		<label for="register-name" id="label-register-name" >{{$namelabel}}</label>
+		<input type="text" maxlength="60" size="32" name="username" id="register-name" value="{{$username}}" >
+	</div>
+	<div id="register-name-end" ></div>
+
+
+	<div id="register-email-wrapper" >
+		<label for="register-email" id="label-register-email" >{{$addrlabel}}</label>
+		<input type="text" maxlength="60" size="32" name="email" id="register-email" value="{{$email}}" >
+	</div>
+	<div id="register-email-end" ></div>
+
+	<p id="register-nickname-desc" >{{$nickdesc}}</p>
+
+	<div id="register-nickname-wrapper" >
+		<label for="register-nickname" id="label-register-nickname" >{{$nicklabel}}</label>
+		<input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" value="{{$nickname}}" ><div id="register-sitename">@{{$sitename}}</div>
+	</div>
+	<div id="register-nickname-end" ></div>
+
+	{{$publish}}
+
+	<div id="register-submit-wrapper">
+		<input type="submit" name="submit" id="register-submit-button" value="{{$regbutt}}" />
+	</div>
+	<div id="register-submit-end" ></div>
+    
+</form>
+
+{{$license}}
+
+
diff --git a/view/templates/remote_friends_common.tpl b/view/templates/remote_friends_common.tpl
new file mode 100644
index 000000000..5844aac87
--- /dev/null
+++ b/view/templates/remote_friends_common.tpl
@@ -0,0 +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/rem/{{$uid}}/{{$cid}}">{{$more}}</a>{{/if}}</div>
+	{{if $items}}
+	{{foreach $items as $item}}
+	<div class="profile-match-wrapper">
+		<div class="profile-match-photo">
+			<a href="{{$item.url}}">
+				<img src="{{$item.photo}}" width="80" height="80" alt="{{$item.name}}" title="{{$item.name}}" />
+			</a>
+		</div>
+		<div class="profile-match-break"></div>
+		<div class="profile-match-name">
+			<a href="{{$itemurl}}" title="{{$item.name}}">{{$item.name}}</a>
+		</div>
+		<div class="profile-match-end"></div>
+	</div>
+	{{/foreach}}
+	{{/if}}
+	<div id="rfic-end" class="clear"></div>
+</div>
+
diff --git a/view/templates/removeme.tpl b/view/templates/removeme.tpl
new file mode 100644
index 000000000..3fe12a223
--- /dev/null
+++ b/view/templates/removeme.tpl
@@ -0,0 +1,25 @@
+{{*
+ *	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/templates/saved_searches_aside.tpl b/view/templates/saved_searches_aside.tpl
new file mode 100644
index 000000000..0685eda7e
--- /dev/null
+++ b/view/templates/saved_searches_aside.tpl
@@ -0,0 +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}}
+	
+	<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.term}}</a>
+		</li>
+		{{/foreach}}
+	</ul>
+	<div class="clear"></div>
+</div>
diff --git a/view/templates/search_item.tpl b/view/templates/search_item.tpl
new file mode 100644
index 000000000..c6b9cc7dc
--- /dev/null
+++ b/view/templates/search_item.tpl
@@ -0,0 +1,69 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<a name="{{$item.id}}" ></a>
+<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
+	<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" >
+		<div class="wall-item-info" id="wall-item-info-{{$item.id}}">
+			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$item.id}}" 
+				 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
+				 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
+				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+				<div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+					<ul>
+						{{$item.item_photo_menu}}
+					</ul>
+				</div>
+			</div>
+			<div class="wall-item-photo-end"></div>	
+			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
+				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
+				{{else}}<div class="wall-item-lock"></div>{{/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}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}">{{$item.ago}}</div>
+				
+		</div>			
+		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			<div class="wall-item-title-end"></div>
+			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
+			{{if $item.has_cats}}
+			<div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}} {{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}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}}{{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+		</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.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-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>
+
+
diff --git a/view/templates/settings-end.tpl b/view/templates/settings-end.tpl
new file mode 100644
index 000000000..a7fb96108
--- /dev/null
+++ b/view/templates/settings-end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/templates/settings-head.tpl b/view/templates/settings-head.tpl
new file mode 100644
index 000000000..218240839
--- /dev/null
+++ b/view/templates/settings-head.tpl
@@ -0,0 +1,30 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script>
+	var ispublic = "{{$ispublic}}";
+
+
+	$(document).ready(function() {
+
+		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
+			var selstr;
+			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
+				selstr = $(this).text();
+				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
+				$('#jot-public').hide();
+			});
+			if(selstr == null) { 
+				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
+				$('#jot-public').show();
+			}
+
+		}).trigger('change');
+
+	});
+
+</script>
+
diff --git a/view/templates/settings.tpl b/view/templates/settings.tpl
new file mode 100644
index 000000000..2ab4bd466
--- /dev/null
+++ b/view/templates/settings.tpl
@@ -0,0 +1,152 @@
+{{*
+ *	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_pass}}</h3>
+
+{{include file="field_password.tpl" field=$password1}}
+{{include file="field_password.tpl" field=$password2}}
+{{include file="field_password.tpl" field=$password3}}
+
+{{if $oid_enable}}
+{{include file="field_input.tpl" field=$openid}}
+{{/if}}
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+</div>
+
+
+<h3 class="settings-heading">{{$h_basic}}</h3>
+
+{{include file="field_input.tpl" field=$username}}
+{{include file="field_input.tpl" field=$email}}
+{{include file="field_password.tpl" field=$password4}}
+{{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>
+
+
+<input type="hidden" name="visibility" value="{{$visibility}}" />
+
+{{include file="field_input.tpl" field=$maxreq}}
+
+{{$profile_in_dir}}
+
+{{$profile_in_net_dir}}
+
+{{$hide_friends}}
+
+{{$hide_wall}}
+
+{{$blockwall}}
+
+{{$blocktags}}
+
+{{$suggestme}}
+
+{{$unkmail}}
+
+
+{{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.notes}}
+			{{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>
+
+
+<h3 class="settings-heading">{{$h_advn}}</h3>
+<div id="settings-pagetype-desc">{{$h_descadvn}}</div>
+
+{{$pagetype}}
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+</div>
+
+
diff --git a/view/templates/settings_addons.tpl b/view/templates/settings_addons.tpl
new file mode 100644
index 000000000..52b71f1db
--- /dev/null
+++ b/view/templates/settings_addons.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$title}}</h1>
+
+
+<form action="settings/addon" method="post" autocomplete="off">
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+{{$settings_addons}}
+
+</form>
+
diff --git a/view/templates/settings_connectors.tpl b/view/templates/settings_connectors.tpl
new file mode 100644
index 000000000..0b0d78299
--- /dev/null
+++ b/view/templates/settings_connectors.tpl
@@ -0,0 +1,40 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h1>{{$title}}</h1>
+
+<div class="connector_statusmsg">{{$diasp_enabled}}</div>
+<div class="connector_statusmsg">{{$ostat_enabled}}</div>
+
+<form action="settings/connectors" method="post" autocomplete="off">
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+{{$settings_connectors}}
+
+{{if $mail_disabled}}
+
+{{else}}
+	<div class="settings-block">
+	<h3 class="settings-heading">{{$h_imap}}</h3>
+	<p>{{$imap_desc}}</p>
+	{{include file="field_custom.tpl" field=$imap_lastcheck}}
+	{{include file="field_input.tpl" field=$mail_server}}
+	{{include file="field_input.tpl" field=$mail_port}}
+	{{include file="field_select.tpl" field=$mail_ssl}}
+	{{include file="field_input.tpl" field=$mail_user}}
+	{{include file="field_password.tpl" field=$mail_pass}}
+	{{include file="field_input.tpl" field=$mail_replyto}}
+	{{include file="field_checkbox.tpl" field=$mail_pubmail}}
+	{{include file="field_select.tpl" field=$mail_action}}
+	{{include file="field_input.tpl" field=$mail_movetofolder}}
+
+	<div class="settings-submit-wrapper" >
+		<input type="submit" id="imap-submit" name="imap-submit" class="settings-submit" value="{{$submit}}" />
+	</div>
+	</div>
+{{/if}}
+
+</form>
+
diff --git a/view/templates/settings_display.tpl b/view/templates/settings_display.tpl
new file mode 100644
index 000000000..a8826aada
--- /dev/null
+++ b/view/templates/settings_display.tpl
@@ -0,0 +1,27 @@
+{{*
+ *	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_network}}
+{{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/templates/settings_display_end.tpl b/view/templates/settings_display_end.tpl
new file mode 100644
index 000000000..a7fb96108
--- /dev/null
+++ b/view/templates/settings_display_end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/templates/settings_features.tpl b/view/templates/settings_features.tpl
new file mode 100644
index 000000000..f5c5c5096
--- /dev/null
+++ b/view/templates/settings_features.tpl
@@ -0,0 +1,25 @@
+{{*
+ *	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.tpl" 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/templates/settings_nick_set.tpl b/view/templates/settings_nick_set.tpl
new file mode 100644
index 000000000..fb886695e
--- /dev/null
+++ b/view/templates/settings_nick_set.tpl
@@ -0,0 +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>
+<div id="settings-nick-end" ></div>
diff --git a/view/templates/settings_nick_subdir.tpl b/view/templates/settings_nick_subdir.tpl
new file mode 100644
index 000000000..874185db5
--- /dev/null
+++ b/view/templates/settings_nick_subdir.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<p>
+It appears that your website is located in a subdirectory of the<br />
+{{$hostname}} website, so this setting may not work reliably.<br />
+</p>
+<p>If you have any issues, you may have better results using the profile<br /> address '<strong>{{$baseurl}}/profile/{{$nickname}}</strong>'.
+</p>
\ No newline at end of file
diff --git a/view/templates/settings_oauth.tpl b/view/templates/settings_oauth.tpl
new file mode 100644
index 000000000..feab78210
--- /dev/null
+++ b/view/templates/settings_oauth.tpl
@@ -0,0 +1,36 @@
+{{*
+ *	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/templates/settings_oauth_edit.tpl b/view/templates/settings_oauth_edit.tpl
new file mode 100644
index 000000000..e3960bf75
--- /dev/null
+++ b/view/templates/settings_oauth_edit.tpl
@@ -0,0 +1,22 @@
+{{*
+ *	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/templates/suggest_friends.tpl b/view/templates/suggest_friends.tpl
new file mode 100644
index 000000000..060db0005
--- /dev/null
+++ b/view/templates/suggest_friends.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="profile-match-wrapper">
+	<a href="{{$ignlnk}}" title="{{$ignore}}" class="icon drophide profile-match-ignore" onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" ></a>
+	<div class="profile-match-photo">
+		<a href="{{$url}}">
+			<img src="{{$photo}}" alt="{{$name}}" width="80" height="80" title="{{$name}} [{{$url}}]" />
+		</a>
+	</div>
+	<div class="profile-match-break"></div>
+	<div class="profile-match-name">
+		<a href="{{$url}}" title="{{$name}}">{{$name}}</a>
+	</div>
+	<div class="profile-match-end"></div>
+	{{if $connlnk}}
+	<div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}">{{$conntxt}}</a></div>
+	{{/if}}
+</div>
\ No newline at end of file
diff --git a/view/templates/suggestions.tpl b/view/templates/suggestions.tpl
new file mode 100644
index 000000000..b4f0cbbe5
--- /dev/null
+++ b/view/templates/suggestions.tpl
@@ -0,0 +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>
+<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/templates/tag_slap.tpl b/view/templates/tag_slap.tpl
new file mode 100644
index 000000000..6d1bd01d6
--- /dev/null
+++ b/view/templates/tag_slap.tpl
@@ -0,0 +1,35 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	<entry>
+		<author>
+			<name>{{$name}}</name>
+			<uri>{{$profile_page}}</uri>
+			<link rel="photo"  type="image/jpeg" media:width="80" media:height="80" href="{{$thumb}}" />
+			<link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="{{$thumb}}" />
+		</author>
+
+		<id>{{$item_id}}</id>
+		<title>{{$title}}</title>
+		<published>{{$published}}</published>
+		<content type="{{$type}}" >{{$content}}</content>
+		<link rel="mentioned" href="{{$accturi}}" />
+		<as:actor>
+		<as:object-type>http://activitystrea.ms/schema/1.0/person</as:object-type>
+		<id>{{$profile_page}}</id>
+		<title></title>
+ 		<link rel="avatar" type="image/jpeg" media:width="175" media:height="175" href="{{$photo}}"/>
+		<link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="{{$thumb}}"/>
+		<poco:preferredUsername>{{$nick}}</poco:preferredUsername>
+		<poco:displayName>{{$name}}</poco:displayName>
+		</as:actor>
+ 		<as:verb>{{$verb}}</as:verb>
+		<as:object>
+		<as:object-type></as:object-type>
+		</as:object>
+		<as:target>
+		<as:object-type></as:object-type>
+		</as:target>
+	</entry>
diff --git a/view/templates/threaded_conversation.tpl b/view/templates/threaded_conversation.tpl
new file mode 100644
index 000000000..bcdcf6e7b
--- /dev/null
+++ b/view/templates/threaded_conversation.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$live_update}}
+
+{{foreach $threads as $thread}}
+{{include file="{{$thread.template}}" item=$thread}}
+{{/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>
+<img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
+<div id="item-delete-selected-end"></div>
+{{/if}}
diff --git a/view/templates/toggle_mobile_footer.tpl b/view/templates/toggle_mobile_footer.tpl
new file mode 100644
index 000000000..008d69663
--- /dev/null
+++ b/view/templates/toggle_mobile_footer.tpl
@@ -0,0 +1,7 @@
+{{*
+ *	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/templates/uexport.tpl b/view/templates/uexport.tpl
new file mode 100644
index 000000000..1d9362d72
--- /dev/null
+++ b/view/templates/uexport.tpl
@@ -0,0 +1,14 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$title}}</h3>
+
+
+{{foreach $options as $o}}
+<dl>
+    <dt><a href="{{$baseurl}}/{{$o.0}}">{{$o.1}}</a></dt>
+    <dd>{{$o.2}}</dd>
+</dl>
+{{/foreach}}
\ No newline at end of file
diff --git a/view/templates/uimport.tpl b/view/templates/uimport.tpl
new file mode 100644
index 000000000..cc137514a
--- /dev/null
+++ b/view/templates/uimport.tpl
@@ -0,0 +1,18 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<form action="uimport" method="post" id="uimport-form" enctype="multipart/form-data">
+<h1>{{$import.title}}</h1>
+    <p>{{$import.intro}}</p>
+    <p>{{$import.instruct}}</p>
+    <p><b>{{$import.warn}}</b></p>
+     {{include file="field_custom.tpl" field=$import.field}}
+     
+     
+	<div id="register-submit-wrapper">
+		<input type="submit" name="submit" id="register-submit-button" value="{{$regbutt}}" />
+	</div>
+	<div id="register-submit-end" ></div>    
+</form>
diff --git a/view/templates/vcard-widget.tpl b/view/templates/vcard-widget.tpl
new file mode 100644
index 000000000..6ccd2ae1d
--- /dev/null
+++ b/view/templates/vcard-widget.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	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="photo" style="width: 175px; height: 175px;" src="{{$photo}}" alt="{{$name}}" /></div>
+	</div>
+
diff --git a/view/templates/viewcontact_template.tpl b/view/templates/viewcontact_template.tpl
new file mode 100644
index 000000000..a9837c7f9
--- /dev/null
+++ b/view/templates/viewcontact_template.tpl
@@ -0,0 +1,14 @@
+{{*
+ *	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/templates/voting_fakelink.tpl b/view/templates/voting_fakelink.tpl
new file mode 100644
index 000000000..3d14ba48b
--- /dev/null
+++ b/view/templates/voting_fakelink.tpl
@@ -0,0 +1,6 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$phrase}}
diff --git a/view/templates/wall_thread.tpl b/view/templates/wall_thread.tpl
new file mode 100644
index 000000000..c0e30c4cb
--- /dev/null
+++ b/view/templates/wall_thread.tpl
@@ -0,0 +1,125 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{if $item.comment_firstcollapsed}}
+	<div class="hide-comments-outer">
+	<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> <span id="hide-comments-{{$item.id}}" class="hide-comments fakelink" onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
+	</div>
+	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
+{{/if}}
+<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
+<a name="{{$item.id}}" ></a>
+<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" >
+	<div class="wall-item-content-wrapper {{$item.indent}} {{$item.shiny}}" id="wall-item-content-wrapper-{{$item.id}}" >
+		<div class="wall-item-info{{if $item.owner_url}} wallwall{{/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}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
+				<img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" /></a>
+			</div>
+			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
+			{{/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}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
+				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+                <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+                    <ul>
+                        {{$item.item_photo_menu}}
+                    </ul>
+                </div>
+
+			</div>
+			<div class="wall-item-photo-end"></div>
+			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
+				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
+				{{else}}<div class="wall-item-lock"></div>{{/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}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}{{/if}}<br />
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}">{{$item.ago}}</div>				
+		</div>			
+		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			<div class="wall-item-title-end"></div>
+			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}
+					<div class="body-tag">
+						{{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}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}} {{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}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}}{{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+			</div>
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
+			{{if $item.vote}}
+			<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$item.id}}">
+				<a href="#" class="icon like" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></a>
+				{{if $item.vote.dislike}}<a href="#" class="icon dislike" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>{{/if}}
+				{{if $item.vote.share}}<a href="#" class="icon recycle wall-item-share-buttons" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>{{/if}}
+				<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+			</div>
+			{{/if}}
+			{{if $item.plink}}
+				<div class="wall-item-links-wrapper"><a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="icon remote-link{{$item.sparkle}}"></a></div>
+			{{/if}}
+			{{if $item.edpost}}
+				<a class="editpost icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
+			{{/if}}
+			 
+			{{if $item.star}}
+			<a href="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}"></a>
+			{{/if}}
+			{{if $item.tagger}}
+			<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon tagged" title="{{$item.tagger.add}}"></a>
+			{{/if}}
+			{{if $item.filer}}
+			<a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"></a>
+			{{/if}}			
+			
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
+			</div>
+				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
+			<div class="wall-item-delete-end"></div>
+		</div>
+	</div>	
+	<div class="wall-item-wrapper-end"></div>
+	<div class="wall-item-like {{$item.indent}}" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
+	<div class="wall-item-dislike {{$item.indent}}" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
+
+			{{if $item.threaded}}
+			{{if $item.comment}}
+			<div class="wall-item-comment-wrapper {{$item.indent}}" >
+				{{$item.comment}}
+			</div>
+			{{/if}}
+			{{/if}}
+
+<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
+</div>
+{{foreach $item.children as $child}}
+	{{include file="{{$child.template}}" item=$child}}
+{{/foreach}}
+
+{{if $item.flatten}}
+<div class="wall-item-comment-wrapper" >
+	{{$item.comment}}
+</div>
+{{/if}}
+</div>
+{{if $item.comment_lastcollapsed}}</div>{{/if}}
diff --git a/view/templates/wallmessage.tpl b/view/templates/wallmessage.tpl
new file mode 100644
index 000000000..6eeabe9ed
--- /dev/null
+++ b/view/templates/wallmessage.tpl
@@ -0,0 +1,37 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h3>{{$header}}</h3>
+
+<h4>{{$subheader}}</h4>
+
+<div id="prvmail-wrapper" >
+<form id="prvmail-form" action="wallmessage/{{$nickname}}" method="post" >
+
+{{$parent}}
+
+<div id="prvmail-to-label">{{$to}}</div>
+{{$recipname}}
+
+<div id="prvmail-subject-label">{{$subject}}</div>
+<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
+
+<div id="prvmail-message-label">{{$yourmessage}}</div>
+<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
+
+
+<div id="prvmail-submit-wrapper" >
+	<input type="submit" id="prvmail-submit" name="submit" value="Submit" tabindex="13" />
+	<div id="prvmail-link-wrapper" >
+		<div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
+	</div> 
+	<div id="prvmail-rotator-wrapper" >
+		<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+	</div> 
+</div>
+<div id="prvmail-end"></div>
+</form>
+</div>
diff --git a/view/templates/wallmsg-end.tpl b/view/templates/wallmsg-end.tpl
new file mode 100644
index 000000000..a7fb96108
--- /dev/null
+++ b/view/templates/wallmsg-end.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/templates/wallmsg-header.tpl b/view/templates/wallmsg-header.tpl
new file mode 100644
index 000000000..8a8ccf00c
--- /dev/null
+++ b/view/templates/wallmsg-header.tpl
@@ -0,0 +1,87 @@
+{{*
+ *	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 : 'div',
+		convert_urls: false,
+		content_css: "{{$baseurl}}/view/custom_tinymce.css",
+		     //Character count
+		theme_advanced_path : false,
+		setup : function(ed) {
+			ed.onInit.add(function(ed) {
+				ed.pasteAsPlainText = true;
+				var editorId = ed.editorId;
+				var textarea = $('#'+editorId);
+				if (typeof(textarea.attr('tabindex')) != "undefined") {
+					$('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
+					textarea.attr('tabindex', null);
+				}
+			});
+		}
+	});
+}
+else
+	$("#prvmail-text").contact_autocomplete(baseurl+"/acl");
+
+
+</script>
+<script>
+
+	function jotGetLink() {
+		reply = prompt("{{$linkurl}}");
+		if(reply && reply.length) {
+			$('#profile-rotator').show();
+			$.get('parse_url?url=' + reply, function(data) {
+				tinyMCE.execCommand('mceInsertRawHTML',false,data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+	function linkdropper(event) {
+		var linkFound = event.dataTransfer.types.contains("text/uri-list");
+		if(linkFound)
+			event.preventDefault();
+	}
+
+	function linkdrop(event) {
+		var reply = event.dataTransfer.getData("text/uri-list");
+		event.target.textContent = reply;
+		event.preventDefault();
+		if(reply && reply.length) {
+			$('#profile-rotator').show();
+			$.get('parse_url?url=' + reply, function(data) {
+				tinyMCE.execCommand('mceInsertRawHTML',false,data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+</script>
+
diff --git a/view/templates/xrd_diaspora.tpl b/view/templates/xrd_diaspora.tpl
new file mode 100644
index 000000000..143980bcc
--- /dev/null
+++ b/view/templates/xrd_diaspora.tpl
@@ -0,0 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	<Link rel="http://joindiaspora.com/seed_location" type="text/html" href="{{$baseurl}}/" />
+	<Link rel="http://joindiaspora.com/guid" type="text/html" href="{{$dspr_guid}}" />
+	<Link rel="diaspora-public-key" type="RSA" href="{{$dspr_key}}" />
diff --git a/view/templates/xrd_host.tpl b/view/templates/xrd_host.tpl
new file mode 100644
index 000000000..1f273e010
--- /dev/null
+++ b/view/templates/xrd_host.tpl
@@ -0,0 +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>
+ 
+    <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/templates/xrd_person.tpl b/view/templates/xrd_person.tpl
new file mode 100644
index 000000000..3f12eff51
--- /dev/null
+++ b/view/templates/xrd_person.tpl
@@ -0,0 +1,43 @@
+{{*
+ *	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}}" />
+	{{$dspr}}
+    <Link rel="salmon" 
+          href="{{$salmon}}" />
+    <Link rel="http://salmon-protocol.org/ns/salmon-replies" 
+          href="{{$salmon}}" />
+    <Link rel="http://salmon-protocol.org/ns/salmon-mention" 
+          href="{{$salmen}}" />
+    <Link rel="magic-public-key" 
+          href="{{$modexp}}" />
+ 
+	<Property xmlns:mk="http://salmon-protocol.org/ns/magic-key"
+          type="http://salmon-protocol.org/ns/magic-key"
+          mk:key_id="1">{{$bigkey}}</Property>
+
+</XRD>
diff --git a/view/theme/cleanzero/templates/nav.tpl b/view/theme/cleanzero/templates/nav.tpl
new file mode 100644
index 000000000..437c7e595
--- /dev/null
+++ b/view/theme/cleanzero/templates/nav.tpl
@@ -0,0 +1,90 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+ <nav>
+	{{$langselector}}
+
+	<div id="site-location">{{$sitelocation}}</div>
+
+
+	<span id="nav-commlink-wrapper">
+
+	{{if $nav.register}}<a id="nav-register-link" class="nav-commlink {{$nav.register.2}} {{$sel.register}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a>{{/if}}
+		
+
+
+	{{if $nav.network}}
+	<a id="nav-network-link" class="nav-commlink {{$nav.network.2}} {{$sel.network}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
+	<span id="net-update" class="nav-ajax-left"></span>
+	{{/if}}
+	{{if $nav.home}}
+	<a id="nav-home-link" class="nav-commlink {{$nav.home.2}} {{$sel.home}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a>
+	<span id="home-update" class="nav-ajax-left"></span>
+	{{/if}}
+	{{if $nav.community}}
+	<a id="nav-community-link" class="nav-commlink {{$nav.community.2}} {{$sel.community}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
+	{{/if}}
+	{{if $nav.introductions}}
+	<a id="nav-notify-link" class="nav-commlink {{$nav.introductions.2}} {{$sel.introductions}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a>
+	<span id="intro-update" class="nav-ajax-left"></span>
+	{{/if}}
+	{{if $nav.messages}}
+	<a id="nav-messages-link" class="nav-commlink {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>
+	<span id="mail-update" class="nav-ajax-left"></span>
+	{{/if}}
+		{{if $nav.notifications}}
+			<a id="nav-notifications-linkmenu" class="nav-commlink" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a>
+				<span id="notify-update" class="nav-ajax-left"></span>
+				<ul id="nav-notifications-menu" class="menu-popup">
+					<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
+					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
+					<li class="empty">{{$emptynotifications}}</li>
+				</ul>
+		{{/if}}	
+	</span>
+       <span id="banner">{{$banner}}</span>
+	<span id="nav-link-wrapper">
+	{{if $nav.logout}}<a id="nav-logout-link" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a> {{/if}}
+	{{if $nav.login}}<a id="nav-login-link" class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a> {{/if}}
+	{{if $nav.help}} <a id="nav-help-link" class="nav-link {{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a>{{/if}}
+		
+	{{if $nav.apps}}<a id="nav-apps-link" class="nav-link {{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a>{{/if}}
+
+	<a id="nav-search-link" class="nav-link {{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a>
+	<a id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a>
+
+	{{if $nav.admin}}<a id="nav-admin-link" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a>{{/if}}
+
+
+
+	
+
+	{{if $nav.settings}}<a id="nav-settings-link" class="nav-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a>{{/if}}
+	{{if $nav.profiles}}<a id="nav-profiles-link" class="nav-link {{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a>{{/if}}
+
+	{{if $nav.contacts}}<a id="nav-contacts-link" class="nav-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a>{{/if}}
+
+
+	{{if $nav.manage}}<a id="nav-manage-link" class="nav-link {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a>{{/if}}
+	</span>
+	<span id="nav-end"></span>
+	
+</nav>
+
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
+</ul>
+<script>
+var pagetitle = null;
+$("nav").bind('nav-update', function(e,data){
+if (pagetitle==null) pagetitle = document.title;
+var count = $(data).find('notif').attr('count');
+if (count>0) {
+document.title = "("+count+") "+pagetitle;
+} else {
+document.title = pagetitle;
+}
+});
+</script>
diff --git a/view/theme/cleanzero/templates/theme_settings.tpl b/view/theme/cleanzero/templates/theme_settings.tpl
new file mode 100644
index 000000000..0743b2594
--- /dev/null
+++ b/view/theme/cleanzero/templates/theme_settings.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{include file="field_select.tpl" field=$color}}
+{{include file="field_select.tpl" field=$font_size}}
+{{include file="field_select.tpl" field=$resize}}
+{{include file="field_select.tpl" field=$theme_width}}
+
+
+<div class="settings-submit-wrapper">
+	<input type="submit" value="{{$submit}}" class="settings-submit" name="cleanzero-settings-submit" />
+</div>
+
diff --git a/view/theme/comix-plain/templates/comment_item.tpl b/view/theme/comix-plain/templates/comment_item.tpl
new file mode 100644
index 000000000..6e1bdd774
--- /dev/null
+++ b/view/theme/comix-plain/templates/comment_item.tpl
@@ -0,0 +1,38 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
+			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
+				<input type="hidden" name="type" value="{{$type}}" />
+				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+				<input type="hidden" name="parent" value="{{$parent}}" />
+				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
+				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
+				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
+					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty triangle-isosceles left" style="display: block;" name="body" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>
+				{{if $qcomment}}
+				{{foreach $qcomment as $qc}}				
+					<span class="fakelink qcomment" onclick="commentInsert(this,{{$id}}); return false;" >{{$qc}}</span>
+					&nbsp;
+				{{/foreach}}
+				{{/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}}" />
+					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
+					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/theme/comix-plain/templates/search_item.tpl b/view/theme/comix-plain/templates/search_item.tpl
new file mode 100644
index 000000000..e07731246
--- /dev/null
+++ b/view/theme/comix-plain/templates/search_item.tpl
@@ -0,0 +1,59 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
+	<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" >
+		<div class="wall-item-info" id="wall-item-info-{{$item.id}}">
+			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$item.id}}" 
+				 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
+				 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
+				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+				<div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+					<ul>
+						{{$item.item_photo_menu}}
+					</ul>
+				</div>
+			</div>
+			<div class="wall-item-photo-end"></div>	
+			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
+				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
+				{{else}}<div class="wall-item-lock"></div>{{/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}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>
+				
+		</div>			
+		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			<div class="wall-item-title-end"></div>
+			<div class="wall-item-body triangle-isosceles left" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/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-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>
+
+
diff --git a/view/theme/comix/templates/comment_item.tpl b/view/theme/comix/templates/comment_item.tpl
new file mode 100644
index 000000000..6e1bdd774
--- /dev/null
+++ b/view/theme/comix/templates/comment_item.tpl
@@ -0,0 +1,38 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
+			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
+				<input type="hidden" name="type" value="{{$type}}" />
+				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+				<input type="hidden" name="parent" value="{{$parent}}" />
+				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
+				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
+				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
+					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty triangle-isosceles left" style="display: block;" name="body" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>
+				{{if $qcomment}}
+				{{foreach $qcomment as $qc}}				
+					<span class="fakelink qcomment" onclick="commentInsert(this,{{$id}}); return false;" >{{$qc}}</span>
+					&nbsp;
+				{{/foreach}}
+				{{/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}}" />
+					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
+					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/theme/comix/templates/search_item.tpl b/view/theme/comix/templates/search_item.tpl
new file mode 100644
index 000000000..a52d93f5c
--- /dev/null
+++ b/view/theme/comix/templates/search_item.tpl
@@ -0,0 +1,59 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="wall-item-outside-wrapper {{$item.indent}} {{$item.shiny}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
+	<div class="wall-item-content-wrapper {{$item.indent}} {{$item.shiny}}" id="wall-item-content-wrapper-{{$item.id}}" >
+		<div class="wall-item-info" id="wall-item-info-{{$item.id}}">
+			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$item.id}}" 
+				 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
+				 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
+				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+				<div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+					<ul>
+						{{$item.item_photo_menu}}
+					</ul>
+				</div>
+			</div>
+			<div class="wall-item-photo-end"></div>	
+			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
+				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
+				{{else}}<div class="wall-item-lock"></div>{{/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}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>
+				
+		</div>			
+		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			<div class="wall-item-title-end"></div>
+			<div class="wall-item-body triangle-isosceles left" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/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-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}} {{$item.shiny}}" ></div>
+
+</div>
+
+
diff --git a/view/theme/decaf-mobile/templates/acl_html_selector.tpl b/view/theme/decaf-mobile/templates/acl_html_selector.tpl
new file mode 100644
index 000000000..05e82f2d0
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/acl_html_selector.tpl
@@ -0,0 +1,34 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<a name="acl-wrapper-target"></a>
+<div id="acl-wrapper">
+	<div id="acl-public-switch">
+		<a href="{{$return_path}}#acl-wrapper-target" {{if $is_private == 1}}class="acl-public-switch-selected"{{/if}} >{{$private}}</a>
+		<a href="{{$return_path}}{{$public_link}}#acl-wrapper-target" {{if $is_private == 0}}class="acl-public-switch-selected"{{/if}} >{{$public}}</a>
+	</div>
+	<div id="acl-list">
+		<div id="acl-list-content">
+			<div id="acl-html-groups" class="acl-html-select-wrapper">
+			{{$group_perms}}<br />
+			<select name="group_allow[]" multiple {{if $is_private == 0}}disabled{{/if}} id="acl-html-group-select" class="acl-html-select" size=7>
+				{{foreach $acl_data.groups as $group}}
+				<option value="{{$group.id}}" {{if $is_private == 1}}{{if $group.selected}}selected{{/if}}{{/if}}>{{$group.name}}</option>
+				{{/foreach}}
+			</select>
+			</div>
+			<div id="acl-html-contacts" class="acl-html-select-wrapper">
+			{{$contact_perms}}<br />
+			<select name="contact_allow[]" multiple {{if $is_private == 0}}disabled{{/if}} id="acl-html-contact-select" class="acl-html-select" size=7>
+				{{foreach $acl_data.contacts as $contact}}
+				<option value="{{$contact.id}}" {{if $is_private == 1}}{{if $contact.selected}}selected{{/if}}{{/if}}>{{$contact.name}} ({{$contact.networkName}})</option>
+				{{/foreach}}
+			</select>
+			</div>
+		</div>
+	</div>
+	<span id="acl-fields"></span>
+</div>
+
diff --git a/view/theme/decaf-mobile/templates/acl_selector.tpl b/view/theme/decaf-mobile/templates/acl_selector.tpl
new file mode 100644
index 000000000..b5e830726
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/acl_selector.tpl
@@ -0,0 +1,28 @@
+{{*
+ *	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 data-src="{0}"><p>{1}</p>
+	<a href="#" class='acl-button-show'>{{$show}}</a>
+	<a href="#" class='acl-button-hide'>{{$hide}}</a>
+</div>
+
+{{*<!--<script>
+	window.allowCID = {{$allowcid}};
+	window.allowGID = {{$allowgid}};
+	window.denyCID = {{$denycid}};
+	window.denyGID = {{$denygid}};
+	window.aclInit = "true";
+</script>-->*}}
diff --git a/view/theme/decaf-mobile/templates/admin_aside.tpl b/view/theme/decaf-mobile/templates/admin_aside.tpl
new file mode 100644
index 000000000..024d6195b
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/admin_aside.tpl
@@ -0,0 +1,36 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h4><a href="{{$admurl}}">{{$admtxt}}</a></h4>
+<ul class='admin linklist'>
+	<li class='admin button {{$admin.site.2}}'><a href='{{$admin.site.0}}'>{{$admin.site.1}}</a></li>
+	<li class='admin button {{$admin.users.2}}'><a href='{{$admin.users.0}}'>{{$admin.users.1}}</a><span id='pending-update' title='{{$h_pending}}'></span></li>
+	<li class='admin button {{$admin.plugins.2}}'><a href='{{$admin.plugins.0}}'>{{$admin.plugins.1}}</a></li>
+	<li class='admin button {{$admin.themes.2}}'><a href='{{$admin.themes.0}}'>{{$admin.themes.1}}</a></li>
+	<li class='admin button {{$admin.dbsync.2}}'><a href='{{$admin.dbsync.0}}'>{{$admin.dbsync.1}}</a></li>
+</ul>
+
+{{if $admin.update}}
+<ul class='admin linklist'>
+	<li class='admin button {{$admin.update.2}}'><a href='{{$admin.update.0}}'>{{$admin.update.1}}</a></li>
+	<li class='admin button {{$admin.update.2}}'><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li>
+</ul>
+{{/if}}
+
+
+{{if $admin.plugins_admin}}<h4>{{$plugadmtxt}}</h4>{{/if}}
+<ul class='admin linklist'>
+	{{foreach $admin.plugins_admin as $l}}
+	<li class='admin button {{$l.2}}'><a href='{{$l.0}}'>{{$l.1}}</a></li>
+	{{/foreach}}
+</ul>
+	
+	
+<h4>{{$logtxt}}</h4>
+<ul class='admin linklist'>
+	<li class='admin button {{$admin.logs.2}}'><a href='{{$admin.logs.0}}'>{{$admin.logs.1}}</a></li>
+</ul>
+
diff --git a/view/theme/decaf-mobile/templates/admin_site.tpl b/view/theme/decaf-mobile/templates/admin_site.tpl
new file mode 100644
index 000000000..035024e68
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/admin_site.tpl
@@ -0,0 +1,72 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+	
+	<form action="{{$baseurl}}/admin/site" method="post">
+    <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+	{{include file="field_input.tpl" field=$sitename}}
+	{{include file="field_textarea.tpl" field=$banner}}
+	{{include file="field_select.tpl" field=$language}}
+	{{include file="field_select.tpl" field=$theme}}
+	{{include file="field_select.tpl" field=$theme_mobile}}
+	{{include file="field_select.tpl" field=$ssl_policy}}
+	{{include file="field_checkbox.tpl" field=$new_share}}
+	{{include file="field_checkbox.tpl" field=$hide_help}} 
+	{{include file="field_select.tpl" field=$singleuser}} 
+	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	
+	<h3>{{$registration}}</h3>
+	{{include file="field_input.tpl" field=$register_text}}
+	{{include file="field_select.tpl" field=$register_policy}}
+	
+	{{include file="field_checkbox.tpl" field=$no_multi_reg}}
+	{{include file="field_checkbox.tpl" field=$no_openid}}
+	{{include file="field_checkbox.tpl" field=$no_regfullname}}
+	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+
+	<h3>{{$upload}}</h3>
+	{{include file="field_input.tpl" field=$maximagesize}}
+	{{include file="field_input.tpl" field=$maximagelength}}
+	{{include file="field_input.tpl" field=$jpegimagequality}}
+	
+	<h3>{{$corporate}}</h3>
+	{{include file="field_input.tpl" field=$allowed_sites}}
+	{{include file="field_input.tpl" field=$allowed_email}}
+	{{include file="field_checkbox.tpl" field=$block_public}}
+	{{include file="field_checkbox.tpl" field=$force_publish}}
+	{{include file="field_checkbox.tpl" field=$no_community_page}}
+	{{include file="field_checkbox.tpl" field=$ostatus_disabled}}
+	{{include file="field_select.tpl" field=$ostatus_poll_interval}} 
+	{{include file="field_checkbox.tpl" field=$diaspora_enabled}}
+	{{include file="field_checkbox.tpl" field=$dfrn_only}}
+	{{include file="field_input.tpl" field=$global_directory}}
+	{{include file="field_checkbox.tpl" field=$thread_allow}}
+	{{include file="field_checkbox.tpl" field=$newuser_private}}
+	{{include file="field_checkbox.tpl" field=$enotify_no_content}}
+	{{include file="field_checkbox.tpl" field=$private_addons}}	
+	{{include file="field_checkbox.tpl" field=$disable_embedded}}	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	
+	<h3>{{$advanced}}</h3>
+	{{include file="field_checkbox.tpl" field=$no_utf}}
+	{{include file="field_checkbox.tpl" field=$verifyssl}}
+	{{include file="field_input.tpl" field=$proxy}}
+	{{include file="field_input.tpl" field=$proxyuser}}
+	{{include file="field_input.tpl" field=$timeout}}
+	{{include file="field_input.tpl" field=$delivery_interval}}
+	{{include file="field_input.tpl" field=$poll_interval}}
+	{{include file="field_input.tpl" field=$maxloadavg}}
+	{{include file="field_input.tpl" field=$abandon_days}}
+	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	
+	</form>
+</div>
diff --git a/view/theme/decaf-mobile/templates/admin_users.tpl b/view/theme/decaf-mobile/templates/admin_users.tpl
new file mode 100644
index 000000000..df795a1f4
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/admin_users.tpl
@@ -0,0 +1,103 @@
+{{*
+ *	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){
+		$j("."+cls).attr('checked','checked');
+		return false;
+	}*/*}}
+</script>
+<div id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+	
+	<form action="{{$baseurl}}/admin/users" method="post">
+        <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+		
+		<h3>{{$h_pending}}</h3>
+		{{if $pending}}
+			<table id='pending'>
+				<thead>
+				<tr>
+					{{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+			{{foreach $pending as $u}}
+				<tr>
+					<td class="created">{{$u.created}}</td>
+					<td class="name">{{$u.name}}</td>
+					<td class="email">{{$u.email}}</td>
+					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}" /></td>
+					<td class="tools">
+						<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title='{{$approve}}'><span class='tool like'></span></a>
+						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><span class='tool dislike'></span></a>
+					</td>
+				</tr>
+			{{/foreach}}
+				</tbody>
+			</table>
+			{{*<!--<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">{{$select_all}}</a></div>-->*}}
+			<div class="submit"><input type="submit" name="page_users_deny" value="{{$deny}}"/> <input type="submit" name="page_users_approve" value="{{$approve}}" /></div>			
+		{{else}}
+			<p>{{$no_pending}}</p>
+		{{/if}}
+	
+	
+		
+	
+		<h3>{{$h_users}}</h3>
+		{{if $users}}
+			<table id='users'>
+				<thead>
+				<tr>
+					<th></th>
+					{{foreach $th_users as $th}}<th>{{$th}}</th>{{/foreach}}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+				{{foreach $users as $u}}
+					<tr>
+						<td><img src="{{$u.micro}}" alt="{{$u.nickname}}" title="{{$u.nickname}}"></td>
+						<td class='name'><a href="{{$u.url}}" title="{{$u.nickname}}" >{{$u.name}}</a></td>
+						<td class='email'>{{$u.email}}</td>
+						<td class='register_date'>{{$u.register_date}}</td>
+						<td class='login_date'>{{$u.login_date}}</td>
+						<td class='lastitem_date'>{{$u.lastitem_date}}</td>
+						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}</td>
+						<td class="checkbox"> 
+                                    {{if $u.is_admin}}
+                                        &nbsp;
+                                    {{else}}
+                                        <input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
+                                    {{/if}}
+						<td class="tools">
+                                    {{if $u.is_admin}}
+                                        &nbsp;
+                                    {{else}}
+                                        <a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><span class='icon block {{if $u.blocked==0}}dim{{/if}}'></span></a>
+                                        <a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><span class='icon drop'></span></a>
+                                    {{/if}}
+						</td>
+					</tr>
+				{{/foreach}}
+				</tbody>
+			</table>
+			{{*<!--<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">{{$select_all}}</a></div>-->*}}
+			<div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div>						
+		{{else}}
+			NO USERS?!?
+		{{/if}}
+	</form>
+</div>
diff --git a/view/theme/decaf-mobile/templates/album_edit.tpl b/view/theme/decaf-mobile/templates/album_edit.tpl
new file mode 100644
index 000000000..094da70a9
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/album_edit.tpl
@@ -0,0 +1,20 @@
+{{*
+ *	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" >
+	<input id="photo-album-edit-form-confirm" type="hidden" name="confirm" value="1" />
+
+	<label id="photo-album-edit-name-label" for="photo-album-edit-name" >{{$nametext}}</label>
+	<input type="text" size="64" name="albumname" value="{{$album}}" >
+
+	<div id="photo-album-edit-name-end"></div>
+
+	<input id="photo-album-edit-submit" type="submit" name="submit" value="{{$submit}}" />
+	<input id="photo-album-edit-drop" type="submit" name="dropalbum" value="{{$dropsubmit}}" onclick="return confirmDelete(function(){remove('photo-album-edit-form-confirm');});" />
+
+</form>
+</div>
+<div id="photo-album-edit-end" ></div>
diff --git a/view/theme/decaf-mobile/templates/categories_widget.tpl b/view/theme/decaf-mobile/templates/categories_widget.tpl
new file mode 100644
index 000000000..1749fced3
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/categories_widget.tpl
@@ -0,0 +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="nets-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=&category={{$term.name}}" class="categories-link{{if $term.selected}} categories-selected{{/if}}">{{$term.name}}</a></li>
+		{{/foreach}}
+	</ul>
+	
+</div>-->*}}
diff --git a/view/theme/decaf-mobile/templates/comment_item.tpl b/view/theme/decaf-mobile/templates/comment_item.tpl
new file mode 100644
index 000000000..63c70aa5b
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/comment_item.tpl
@@ -0,0 +1,84 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--		<script>
+		$(document).ready( function () {
+			$(document).mouseup(function(e) {
+				var container = $("#comment-edit-wrapper-{{$id}}");
+				if( container.has(e.target).length === 0) {
+					commentClose(document.getElementById('comment-edit-text-{{$id}}'),{{$id}});
+					cmtBbClose({{$id}});
+				}
+			});
+		});
+		</script>-->*}}
+
+		<div class="comment-wwedit-wrapper {{$indent}}" id="comment-edit-wrapper-{{$id}}" style="display: block;" >
+			<a name="comment-wwedit-wrapper-pos"></a>
+			<form class="comment-edit-form {{$indent}}" id="comment-edit-form-{{$id}}" action="item" method="post" >
+{{*<!--			<span id="hide-commentbox-{{$id}}" class="hide-commentbox fakelink" onclick="showHideCommentBox({{$id}});">{{$comment}}</span>
+			<form class="comment-edit-form" style="display: none;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">-->*}}
+				<input type="hidden" name="type" value="{{$type}}" />
+				<input type="hidden" name="source" value="{{$sourceapp}}" />
+				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+				<input type="hidden" name="parent" value="{{$parent}}" />
+				<input type="hidden" name="return" value="{{$return_path}}#comment-wwedit-wrapper-pos" />
+				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
+				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+
+				{{*<!--<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >-->*}}
+					<a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-{{$id}}" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+				{{*<!--</div>-->*}}
+				{{*<!--<div class="comment-edit-photo-end"></div>-->*}}
+				{{*<!--<ul class="comment-edit-bb-{{$id}}">
+					<li><a class="editicon boldbb shadow"
+						style="cursor: pointer;" title="{{$edbold}}"
+						onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
+					<li><a class="editicon italicbb shadow"
+						style="cursor: pointer;" title="{{$editalic}}"
+						onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
+					<li><a class="editicon underlinebb shadow"
+						style="cursor: pointer;" title="{{$eduline}}"
+						onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
+					<li><a class="editicon quotebb shadow"
+						style="cursor: pointer;" title="{{$edquote}}"
+						onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
+					<li><a class="editicon codebb shadow"
+						style="cursor: pointer;" title="{{$edcode}}"
+						onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>-->*}}
+{{*<!--					<li><a class="editicon imagebb shadow"
+						style="cursor: pointer;" title="{{$edimg}}"
+						onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
+					<li><a class="editicon urlbb shadow"
+						style="cursor: pointer;" title="{{$edurl}}"
+						onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
+					<li><a class="editicon videobb shadow"
+						style="cursor: pointer;" title="{{$edvideo}}"
+						onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>-->*}}
+				{{*<!--</ul>	-->*}}
+				{{*<!--<div class="comment-edit-bb-end"></div>-->*}}
+{{*<!--				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose({{$id}});" >{{$comment}}</textarea>-->*}}
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-full" name="body" ></textarea>
+				{{*<!--{{if $qcomment}}
+					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
+					<option value=""></option>
+				{{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}}" >
+					<input type="submit" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
+					{{*<!--<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="preview-link fakelink">{{$preview}}</span>
+					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>-->*}}
+				</div>
+
+				{{*<!--<div class="comment-edit-end"></div>-->*}}
+			</form>
+
+		</div>
diff --git a/view/theme/decaf-mobile/templates/common_tabs.tpl b/view/theme/decaf-mobile/templates/common_tabs.tpl
new file mode 100644
index 000000000..9fa4ed41d
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/common_tabs.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<ul class="tabs">
+	{{foreach $tabs as $tab}}
+		<li id="{{$tab.id}}"><a href="{{$tab.url}}" class="tab button {{$tab.sel}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
+	{{/foreach}}
+	<div id="tabs-end"></div>
+</ul>
diff --git a/view/theme/decaf-mobile/templates/contact_block.tpl b/view/theme/decaf-mobile/templates/contact_block.tpl
new file mode 100644
index 000000000..5a0a26b87
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/contact_block.tpl
@@ -0,0 +1,17 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--<div id="contact-block">
+<h4 class="contact-block-h4">{{$contacts}}</h4>
+{{if $micropro}}
+		<a class="allcontact-link" href="viewcontacts/{{$nickname}}">{{$viewcontacts}}</a>
+		<div class='contact-block-content'>
+		{{foreach $micropro as $m}}
+			{{$m}}
+		{{/foreach}}
+		</div>
+{{/if}}
+</div>
+<div class="clear"></div>-->*}}
diff --git a/view/theme/decaf-mobile/templates/contact_edit.tpl b/view/theme/decaf-mobile/templates/contact_edit.tpl
new file mode 100644
index 000000000..0f028d590
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/contact_edit.tpl
@@ -0,0 +1,98 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h2>{{$header}}</h2>
+
+<div id="contact-edit-wrapper" >
+
+	{{$tab_str}}
+
+	<div id="contact-edit-drop-link-wrapper" >
+		<a href="contacts/{{$contact_id}}/drop?confirm=1" class="icon drophide" id="contact-edit-drop-link" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'contacts/{{$contact_id}}/drop')});"  title="{{$delete}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}}></a>
+	</div>
+
+	<div id="contact-edit-drop-link-end"></div>
+
+	<div class="vcard">
+		<div class="fn">{{$name}}</div>
+		<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="{{$photo}}" alt="{{$name}}" /></div>
+	</div>
+
+
+	<div id="contact-edit-nav-wrapper" >
+		<div id="contact-edit-links">
+			<ul>
+				<li><div id="contact-edit-rel">{{$relation_text}}</div></li>
+				<li><div id="contact-edit-nettype">{{$nettype}}</div></li>
+				{{if $lost_contact}}
+					<li><div id="lost-contact-message">{{$lost_contact}}</div></li>
+				{{/if}}
+				{{if $insecure}}
+					<li><div id="insecure-message">{{$insecure}}</div></li>
+				{{/if}}
+				{{if $blocked}}
+					<li><div id="block-message">{{$blocked}}</div></li>
+				{{/if}}
+				{{if $ignored}}
+					<li><div id="ignore-message">{{$ignored}}</div></li>
+				{{/if}}
+				{{if $archived}}
+					<li><div id="archive-message">{{$archived}}</div></li>
+				{{/if}}
+
+				<li>&nbsp;</li>
+
+				{{if $common_text}}
+					<li><div id="contact-edit-common"><a href="{{$common_link}}">{{$common_text}}</a></div></li>
+				{{/if}}
+				{{if $all_friends}}
+					<li><div id="contact-edit-allfriends"><a href="allfriends/{{$contact_id}}">{{$all_friends}}</a></div></li>
+				{{/if}}
+
+
+				<li><a href="network/0?nets=all&cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li>
+				{{if $lblsuggest}}
+					<li><a href="fsuggest/{{$contact_id}}" id="contact-edit-suggest">{{$lblsuggest}}</a></li>
+				{{/if}}
+
+			</ul>
+		</div>
+	</div>
+	<div id="contact-edit-nav-end"></div>
+
+
+<form action="contacts/{{$contact_id}}" method="post" >
+<input type="hidden" name="contact_id" value="{{$contact_id}}">
+
+	{{if $poll_enabled}}
+		<div id="contact-edit-poll-wrapper">
+			<div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
+			<span id="contact-edit-poll-text">{{$updpub}} {{$poll_interval}}</span> <span id="contact-edit-update-now" class="button"><a id="update_now_link" href="contacts/{{$contact_id}}/update" >{{$udnow}}</a></span>
+		</div>
+	{{/if}}
+	<div id="contact-edit-end" ></div>
+
+	{{include file="field_checkbox.tpl" field=$hidden}}
+
+<div id="contact-edit-info-wrapper">
+<h4>{{$lbl_info1}}</h4>
+	<textarea id="contact-edit-info" rows="8"{{* cols="35"*}} name="info">{{$info}}</textarea>
+	<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
+</div>
+<div id="contact-edit-info-end"></div>
+
+
+<div id="contact-edit-profile-select-text">
+<h4>{{$lbl_vis1}}</h4>
+<p>{{$lbl_vis2}}</p> 
+</div>
+{{$profile_select}}
+<div id="contact-edit-profile-select-end"></div>
+
+<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
+
+</form>
+</div>
diff --git a/view/theme/decaf-mobile/templates/contact_head.tpl b/view/theme/decaf-mobile/templates/contact_head.tpl
new file mode 100644
index 000000000..a7fb96108
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/contact_head.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/theme/decaf-mobile/templates/contact_template.tpl b/view/theme/decaf-mobile/templates/contact_template.tpl
new file mode 100644
index 000000000..f017744f7
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/contact_template.tpl
@@ -0,0 +1,43 @@
+{{*
+ *	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" >
+		<div class="contact-entry-photo mframe" id="contact-entry-photo-{{$contact.id}}"
+		{{*onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}});" 
+		onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)"*}} >
+
+{{*<!--			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>-->*}}
+			{{*<!--<span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">-->*}}
+			<a href="{{$contact.photo_menu.edit.1}}" title="{{$contact.photo_menu.edit.0}}">
+			<img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" />
+			</a>
+			{{*<!--</span>-->*}}
+
+{{*<!--			{{if $contact.photo_menu}}
+			<span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">menu</span>
+                <div class="contact-photo-menu" id="contact-photo-menu-{{$contact.id}}">
+                    <ul>
+						{{foreach $contact.photo_menu as $c}}
+						{{if $c.2}}
+						<li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+						{{else}}
+						<li><a href="{{$c.1}}">{{$c.0}}</a></li>
+						{{/if}}
+						{{/foreach}}
+                    </ul>
+                </div>
+			{{/if}}-->*}}
+		</div>
+			
+	</div>
+	<div class="contact-entry-photo-end" ></div>
+		<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div><br />
+{{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
+	<div class="contact-entry-network" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>
+
+	<div class="contact-entry-end" ></div>
+</div>
diff --git a/view/theme/decaf-mobile/templates/contacts-end.tpl b/view/theme/decaf-mobile/templates/contacts-end.tpl
new file mode 100644
index 000000000..adeea280c
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/contacts-end.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--
+<script src="{{$baseurl}}/library/jquery_ac/friendica.complete.min.js" ></script>
+
+-->*}}
diff --git a/view/theme/decaf-mobile/templates/contacts-head.tpl b/view/theme/decaf-mobile/templates/contacts-head.tpl
new file mode 100644
index 000000000..7fa141164
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/contacts-head.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--
+<script>
+	window.autocompleteType = 'contacts-head';
+</script>
+-->*}}
diff --git a/view/theme/decaf-mobile/templates/contacts-template.tpl b/view/theme/decaf-mobile/templates/contacts-template.tpl
new file mode 100644
index 000000000..b9162c2e9
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/contacts-template.tpl
@@ -0,0 +1,33 @@
+{{*
+ *	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}}
+
+
+<div id="contacts-display-wrapper">
+{{foreach $contacts as $contact}}
+	{{include file="contact_template.tpl"}}
+{{/foreach}}
+</div>
+<div id="contact-edit-end"></div>
+
+{{$paginate}}
+
+
+
+
diff --git a/view/theme/decaf-mobile/templates/contacts-widget-sidebar.tpl b/view/theme/decaf-mobile/templates/contacts-widget-sidebar.tpl
new file mode 100644
index 000000000..bda321896
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/contacts-widget-sidebar.tpl
@@ -0,0 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$follow_widget}}
+
diff --git a/view/theme/decaf-mobile/templates/conversation.tpl b/view/theme/decaf-mobile/templates/conversation.tpl
new file mode 100644
index 000000000..f6810bb10
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/conversation.tpl
@@ -0,0 +1,34 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$live_update}}
+
+{{foreach $threads as $thread}}
+<div id="tread-wrapper-{{$thread.id}}" class="tread-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="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/theme/decaf-mobile/templates/cropbody.tpl b/view/theme/decaf-mobile/templates/cropbody.tpl
new file mode 100644
index 000000000..5ace9a1aa
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/cropbody.tpl
@@ -0,0 +1,32 @@
+{{*
+ *	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>
+
+<form action="profile_photo/{{$resource}}" id="crop-image-form" method="post" />
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+<input type="hidden" name="cropfinal" value="1" />
+<input type="hidden" name="xstart" id="x1" />
+<input type="hidden" name="ystart" id="y1" />
+<input type="hidden" name="xfinal" id="x2" />
+<input type="hidden" name="yfinal" id="y2" />
+<input type="hidden" name="height" id="height" />
+<input type="hidden" name="width"  id="width" />
+
+<div id="crop-image-submit-wrapper" >
+<input type="submit" name="submit" value="{{$done}}" />
+</div>
+
+</form>
diff --git a/view/theme/decaf-mobile/templates/cropend.tpl b/view/theme/decaf-mobile/templates/cropend.tpl
new file mode 100644
index 000000000..e75083f51
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/cropend.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	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>
+      <script type="text/javascript" language="javascript">initCrop();</script>-->*}}
diff --git a/view/theme/decaf-mobile/templates/crophead.tpl b/view/theme/decaf-mobile/templates/crophead.tpl
new file mode 100644
index 000000000..6438cfb35
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/crophead.tpl
@@ -0,0 +1,6 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+      <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />
diff --git a/view/theme/decaf-mobile/templates/display-head.tpl b/view/theme/decaf-mobile/templates/display-head.tpl
new file mode 100644
index 000000000..294320192
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/display-head.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--<script>
+	window.autoCompleteType = 'display-head';
+</script>
+-->*}}
diff --git a/view/theme/decaf-mobile/templates/end.tpl b/view/theme/decaf-mobile/templates/end.tpl
new file mode 100644
index 000000000..6914cfd24
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/end.tpl
@@ -0,0 +1,30 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<!--[if IE]>
+<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+<![endif]-->
+{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></script>
+<script type="text/javascript">
+  tinyMCE.init({ mode : "none"});
+</script>-->*}}
+{{*<!--<script type="text/javascript" src="{{$baseurl}}/js/jquery.js" ></script>
+<script type="text/javascript">var $j = jQuery.noConflict();</script>
+<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/jquery.divgrow-1.3.1.f1.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/js/jquery.textinputs.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/fk.autocomplete.js" ></script>-->*}}
+{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
+<script type="text/javascript" src="{{$baseurl}}/library/colorbox/jquery.colorbox-min.js"></script>-->*}}
+{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/tiptip/jquery.tipTip.minified.js"></script>-->*}}
+{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/jgrowl/jquery.jgrowl_minimized.js"></script>
+<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/acl.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/js/webtoolkit.base64.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/main.js" ></script>-->*}}
+<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/theme.js"></script>
+
+<!--<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/jquery.package.js" ></script>
+<script type="text/javascript">var $j = jQuery.noConflict();</script>
+<script type="text/javascript" src="{{$baseurl}}/view/theme/decaf-mobile/js/decaf-mobile.package.js" ></script>-->
+
diff --git a/view/theme/decaf-mobile/templates/event_end.tpl b/view/theme/decaf-mobile/templates/event_end.tpl
new file mode 100644
index 000000000..63dbec442
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/event_end.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--<script language="javascript" type="text/javascript"
+          src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script>
+
+-->*}}
diff --git a/view/theme/decaf-mobile/templates/event_head.tpl b/view/theme/decaf-mobile/templates/event_head.tpl
new file mode 100644
index 000000000..bd72758e6
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/event_head.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	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">
+window.aclType = 'event_head';
+</script>
+-->*}}
diff --git a/view/theme/decaf-mobile/templates/field_checkbox.tpl b/view/theme/decaf-mobile/templates/field_checkbox.tpl
new file mode 100644
index 000000000..f7f857f59
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/field_checkbox.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	
+	<div class='field checkbox' id='div_id_{{$field.0}}'>
+		<label id='label_id_{{$field.0}}' for='id_{{$field.0}}'>{{$field.1}}</label>
+		<input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}}><br />
+		<span class='field_help' id='help_id_{{$field.0}}'>{{$field.3}}</span>
+	</div>
diff --git a/view/theme/decaf-mobile/templates/field_input.tpl b/view/theme/decaf-mobile/templates/field_input.tpl
new file mode 100644
index 000000000..240bed249
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/field_input.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	
+	<div class='field input' id='wrapper_{{$field.0}}'>
+		<label for='id_{{$field.0}}'>{{$field.1}}</label><br />
+		<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/theme/decaf-mobile/templates/field_openid.tpl b/view/theme/decaf-mobile/templates/field_openid.tpl
new file mode 100644
index 000000000..d5ebd9a3b
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/field_openid.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	
+	<div class='field input openid' id='wrapper_{{$field.0}}'>
+		<label for='id_{{$field.0}}'>{{$field.1}}</label><br />
+		<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/theme/decaf-mobile/templates/field_password.tpl b/view/theme/decaf-mobile/templates/field_password.tpl
new file mode 100644
index 000000000..f1352f27b
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/field_password.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	
+	<div class='field password' id='wrapper_{{$field.0}}'>
+		<label for='id_{{$field.0}}'>{{$field.1}}</label><br />
+		<input type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/theme/decaf-mobile/templates/field_themeselect.tpl b/view/theme/decaf-mobile/templates/field_themeselect.tpl
new file mode 100644
index 000000000..95cfd6bcd
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/field_themeselect.tpl
@@ -0,0 +1,14 @@
+{{*
+ *	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}}' {{*{{if $field.5}}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/theme/decaf-mobile/templates/field_yesno.tpl b/view/theme/decaf-mobile/templates/field_yesno.tpl
new file mode 100644
index 000000000..9cdb95e01
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/field_yesno.tpl
@@ -0,0 +1,19 @@
+{{*
+ *	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>-->*}}
+{{include file="field_checkbox.tpl"}}
diff --git a/view/theme/decaf-mobile/templates/generic_links_widget.tpl b/view/theme/decaf-mobile/templates/generic_links_widget.tpl
new file mode 100644
index 000000000..705ddb57c
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/generic_links_widget.tpl
@@ -0,0 +1,17 @@
+{{*
+ *	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 class="tabs links-widget">
+		{{foreach $items as $item}}
+			<li class="tool"><a href="{{$item.url}}" class="tab {{if $item.selected}}selected{{/if}}">{{$item.label}}</a></li>
+		{{/foreach}}
+		<div id="tabs-end"></div>
+	</ul>
+	
+</div>
diff --git a/view/theme/decaf-mobile/templates/group_drop.tpl b/view/theme/decaf-mobile/templates/group_drop.tpl
new file mode 100644
index 000000000..269322815
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/group_drop.tpl
@@ -0,0 +1,14 @@
+{{*
+ *	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/theme/decaf-mobile/templates/group_side.tpl b/view/theme/decaf-mobile/templates/group_side.tpl
new file mode 100644
index 000000000..7d9d23ebe
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/group_side.tpl
@@ -0,0 +1,38 @@
+{{*
+ *	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/theme/decaf-mobile/templates/head.tpl b/view/theme/decaf-mobile/templates/head.tpl
new file mode 100644
index 000000000..07398391f
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/head.tpl
@@ -0,0 +1,35 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+{{*<!--<meta content='width=device-width, minimum-scale=1 maximum-scale=1' name='viewport'>
+<meta content='True' name='HandheldFriendly'>
+<meta content='320' name='MobileOptimized'>-->*}}
+<meta name="viewport" content="width=device-width; initial-scale = 1.0; maximum-scale=1.0; user-scalable=no" />
+{{*<!--<meta name="viewport" content="width=100%;  initial-scale=1; maximum-scale=1; minimum-scale=1; user-scalable=no;" />-->*}}
+
+<base href="{{$baseurl}}/" />
+<meta name="generator" content="{{$generator}}" />
+{{*<!--<link rel="stylesheet" href="{{$baseurl}}/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="{{$baseurl}}/library/colorbox/colorbox.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="{{$baseurl}}/library/tiptip/tipTip.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="{{$baseurl}}/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />-->*}}
+
+<link rel="stylesheet" type="text/css" href="{{$stylesheet}}" media="all" />
+
+<link rel="shortcut icon" href="{{$baseurl}}/images/friendica-32.png" />
+<link rel="search"
+         href="{{$baseurl}}/opensearch" 
+         type="application/opensearchdescription+xml" 
+         title="Search in Friendica" />
+
+<script>
+	window.delItem = "{{$delitem}}";
+{{*/*	window.commentEmptyText = "{{$comment}}";
+	window.showMore = "{{$showmore}}";
+	window.showFewer = "{{$showfewer}}";
+	var updateInterval = {{$update_interval}};
+	var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}};*/*}}
+</script>
diff --git a/view/theme/decaf-mobile/templates/jot-end.tpl b/view/theme/decaf-mobile/templates/jot-end.tpl
new file mode 100644
index 000000000..88c8e59c6
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/jot-end.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.min.js" ></script>
+{{*<!--
+<script>if(typeof window.jotInit != 'undefined') initEditor();</script>
+-->*}}
diff --git a/view/theme/decaf-mobile/templates/jot-header.tpl b/view/theme/decaf-mobile/templates/jot-header.tpl
new file mode 100644
index 000000000..b0bf78916
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/jot-header.tpl
@@ -0,0 +1,22 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script>
+{{*/*	var none = "none"; // ugly hack: {{$editselect}} shouldn't be a string if TinyMCE is enabled, but should if it isn't
+	window.editSelect = {{$editselect}};
+	window.isPublic = "{{$ispublic}}";
+	window.nickname = "{{$nickname}}";
+	window.linkURL = "{{$linkurl}}";
+	window.vidURL = "{{$vidurl}}";
+	window.audURL = "{{$audurl}}";
+	window.whereAreU = "{{$whereareu}}";
+	window.term = "{{$term}}";
+	window.baseURL = "{{$baseurl}}";
+	window.geoTag = function () { {{$geotag}} }*/*}}
+	window.jotId = "#profile-jot-text";
+	window.imageUploadButton = 'wall-image-upload';
+</script>
+
diff --git a/view/theme/decaf-mobile/templates/jot.tpl b/view/theme/decaf-mobile/templates/jot.tpl
new file mode 100644
index 000000000..61a72154c
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/jot.tpl
@@ -0,0 +1,104 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div id="profile-jot-wrapper" >
+	<div id="profile-jot-banner-wrapper">
+		<div id="profile-jot-desc" >&nbsp;</div>
+		<div id="character-counter" class="grey"></div>
+	</div>
+	<div id="profile-jot-banner-end"></div>
+
+	<form id="profile-jot-form" action="{{$action}}" method="post" >
+		<input type="hidden" name="type" value="{{$ptyp}}" />
+		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+		<input type="hidden" name="return" value="{{$return_path}}" />
+		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
+		<input type="hidden" name="coord" id="jot-coord" value="" />
+		<input type="hidden" name="post_id" value="{{$post_id}}" />
+		<input type="hidden" name="source" value="{{$sourceapp}}" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" ></div>
+		{{if $placeholdercategory}}
+		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" /></div>
+		{{/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" placeholder={{$share}} >{{if $content}}{{$content}}{{/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-rotator-wrapper" style="display: {{$visitor}};" >
+		<img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+	</div> 
+	
+	<div id="profile-upload-wrapper" style="display: {{$visitor}};" >
+		<div id="wall-image-upload-div" style="display: none;" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="{{$upload}}"></a></div>
+	</div> 
+	<div id="profile-attach-wrapper" style="display: {{$visitor}};" >
+		<div id="wall-file-upload-div" style="display: none;" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="{{$attach}}"></a></div>
+	</div> 
+
+	{{*<!--<div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
+		<a id="profile-link" class="icon link" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>-->*}}
+	{{*<!--<div id="profile-link-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-link" class="icon link" title="{{$weblink}}" onclick="jotGetLink(); return false;"></a>
+	</div> 
+	<div id="profile-video-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-video" class="icon video" title="{{$video}}" onclick="jotVideoURL();return false;"></a>
+	</div> 
+	<div id="profile-audio-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-audio" class="icon audio" title="{{$audio}}" onclick="jotAudioURL();return false;"></a>
+	</div> 
+	<div id="profile-location-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-location" class="icon globe" title="{{$setloc}}" onclick="jotGetLocation();return false;"></a>
+	</div> 
+	<div id="profile-nolocation-wrapper" style="display: none;" >
+		<a id="profile-nolocation" class="icon noglobe" title="{{$noloc}}" onclick="jotClearLocation();return false;"></a>
+	</div> -->*}}
+
+	{{*<!--<div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" >
+		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}}"  title="{{$permset}}" ></a>{{$bang}}
+	</div>
+
+	<span onclick="preview_post();" id="jot-preview-link" class="fakelink">{{$preview}}</span>-->*}}
+
+	<div id="profile-jot-perms-end"></div>
+
+
+	<div id="profile-jot-plugin-wrapper">
+  	{{$jotplugins}}
+	</div>
+
+	<div id="jot-preview-content" style="display:none;"></div>
+
+	{{*<!--<div style="display: none;">-->*}}
+		<div id="profile-jot-acl-wrapper">
+			{{*<!--{{$acl}}
+			<hr style="clear:both"/>
+			<div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
+			{{$jotnets}}
+			<div id="profile-jot-networks-end"></div>-->*}}
+			{{if $acl_data}}
+			{{include file="acl_html_selector.tpl"}}
+			{{/if}}
+			{{$jotnets}}
+		</div>
+	{{*<!--</div>-->*}}
+
+
+</div>
+
+<div id="profile-jot-end"></div>
+</form>
+</div>
+		{{*<!--{{if $content}}<script>window.jotInit = true;</script>{{/if}}-->*}}
+<script>
+document.getElementById('wall-image-upload-div').style.display = "inherit";
+document.getElementById('wall-file-upload-div').style.display = "inherit";
+</script>
diff --git a/view/theme/decaf-mobile/templates/jot_geotag.tpl b/view/theme/decaf-mobile/templates/jot_geotag.tpl
new file mode 100644
index 000000000..d828980e5
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/jot_geotag.tpl
@@ -0,0 +1,16 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+	if(navigator.geolocation) {
+		navigator.geolocation.getCurrentPosition(function(position) {
+			var lat = position.coords.latitude.toFixed(4);
+			var lon = position.coords.longitude.toFixed(4);
+
+			$j('#jot-coord').val(lat + ', ' + lon);
+			$j('#profile-nolocation-wrapper').show();
+		});
+	}
+
diff --git a/view/theme/decaf-mobile/templates/lang_selector.tpl b/view/theme/decaf-mobile/templates/lang_selector.tpl
new file mode 100644
index 000000000..a1aee8277
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/lang_selector.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	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/theme/decaf-mobile/templates/like_noshare.tpl b/view/theme/decaf-mobile/templates/like_noshare.tpl
new file mode 100644
index 000000000..9d6a58ea2
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/like_noshare.tpl
@@ -0,0 +1,12 @@
+{{*
+ *	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="like/{{$id}}?verb=like&return={{$return_path}}#{{$item.id}}" class="icon like" title="{{$likethis}}" ></a>
+	{{if $nolike}}
+	<a href="like/{{$id}}?verb=dislike&return={{$return_path}}#{{$item.id}}" class="icon dislike" title="{{$nolike}}" ></a>
+	{{/if}}
+	<img id="like-rotator-{{$id}}" class="like-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+</div>
diff --git a/view/theme/decaf-mobile/templates/login.tpl b/view/theme/decaf-mobile/templates/login.tpl
new file mode 100644
index 000000000..69d053181
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/login.tpl
@@ -0,0 +1,50 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div class="login-form">
+<form action="{{$dest_url}}" 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>
+	
+	{{if $openid}}
+			<div id="login_openid">
+			{{include file="field_openid.tpl" field=$lopenid}}
+			</div>
+	{{/if}}
+
+	<br />
+	<div id='login-footer'>
+	{{*<!--<div class="login-extra-links">
+	By signing in you agree to the latest <a href="tos.html" title="{{$tostitle}}" id="terms-of-service-link" >{{$toslink}}</a> and <a href="privacy.html" title="{{$privacytitle}}" id="privacy-link" >{{$privacylink}}</a>
+	</div>-->*}}
+
+	<br />
+	{{include file="field_checkbox.tpl" field=$lremember}}
+
+	<div id="login-submit-wrapper" >
+		<input type="submit" name="submit" id="login-submit-button" value="{{$login}}" />
+	</div>
+
+	<br /><br />
+	<div class="login-extra-links">
+		{{if $register}}<a href="register" title="{{$register.title}}" id="register-link">{{$register.desc}}</a>{{/if}}
+        <a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
+	</div>
+	</div>
+	
+	{{foreach $hiddens as $k=>$v}}
+		<input type="hidden" name="{{$k}}" value="{{$v}}" />
+	{{/foreach}}
+	
+	
+</form>
+</div>
+
+{{*<!--<script type="text/javascript">window.loginName = "{{$lname.0}}";</script>-->*}}
diff --git a/view/theme/decaf-mobile/templates/login_head.tpl b/view/theme/decaf-mobile/templates/login_head.tpl
new file mode 100644
index 000000000..c2d9504ad
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/login_head.tpl
@@ -0,0 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--<link rel="stylesheet" href="{{$baseurl}}/view/theme/frost-mobile/login-style.css" type="text/css" media="all" />-->*}}
+
diff --git a/view/theme/decaf-mobile/templates/lostpass.tpl b/view/theme/decaf-mobile/templates/lostpass.tpl
new file mode 100644
index 000000000..5a22c245b
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/lostpass.tpl
@@ -0,0 +1,26 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="lostpass-form">
+<h2>{{$title}}</h2>
+<br /><br /><br />
+
+<form action="lostpass" method="post" >
+<div id="login-name-wrapper" class="field input">
+        <label for="login-name" id="label-login-name">{{$name}}</label><br />
+        <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
+</div>
+<div id="login-extra-end"></div>
+<p id="lostpass-desc">
+{{$desc}}
+</p>
+<br />
+
+<div id="login-submit-wrapper" >
+        <input type="submit" name="submit" id="lostpass-submit-button" value="{{$submit}}" />
+</div>
+<div id="login-submit-end"></div>
+</form>
+</div>
diff --git a/view/theme/decaf-mobile/templates/mail_conv.tpl b/view/theme/decaf-mobile/templates/mail_conv.tpl
new file mode 100644
index 000000000..c2b43c538
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/mail_conv.tpl
@@ -0,0 +1,23 @@
+{{*
+ *	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>
+	<div class="mail-conv-detail" >
+		<div class="mail-conv-sender-name" >{{$mail.from_name}}</div>
+		<div class="mail-conv-date">{{$mail.date}}</div>
+		<div class="mail-conv-subject">{{$mail.subject}}</div>
+	</div>
+	<div class="mail-conv-body">{{$mail.body}}</div>
+</div>
+<div class="mail-conv-outside-wrapper-end"></div>
+
+
+<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}?confirm=1" class="icon drophide delete-icon mail-list-delete-icon" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'message/drop/{{$mail.id}}')});" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);*}}" ></a></div>
+<div class="mail-conv-delete-end"></div>
+
+<hr class="mail-conv-break" />
diff --git a/view/theme/decaf-mobile/templates/mail_list.tpl b/view/theme/decaf-mobile/templates/mail_list.tpl
new file mode 100644
index 000000000..538f6affb
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/mail_list.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="mail-list-outside-wrapper">
+	<div class="mail-list-sender" >
+		<a href="{{$from_url}}" class="mail-list-sender-url" ><img class="mail-list-sender-photo{{$sparkle}}" src="{{$from_photo}}" height="80" width="80" alt="{{$from_name}}" /></a>
+	</div>
+	<div class="mail-list-detail">
+		<div class="mail-list-sender-name" >{{$from_name}}</div>
+		<div class="mail-list-date">{{$date}}</div>
+		<div class="mail-list-subject"><a href="message/{{$id}}" class="mail-list-link">{{$subject}}</a></div>
+	<div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-{{$id}}" >
+		<a href="message/dropconv/{{$id}}?confirm=1" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'message/dropconv/{{$id}}')});"  title="{{$delete}}" class="icon drophide mail-list-delete	delete-icon" id="mail-list-delete-{{$id}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}} ></a>
+	</div>
+</div>
+</div>
+<div class="mail-list-delete-end"></div>
+
+<div class="mail-list-outside-wrapper-end"></div>
diff --git a/view/theme/decaf-mobile/templates/manage.tpl b/view/theme/decaf-mobile/templates/manage.tpl
new file mode 100644
index 000000000..f7d72f653
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/manage.tpl
@@ -0,0 +1,23 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$title}}</h3>
+<div id="identity-manage-desc">{{$desc}}</div>
+<div id="identity-manage-choose">{{$choose}}</div>
+<div id="identity-selector-wrapper">
+	<form action="manage" method="post" >
+	<select name="identity" size="4" onchange="this.form.submit();" >
+
+	{{foreach $identities as $id}}
+		<option {{$id.selected}} value="{{$id.uid}}">{{$id.username}} ({{$id.nickname}})</option>
+	{{/foreach}}
+
+	</select>
+	<div id="identity-select-break"></div>
+
+	{{* name="submit" interferes with this.form.submit() *}}
+	<input id="identity-submit" type="submit" {{*name="submit"*}} value="{{$submit}}" />
+</div></form>
+
diff --git a/view/theme/decaf-mobile/templates/message-end.tpl b/view/theme/decaf-mobile/templates/message-end.tpl
new file mode 100644
index 000000000..adeea280c
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/message-end.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--
+<script src="{{$baseurl}}/library/jquery_ac/friendica.complete.min.js" ></script>
+
+-->*}}
diff --git a/view/theme/decaf-mobile/templates/message-head.tpl b/view/theme/decaf-mobile/templates/message-head.tpl
new file mode 100644
index 000000000..a7fb96108
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/message-head.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/theme/decaf-mobile/templates/moderated_comment.tpl b/view/theme/decaf-mobile/templates/moderated_comment.tpl
new file mode 100644
index 000000000..b2401ca48
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/moderated_comment.tpl
@@ -0,0 +1,66 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
+			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
+				<input type="hidden" name="type" value="{{$type}}" />
+				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+				<input type="hidden" name="parent" value="{{$parent}}" />
+				<input type="hidden" name="return" value="{{$return_path}}" />
+				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
+				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
+					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<div id="mod-cmnt-wrap-{{$id}}" class="mod-cmnt-wrap" style="display:none">
+					<div id="mod-cmnt-name-lbl-{{$id}}" class="mod-cmnt-name-lbl">{{$lbl_modname}}</div>
+					<input type="text" id="mod-cmnt-name-{{$id}}" class="mod-cmnt-name" name="mod-cmnt-name" value="{{$modname}}" />
+					<div id="mod-cmnt-email-lbl-{{$id}}" class="mod-cmnt-email-lbl">{{$lbl_modemail}}</div>
+					<input type="text" id="mod-cmnt-email-{{$id}}" class="mod-cmnt-email" name="mod-cmnt-email" value="{{$modemail}}" />
+					<div id="mod-cmnt-url-lbl-{{$id}}" class="mod-cmnt-url-lbl">{{$lbl_modurl}}</div>
+					<input type="text" id="mod-cmnt-url-{{$id}}" class="mod-cmnt-url" name="mod-cmnt-url" value="{{$modurl}}" />
+				</div>
+				<ul class="comment-edit-bb-{{$id}}">
+					<li><a class="editicon boldbb shadow"
+						style="cursor: pointer;" title="{{$edbold}}"
+						onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
+					<li><a class="editicon italicbb shadow"
+						style="cursor: pointer;" title="{{$editalic}}"
+						onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
+					<li><a class="editicon underlinebb shadow"
+						style="cursor: pointer;" title="{{$eduline}}"
+						onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
+					<li><a class="editicon quotebb shadow"
+						style="cursor: pointer;" title="{{$edquote}}"
+						onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
+					<li><a class="editicon codebb shadow"
+						style="cursor: pointer;" title="{{$edcode}}"
+						onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
+					<li><a class="editicon imagebb shadow"
+						style="cursor: pointer;" title="{{$edimg}}"
+						onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
+					<li><a class="editicon urlbb shadow"
+						style="cursor: pointer;" title="{{$edurl}}"
+						onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
+					<li><a class="editicon videobb shadow"
+						style="cursor: pointer;" title="{{$edvideo}}"
+						onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
+				</ul>	
+				<div class="comment-edit-bb-end"></div>
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>			
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
+					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
+					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
+					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/theme/decaf-mobile/templates/msg-end.tpl b/view/theme/decaf-mobile/templates/msg-end.tpl
new file mode 100644
index 000000000..594f3f79b
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/msg-end.tpl
@@ -0,0 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.min.js" ></script>
+
diff --git a/view/theme/decaf-mobile/templates/msg-header.tpl b/view/theme/decaf-mobile/templates/msg-header.tpl
new file mode 100644
index 000000000..8447bb300
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/msg-header.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script language="javascript" type="text/javascript">
+{{*/*	window.nickname = "{{$nickname}}";
+	window.linkURL = "{{$linkurl}}";
+	var plaintext = "none";
+	window.autocompleteType = 'msg-header';*/*}}
+	window.jotId = "#prvmail-text";
+	window.imageUploadButton = 'prvmail-upload';
+</script>
+
diff --git a/view/theme/decaf-mobile/templates/nav.tpl b/view/theme/decaf-mobile/templates/nav.tpl
new file mode 100644
index 000000000..87d0bdec7
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/nav.tpl
@@ -0,0 +1,160 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<nav>
+{{*<!--	{{$langselector}} -->*}}
+
+{{*<!--	<div id="site-location">{{$sitelocation}}</div> -->*}}
+
+	<span id="nav-link-wrapper" >
+
+{{*<!--	<a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>-->*}}
+	<div class="nav-button-container">
+{{*<!--	<a class="system-menu-link nav-link" href="#system-menu" title="Menu">-->*}}
+	<a href="{{$nav.navigation.0}}" title="{{$nav.navigation.3}}" >
+	<img rel="#system-menu-list" class="nav-link" src="view/theme/decaf-mobile/images/menu.png">
+	</a>
+{{*<!--	</a>-->*}}
+	{{*<!--<ul id="system-menu-list" class="nav-menu-list">
+		{{if $nav.login}}
+		<a id="nav-login-link" class="nav-load-page-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a>
+		{{/if}}
+
+		{{if $nav.register}}
+		<a id="nav-register-link" class="nav-load-page-link {{$nav.register.2}} {{$sel.register}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a>
+		{{/if}}
+
+		{{if $nav.settings}}
+		<li><a id="nav-settings-link" class="{{$nav.settings.2}} nav-load-page-link" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>
+		{{/if}}
+
+		{{if $nav.manage}}
+		<li>
+		<a id="nav-manage-link" class="nav-load-page-link {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a>
+		</li>
+		{{/if}}
+
+		{{if $nav.profiles}}
+		<li><a id="nav-profiles-link" class="{{$nav.profiles.2}} nav-load-page-link" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a></li>
+		{{/if}}
+
+		{{if $nav.admin}}
+		<li><a id="nav-admin-link" class="{{$nav.admin.2}} nav-load-page-link" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a></li>
+		{{/if}}
+
+		<li><a id="nav-search-link" class="{{$nav.search.2}} nav-load-page-link" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a></li>
+
+		{{if $nav.apps}}
+		<li><a id="nav-apps-link" class="{{$nav.apps.2}} nav-load-page-link" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a></li>
+		{{/if}}
+
+		{{if $nav.help}}
+		<li><a id="nav-help-link" class="{{$nav.help.2}} nav-load-page-link" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a></li>
+		{{/if}}
+		
+		{{if $nav.logout}}
+		<li><a id="nav-logout-link" class="{{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>
+		{{/if}}
+	</ul>-->*}}
+	</div>
+
+	{{if $nav.notifications}}
+{{*<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a>-->*}}
+	<div class="nav-button-container">
+{{*<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">-->*}}
+	<a href="{{$nav.notifications.all.0}}">
+	<img rel="#nav-notifications-menu" class="nav-link" src="view/theme/decaf-mobile/images/notifications.png">
+	</a>
+{{*<!--	</a>-->*}}
+	{{*<!--<span id="notify-update" class="nav-ajax-left"></span>
+	<ul id="nav-notifications-menu" class="notifications-menu-popup">
+		<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
+		<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
+		<li class="empty">{{$emptynotifications}}</li>
+	</ul>-->*}}
+	</div>
+	{{/if}}		
+
+{{*<!--	<a id="contacts-menu-link" class="nav-link" href="#contacts-menu" title="Contacts">Contacts</a>-->*}}
+	{{if $nav.contacts}}
+	<div class="nav-button-container">
+{{*<!--	<a class="contacts-menu-link nav-link" href="#contacts-menu" title="Contacts">-->*}}
+	<a id="nav-contacts-link" class="{{$nav.contacts.2}} nav-load-page-link" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >
+	<img rel="#contacts-menu-list"  class="nav-link" src="view/theme/decaf-mobile/images/contacts.png">
+	</a>
+	{{*<!--</a>-->*}}
+	{{if $nav.introductions}}
+	<span id="intro-update" class="nav-ajax-left"></span>
+	{{/if}}
+	{{*<!--<ul id="contacts-menu-list" class="nav-menu-list">
+		{{if $nav.contacts}}
+		<li><a id="nav-contacts-link" class="{{$nav.contacts.2}} nav-load-page-link" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a><li>
+		{{/if}}
+
+		<li><a id="nav-directory-link" class="{{$nav.directory.2}} nav-load-page-link" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a><li>
+
+		{{if $nav.introductions}}
+		<li>
+		<a id="nav-notify-link" class="{{$nav.introductions.2}} {{$sel.introductions}} nav-load-page-link" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a>
+		</li>
+		{{/if}}
+	</ul>-->*}}
+	</div>
+	{{/if}}
+
+	{{if $nav.messages}}
+{{*<!--	<a id="nav-messages-link" class="nav-link {{$nav.messages.2}} {{$sel.messages}} nav-load-page-link" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>-->*}}
+	<div class="nav-button-container">
+	<a id="nav-messages-link" class="{{$nav.messages.2}} {{$sel.messages}} nav-load-page-link" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >
+	<img src="view/theme/decaf-mobile/images/message.png" class="nav-link">
+	</a>
+	<span id="mail-update" class="nav-ajax-left"></span>
+	</div>
+	{{/if}}
+
+{{*<!--	<a id="network-menu-link" class="nav-link" href="#network-menu" title="Network">Network</a>-->*}}
+	{{if $nav.network}}
+	<div class="nav-button-container">
+{{*<!--	<a class="network-menu-link nav-link" href="#network-menu" title="Network">-->*}}
+	<a id="nav-network-link" class="{{$nav.network.2}} {{$sel.network}} nav-load-page-link" href="/" >
+	<img rel="#network-menu-list" class="nav-link" src="view/theme/decaf-mobile/images/network.png">
+	</a>
+{{*<!--	</a>-->*}}
+	<span id="net-update" class="nav-ajax-left"></span>
+	</div>
+	{{/if}}
+<!--	<ul id="network-menu-list" class="nav-menu-list">
+		{{if $nav.network}}
+		<li>
+		<a id="nav-network-link" class="{{$nav.network.2}} {{$sel.network}} nav-load-page-link" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
+		</li>
+		{{/if}}
+
+		{{if $nav.network}}
+		<li>
+		<a class="nav-menu-icon network-reset-link nav-link" href="{{$nav.net_reset.0}}" title="{{$nav.net_reset.3}}">{{$nav.net_reset.1}}</a>
+		</li>
+		{{/if}}
+
+		{{if $nav.home}}
+		<li><a id="nav-home-link" class="{{$nav.home.2}} {{$sel.home}} nav-load-page-link" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a></li>
+		{{/if}}
+
+		{{if $nav.community}}
+		<li>
+		<a id="nav-community-link" class="{{$nav.community.2}} {{$sel.community}} nav-load-page-link" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
+		</li>
+		{{/if}}
+	</ul>
+	</div>-->
+
+	</span>
+	{{*<!--<span id="nav-end"></span>-->*}}
+	<span id="banner">{{$banner}}</span>
+</nav>
+
+{{*<!--<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
+</ul>-->*}}
diff --git a/view/theme/decaf-mobile/templates/photo_drop.tpl b/view/theme/decaf-mobile/templates/photo_drop.tpl
new file mode 100644
index 000000000..57f26cf52
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/photo_drop.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	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}}?confirm=1" onclick="return confirmDelete(function(){this.href='item/drop/{{$id}}'});" class="icon drophide" title="{{$delete}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}} ></a>
+</div>
+<div class="wall-item-delete-end"></div>
diff --git a/view/theme/decaf-mobile/templates/photo_edit.tpl b/view/theme/decaf-mobile/templates/photo_edit.tpl
new file mode 100644
index 000000000..1cff8f044
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/photo_edit.tpl
@@ -0,0 +1,65 @@
+{{*
+ *	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}}" />
+	<input id="photo-edit-form-confirm" type="hidden" name="confirm" value="1" />
+
+	<div class="photo-edit-input-text">
+	<label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$newalbum}}</label>
+	<input id="photo-edit-albumname" type="text" size="32" name="albname" value="{{$album}}" />
+	</div>
+
+	<div id="photo-edit-albumname-end"></div>
+
+	<div class="photo-edit-input-text">
+	<label id="photo-edit-caption-label" for="photo-edit-caption">{{$capt_label}}</label>
+	<input id="photo-edit-caption" type="text" size="32" name="desc" value="{{$caption}}" />
+	</div>
+
+	<div id="photo-edit-caption-end"></div>
+
+	<div class="photo-edit-input-text">
+	<label id="photo-edit-tags-label" for="photo-edit-newtag" >{{$tag_label}}</label>
+	<input name="newtag" id="photo-edit-newtag" size="32" title="{{$help_tags}}" type="text" />
+	</div>
+
+	<div id="photo-edit-tags-end"></div>
+
+	<div class="photo-edit-rotate-choice">
+	<label id="photo-edit-rotate-cw-label" for="photo-edit-rotate-cw">{{$rotatecw}}</label>
+	<input id="photo-edit-rotate-cw" class="photo-edit-rotate" type="radio" name="rotate" value="1" /><br />
+	</div>
+
+	<div class="photo-edit-rotate-choice">
+	<label id="photo-edit-rotate-ccw-label" for="photo-edit-rotate-ccw">{{$rotateccw}}</label>
+	<input id="photo-edit-rotate-ccw" class="photo-edit-rotate" type="radio" name="rotate" value="2" />
+	</div>
+	<div id="photo-edit-rotate-end"></div>
+
+	<div id="photo-edit-perms" class="photo-edit-perms" >
+		{{*<!--<a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="popupbox button" title="{{$permissions}}"/>
+			<span id="jot-perms-icon" class="icon {{$lockstate}} photo-perms-icon" ></span><div class="photo-jot-perms-text">{{$permissions}}</div>
+		</a>
+		<div id="photo-edit-perms-menu-end"></div>
+		
+		<div style="display: none;">-->*}}
+			<div id="photo-edit-perms-select" >
+				{{*<!--{{$aclselect}}-->*}}
+				{{include file="acl_html_selector.tpl"}}
+			</div>
+		{{*<!--</div>-->*}}
+	</div>
+	<div id="photo-edit-perms-end"></div>
+
+	<input id="photo-edit-submit-button" type="submit" name="submit" value="{{$submit}}" />
+	<input id="photo-edit-delete-button" type="submit" name="delete" value="{{$delete}}" onclick="return confirmDelete(function(){remove('photo-edit-form-confirm');});" />
+
+	<div id="photo-edit-end"></div>
+</form>
+
+
diff --git a/view/theme/decaf-mobile/templates/photo_edit_head.tpl b/view/theme/decaf-mobile/templates/photo_edit_head.tpl
new file mode 100644
index 000000000..740c3b425
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/photo_edit_head.tpl
@@ -0,0 +1,12 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--
+<script>
+	window.prevLink = "{{$prevlink}}";
+	window.nextLink = "{{$nextlink}}";
+	window.photoEdit = true;
+
+</script>-->*}}
diff --git a/view/theme/decaf-mobile/templates/photo_view.tpl b/view/theme/decaf-mobile/templates/photo_view.tpl
new file mode 100644
index 000000000..5ccb5fb16
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/photo_view.tpl
@@ -0,0 +1,47 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<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>
+
+<div id="photo-nav">
+	{{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}"><img src="view/theme/decaf-mobile/images/arrow-left.png"></a></div>{{/if}}
+	{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}"><img src="view/theme/decaf-mobile/images/arrow-right.png"></a></div>{{/if}}
+</div>
+<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}"><img src="{{$photo.src}}" /></a></div>
+<div id="photo-photo-end"></div>
+<div id="photo-caption">{{$desc}}</div>
+{{if $tags}}
+<div id="in-this-photo-text">{{$tags.0}}</div>
+<div id="in-this-photo">{{$tags.1}}</div>
+{{/if}}
+{{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}}
+
+{{if $edit}}
+{{$edit}}
+{{else}}
+
+{{if $likebuttons}}
+<div id="photo-like-div">
+	{{$likebuttons}}
+	{{$like}}
+	{{$dislike}}	
+</div>
+{{/if}}
+
+{{$comments}}
+
+{{$paginate}}
+{{/if}}
+
diff --git a/view/theme/decaf-mobile/templates/photos_head.tpl b/view/theme/decaf-mobile/templates/photos_head.tpl
new file mode 100644
index 000000000..c8bfa62c1
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/photos_head.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--
+<script>
+	window.isPublic = "{{$ispublic}}";
+</script>
+-->*}}
diff --git a/view/theme/decaf-mobile/templates/photos_upload.tpl b/view/theme/decaf-mobile/templates/photos_upload.tpl
new file mode 100644
index 000000000..9c22448dd
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/photos_upload.tpl
@@ -0,0 +1,56 @@
+{{*
+ *	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" >
+	<div id="photos-upload-new-wrapper" >
+		<div id="photos-upload-newalbum-div">
+			<label id="photos-upload-newalbum-text" for="photos-upload-newalbum" >{{$newalbum}}</label>
+		</div>
+		<input id="photos-upload-newalbum" type="text" name="newalbum" />
+	</div>
+	<div id="photos-upload-new-end"></div>
+	<div id="photos-upload-exist-wrapper">
+		<div id="photos-upload-existing-album-text">{{$existalbumtext}}</div>
+		<select id="photos-upload-album-select" name="album">
+		{{$albumselect}}
+		</select>
+	</div>
+	<div id="photos-upload-exist-end"></div>
+
+	{{$default_upload_box}}
+
+	<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
+		<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" checked />
+		<label id="photos-upload-noshare-text" for="photos-upload-noshare" >{{$nosharetext}}</label>
+	</div>
+
+
+	{{*<!--<div id="photos-upload-perms" class="photos-upload-perms" >
+		<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button popupbox" />
+		<span id="jot-perms-icon" class="icon {{$lockstate}}" ></span>{{$permissions}}
+		</a>
+	</div>
+	<div id="photos-upload-perms-end"></div>
+
+	<div style="display: none;">-->*}}
+		<div id="photos-upload-permissions-wrapper">
+			{{*<!--{{$aclselect}}-->*}}
+			{{include file="acl_html_selector.tpl"}}
+		</div>
+	{{*<!--</div>-->*}}
+
+	<div id="photos-upload-spacer"></div>
+
+	{{$alt_uploader}}
+
+	{{$default_upload_submit}}
+
+	<div class="photos-upload-end" ></div>
+</form>
+
diff --git a/view/theme/decaf-mobile/templates/profed_end.tpl b/view/theme/decaf-mobile/templates/profed_end.tpl
new file mode 100644
index 000000000..e9c03543b
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/profed_end.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--
+<script type="text/javascript" src="js/country.min.js" ></script>
+
+<script language="javascript" type="text/javascript">
+	Fill_Country('{{$country_name}}');
+	Fill_States('{{$region}}');
+</script>
+-->*}}
diff --git a/view/theme/decaf-mobile/templates/profed_head.tpl b/view/theme/decaf-mobile/templates/profed_head.tpl
new file mode 100644
index 000000000..c8ce27bb8
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/profed_head.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--
+<script language="javascript" type="text/javascript">
+	window.editSelect = "none";
+</script>
+-->*}}
diff --git a/view/theme/decaf-mobile/templates/profile_edit.tpl b/view/theme/decaf-mobile/templates/profile_edit.tpl
new file mode 100644
index 000000000..7583784fb
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/profile_edit.tpl
@@ -0,0 +1,329 @@
+{{*
+ *	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/{{$profile_id}}/view?tab=profile" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></li>
+<li><a href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a></li>
+<li></li>
+<li><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" {{$disabled}} >{{$del_prof}}</a></li>
+
+</ul>
+</div>
+
+<div id="profile-edit-links-end"></div>
+
+
+<div id="profile-edit-wrapper" >
+<form id="profile-edit-form" name="form1" action="profiles/{{$profile_id}}" method="post" >
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+<div id="profile-edit-profile-name-wrapper" >
+<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$lbl_profname}} </label>
+<input type="text" size="28" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name}}" /><div class="required">*</div>
+</div>
+<div id="profile-edit-profile-name-end"></div>
+
+<div id="profile-edit-name-wrapper" >
+<label id="profile-edit-name-label" for="profile-edit-name" >{{$lbl_fullname}} </label>
+<input type="text" size="28" name="name" id="profile-edit-name" value="{{$name}}" />
+</div>
+<div id="profile-edit-name-end"></div>
+
+<div id="profile-edit-pdesc-wrapper" >
+<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >{{$lbl_title}} </label>
+<input type="text" size="28" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc}}" />
+</div>
+<div id="profile-edit-pdesc-end"></div>
+
+
+<div id="profile-edit-gender-wrapper" >
+<label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}} </label>
+{{$gender}}
+</div>
+<div id="profile-edit-gender-end"></div>
+
+<div id="profile-edit-dob-wrapper" >
+<label id="profile-edit-dob-label" for="dob-select" >{{$lbl_bd}} </label>
+<div id="profile-edit-dob" >
+{{$dob}} {{$age}}
+</div>
+</div>
+<div id="profile-edit-dob-end"></div>
+
+{{$hide_friends}}
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="profile-edit-address-wrapper" >
+<label id="profile-edit-address-label" for="profile-edit-address" >{{$lbl_address}} </label>
+<input type="text" size="28" name="address" id="profile-edit-address" value="{{$address}}" />
+</div>
+<div id="profile-edit-address-end"></div>
+
+<div id="profile-edit-locality-wrapper" >
+<label id="profile-edit-locality-label" for="profile-edit-locality" >{{$lbl_city}} </label>
+<input type="text" size="28" name="locality" id="profile-edit-locality" value="{{$locality}}" />
+</div>
+<div id="profile-edit-locality-end"></div>
+
+
+<div id="profile-edit-postal-code-wrapper" >
+<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$lbl_zip}} </label>
+<input type="text" size="28" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code}}" />
+</div>
+<div id="profile-edit-postal-code-end"></div>
+
+<div id="profile-edit-country-name-wrapper" >
+<label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$lbl_country}} </label>
+<input type="text" size="28" name="country_name" id="profile-edit-country-name" value="{{$country_name}}" />
+{{*<!--<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('{{$region}}');">
+<option selected="selected" >{{$country_name}}</option>
+<option>temp</option>
+</select>-->*}}
+</div>
+<div id="profile-edit-country-name-end"></div>
+
+<div id="profile-edit-region-wrapper" >
+<label id="profile-edit-region-label" for="profile-edit-region" >{{$lbl_region}} </label>
+<input type="text" size="28" name="region" id="profile-edit-region" value="{{$region}}" />
+{{*<!--<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
+<option selected="selected" >{{$region}}</option>
+<option>temp</option>
+</select>-->*}}
+</div>
+<div id="profile-edit-region-end"></div>
+
+<div id="profile-edit-hometown-wrapper" >
+<label id="profile-edit-hometown-label" for="profile-edit-hometown" >{{$lbl_hometown}} </label>
+<input type="text" size="28" name="hometown" id="profile-edit-hometown" value="{{$hometown}}" />
+</div>
+<div id="profile-edit-hometown-end"></div>
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+<div id="profile-edit-marital-wrapper" >
+<label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}} </label>
+{{$marital}}
+</div>
+<label id="profile-edit-with-label" for="profile-edit-with" > {{$lbl_with}} </label>
+<input type="text" size="28" name="with" id="profile-edit-with" title="{{$lbl_ex1}}" value="{{$with}}" />
+<label id="profile-edit-howlong-label" for="profile-edit-howlong" > {{$lbl_howlong}} </label>
+<input type="text" size="28" name="howlong" id="profile-edit-howlong" title="{{$lbl_howlong}}" value="{{$howlong}}" />
+
+<div id="profile-edit-marital-end"></div>
+
+<div id="profile-edit-sexual-wrapper" >
+<label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}} </label>
+{{$sexual}}
+</div>
+<div id="profile-edit-sexual-end"></div>
+
+
+
+<div id="profile-edit-homepage-wrapper" >
+<label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$lbl_homepage}} </label>
+<input type="text" size="28" name="homepage" id="profile-edit-homepage" value="{{$homepage}}" />
+</div>
+<div id="profile-edit-homepage-end"></div>
+
+<div id="profile-edit-politic-wrapper" >
+<label id="profile-edit-politic-label" for="profile-edit-politic" >{{$lbl_politic}} </label>
+<input type="text" size="28" name="politic" id="profile-edit-politic" value="{{$politic}}" />
+</div>
+<div id="profile-edit-politic-end"></div>
+
+<div id="profile-edit-religion-wrapper" >
+<label id="profile-edit-religion-label" for="profile-edit-religion" >{{$lbl_religion}} </label>
+<input type="text" size="28" name="religion" id="profile-edit-religion" value="{{$religion}}" />
+</div>
+<div id="profile-edit-religion-end"></div>
+
+<div id="profile-edit-pubkeywords-wrapper" >
+<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$lbl_pubkey}} </label>
+<input type="text" size="28" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords}}" />
+</div><div id="profile-edit-pubkeywords-desc">{{$lbl_pubdsc}}</div>
+<div id="profile-edit-pubkeywords-end"></div>
+
+<div id="profile-edit-prvkeywords-wrapper" >
+<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >{{$lbl_prvkey}} </label>
+<input type="text" size="28" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords}}" />
+</div><div id="profile-edit-prvkeywords-desc">{{$lbl_prvdsc}}</div>
+<div id="profile-edit-prvkeywords-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+<div id="about-jot-wrapper" class="profile-jot-box">
+<p id="about-jot-desc" >
+{{$lbl_about}}
+</p>
+
+<textarea rows="10" cols="30" id="profile-about-text" class="profile-edit-textarea" name="about" >{{$about}}</textarea>
+
+</div>
+<div id="about-jot-end"></div>
+
+
+<div id="interest-jot-wrapper" class="profile-jot-box" >
+<p id="interest-jot-desc" >
+{{$lbl_hobbies}}
+</p>
+
+<textarea rows="10" cols="30" id="interest-jot-text" class="profile-edit-textarea" name="interest" >{{$interest}}</textarea>
+
+</div>
+<div id="interest-jot-end"></div>
+
+
+<div id="likes-jot-wrapper" class="profile-jot-box" >
+<p id="likes-jot-desc" >
+{{$lbl_likes}}
+</p>
+
+<textarea rows="10" cols="30" id="likes-jot-text" class="profile-edit-textarea" name="likes" >{{$likes}}</textarea>
+
+</div>
+<div id="likes-jot-end"></div>
+
+
+<div id="dislikes-jot-wrapper" class="profile-jot-box" >
+<p id="dislikes-jot-desc" >
+{{$lbl_dislikes}}
+</p>
+
+<textarea rows="10" cols="30" id="dislikes-jot-text" class="profile-edit-textarea" name="dislikes" >{{$dislikes}}</textarea>
+
+</div>
+<div id="dislikes-jot-end"></div>
+
+
+<div id="contact-jot-wrapper" class="profile-jot-box" >
+<p id="contact-jot-desc" >
+{{$lbl_social}}
+</p>
+
+<textarea rows="10" cols="30" id="contact-jot-text" class="profile-edit-textarea" name="contact" >{{$contact}}</textarea>
+
+</div>
+<div id="contact-jot-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="music-jot-wrapper" class="profile-jot-box" >
+<p id="music-jot-desc" >
+{{$lbl_music}}
+</p>
+
+<textarea rows="10" cols="30" id="music-jot-text" class="profile-edit-textarea" name="music" >{{$music}}</textarea>
+
+</div>
+<div id="music-jot-end"></div>
+
+<div id="book-jot-wrapper" class="profile-jot-box" >
+<p id="book-jot-desc" >
+{{$lbl_book}}
+</p>
+
+<textarea rows="10" cols="30" id="book-jot-text" class="profile-edit-textarea" name="book" >{{$book}}</textarea>
+
+</div>
+<div id="book-jot-end"></div>
+
+
+
+<div id="tv-jot-wrapper" class="profile-jot-box" >
+<p id="tv-jot-desc" >
+{{$lbl_tv}} 
+</p>
+
+<textarea rows="10" cols="30" id="tv-jot-text" class="profile-edit-textarea" name="tv" >{{$tv}}</textarea>
+
+</div>
+<div id="tv-jot-end"></div>
+
+
+
+<div id="film-jot-wrapper" class="profile-jot-box" >
+<p id="film-jot-desc" >
+{{$lbl_film}}
+</p>
+
+<textarea rows="10" cols="30" id="film-jot-text" class="profile-edit-textarea" name="film" >{{$film}}</textarea>
+
+</div>
+<div id="film-jot-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="romance-jot-wrapper" class="profile-jot-box" >
+<p id="romance-jot-desc" >
+{{$lbl_love}}
+</p>
+
+<textarea rows="10" cols="30" id="romance-jot-text" class="profile-edit-textarea" name="romance" >{{$romance}}</textarea>
+
+</div>
+<div id="romance-jot-end"></div>
+
+
+
+<div id="work-jot-wrapper" class="profile-jot-box" >
+<p id="work-jot-desc" >
+{{$lbl_work}}
+</p>
+
+<textarea rows="10" cols="30" id="work-jot-text" class="profile-edit-textarea" name="work" >{{$work}}</textarea>
+
+</div>
+<div id="work-jot-end"></div>
+
+
+
+<div id="education-jot-wrapper" class="profile-jot-box" >
+<p id="education-jot-desc" >
+{{$lbl_school}} 
+</p>
+
+<textarea rows="10" cols="30" id="education-jot-text" class="profile-edit-textarea" name="education" >{{$education}}</textarea>
+
+</div>
+<div id="education-jot-end"></div>
+
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+</form>
+</div>
+
diff --git a/view/theme/decaf-mobile/templates/profile_photo.tpl b/view/theme/decaf-mobile/templates/profile_photo.tpl
new file mode 100644
index 000000000..6bcb3cf85
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/profile_photo.tpl
@@ -0,0 +1,24 @@
+{{*
+ *	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" for="profile-photo-upload">{{$lbl_upfile}} </label>
+<input name="userfile" type="file" id="profile-photo-upload" size="25" />
+</div>
+
+<div id="profile-photo-submit-wrapper">
+<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}">
+</div>
+
+</form>
+
+<div id="profile-photo-link-select-wrapper">
+{{$select}}
+</div>
diff --git a/view/theme/decaf-mobile/templates/profile_vcard.tpl b/view/theme/decaf-mobile/templates/profile_vcard.tpl
new file mode 100644
index 000000000..85c6345d6
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/profile_vcard.tpl
@@ -0,0 +1,56 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="vcard">
+
+	<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 $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/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}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
+
+	{{include file="diaspora_vcard.tpl"}}
+
+	<div id="profile-vcard-break"></div>	
+	<div id="profile-extra-links">
+		<ul>
+			{{if $connect}}
+				<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
+			{{/if}}
+			{{if $wallmessage}}
+				<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
+			{{/if}}
+		</ul>
+	</div>
+</div>
+
+{{$contact_block}}
+
+
diff --git a/view/theme/decaf-mobile/templates/prv_message.tpl b/view/theme/decaf-mobile/templates/prv_message.tpl
new file mode 100644
index 000000000..6372d306a
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/prv_message.tpl
@@ -0,0 +1,48 @@
+{{*
+ *	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="messageto" 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="28" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
+
+<div id="prvmail-message-label">{{$yourmessage}}</div>
+<textarea rows="8" cols="32" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
+
+
+<div id="prvmail-submit-wrapper" >
+	<input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" />
+	<div id="prvmail-upload-wrapper"  style="display: none;">
+		<div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
+	</div> 
+	{{*<!--<div id="prvmail-link-wrapper" >
+		<div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
+	</div>-->*}} 
+	<div id="prvmail-rotator-wrapper" >
+		<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+	</div> 
+</div>
+<div id="prvmail-end"></div>
+</form>
+</div>
+
+<script>
+document.getElementById('prvmail-upload-wrapper').style.display = "inherit";
+</script>
diff --git a/view/theme/decaf-mobile/templates/register.tpl b/view/theme/decaf-mobile/templates/register.tpl
new file mode 100644
index 000000000..3f64bb672
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/register.tpl
@@ -0,0 +1,85 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class='register-form'>
+<h2>{{$regtitle}}</h2>
+<br />
+
+<form action="register" method="post" id="register-form">
+
+	<input type="hidden" name="photo" value="{{$photo}}" />
+
+	{{$registertext}}
+
+	<p id="register-realpeople">{{$realpeople}}</p>
+
+	<br />
+{{if $oidlabel}}
+	<div id="register-openid-wrapper" >
+    	<label for="register-openid" id="label-register-openid" >{{$oidlabel}}</label><input 	type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="{{$openid}}" >
+	</div>
+	<div id="register-openid-end" ></div>
+{{/if}}
+
+	<div class="register-explain-wrapper">
+	<p id="register-fill-desc">{{$fillwith}} {{$fillext}}</p>
+	</div>
+
+	<br /><br />
+
+{{if $invitations}}
+
+	<p id="register-invite-desc">{{$invite_desc}}</p>
+	<div id="register-invite-wrapper" >
+		<label for="register-invite" id="label-register-invite" >{{$invite_label}}</label>
+		<input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" value="{{$invite_id}}" >
+	</div>
+	<div id="register-name-end" ></div>
+
+{{/if}}
+
+
+	<div id="register-name-wrapper" class="field input" >
+		<label for="register-name" id="label-register-name" >{{$namelabel}}</label><br />
+		<input type="text" maxlength="60" size="32" name="username" id="register-name" value="{{$username}}" >
+	</div>
+	<div id="register-name-end" ></div>
+
+
+	<div id="register-email-wrapper"  class="field input" >
+		<label for="register-email" id="label-register-email" >{{$addrlabel}}</label><br />
+		<input type="text" maxlength="60" size="32" name="email" id="register-email" value="{{$email}}" >
+	</div>
+	<div id="register-email-end" ></div>
+
+	<div id="register-nickname-wrapper" class="field input" >
+		<label for="register-nickname" id="label-register-nickname" >{{$nicklabel}}</label><br />
+		<input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" value="{{$nickname}}" >
+	</div>
+	<div id="register-nickname-end" ></div>
+
+	<div class="register-explain-wrapper">
+	<p id="register-nickname-desc" >{{$nickdesc}}</p>
+	</div>
+
+	{{$publish}}
+
+	<div id="register-footer">
+	{{*<!--<div class="agreement">
+	By clicking '{{$regbutt}}' you are agreeing to the latest <a href="tos.html" title="{{$tostitle}}" id="terms-of-service-link" >{{$toslink}}</a> and <a href="privacy.html" title="{{$privacytitle}}" id="privacy-link" >{{$privacylink}}</a>
+	</div>-->*}}
+	<br />
+
+	<div id="register-submit-wrapper">
+		<input type="submit" name="submit" id="register-submit-button" value="{{$regbutt}}" />
+	</div>
+	<div id="register-submit-end" ></div>
+	</div>
+</form>
+<br /><br /><br />
+
+{{$license}}
+
+</div>
diff --git a/view/theme/decaf-mobile/templates/search_item.tpl b/view/theme/decaf-mobile/templates/search_item.tpl
new file mode 100644
index 000000000..a6da44d3d
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/search_item.tpl
@@ -0,0 +1,69 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<a name="{{$item.id}}" ></a>
+{{*<!--<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >-->*}}
+	<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" >
+		<div class="wall-item-info" id="wall-item-info-{{$item.id}}">
+			{{*<!--<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$item.id}}" 
+				 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
+				 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">-->*}}
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
+				{{*<!--<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+				<div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+					<ul>
+						{{$item.item_photo_menu}}
+					</ul>
+				</div>
+			</div>-->*}}
+			<div class="wall-item-photo-end"></div>	
+			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
+				{{if $item.lock}}{{*<!--<div class="wall-item-lock">-->*}}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="{{$item.lock}}" {{*onclick="lockview(event,{{$item.id}});" *}}/>{{*<!--</div>-->*}}
+				{{else}}<div class="wall-item-lock"></div>{{/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}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}">{{$item.ago}}</div>
+				
+		{{*<!--</div>-->*}}
+		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			{{*<!--<div class="wall-item-title-end"></div>-->*}}
+			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
+			{{if $item.has_cats}}
+			<div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}} {{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}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}}{{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
+			{{*<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >-->*}}
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}?confirm=1" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'item/drop/{{$item.id}}')});" class="wall-item-delete-wrapper icon drophide" title="{{$item.drop.delete}}" id="wall-item-delete-wrapper-{{$item.id}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}} ></a>{{/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-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>-->*}}
+
+
diff --git a/view/theme/decaf-mobile/templates/settings-head.tpl b/view/theme/decaf-mobile/templates/settings-head.tpl
new file mode 100644
index 000000000..c8bfa62c1
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/settings-head.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--
+<script>
+	window.isPublic = "{{$ispublic}}";
+</script>
+-->*}}
diff --git a/view/theme/decaf-mobile/templates/settings.tpl b/view/theme/decaf-mobile/templates/settings.tpl
new file mode 100644
index 000000000..587b96e28
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/settings.tpl
@@ -0,0 +1,156 @@
+{{*
+ *	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_pass}}</h3>
+
+{{include file="field_password.tpl" field=$password1}}
+{{include file="field_password.tpl" field=$password2}}
+{{include file="field_password.tpl" field=$password3}}
+
+{{if $oid_enable}}
+{{include file="field_input.tpl" field=$openid}}
+{{/if}}
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+</div>
+
+
+<h3 class="settings-heading">{{$h_basic}}</h3>
+
+{{include file="field_input.tpl" field=$username}}
+{{include file="field_input.tpl" field=$email}}
+{{include file="field_password.tpl" field=$password4}}
+{{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>
+
+
+<input type="hidden" name="visibility" value="{{$visibility}}" />
+
+{{include file="field_input.tpl" field=$maxreq}}
+
+{{$profile_in_dir}}
+
+{{$profile_in_net_dir}}
+
+{{$hide_friends}}
+
+{{$hide_wall}}
+
+{{$blockwall}}
+
+{{$blocktags}}
+
+{{$suggestme}}
+
+{{$unkmail}}
+
+
+{{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.notes}}
+			{{include file="field_yesno.tpl" field=$expire.starred}}
+			{{include file="field_yesno.tpl" field=$expire.network_only}}
+		</div>
+	</div>
+
+</div>
+
+
+<div id="settings-perms-wrapper" class="field">
+<label for="settings-default-perms">{{$settings_perms}}</label><br/>
+<div id="settings-default-perms" class="settings-default-perms" >
+{{*<!--	<a href="#settings-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>{{$permissions}} {{$permdesc}}</a>
+	<div id="settings-default-perms-menu-end"></div>
+
+	<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >
+	
+	<div style="display: none;">-->*}}
+		<div id="settings-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;margin-bottom: 20px">
+			{{*<!--{{$aclselect}}-->*}}
+			{{include file="acl_html_selector.tpl"}}
+		</div>
+{{*<!--	</div>
+
+	</div>-->*}}
+</div>
+</div>
+<br/>
+<div id="settings-default-perms-end"></div>
+
+{{$group_select}}
+
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+</div>
+
+
+
+<h3 class="settings-heading">{{$h_not}}</h3>
+<div id="settings-notifications">
+
+<div id="settings-activity-desc">{{$activity_options}}</div>
+
+{{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>
+
+
+<h3 class="settings-heading">{{$h_advn}}</h3>
+<div id="settings-pagetype-desc">{{$h_descadvn}}</div>
+
+{{$pagetype}}
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+</div>
+
+
diff --git a/view/theme/decaf-mobile/templates/settings_display_end.tpl b/view/theme/decaf-mobile/templates/settings_display_end.tpl
new file mode 100644
index 000000000..4b3db00f5
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/settings_display_end.tpl
@@ -0,0 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	<script>$j(function(){ previewTheme($j("#id_{{$theme.0}}")[0]); });</script>
+
diff --git a/view/theme/decaf-mobile/templates/suggest_friends.tpl b/view/theme/decaf-mobile/templates/suggest_friends.tpl
new file mode 100644
index 000000000..7221dc689
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/suggest_friends.tpl
@@ -0,0 +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}}" width="80" height="80" title="{{$name}} [{{$url}}]" onError="this.src='../../../images/person-48.jpg';" />
+		</a>
+	</div>
+	<div class="profile-match-break"></div>
+	<div class="profile-match-name">
+		<a href="{{$url}}" title="{{$name}}">{{$name}}</a>
+	</div>
+	<div class="profile-match-end"></div>
+	{{if $connlnk}}
+	<div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}">{{$conntxt}}</a></div>
+	{{/if}}
+	<a href="{{$ignlnk}}&confirm=1" title="{{$ignore}}" class="icon drophide profile-match-ignore" id="profile-match-drop-{{$ignid}}" {{*onmouseout="imgdull(this);" onmouseover="imgbright(this);"*}} onclick="id=this.id;return confirmDelete(function(){changeHref(id, '{{$ignlnk}}')});" ></a>
+</div>
diff --git a/view/theme/decaf-mobile/templates/threaded_conversation.tpl b/view/theme/decaf-mobile/templates/threaded_conversation.tpl
new file mode 100644
index 000000000..e90caf5a7
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/threaded_conversation.tpl
@@ -0,0 +1,17 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$live_update}}
+
+{{foreach $threads as $thread}}
+{{if $mode == display}}
+{{include file="{{$thread.template}}" item=$thread}}
+{{else}}
+{{include file="wall_thread_toponly.tpl" item=$thread}}
+{{/if}}
+{{/foreach}}
+
+<div id="conversation-end"></div>
+
diff --git a/view/theme/decaf-mobile/templates/voting_fakelink.tpl b/view/theme/decaf-mobile/templates/voting_fakelink.tpl
new file mode 100644
index 000000000..1e073916e
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/voting_fakelink.tpl
@@ -0,0 +1,6 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<span class="fakelink-wrapper"  id="{{$type}}list-{{$id}}-wrapper">{{$phrase}}</span>
diff --git a/view/theme/decaf-mobile/templates/wall_thread.tpl b/view/theme/decaf-mobile/templates/wall_thread.tpl
new file mode 100644
index 000000000..058ae43cc
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/wall_thread.tpl
@@ -0,0 +1,124 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
+<a name="{{$item.id}}" ></a>
+{{*<!--<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}} wallwall" id="wall-item-outside-wrapper-{{$item.id}}" >-->*}}
+	<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" >
+		<div class="wall-item-info{{if $item.owner_url}} wallwall{{/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}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
+				<img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" onError="this.src='../../../images/person-48.jpg';" />
+				</a>
+			</div>
+			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
+			{{/if}}
+			{{*<!--<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-{{$item.id}}" 
+				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
+                onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">-->*}}
+			{{*<!--<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">-->*}}
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" onError="this.src='../../../images/person-48.jpg';" />
+				</a>
+				{{*<!--<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+                <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+                    <ul class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+                        {{$item.item_photo_menu}}
+                    </ul>
+                </div>-->*}}
+
+			{{*<!--</div>-->*}}
+			{{*<!--<div class="wall-item-photo-end"></div>-->*}}
+			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
+				{{if $item.lock}}{{*<!--<div class="wall-item-lock">-->*}}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="{{$item.lock}}" {{*onclick="lockview(event,{{$item.id}});"*}} />{{*<!--</div>-->*}}
+				{{else}}<div class="wall-item-lock"></div>{{/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}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}{{/if}}<br />
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>				
+		{{*<!--</div>-->*}}
+		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			{{*<!--<div class="wall-item-title-end"></div>-->*}}
+			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}
+					{{*<!--<div class="body-tag">-->*}}
+						{{foreach $item.tags as $tag}}
+							<span class='body-tag tag'>{{$tag}}</span>
+						{{/foreach}}
+					{{*<!--</div>-->*}}
+			{{if $item.has_cats}}
+			<div class="categorytags">{{$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">{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+			</div>
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
+			{{if $item.vote}}
+			<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$item.id}}">
+				<a href="like/{{$item.id}}?verb=like&return={{$return_path}}#{{$item.id}}" class="icon like" title="{{$item.vote.like.0}}" ></a>
+				{{if $item.vote.dislike}}
+				<a href="like/{{$item.id}}?verb=dislike&return={{$return_path}}#{{$item.id}}" class="icon dislike" title="{{$item.vote.dislike.0}}" ></a>
+				{{/if}}
+				{{*<!--{{if $item.vote.share}}<a href="#" class="icon recycle wall-item-share-buttons" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>{{/if}}-->*}}
+				<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+			</div>
+			{{/if}}
+			{{if $item.plink}}
+				{{*<!--<div class="wall-item-links-wrapper">-->*}}<a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="wall-item-links-wrapper icon remote-link{{$item.sparkle}}"></a>{{*<!--</div>-->*}}
+			{{/if}}
+			{{if $item.edpost}}
+				<a class="editpost icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
+			{{/if}}
+			 
+			{{if $item.star}}
+			<a href="starred/{{$item.id}}?return={{$return_path}}#{{$item.id}}" id="starred-{{$item.id}}" class="star-item icon {{$item.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 tagged" title="{{$item.tagger.add}}"></a>
+			{{/if}}-->*}}
+			{{*<!--{{if $item.filer}}
+			<a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"></a>
+			{{/if}}			-->*}}
+			
+			{{*<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >-->*}}
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}?confirm=1" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'item/drop/{{$item.id}}')});" class="wall-item-delete-wrapper icon drophide" title="{{$item.drop.delete}}" id="wall-item-delete-wrapper-{{$item.id}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}} ></a>{{/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 wall-item-like-full {{$item.indent}}" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
+	<div class="wall-item-dislike wall-item-dislike-full {{$item.indent}}" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
+
+	{{if $item.threaded}}
+	{{if $item.comment}}
+	{{*<!--<div class="wall-item-comment-wrapper {{$item.indent}}" >-->*}}
+		{{$item.comment}}
+	{{*<!--</div>-->*}}
+	{{/if}}
+	{{/if}}
+
+{{*<!--<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>-->*}}
+{{*<!--</div>-->*}}
+{{foreach $item.children as $child}}
+	{{include file="{{$child.template}}" item=$child}}
+{{/foreach}}
+
+{{if $item.flatten}}
+{{*<!--<div class="wall-item-comment-wrapper" >-->*}}
+	{{$item.comment}}
+{{*<!--</div>-->*}}
+{{/if}}
+</div>
+
diff --git a/view/theme/decaf-mobile/templates/wall_thread_toponly.tpl b/view/theme/decaf-mobile/templates/wall_thread_toponly.tpl
new file mode 100644
index 000000000..af8626a84
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/wall_thread_toponly.tpl
@@ -0,0 +1,106 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<!--{{if $item.comment_firstcollapsed}}
+	<div class="hide-comments-outer">
+	<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> <span id="hide-comments-{{$item.id}}" class="hide-comments fakelink" onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
+	</div>
+	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
+{{/if}}-->
+<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
+<a name="{{$item.id}}" ></a>
+	<div class="wall-item-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}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
+				<img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" onError="this.src='../../../images/person-48.jpg';" />
+				</a>
+			</div>
+			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
+			{{/if}}
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" onError="this.src='../../../images/person-48.jpg';" />
+				</a>
+
+			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
+				{{if $item.lock}}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="{{$item.lock}}" {{*onclick="lockview(event,{{$item.id}});"*}} />
+				{{else}}<div class="wall-item-lock"></div>{{/if}}	
+				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
+			</div>
+		</div>
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}{{/if}}<br />
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>				
+		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}
+						{{foreach $item.tags as $tag}}
+							<span class='body-tag tag'>{{$tag}}</span>
+						{{/foreach}}
+			{{if $item.has_cats}}
+			<div class="categorytags">{{$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">{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+			</div>
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
+			{{if $item.vote}}
+			<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$item.id}}">
+				<a href="like/{{$item.id}}?verb=like&return={{$return_path}}#{{$item.id}}" class="icon like" title="{{$item.vote.like.0}}" ></a>
+				{{if $item.vote.dislike}}
+				<a href="like/{{$item.id}}?verb=dislike&return={{$return_path}}#{{$item.id}}" class="icon dislike" title="{{$item.vote.dislike.0}}" ></a>
+				{{/if}}
+				{{*<!--{{if $item.vote.share}}<a href="#" class="icon recycle wall-item-share-buttons" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>{{/if}}-->*}}
+				<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+			</div>
+			{{/if}}
+			{{if $item.plink}}
+				<a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="wall-item-links-wrapper icon remote-link{{$item.sparkle}}"></a>
+			{{/if}}
+			{{if $item.edpost}}
+				<a class="editpost icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
+			{{/if}}
+			 
+			{{if $item.star}}
+			<a href="starred/{{$item.id}}?return={{$return_path}}#{{$item.id}}" id="starred-{{$item.id}}" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}"></a>
+			{{/if}}
+			{{*<!--{{if $item.tagger}}
+			<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon tagged" title="{{$item.tagger.add}}"></a>
+			{{/if}}
+			{{if $item.filer}}
+			<a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"></a>
+			{{/if}}			-->*}}
+			
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}?confirm=1" onclick="id=this.id;return confirmDelete(function(){changeHref(id, 'item/drop/{{$item.id}}')});" class="wall-item-delete-wrapper icon drophide" title="{{$item.drop.delete}}" id="wall-item-delete-wrapper-{{$item.id}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}} ></a>{{/if}}
+				{{*<!--{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}-->*}}
+		</div>
+	</div>	
+	<div class="wall-item-like {{$item.indent}}" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
+	<div class="wall-item-dislike {{$item.indent}}" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
+
+	<div class="hide-comments-outer">
+	<a href="display/{{$user.nickname}}/{{$item.id}}"><span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.total_comments_num}} {{$item.total_comments_text}}</span></a>
+	</div>
+<!--	{{if $item.threaded}}
+	{{if $item.comment}}
+		{{$item.comment}}
+	{{/if}}
+	{{/if}}
+
+{{foreach $item.children as $child}}
+	{{include file="{{$child.template}}" item=$child}}
+{{/foreach}}
+
+{{if $item.flatten}}
+	{{$item.comment}}
+{{/if}}-->
+</div>
+<!--{{if $item.comment_lastcollapsed}}</div>{{/if}}-->
+
diff --git a/view/theme/decaf-mobile/templates/wallmessage.tpl b/view/theme/decaf-mobile/templates/wallmessage.tpl
new file mode 100644
index 000000000..4cba90091
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/wallmessage.tpl
@@ -0,0 +1,37 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h3>{{$header}}</h3>
+
+<h4>{{$subheader}}</h4>
+
+<div id="prvmail-wrapper" >
+<form id="prvmail-form" action="wallmessage/{{$nickname}}" method="post" >
+
+{{$parent}}
+
+<div id="prvmail-to-label">{{$to}}</div>
+{{$recipname}}
+
+<div id="prvmail-subject-label">{{$subject}}</div>
+<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
+
+<div id="prvmail-message-label">{{$yourmessage}}</div>
+<textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
+
+
+<div id="prvmail-submit-wrapper" >
+	<input type="submit" id="prvmail-submit" name="submit" value="Submit" tabindex="13" />
+	{{*<!--<div id="prvmail-link-wrapper" >
+		<div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
+	</div> -->*}}
+	<div id="prvmail-rotator-wrapper" >
+		<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+	</div> 
+</div>
+<div id="prvmail-end"></div>
+</form>
+</div>
diff --git a/view/theme/decaf-mobile/templates/wallmsg-end.tpl b/view/theme/decaf-mobile/templates/wallmsg-end.tpl
new file mode 100644
index 000000000..594f3f79b
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/wallmsg-end.tpl
@@ -0,0 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.min.js" ></script>
+
diff --git a/view/theme/decaf-mobile/templates/wallmsg-header.tpl b/view/theme/decaf-mobile/templates/wallmsg-header.tpl
new file mode 100644
index 000000000..e6f1c6737
--- /dev/null
+++ b/view/theme/decaf-mobile/templates/wallmsg-header.tpl
@@ -0,0 +1,12 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script language="javascript" type="text/javascript">
+{{*//window.editSelect = "none";*}}
+window.jotId = "#prvmail-text";
+window.imageUploadButton = 'prvmail-upload';
+</script>
+
diff --git a/view/theme/diabook/templates/admin_users.tpl b/view/theme/diabook/templates/admin_users.tpl
new file mode 100644
index 000000000..8127944a3
--- /dev/null
+++ b/view/theme/diabook/templates/admin_users.tpl
@@ -0,0 +1,93 @@
+{{*
+ *	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='name'><a href="{{$u.url}}" title="{{$u.nickname}}" >{{$u.name}}</a></td>
+						<td class='email'>{{$u.email}}</td>
+						<td class='register_date'>{{$u.register_date}}</td>
+						<td class='login_date'>{{$u.login_date}}</td>
+						<td class='lastitem_date'>{{$u.lastitem_date}}</td>
+						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}</td>
+						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
+						<td class="tools" style="width:60px;">
+							<a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/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 ad_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/theme/diabook/templates/bottom.tpl b/view/theme/diabook/templates/bottom.tpl
new file mode 100644
index 000000000..7d8f63d16
--- /dev/null
+++ b/view/theme/diabook/templates/bottom.tpl
@@ -0,0 +1,160 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script type="text/javascript" src="{{$baseurl}}/view/theme/diabook/js/jquery.autogrow.textarea.js"></script>
+<script type="text/javascript">
+
+$(document).ready(function() {
+    $("iframe").each(function(){
+        var ifr_source = $(this).attr("src");
+        var wmode = "wmode=transparent";
+        if(ifr_source.indexOf("?") != -1) {
+            var getQString = ifr_source.split("?");
+            var oldString = getQString[1];
+            var newString = getQString[0];
+            $(this).attr("src",newString+"?"+wmode+"&"+oldString);
+        }
+        else $(this).attr("src",ifr_source+"?"+wmode);
+       
+    });
+    
+    $("div#pause").attr("style", "position: fixed;bottom: 43px;left: 5px;");
+    $("div#pause").html("<img src='images/pause.gif' alt='pause' title='pause live-updates (ctrl+space)' style='border: 1px solid black;opacity: 0.2;'>");
+    $(document).keydown(function(event) {
+    if (!$("div#pause").html()){
+    $("div#pause").html("<img src='images/pause.gif' alt='pause' title='pause live-updates (ctrl+space)' style='border: 1px solid black;opacity: 0.2;'>");
+		}});  
+    $(".autocomplete").attr("style", "width: 350px;color: black;border: 1px solid #D2D2D2;background: white;cursor: pointer;text-align: left;max-height: 350px;overflow: auto;");
+	 
+	});
+	
+	$(document).ready(function(){
+		$("#sortable_boxes").sortable({
+			update: function(event, ui) {
+				var BoxOrder = $(this).sortable("toArray").toString();
+				$.cookie("Boxorder", BoxOrder , { expires: 365, path: "/" });
+			}
+		});
+
+    	var cookie = $.cookie("Boxorder");		
+    	if (!cookie) return;
+    	var SavedID = cookie.split(",");
+	   for (var Sitem=0, m = SavedID.length; Sitem < m; Sitem++) {
+           $("#sortable_boxes").append($("#sortable_boxes").children("#" + SavedID[Sitem]));
+	       }
+	     
+	});
+	
+	
+	function tautogrow(id){
+		$("textarea#comment-edit-text-" +id).autogrow(); 	
+ 	};
+ 	
+ 	function open_boxsettings() {
+		$("div#boxsettings").attr("style","display: block;height:500px;width:300px;");
+		$("label").attr("style","width: 150px;");
+		};
+ 	
+	function yt_iframe() {
+	$("iframe").load(function() { 
+	var ifr_src = $(this).contents().find("body iframe").attr("src");
+	$("iframe").contents().find("body iframe").attr("src", ifr_src+"&wmode=transparent");
+    });
+
+	};
+
+	function scrolldown(){
+			$("html, body").animate({scrollTop:$(document).height()}, "slow");
+			return false;
+		};
+		
+	function scrolltop(){
+			$("html, body").animate({scrollTop:0}, "slow");
+			return false;
+		};
+	 	
+	$(window).scroll(function () { 
+		
+		var footer_top = $(document).height() - 30;
+		$("div#footerbox").css("top", footer_top);
+	
+		var scrollInfo = $(window).scrollTop();      
+		
+		if (scrollInfo <= "900"){
+      $("a#top").attr("id","down");
+      $("a#down").attr("onclick","scrolldown()");
+	 	$("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_bottom.png");
+	 	$("img#scroll_top_bottom").attr("title","Scroll to bottom");
+	 	} 
+	 	    
+      if (scrollInfo > "900"){
+      $("a#down").attr("id","top");
+      $("a#top").attr("onclick","scrolltop()");
+	 	$("img#scroll_top_bottom").attr("src","view/theme/diabook/icons/scroll_top.png");
+	 	$("img#scroll_top_bottom").attr("title","Back to top");
+	 	}
+		
+    });
+  
+
+	function insertFormatting(comment,BBcode,id) {
+	
+		var tmpStr = $("#comment-edit-text-" + id).val();
+		if(tmpStr == comment) {
+			tmpStr = "";
+			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+			openMenu("comment-edit-submit-wrapper-" + id);
+								}
+
+	textarea = document.getElementById("comment-edit-text-" +id);
+	if (document.selection) {
+		textarea.focus();
+		selected = document.selection.createRange();
+		if (BBcode == "url"){
+			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
+			} else			
+		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
+		var start = textarea.selectionStart;
+		var end = textarea.selectionEnd;
+		if (BBcode == "url"){
+			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+			} else
+		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+	}
+	return true;
+	}
+
+	function cmtBbOpen(id) {
+	$(".comment-edit-bb-" + id).show();
+	}
+	function cmtBbClose(id) {
+	$(".comment-edit-bb-" + id).hide();
+	}
+	
+	/*$(document).ready(function(){
+	var doctitle = document.title;
+	function checkNotify() {
+	if(document.getElementById("notify-update").innerHTML != "")
+	document.title = "("+document.getElementById("notify-update").innerHTML+") " + doctitle;
+	else
+	document.title = doctitle;
+	};
+	setInterval(function () {checkNotify();}, 10 * 1000);
+	})*/
+</script>
+<script>
+var pagetitle = null;
+$("nav").bind('nav-update',  function(e,data){
+  if (pagetitle==null) pagetitle = document.title;
+  var count = $(data).find('notif').attr('count');
+  if (count>0) {
+    document.title = "("+count+") "+pagetitle;
+  } else {
+    document.title = pagetitle;
+  }
+});
+</script>
diff --git a/view/theme/diabook/templates/ch_directory_item.tpl b/view/theme/diabook/templates/ch_directory_item.tpl
new file mode 100644
index 000000000..2d2d968ca
--- /dev/null
+++ b/view/theme/diabook/templates/ch_directory_item.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div class="directory-item" id="directory-item-{{$id}}" >
+	<div class="directory-photo-wrapper" id="directory-photo-wrapper-{{$id}}" > 
+		<div class="directory-photo" id="directory-photo-{{$id}}" >
+			<a href="{{$profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$id}}" >
+				<img class="directory-photo-img" src="{{$photo}}" alt="{{$alt_text}}" title="{{$alt_text}}" />
+			</a>
+		</div>
+	</div>
+</div>
diff --git a/view/theme/diabook/templates/comment_item.tpl b/view/theme/diabook/templates/comment_item.tpl
new file mode 100644
index 000000000..a03d0f2a6
--- /dev/null
+++ b/view/theme/diabook/templates/comment_item.tpl
@@ -0,0 +1,48 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
+			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
+				<input type="hidden" name="type" value="{{$type}}" />
+				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+				<input type="hidden" name="parent" value="{{$parent}}" />
+				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
+				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
+				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
+					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});tautogrow({{$id}});cmtBbOpen({{$id}});"  >{{$comment}}</textarea>
+				<div class="comment-edit-bb-{{$id}}" style="display:none;">				
+				<a class="icon bb-image" style="cursor: pointer;" title="{{$edimg}}" onclick="insertFormatting('{{$comment}}','img',{{$id}});">img</a>	
+				<a class="icon bb-url" style="cursor: pointer;" title="{{$edurl}}" onclick="insertFormatting('{{$comment}}','url',{{$id}});">url</a>
+				<a class="icon bb-video" style="cursor: pointer;" title="{{$edvideo}}" onclick="insertFormatting('{{$comment}}','video',{{$id}});">video</a>														
+				<a class="icon underline" style="cursor: pointer;" title="{{$eduline}}" onclick="insertFormatting('{{$comment}}','u',{{$id}});">u</a>
+				<a class="icon italic" style="cursor: pointer;" title="{{$editalic}}" onclick="insertFormatting('{{$comment}}','i',{{$id}});">i</a>
+				<a class="icon bold" style="cursor: pointer;"  title="{{$edbold}}" onclick="insertFormatting('{{$comment}}','b',{{$id}});">b</a>
+				<a class="icon quote" style="cursor: pointer;" title="{{$edquote}}" onclick="insertFormatting('{{$comment}}','quote',{{$id}});">quote</a>																			
+				</div>				
+				{{if $qcomment}}
+					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
+					<option value=""></option>
+				{{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}}" />
+					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
+					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/theme/diabook/templates/communityhome.tpl b/view/theme/diabook/templates/communityhome.tpl
new file mode 100644
index 000000000..197577f30
--- /dev/null
+++ b/view/theme/diabook/templates/communityhome.tpl
@@ -0,0 +1,177 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div id="twittersettings" style="display:none">
+<form id="twittersettingsform" action="network" method="post" >
+{{include file="field_input.tpl" field=$TSearchTerm}}
+<div class="settings-submit-wrapper">
+<input id="twittersub" type="submit" value="{{$sub}}" class="settings-submit" name="diabook-settings-sub"></input>
+</div>
+</form>
+</div>
+
+<div id="mapcontrol" style="display:none;">
+<form id="mapform" action="network" method="post" >
+<div id="layermanager" style="width: 350px;position: relative;float: right;right:20px;height: 300px;"></div>
+<div id="map2" style="height:350px;width:350px;"></div>
+<div id="mouseposition" style="width: 350px;"></div>
+{{include file="field_input.tpl" field=$ELZoom}}
+{{include file="field_input.tpl" field=$ELPosX}}
+{{include file="field_input.tpl" field=$ELPosY}}
+<div class="settings-submit-wrapper">
+<input id="mapsub" type="submit" value="{{$sub}}" class="settings-submit" name="diabook-settings-map-sub"></input>
+</div>
+<span style="width: 500px;"><p>this ist still under development. 
+the idea is to provide a map with different layers(e.g. earth population, atomic power plants, wheat growing acreages, sunrise or what you want) 
+and markers(events, demos, friends, anything, that is intersting for you). 
+These layer and markers should be importable and deletable by the user.</p>
+<p>help on this feature is very appreciated. i am not that good in js so it's a start, but needs tweaks and further dev.
+just contact me, if you are intesrested in joining</p>
+<p>https://toktan.org/profile/thomas</p>
+<p>this is build with <b>mapquery</b> http://mapquery.org/ and 
+<b>openlayers</b>http://openlayers.org/</p>
+</span>
+</form>
+</div>
+
+<div id="boxsettings" style="display:none">
+<form id="boxsettingsform" action="network" method="post" >
+<fieldset><legend>{{$boxsettings.title.1}}</legend>
+{{include file="field_select.tpl" field=$close_pages}}
+{{include file="field_select.tpl" field=$close_profiles}}
+{{include file="field_select.tpl" field=$close_helpers}}
+{{include file="field_select.tpl" field=$close_services}}
+{{include file="field_select.tpl" field=$close_friends}}
+{{include file="field_select.tpl" field=$close_lastusers}}
+{{include file="field_select.tpl" field=$close_lastphotos}}
+{{include file="field_select.tpl" field=$close_lastlikes}}
+{{include file="field_select.tpl" field=$close_twitter}}
+{{include file="field_select.tpl" field=$close_mapquery}}
+<div class="settings-submit-wrapper">
+<input id="boxsub" type="submit" value="{{$sub}}" class="settings-submit" name="diabook-settings-box-sub"></input>
+</div>
+</fieldset>
+</form>
+</div>
+
+<div id="pos_null" style="margin-bottom:-30px;">
+</div>
+
+<div id="sortable_boxes">
+
+<div id="close_pages" style="margin-top:30px;">
+{{if $page}}
+<div>{{$page}}</div>
+{{/if}}
+</div>
+
+<div id="close_profiles">
+{{if $comunity_profiles_title}}
+<h3>{{$comunity_profiles_title}}<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="{{$close}}"></a></h3>
+<div id='lastusers-wrapper' class='items-wrapper'>
+{{foreach $comunity_profiles_items as $i}}
+	{{$i}}
+{{/foreach}}
+</div>
+{{/if}}
+</div>
+
+<div id="close_helpers">
+{{if $helpers}}
+<h3>{{$helpers.title.1}}<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="{{$close}}"></a></h3>
+<a href="http://friendica.com/resources" title="How-to's" style="margin-left: 10px; " target="blank">How-To Guides</a><br>
+<a href="http://kakste.com/profile/newhere" title="@NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
+<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
+<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
+<a href="http://newzot.hydra.uberspace.de/profile/newzot" title="Local Friendica" style="margin-left: 10px; " target="blank">Local Friendica</a>
+{{/if}}
+</div>
+
+<div id="close_services">
+{{if $con_services}}
+<h3>{{$con_services.title.1}}<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="{{$close}}"></a></h3>
+<div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;">
+<a href="{{$url}}/facebook"><img alt="Facebook" src="view/theme/diabook/icons/facebook.png" title="Facebook"></a>
+<a href="{{$url}}/settings/connectors"><img alt="StatusNet" src="view/theme/diabook/icons/StatusNet.png?" title="StatusNet"></a>
+<a href="{{$url}}/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook/icons/livejournal.png?" title="LiveJournal"></a>
+<a href="{{$url}}/settings/connectors"><img alt="Posterous" src="view/theme/diabook/icons/posterous.png?" title="Posterous"></a>
+<a href="{{$url}}/settings/connectors"><img alt="Tumblr" src="view/theme/diabook/icons/tumblr.png?" title="Tumblr"></a>
+<a href="{{$url}}/settings/connectors"><img alt="Twitter" src="view/theme/diabook/icons/twitter.png?" title="Twitter"></a>
+<a href="{{$url}}/settings/connectors"><img alt="WordPress" src="view/theme/diabook/icons/wordpress.png?" title="WordPress"></a>
+<a href="{{$url}}/settings/connectors"><img alt="E-Mail" src="view/theme/diabook/icons/email.png?" title="E-Mail"></a>
+</div>
+{{/if}}
+</div>
+
+<div id="close_friends" style="margin-bottom:53px;">
+{{if $nv}}
+<h3>{{$nv.title.1}}<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="{{$close}}"></a></h3>
+<a class="{{$nv.directory.2}}" href="{{$nv.directory.0}}" style="margin-left: 10px; " title="{{$nv.directory.3}}" >{{$nv.directory.1}}</a><br>
+<a class="{{$nv.global_directory.2}}" href="{{$nv.global_directory.0}}" target="blank" style="margin-left: 10px; " title="{{$nv.global_directory.3}}" >{{$nv.global_directory.1}}</a><br>
+<a class="{{$nv.match.2}}" href="{{$nv.match.0}}" style="margin-left: 10px; " title="{{$nv.match.3}}" >{{$nv.match.1}}</a><br>
+<a class="{{$nv.suggest.2}}" href="{{$nv.suggest.0}}" style="margin-left: 10px; " title="{{$nv.suggest.3}}" >{{$nv.suggest.1}}</a><br>
+<a class="{{$nv.invite.2}}" href="{{$nv.invite.0}}" style="margin-left: 10px; " title="{{$nv.invite.3}}" >{{$nv.invite.1}}</a>
+{{$nv.search}}
+{{/if}}
+</div>
+
+<div id="close_lastusers">
+{{if $lastusers_title}}
+<h3>{{$lastusers_title}}<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="{{$close}}"></a></h3>
+<div id='lastusers-wrapper' class='items-wrapper'>
+{{foreach $lastusers_items as $i}}
+	{{$i}}
+{{/foreach}}
+</div>
+{{/if}}
+</div>
+
+{{if $activeusers_title}}
+<h3>{{$activeusers_title}}</h3>
+<div class='items-wrapper'>
+{{foreach $activeusers_items as $i}}
+	{{$i}}
+{{/foreach}}
+</div>
+{{/if}}
+
+<div id="close_lastphotos">
+{{if $photos_title}}
+<h3>{{$photos_title}}<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="{{$close}}"></a></h3>
+<div id='ra-photos-wrapper' class='items-wrapper'>
+{{foreach $photos_items as $i}}
+	{{$i}}
+{{/foreach}}
+</div>
+{{/if}}
+</div>
+
+<div id="close_lastlikes">
+{{if $like_title}}
+<h3>{{$like_title}}<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="{{$close}}"></a></h3>
+<ul id='likes'>
+{{foreach $like_items as $i}}
+	<li id='ra-photos-wrapper'>{{$i}}</li>
+{{/foreach}}
+</ul>
+{{/if}}
+</div>
+
+<div id="close_twitter">
+<h3 style="height:1.17em">{{$twitter.title.1}}<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="{{$close}}"></a></h3>
+<div id="twitter">
+</div>
+</div>
+
+<div id="close_mapquery">
+{{if $mapquery}}
+<h3>{{$mapquery.title.1}}<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="{{$close}}"></a></h3>
+<div id="map" style="height:165px;width:165px;margin-left:3px;margin-top:3px;margin-bottom:1px;">
+</div>
+<div style="font-size:9px;margin-left:3px;">Data CC-By-SA by <a href="http://openstreetmap.org/">OpenStreetMap</a></div>
+{{/if}}
+</div>
+</div>
diff --git a/view/theme/diabook/templates/contact_template.tpl b/view/theme/diabook/templates/contact_template.tpl
new file mode 100644
index 000000000..8e0e1acc7
--- /dev/null
+++ b/view/theme/diabook/templates/contact_template.tpl
@@ -0,0 +1,36 @@
+{{*
+ *	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" >
+		<div class="contact-entry-photo mframe" id="contact-entry-photo-{{$contact.id}}"
+		onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}}); openMenu('contact-photo-menu-button-{{$contact.id}}')" 
+		onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$contact.id}}\'); closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)" >
+
+			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>
+
+			{{if $contact.photo_menu}}
+			<span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">menu</span>
+                <div class="contact-photo-menu" id="contact-photo-menu-{{$contact.id}}">
+                    <ul>
+						{{foreach $contact.photo_menu as $c}}
+						{{if $c.2}}
+						<li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+						{{else}}
+						<li><a href="{{$c.1}}">{{$c.0}}</a></li>
+						{{/if}}
+						{{/foreach}}
+                    </ul>
+                </div>
+			{{/if}}
+		</div>
+			
+	</div>
+	<div class="contact-entry-photo-end" ></div>
+		<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div>
+
+	<div class="contact-entry-end" ></div>
+</div>
diff --git a/view/theme/diabook/templates/directory_item.tpl b/view/theme/diabook/templates/directory_item.tpl
new file mode 100644
index 000000000..539428764
--- /dev/null
+++ b/view/theme/diabook/templates/directory_item.tpl
@@ -0,0 +1,47 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div class="directory-item" id="directory-item-{{$id}}" >
+	<div class="directory-photo-wrapper" id="directory-photo-wrapper-{{$id}}" > 
+		<div class="directory-photo" id="directory-photo-{{$id}}" >
+			<a href="{{$profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$id}}" >
+				<img class="directory-photo-img photo" src="{{$photo}}" alt="{{$alt_text}}" title="{{$alt_text}}" />
+			</a>
+		</div>
+	</div>
+	<div class="directory-profile-wrapper" id="directory-profile-wrapper-{{$id}}" >
+		<div class="contact-name" id="directory-name-{{$id}}">{{$name}}</div>
+		<div class="page-type">{{$page_type}}</div>
+		{{if $pdesc}}<div class="directory-profile-title">{{$profile.pdesc}}</div>{{/if}}
+    	<div class="directory-detailcolumns-wrapper" id="directory-detailcolumns-wrapper-{{$id}}">
+        	<div class="directory-detailscolumn-wrapper" id="directory-detailscolumn1-wrapper-{{$id}}">	
+			{{if $location}}
+			    <dl class="location"><dt class="location-label">{{$location}}</dt>
+				<dd class="adr">
+					{{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/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}}
+			</div>	
+			<div class="directory-detailscolumn-wrapper" id="directory-detailscolumn2-wrapper-{{$id}}">	
+				{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
+
+				{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
+			</div>
+		</div>
+	  	<div class="directory-copy-wrapper" id="directory-copy-wrapper-{{$id}}" >
+			{{if $about}}<dl class="directory-copy"><dt class="directory-copy-label">{{$about}}</dt><dd class="directory-copy-data">{{$profile.about}}</dd></dl>{{/if}}
+  		</div>
+	</div>
+</div>
diff --git a/view/theme/diabook/templates/footer.tpl b/view/theme/diabook/templates/footer.tpl
new file mode 100644
index 000000000..459a229fa
--- /dev/null
+++ b/view/theme/diabook/templates/footer.tpl
@@ -0,0 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id="footerbox" style="display:none">
+<a style="float:right; color:#333;margin-right:10px;display: table;margin-top: 5px;" href="friendica" title="Site Info / Impressum" >Info / Impressum</a>
+</div>
\ No newline at end of file
diff --git a/view/theme/diabook/templates/generic_links_widget.tpl b/view/theme/diabook/templates/generic_links_widget.tpl
new file mode 100644
index 000000000..1e0805aca
--- /dev/null
+++ b/view/theme/diabook/templates/generic_links_widget.tpl
@@ -0,0 +1,16 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id="widget_{{$title}}">
+	{{if $title}}<h3 style="border-bottom: 1px solid #D2D2D2;">{{$title}}</h3>{{/if}}
+	{{if $desc}}<div class="desc">{{$desc}}</div>{{/if}}
+	
+	<ul  class="rs_tabs">
+		{{foreach $items as $item}}
+			<li><a href="{{$item.url}}" class="rs_tab button {{if $item.selected}}selected{{/if}}">{{$item.label}}</a></li>
+		{{/foreach}}
+	</ul>
+	
+</div>
diff --git a/view/theme/diabook/templates/group_side.tpl b/view/theme/diabook/templates/group_side.tpl
new file mode 100644
index 000000000..45f2e171f
--- /dev/null
+++ b/view/theme/diabook/templates/group_side.tpl
@@ -0,0 +1,39 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id="profile_side" >
+	<div class="">
+		<h3 style="margin-left: 2px;">{{$title}}<a href="group/new" title="{{$createtext}}" class="icon text_add"></a></h3>
+	</div>
+
+	<div id="sidebar-group-list">
+		<ul class="menu-profile-side">
+			{{foreach $groups as $group}}
+			<li class="menu-profile-list">
+				<a href="{{$group.href}}" class="menu-profile-list-item">
+					<span class="menu-profile-icon {{if $group.selected}}group_selected{{else}}group_unselected{{/if}}"></span>
+					{{$group.text}}
+				</a>
+				{{if $group.edit}}
+					<a href="{{$group.edit.href}}" class="action"><span class="icon text_edit" ></span></a>
+				{{/if}}
+				{{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}}
+			</li>
+			{{/foreach}}
+		</ul>
+	</div>
+  {{if $ungrouped}}
+  <div id="sidebar-ungrouped">
+  <a href="nogroup">{{$ungrouped}}</a>
+  </div>
+  {{/if}}
+</div>	
+
diff --git a/view/theme/diabook/templates/jot.tpl b/view/theme/diabook/templates/jot.tpl
new file mode 100644
index 000000000..aa57d1757
--- /dev/null
+++ b/view/theme/diabook/templates/jot.tpl
@@ -0,0 +1,92 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div id="profile-jot-wrapper" >
+	<div id="profile-jot-banner-wrapper">
+		<div id="profile-jot-desc" >&nbsp;</div>
+	</div>
+	<div id="profile-jot-banner-end"></div>
+
+	<form id="profile-jot-form" action="{{$action}}" method="post" >
+		<input type="hidden" name="type" value="{{$ptyp}}" />
+		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+		<input type="hidden" name="return" value="{{$return_path}}" />
+		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
+		<input type="hidden" name="coord" id="jot-coord" value="" />
+		<input type="hidden" name="post_id" value="{{$post_id}}" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none">
+		{{if $placeholdercategory}}
+		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" /></div>
+		{{/if}}
+		<div id="character-counter" class="grey"></div>		
+		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}</textarea>
+
+
+<div id="profile-jot-submit-wrapper" class="jothidden">
+	
+	<div id="profile-upload-wrapper" style="display: {{$visitor}};" >
+		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="camera" title="{{$upload}}"></a></div>
+	</div> 
+	<div id="profile-attach-wrapper" style="display: {{$visitor}};" >
+		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="attach" title="{{$attach}}"></a></div>
+	</div> 
+
+	<div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
+		<a id="profile-link" class="weblink" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
+	</div> 
+	<div id="profile-video-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-video" class="video2" title="{{$video}}" onclick="jotVideoURL();return false;"></a>
+	</div> 
+	<div id="profile-audio-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-audio" class="audio2" title="{{$audio}}" onclick="jotAudioURL();return false;"></a>
+	</div> 
+	<div id="profile-location-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-location" class="globe" title="{{$setloc}}" onclick="jotGetLocation();return false;"></a>
+	</div> 
+	<div id="profile-nolocation-wrapper" style="/*display: none;*/" >
+		<a id="profile-nolocation" class="noglobe" title="{{$noloc}}" onclick="jotClearLocation();return false;"></a>
+	</div> 
+
+	<input type="submit" id="profile-jot-submit" class="button creation2" name="submit" value="{{$share}}" />
+  
+   <span onclick="preview_post();" id="jot-preview-link" class="tab button">{{$preview}}</span>
+   
+	<div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" >
+		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}}"  title="{{$permset}}" ></a>{{$bang}}
+	</div>
+
+
+	<div id="profile-jot-plugin-wrapper">
+  	{{$jotplugins}}
+	</div>
+	
+	<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
+		<img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+	</div> 
+	
+	</div>
+   <div id="profile-jot-perms-end"></div>
+	
+	<div id="jot-preview-content" style="display:none;"></div>
+
+	<div style="display: none;">
+		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+			{{$acl}}
+			<hr style="clear:both;"/>
+			<div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
+			<div id="profile-jot-email-end"></div>
+			{{$jotnets}}
+		</div>
+	</div>
+
+
+
+
+</form>
+</div>
+		{{if $content}}<script>initEditor();</script>{{/if}}
diff --git a/view/theme/diabook/templates/login.tpl b/view/theme/diabook/templates/login.tpl
new file mode 100644
index 000000000..797c33ff9
--- /dev/null
+++ b/view/theme/diabook/templates/login.tpl
@@ -0,0 +1,38 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<form action="{{$dest_url}}" 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>
+	
+	{{if $openid}}
+			<div id="login_openid">
+			{{include file="field_openid.tpl" field=$lopenid}}
+			</div>
+	{{/if}}
+	
+	<div id="login-submit-wrapper" >
+		<input type="submit" name="submit" id="login-submit-button" value="{{$login}}" />
+	</div>
+	
+   <div id="login-extra-links">
+		{{if $register}}<a href="register" title="{{$register.title}}" id="register-link">{{$register.desc}}</a>{{/if}}
+        <a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
+	</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/theme/diabook/templates/mail_conv.tpl b/view/theme/diabook/templates/mail_conv.tpl
new file mode 100644
index 000000000..915d4c13a
--- /dev/null
+++ b/view/theme/diabook/templates/mail_conv.tpl
@@ -0,0 +1,65 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="wall-item-container {{$item.indent}}">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper"
+				<a href="{{$mail.profile_url}}" target="redir" title="{{$mail.from_name}}" class="contact-photo-link" id="wall-item-photo-link-{{$mail.id}}">
+					<img src="{{$mail.from_photo}}" class="contact-photo{{$mail.sparkle}}" id="wall-item-photo-{{$mail.id}}" alt="{{$mail.from_name}}" />
+				</a>
+			</div>
+		</div>
+		<div class="wall-item-content">
+			{{$mail.body}}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="">
+		</div>
+		<div class="wall-item-actions">
+			<div class="wall-item-actions-author">
+				<a href="{{$mail.from_url}}" target="redir" class="wall-item-name-link"><span class="wall-item-name{{$mail.sparkle}}">{{$mail.from_name}}</span></a> <span class="wall-item-ago">{{$mail.date}}</span>
+			</div>
+			
+			<div class="wall-item-actions-social">
+			</div>
+			
+			<div class="wall-item-actions-tools">
+				<a href="message/drop/{{$mail.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$mail.delete}}">{{$mail.delete}}</a>
+			</div>
+			
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+	</div>
+</div>
+
+
+{{*
+
+
+<div class="mail-conv-outside-wrapper">
+	<div class="mail-conv-sender" >
+		<a href="{{$mail.from_url}}" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo{{$mail.sparkle}}" src="{{$mail.from_photo}}" heigth="80" width="80" alt="{{$mail.from_name}}" /></a>
+	</div>
+	<div class="mail-conv-detail" >
+		<div class="mail-conv-sender-name" >{{$mail.from_name}}</div>
+		<div class="mail-conv-date">{{$mail.date}}</div>
+		<div class="mail-conv-subject">{{$mail.subject}}</div>
+		<div class="mail-conv-body">{{$mail.body}}</div>
+	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
+	<div class="mail-conv-outside-wrapper-end"></div>
+</div>
+</div>
+<hr class="mail-conv-break" />
+
+*}}
diff --git a/view/theme/diabook/templates/mail_display.tpl b/view/theme/diabook/templates/mail_display.tpl
new file mode 100644
index 000000000..dc1fbbc6f
--- /dev/null
+++ b/view/theme/diabook/templates/mail_display.tpl
@@ -0,0 +1,17 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id="mail-display-subject">
+	<span class="{{if $thread_seen}}seen{{else}}unseen{{/if}}">{{$thread_subject}}</span>
+	<a href="message/dropconv/{{$thread_id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="mail-delete icon s22 delete"></a>
+</div>
+
+{{foreach $mails as $mail}}
+	<div id="tread-wrapper-{{$mail_item.id}}" class="tread-wrapper">
+		{{include file="mail_conv.tpl"}}
+	</div>
+{{/foreach}}
+
+{{include file="prv_message.tpl"}}
diff --git a/view/theme/diabook/templates/mail_list.tpl b/view/theme/diabook/templates/mail_list.tpl
new file mode 100644
index 000000000..9dde46bc8
--- /dev/null
+++ b/view/theme/diabook/templates/mail_list.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="mail-list-wrapper">
+	<span class="mail-subject {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span>
+	<span class="mail-from">{{$from_name}}</span>
+	<span class="mail-date">{{$date}}</span>
+	<span class="mail-count">{{$count}}</span>
+	
+	<a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="mail-delete icon s22 delete"></a>
+</div>
diff --git a/view/theme/diabook/templates/message_side.tpl b/view/theme/diabook/templates/message_side.tpl
new file mode 100644
index 000000000..723b0b710
--- /dev/null
+++ b/view/theme/diabook/templates/message_side.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id="message-sidebar" class="widget">
+	<div id="message-new" class="{{if $new.sel}}selected{{/if}}"><a href="{{$new.url}}">{{$new.label}}</a> </div>
+	
+	<ul class="message-ul">
+		{{foreach $tabs as $t}}
+			<li class="tool {{if $t.sel}}selected{{/if}}"><a href="{{$t.url}}" class="message-link">{{$t.label}}</a></li>
+		{{/foreach}}
+	</ul>
+	
+</div>
diff --git a/view/theme/diabook/templates/nav.tpl b/view/theme/diabook/templates/nav.tpl
new file mode 100644
index 000000000..45dc47614
--- /dev/null
+++ b/view/theme/diabook/templates/nav.tpl
@@ -0,0 +1,193 @@
+{{*
+ *	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 $nav.network}}
+			<li id="nav-network-link" class="nav-menu-icon">
+				<a class="{{$nav.network.2}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >
+				<span class="icon notifications">Benachrichtigungen</span>
+				<span id="net-update" class="nav-notify"></span></a>
+			</li>
+		    {{/if}}
+	
+			{{if $nav.contacts}}
+			<li class="nav-menu-icon" id="nav-contacts-linkmenu">
+				<a href="{{$nav.contacts.0}}" rel="#nav-contacts-menu" title="{{$nav.contacts.1}}">
+				<span class="icon contacts">{{$nav.contacts.1}}</span>
+				<span id="intro-update" class="nav-notify"></span></a>
+				<ul id="nav-contacts-menu" class="menu-popup">
+					<li id="nav-contacts-see-intro"><a href="{{$nav.notifications.0}}">{{$nav.introductions.1}}</a><span id="intro-update-li" class="nav-notify"></span></li>
+					<li id="nav-contacts-all"><a href="contacts">{{$nav.contacts.1}}</a></li> 
+				</ul>
+			</li>	
+
+			{{/if}}
+			
+			{{if $nav.messages}}
+			<li  id="nav-messages-linkmenu" class="nav-menu-icon">
+			  <a href="{{$nav.messages.0}}" rel="#nav-messages-menu" title="{{$nav.messages.1}}">
+			  <span class="icon messages">{{$nav.messages.1}}</span>
+				<span id="mail-update" class="nav-notify"></span></a>
+				<ul id="nav-messages-menu" class="menu-popup">
+					<li id="nav-messages-see-all"><a href="{{$nav.messages.0}}">{{$nav.messages.1}}</a></li>
+					<li id="nav-messages-see-all"><a href="{{$nav.messages.new.0}}">{{$nav.messages.new.1}}</a></li>
+				</ul>
+			</li>		
+			{{/if}}
+		
+      {{if $nav.notifications}}
+			<li  id="nav-notifications-linkmenu" class="nav-menu-icon">
+			<a href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">
+			<span class="icon notify">{{$nav.notifications.1}}</span>
+				<span id="notify-update" class="nav-notify"></span></a>
+				<ul id="nav-notifications-menu" class="menu-popup">
+					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
+					<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
+					<li class="empty">{{$emptynotifications}}</li>
+				</ul>
+			</li>		
+		{{/if}}	
+			
+		{{if $nav.search}}
+		<li id="search-box">
+			<form method="get" action="{{$nav.search.0}}">
+				<input id="search-text" class="nav-menu-search" type="text" value="" name="search">
+			</form>
+		</li>		
+		{{/if}}	
+		
+		<li  style="width: 1%; height: 1px;float: right;"></li>	
+		
+		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
+			<ul id="nav-site-menu" class="menu-popup">
+				{{if $nav.manage}}<li><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a></li>{{/if}}				
+					
+				{{if $nav.help}} <li><a class="{{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a></li>{{/if}}									
+										
+										 <li><a class="{{$nav.search.2}}" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
+										
+				{{if $nav.settings}}<li><a class="menu-sep {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>{{/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>		
+		</li>
+		
+		
+		{{if $nav.directory}}
+		<li id="nav-directory-link" class="nav-menu {{$sel.directory}}">
+			<a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a>
+		</li>
+		{{/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}}		
+		
+      {{if $nav.home}}
+			<li id="nav-home-link" class="nav-menu {{$sel.home}}">
+				<a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}
+				<span id="home-update" class="nav-notify"></span></a>
+			</li>
+		{{/if}}		
+		
+		{{if $userinfo}}
+			<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="{{$sitelocation}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"></a>
+				<ul id="nav-user-menu" class="menu-popup">
+					{{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="menu-sep {{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.3}}</a></li>{{/if}}
+					{{if $nav.notifications}}<li><a class="{{$nav.notifications.2}}" href="{{$nav.notifications.0}}" title="{{$nav.notifications.3}}" >{{$nav.notifications.1}}</a></li>{{/if}}
+					{{if $nav.messages}}<li><a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.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}}	
+				</ul>
+			</li>
+		{{/if}}
+		
+					{{if $nav.login}}
+					<li id="nav-home-link" class="nav-menu {{$sel.home}}">
+						<a class="{{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a>
+					<li>
+					{{/if}}
+		
+		
+		
+	</ul>	
+
+
+	
+</nav>
+
+
+<div id="scrollup" style="position: fixed; bottom: 5px; right: 10px;z-index: 97;"><a id="down" onclick="scrolldown()" ><img id="scroll_top_bottom" src="view/theme/diabook/icons/scroll_bottom.png" style="display:cursor !important;" alt="back to top" title="Scroll to bottom"></a></div>
+<div style="position: fixed; bottom: 61px; left: 6px;">{{$langselector}}</div>
+<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
+
+
+
+
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li class="{4}"><a href="{0}"><img data-src="{1}">{2} <span class="notif-when">{3}</span></a></li>
+</ul>
+
+
+
+{{*
+
+{{if $nav.logout}}<a id="nav-logout-link" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a> {{/if}}
+{{if $nav.login}}<a id="nav-login-link" class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a> {{/if}}
+
+<span id="nav-link-wrapper" >
+
+{{if $nav.register}}<a id="nav-register-link" class="nav-commlink {{$nav.register.2}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a>{{/if}}
+	
+<a id="nav-help-link" class="nav-link {{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a>
+	
+{{if $nav.apps}}<a id="nav-apps-link" class="nav-link {{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a>{{/if}}
+
+<a id="nav-search-link" class="nav-link {{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a>
+<a id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a>
+
+{{if $nav.admin}}<a id="nav-admin-link" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a>{{/if}}
+
+{{if $nav.notifications}}
+<a id="nav-notify-link" class="nav-commlink {{$nav.notifications.2}}" href="{{$nav.notifications.0}}" title="{{$nav.notifications.3}}" >{{$nav.notifications.1}}</a>
+<span id="notify-update" class="nav-ajax-left"></span>
+{{/if}}
+{{if $nav.messages}}
+<a id="nav-messages-link" class="nav-commlink {{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>
+<span id="mail-update" class="nav-ajax-left"></span>
+{{/if}}
+
+{{if $nav.manage}}<a id="nav-manage-link" class="nav-commlink {{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a>{{/if}}
+
+{{if $nav.settings}}<a id="nav-settings-link" class="nav-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a>{{/if}}
+{{if $nav.profiles}}<a id="nav-profiles-link" class="nav-link {{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a>{{/if}}
+
+
+</span>
+<span id="nav-end"></span>
+<span id="banner">{{$banner}}</span>
+*}}
diff --git a/view/theme/diabook/templates/nets.tpl b/view/theme/diabook/templates/nets.tpl
new file mode 100644
index 000000000..b9c6b828f
--- /dev/null
+++ b/view/theme/diabook/templates/nets.tpl
@@ -0,0 +1,22 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id="profile_side">
+	<h3 style="margin-left: 2px;">{{$title}}</h3>
+	<div id="nets-desc">{{$desc}}</div>
+   
+	<ul class="menu-profile-side">
+	<li class="menu-profile-list">
+	<span class="menu-profile-icon {{if $sel_all}}group_selected{{else}}group_unselected{{/if}}"></span>	
+	<a style="text-decoration: none;" href="{{$base}}?nets=all" class="menu-profile-list-item">{{$all}}</a></li>
+	{{foreach $nets as $net}}
+	<li class="menu-profile-list">
+	<a href="{{$base}}?nets={{$net.ref}}" class="menu-profile-list-item">
+	<span class="menu-profile-icon {{if $net.selected}}group_selected{{else}}group_unselected{{/if}}"></span>		
+	{{$net.name}}	
+	</a></li>
+	{{/foreach}}
+	</ul>
+</div>
diff --git a/view/theme/diabook/templates/oembed_video.tpl b/view/theme/diabook/templates/oembed_video.tpl
new file mode 100644
index 000000000..993b410e0
--- /dev/null
+++ b/view/theme/diabook/templates/oembed_video.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<a class="embed_yt" href='{{$embedurl}}' onclick='this.innerHTML=Base64.decode("{{$escapedhtml}}"); yt_iframe();javascript:$(this).parent().css("height", "450px"); return false;' style='float:left; margin: 1em; position: relative;'>
+	<img width='{{$tw}}' height='{{$th}}' src='{{$turl}}' >
+	<div style='position: absolute; top: 0px; left: 0px; width: {{$twpx}}; height: {{$thpx}}; background: url(images/icons/48/play.png) no-repeat center center;'></div>
+</a>
diff --git a/view/theme/diabook/templates/photo_item.tpl b/view/theme/diabook/templates/photo_item.tpl
new file mode 100644
index 000000000..344c58a0b
--- /dev/null
+++ b/view/theme/diabook/templates/photo_item.tpl
@@ -0,0 +1,70 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{if $indent}}{{else}}
+<div class="wall-item-decor">
+	<img id="like-rotator-{{$id}}" class="like-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+</div>
+{{/if}}
+
+<div class="wall-item-photo-container {{$indent}}">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper" >
+				<a href="{{$profile_url}}" target="redir" title="" class="contact-photo-link" id="wall-item-photo-link-{{$id}}">
+					<img src="{{$thumb}}" class="contact-photo{{$sparkle}}" id="wall-item-photo-{{$id}}" alt="{{$name}}" />
+				</a>
+				<a href="#" rel="#wall-item-photo-menu-{{$id}}" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-{{$id}}">menu</a>
+				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-{{$id}}">
+				{{$photo_menu}}
+				</ul>
+				
+			</div>
+		</div>
+			<div class="wall-item-actions-author">
+				<a href="{{$profile_url}}" target="redir" title="{{$name}}" class="wall-item-name-link"><span class="wall-item-name{{$sparkle}}">{{$name}}</span></a> 
+			<span class="wall-item-ago">-
+			{{if $plink}}<a class="link" title="{{$plink.title}}" href="{{$plink.href}}" style="color: #999">{{$ago}}</a>{{else}} {{$ago}} {{/if}}
+			{{if $lock}} - <span class="fakelink" style="color: #999" onclick="lockview(event,{{$id}});">{{$lock}}</span> {{/if}}
+			</span>
+			</div>
+		<div class="wall-item-content">
+			{{if $title}}<h2><a href="{{$plink.href}}">{{$title}}</a></h2>{{/if}}
+			{{$body}}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+			{{foreach $tags as $tag}}
+				<span class='tag'>{{$tag}}</span>
+			{{/foreach}}
+		</div>
+	</div>
+	
+	<div class="wall-item-bottom" style="display: table-row;">
+		<div class="wall-item-actions">
+	   </div>
+		<div class="wall-item-actions">
+			
+			<div class="wall-item-actions-tools">
+
+				{{if $drop.dropping}}
+					<input type="checkbox" title="{{$drop.select}}" name="itemselected[]" class="item-select" value="{{$id}}" />
+					<a href="item/drop/{{$id}}" onclick="return confirmDelete();" class="icon drop" title="{{$drop.delete}}">{{$drop.delete}}</a>
+				{{/if}}
+				{{if $edpost}}
+					<a class="icon pencil" href="{{$edpost.0}}" title="{{$edpost.1}}"></a>
+				{{/if}}
+			</div>
+
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+			
+	</div>
+</div>
+
diff --git a/view/theme/diabook/templates/photo_view.tpl b/view/theme/diabook/templates/photo_view.tpl
new file mode 100644
index 000000000..e3908be00
--- /dev/null
+++ b/view/theme/diabook/templates/photo_view.tpl
@@ -0,0 +1,38 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<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}}" class="lightbox" title="{{$photo.title}}"><img src="{{$photo.src}}" /></a></div>
+{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}">{{$nextlink.1}}</a></div>{{/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}}
+
+<div style="margin-top:20px">
+</div>
+<div id="wall-photo-container">
+{{$comments}}
+</div>
+
+{{$paginate}}
+
diff --git a/view/theme/diabook/templates/profile_side.tpl b/view/theme/diabook/templates/profile_side.tpl
new file mode 100644
index 000000000..267afc76a
--- /dev/null
+++ b/view/theme/diabook/templates/profile_side.tpl
@@ -0,0 +1,26 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id="profile_side">
+	<div id="ps-usernameicon">
+		<a href="{{$ps.usermenu.status.0}}" title="{{$userinfo.name}}">
+			<img src="{{$userinfo.icon}}" id="ps-usericon" alt="{{$userinfo.name}}">
+		</a>
+		<a href="{{$ps.usermenu.status.0}}" id="ps-username" title="{{$userinfo.name}}">{{$userinfo.name}}</a>
+	</div>
+	
+<ul id="profile-side-menu" class="menu-profile-side">
+	<li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="{{$ps.usermenu.status.0}}">{{$ps.usermenu.status.1}}<span class="menu-profile-icon home"></span></a></li>
+	<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="{{$ps.usermenu.photos.0}}">{{$ps.usermenu.photos.1}}<span class="menu-profile-icon photos"></span></a></li>
+	<li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="{{$ps.usermenu.contacts.0}}">{{$ps.usermenu.contacts.1}}<span class="menu-profile-icon pscontacts"></span></a></li>		
+	<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="{{$ps.usermenu.events.0}}">{{$ps.usermenu.events.1}}<span class="menu-profile-icon events"></span></a></li>
+	<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="{{$ps.usermenu.notes.0}}">{{$ps.usermenu.notes.1}}<span class="menu-profile-icon notes"></span></a></li>
+	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="{{$ps.usermenu.pgroups.0}}" target="blanc">{{$ps.usermenu.pgroups.1}}<span class="menu-profile-icon foren"></span></a></li>
+	<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="{{$ps.usermenu.community.0}}">{{$ps.usermenu.community.1}}<span class="menu-profile-icon com_side"></span></a></li>
+</ul>
+
+</div>
+
+				
diff --git a/view/theme/diabook/templates/profile_vcard.tpl b/view/theme/diabook/templates/profile_vcard.tpl
new file mode 100644
index 000000000..f2eda1b2d
--- /dev/null
+++ b/view/theme/diabook/templates/profile_vcard.tpl
@@ -0,0 +1,69 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="vcard">
+
+	<div class="tool">
+		<div class="fn label">{{$profile.name}}</div>
+		{{if $profile.edit}}
+			<div class="action">
+			<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
+			<ul id="profiles-menu" class="menu-popup">
+				{{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>
+				<li><a href="profiles" >{{$profile.edit.3}}</a></li>
+								
+			</ul>
+			</div>
+		{{/if}}
+	</div>
+				
+	
+
+	<div id="profile-photo-wrapper"><img class="photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></div>
+	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
+
+
+	{{if $location}}
+		<dl class="location"><dt class="location-label">{{$location}}</dt><br> 
+		<dd class="adr">
+			{{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/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 $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/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}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
+
+	{{include file="diaspora_vcard.tpl"}}
+	
+	<div id="profile-extra-links">
+		<ul>
+			{{if $connect}}
+				<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
+			{{/if}}
+		</ul>
+	</div>
+</div>
+
+{{$contact_block}}
+
+
diff --git a/view/theme/diabook/templates/prv_message.tpl b/view/theme/diabook/templates/prv_message.tpl
new file mode 100644
index 000000000..2daf54ecd
--- /dev/null
+++ b/view/theme/diabook/templates/prv_message.tpl
@@ -0,0 +1,45 @@
+{{*
+ *	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" style="background: none repeat scroll 0 0 white;border: 1px solid #CCC;border-radius: 5px 5px 5px 5px;height: 20px;margin: 0 0 5px;
+vertical-align: middle;" name="messageto" value="{{$prefill}}" maxlength="255" size="64" tabindex="10" />
+<input type="hidden" id="recip-complete" name="messageto" value="{{$preid}}">
+{{else}}
+{{$select}}
+{{/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/theme/diabook/templates/right_aside.tpl b/view/theme/diabook/templates/right_aside.tpl
new file mode 100644
index 000000000..d36184026
--- /dev/null
+++ b/view/theme/diabook/templates/right_aside.tpl
@@ -0,0 +1,25 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id="profile_side">
+	<div id="ps-usernameicon">
+		<a href="{{$ps.usermenu.status.0}}" title="{{$userinfo.name}}">
+			<img src="{{$userinfo.icon}}" id="ps-usericon" alt="{{$userinfo.name}}">
+		</a>
+		<a href="{{$ps.usermenu.status.0}}" id="ps-username" title="{{$userinfo.name}}">{{$userinfo.name}}</a>
+	</div>
+	
+<ul id="profile-side-menu" class="menu-profile-side">
+	<li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="{{$ps.usermenu.status.0}}">{{$ps.usermenu.status.1}}</a></li>
+	<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="{{$ps.usermenu.photos.0}}">{{$ps.usermenu.photos.1}}</a></li>
+	<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="{{$ps.usermenu.events.0}}">{{$ps.usermenu.events.1}}</a></li>
+	<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="{{$ps.usermenu.notes.0}}">{{$ps.usermenu.notes.1}}</a></li>
+	<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="http://dir.friendica.com/directory/forum" target="blanc">Public Groups</a></li>
+	<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="{{$ps.usermenu.community.0}}">{{$ps.usermenu.community.1}}</a></li>
+</ul>
+
+</div>
+
+				
\ No newline at end of file
diff --git a/view/theme/diabook/templates/search_item.tpl b/view/theme/diabook/templates/search_item.tpl
new file mode 100644
index 000000000..d48103298
--- /dev/null
+++ b/view/theme/diabook/templates/search_item.tpl
@@ -0,0 +1,116 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{if $item.indent}}{{else}}
+<div class="wall-item-decor">
+	<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+</div>
+{{/if}}
+<div class="wall-item-container {{$item.indent}}">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper"
+				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
+				onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="contact-photo-link" id="wall-item-photo-link-{{$item.id}}">
+					<img src="{{$item.thumb}}" class="contact-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
+				</a>
+				<a href="#" rel="#wall-item-photo-menu-{{$item.id}}" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-{{$item.id}}">menu</a>
+				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
+				{{$item.item_photo_menu}}
+				</ul>
+				
+			</div>
+		</div>
+			<div class="wall-item-actions-author">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a> 
+			<span class="wall-item-ago">-
+			{{if $item.plink}}<a class="link" title="{{$item.plink.title}}" href="{{$item.plink.href}}" style="color: #999">{{$item.ago}}</a>{{else}} {{$item.ago}} {{/if}}
+			{{if $item.lock}} - <span class="fakelink" style="color: #999" onclick="lockview(event,{{$item.id}});">{{$item.lock}}</span> {{/if}}
+			</span>
+			</div>
+		<div class="wall-item-content">
+			{{if $item.title}}<h2><a href="{{$item.plink.href}}">{{$item.title}}</a></h2>{{/if}}
+			{{$item.body}}
+			{{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-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+			{{foreach $item.tags as $tag}}
+				<span class='tag'>{{$tag}}</span>
+			{{/foreach}}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="">
+
+		</div>
+		<div class="wall-item-actions">
+
+			<div class="wall-item-actions-social">
+			
+			
+			{{if $item.vote}}
+				<a href="#" id="like-{{$item.id}}" class="icon like" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false">{{$item.vote.like.1}}</a>
+				<a href="#" id="dislike-{{$item.id}}" class="icon dislike" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>
+			{{/if}}
+						
+			{{if $item.vote.share}}
+				<a href="#" id="share-{{$item.id}}" class="icon recycle" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>
+			{{/if}}	
+
+
+			{{if $item.star}}
+				<a href="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}">
+				<img src="images/star_dummy.png" class="icon star" alt="{{$item.star.do}}" /> </a>
+				<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon tagged" title="{{$item.star.tagger}}"></a>					  
+			{{/if}}	
+			
+			{{if $item.filer}}
+			<a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item icon file-as" title="{{$item.star.filer}}"></a>
+			{{/if}}				
+			
+			{{if $item.plink}}<a class="icon link" title="{{$item.plink.title}}" href="{{$item.plink.href}}">{{$item.plink.title}}</a>{{/if}}
+			
+					
+					
+			</div>
+			
+			<div class="wall-item-actions-tools">
+
+				{{if $item.drop.pagedrop}}
+					<input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
+				{{/if}}
+				{{if $item.drop.dropping}}
+					<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drop" title="{{$item.drop.delete}}">{{$item.drop.delete}}</a>
+				{{/if}}
+				{{if $item.edpost}}
+					<a class="icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
+				{{/if}}
+			</div>
+			<div class="wall-item-location">{{$item.location}}&nbsp;</div>
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links"></div>
+		<div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
+		<div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>	
+	</div>
+</div>
+
+<div class="wall-item-comment-wrapper" >
+	{{$item.comment}}
+</div>
diff --git a/view/theme/diabook/templates/theme_settings.tpl b/view/theme/diabook/templates/theme_settings.tpl
new file mode 100644
index 000000000..5532d402c
--- /dev/null
+++ b/view/theme/diabook/templates/theme_settings.tpl
@@ -0,0 +1,46 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{include file="field_select.tpl" field=$color}}
+
+{{include file="field_select.tpl" field=$font_size}}
+
+{{include file="field_select.tpl" field=$line_height}}
+
+{{include file="field_select.tpl" field=$resolution}}
+
+<div class="settings-submit-wrapper">
+	<input type="submit" value="{{$submit}}" class="settings-submit" name="diabook-settings-submit" />
+</div>
+<br>
+<h3>Show/hide boxes at right-hand column</h3>
+{{include file="field_select.tpl" field=$close_pages}}
+{{include file="field_select.tpl" field=$close_profiles}}
+{{include file="field_select.tpl" field=$close_helpers}}
+{{include file="field_select.tpl" field=$close_services}}
+{{include file="field_select.tpl" field=$close_friends}}
+{{include file="field_select.tpl" field=$close_lastusers}}
+{{include file="field_select.tpl" field=$close_lastphotos}}
+{{include file="field_select.tpl" field=$close_lastlikes}}
+{{include file="field_select.tpl" field=$close_twitter}}
+{{include file="field_input.tpl" field=$TSearchTerm}}
+{{include file="field_select.tpl" field=$close_mapquery}}
+
+{{include file="field_input.tpl" field=$ELPosX}}
+
+{{include file="field_input.tpl" field=$ELPosY}}
+
+{{include file="field_input.tpl" field=$ELZoom}}
+
+<div class="settings-submit-wrapper">
+	<input type="submit" value="{{$submit}}" class="settings-submit" name="diabook-settings-submit" />
+</div>
+
+<br>
+
+<div class="field select">
+<a onClick="restore_boxes()" title="Restore boxorder at right-hand column" style="cursor: pointer;">Restore boxorder at right-hand column</a>
+</div>
+
diff --git a/view/theme/diabook/templates/wall_thread.tpl b/view/theme/diabook/templates/wall_thread.tpl
new file mode 100644
index 000000000..be143cfba
--- /dev/null
+++ b/view/theme/diabook/templates/wall_thread.tpl
@@ -0,0 +1,146 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{if $item.comment_firstcollapsed}}
+	<div class="hide-comments-outer">
+	<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> <span id="hide-comments-{{$item.id}}" class="hide-comments fakelink" onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
+	</div>
+	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
+{{/if}}
+<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
+{{if $item.indent}}{{else}}
+<div class="wall-item-decor">
+	<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+</div>
+{{/if}}
+<div class="wall-item-container {{$item.indent}}">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper"
+				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
+				onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="contact-photo-link" id="wall-item-photo-link-{{$item.id}}">
+					<img src="{{$item.thumb}}" class="contact-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
+				</a>
+				<a href="#" rel="#wall-item-photo-menu-{{$item.id}}" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-{{$item.id}}">menu</a>
+				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
+				{{$item.item_photo_menu}}
+				</ul>
+				
+			</div>
+		</div>
+			<div class="wall-item-actions-author">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a> 
+			<span class="wall-item-ago">-
+			{{if $item.plink}}<a class="link{{$item.sparkle}}" title="{{$item.plink.title}}" href="{{$item.plink.href}}" style="color: #999">{{$item.ago}}</a>{{else}} {{$item.ago}} {{/if}}
+			{{if $item.lock}} - <span class="fakelink" style="color: #999" onclick="lockview(event,{{$item.id}});">{{$item.lock}}</span> {{/if}}
+			</span>
+			</div>
+		<div class="wall-item-content">
+			{{if $item.title}}<h2><a href="{{$item.plink.href}}">{{$item.title}}</a></h2>{{/if}}
+			{{$item.body}}
+			{{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-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+			{{foreach $item.tags as $tag}}
+				<span class='tag'>{{$tag}}</span>
+			{{/foreach}}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="">
+
+		</div>
+		<div class="wall-item-actions">
+
+			<div class="wall-item-actions-social">
+			
+			
+			{{if $item.vote}}
+				<a href="#" id="like-{{$item.id}}" class="icon like" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false">{{$item.vote.like.1}}</a>
+				{{if $item.vote.dislike}}
+				<a href="#" id="dislike-{{$item.id}}" class="icon dislike" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>
+				{{/if}}
+			{{/if}}
+						
+			{{if $item.vote.share}}
+				<a href="#" id="share-{{$item.id}}" class="icon recycle" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>
+			{{/if}}	
+
+
+			{{if $item.star}}
+				<a href="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}">
+				<img src="images/star_dummy.png" class="icon star" alt="{{$item.star.do}}" /> </a>
+			{{/if}}
+
+			{{if $item.tagger}}
+				<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon tagged" title="{{$item.tagger.add}}"></a>					  
+			{{/if}}	
+			
+			{{if $item.filer}}
+			<a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item icon file-as" title="{{$item.star.filer}}"></a>
+			{{/if}}				
+			
+			{{if $item.plink}}<a class="icon link" title="{{$item.plink.title}}" href="{{$item.plink.href}}">{{$item.plink.title}}</a>{{/if}}
+			
+					
+					
+			</div>
+			
+			<div class="wall-item-actions-tools">
+
+				{{if $item.drop.pagedrop}}
+					<input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
+				{{/if}}
+				{{if $item.drop.dropping}}
+					<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drop" title="{{$item.drop.delete}}">{{$item.drop.delete}}</a>
+				{{/if}}
+				{{if $item.edpost}}
+					<a class="icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
+				{{/if}}
+			</div>
+			<div class="wall-item-location">{{$item.location}}&nbsp;</div>
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links"></div>
+		<div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
+		<div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>	
+	</div>
+</div>
+
+{{if $item.threaded}}
+{{if $item.comment}}
+<div class="wall-item-comment-wrapper {{$item.indent}}" >
+	{{$item.comment}}
+</div>
+{{/if}}
+{{/if}}
+
+{{if $item.flatten}}
+<div class="wall-item-comment-wrapper" >
+	{{$item.comment}}
+</div>
+{{/if}}
+
+
+{{foreach $item.children as $child_item}}
+	{{include file="{{$child_item.template}}" item=$child_item}}
+{{/foreach}}
+
+</div>
+{{if $item.comment_lastcollapsed}}</div>{{/if}}
diff --git a/view/theme/dispy/templates/bottom.tpl b/view/theme/dispy/templates/bottom.tpl
new file mode 100644
index 000000000..49487240d
--- /dev/null
+++ b/view/theme/dispy/templates/bottom.tpl
@@ -0,0 +1,76 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script type="text/javascript" src="{{$baseurl}}/view/theme/dispy/js/jquery.autogrow.textarea.js"></script>
+<script type="text/javascript">
+$(document).ready(function() {
+
+});
+function tautogrow(id) {
+	$("textarea#comment-edit-text-" + id).autogrow();
+};
+
+function insertFormatting(comment, BBcode, id) {
+	var tmpStr = $("#comment-edit-text-" + id).val();
+	if(tmpStr == comment) {
+		tmpStr = "";
+		$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+		$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+		openMenu("comment-edit-submit-wrapper-" + id);
+	}
+	textarea = document.getElementById("comment-edit-text-" + id);
+	if (document.selection) {
+		textarea.focus();
+		selected = document.selection.createRange();
+		if (BBcode == "url") {
+			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
+		} else {
+			selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+		}
+	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
+		var start = textarea.selectionStart;
+		var end = textarea.selectionEnd;
+		if (BBcode == "url") {
+			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]"
+			+ "http://" + textarea.value.substring(start, end)
+			+ "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+		} else {
+			textarea.value = textarea.value.substring(0, start)
+			+ "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]"
+			+ textarea.value.substring(end, textarea.value.length);
+		}
+	}
+	return true;
+}
+
+function cmtBbOpen(id) {
+	$(".comment-edit-bb-" + id).show();
+}
+function cmtBbClose(id) {
+    $(".comment-edit-bb-" + id).hide();
+}
+
+var doctitle = document.title;
+function checkNotify() {
+	if(document.getElementById("notify-update").innerHTML != "") {
+		document.title = "("+document.getElementById("notify-update").innerHTML+") " + doctitle;
+	} else {
+		document.title = doctitle;
+    };
+    setInterval(function () {checkNotify();}, 10 * 1000);
+}
+
+$(document).ready(function(){
+var doctitle = document.title;
+function checkNotify() {
+if(document.getElementById("notify-update").innerHTML != "")
+document.title = "("+document.getElementById("notify-update").innerHTML+") " + doctitle;
+else
+document.title = doctitle;
+};
+setInterval(function () {checkNotify();}, 10 * 1000);
+})
+
+</script>
diff --git a/view/theme/dispy/templates/comment_item.tpl b/view/theme/dispy/templates/comment_item.tpl
new file mode 100644
index 000000000..b30aede3d
--- /dev/null
+++ b/view/theme/dispy/templates/comment_item.tpl
@@ -0,0 +1,75 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
+			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
+				<input type="hidden" name="type" value="{{$type}}" />
+				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+				<input type="hidden" name="parent" value="{{$parent}}" />
+				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
+				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
+				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
+					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<ul class="comment-edit-bb-{{$id}}">
+					<li><a class="editicon boldbb shadow"
+						style="cursor: pointer;"
+						onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
+					<li><a class="editicon italicbb shadow"
+						style="cursor: pointer;"
+						onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
+					<li><a class="editicon underlinebb shadow"
+						style="cursor: pointer;"
+						onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
+					<li><a class="editicon quotebb shadow"
+						style="cursor: pointer;"
+						onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
+					<li><a class="editicon codebb shadow"
+						style="cursor: pointer;"
+						onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
+					<li><a class="editicon imagebb shadow"
+						style="cursor: pointer;"
+						onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
+					<li><a class="editicon urlbb shadow"
+						style="cursor: pointer;"
+						onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
+					<li><a class="editicon videobb shadow"
+						style="cursor: pointer;"
+						onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
+				</ul>
+				<div class="comment-edit-bb-end"></div>
+				<textarea id="comment-edit-text-{{$id}}"
+					class="comment-edit-text-empty"
+					name="body"
+					onfocus="commentOpen(this,{{$id}});tautogrow({{$id}});cmtBbOpen({{$id}});"
+					onblur="commentClose(this,{{$id}});"
+					placeholder="Comment">{{$comment}}</textarea>
+				{{if $qcomment}}
+                <div class="qcomment-wrapper">
+					<select id="qcomment-select-{{$id}}"
+						name="qcomment-{{$id}}"
+						class="qcomment"
+						onchange="qCommentInsert(this,{{$id}});">
+					<option value=""></option>
+					{{foreach $qcomment as $qc}}
+					<option value="{{$qc}}">{{$qc}}</option>
+					{{/foreach}}
+					</select>
+				</div>
+				{{/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}}" />
+					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
+					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+				<div class="comment-edit-end"></div>
+			</form>
+		</div>
diff --git a/view/theme/dispy/templates/communityhome.tpl b/view/theme/dispy/templates/communityhome.tpl
new file mode 100644
index 000000000..83749ae36
--- /dev/null
+++ b/view/theme/dispy/templates/communityhome.tpl
@@ -0,0 +1,40 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{if $page}}
+<div>{{$page}}</div>
+{{/if}}
+
+<h3 id="extra-help-header">Help or '@NewHere'?</h3>
+<div id="extra-help">
+<a href="https://helpers.pyxis.uberspace.de/profile/helpers"
+	title="Friendica Support" target="_blank">Friendica Support</a><br />
+<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk"
+	title="Let's talk" target="_blank">Let's talk</a><br />
+<a href="http://newzot.hydra.uberspace.de/profile/newzot"
+	title="Local Friendica" target="_blank">Local Friendica</a><br />
+<a href="http://kakste.com/profile/newhere" title="@NewHere" target="_blank">NewHere</a>
+</div>
+
+<h3 id="connect-services-header">Connectable Services</h3>
+<ul id="connect-services">
+<li><a href="{{$url}}/facebook"><img alt="Facebook"
+	src="view/theme/dispy/icons/facebook.png" title="Facebook" /></a></li>
+<li><a href="{{$url}}/settings/connectors"><img
+	alt="StatusNet" src="view/theme/dispy/icons/StatusNet.png" title="StatusNet" /></a></li>
+<li><a href="{{$url}}/settings/connectors"><img
+	alt="LiveJournal" src="view/theme/dispy/icons/livejournal.png" title="LiveJournal" /></a></li>
+<li><a href="{{$url}}/settings/connectors"><img
+	alt="Posterous" src="view/theme/dispy/icons/posterous.png" title="Posterous" /></a></li>
+<li><a href="{{$url}}/settings/connectors"><img
+	alt="Tumblr" src="view/theme/dispy/icons/tumblr.png" title="Tumblr" /></a></li>
+<li><a href="{{$url}}/settings/connectors"><img
+	alt="Twitter" src="view/theme/dispy/icons/twitter.png" title="Twitter" /></a></li>
+<li><a href="{{$url}}/settings/connectors"><img
+	alt="WordPress" src="view/theme/dispy/icons/wordpress.png" title="WordPress" /></a></li>
+<li><a href="{{$url}}/settings/connectors"><img
+	alt="E-Mail" src="view/theme/dispy/icons/email.png" title="E-Mail" /></a></li>
+</ul>
+
diff --git a/view/theme/dispy/templates/contact_template.tpl b/view/theme/dispy/templates/contact_template.tpl
new file mode 100644
index 000000000..d22acd5a6
--- /dev/null
+++ b/view/theme/dispy/templates/contact_template.tpl
@@ -0,0 +1,41 @@
+{{*
+ *	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">
+		<div class="contact-entry-photo mframe" id="contact-entry-photo-{{$contact.id}}"
+		onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}}); openMenu('contact-photo-menu-button-{{$contact.id}}')" 
+		onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$contact.id}}\'); closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)">
+
+			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>
+
+			{{if $contact.photo_menu}}
+			<span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">menu</span>
+                <div class="contact-photo-menu" id="contact-photo-menu-{{$contact.id}}">
+                    <ul>
+						{{foreach $contact.photo_menu as $c}}
+						{{if $c.2}}
+						<li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+						{{else}}
+						<li><a href="{{$c.1}}">{{$c.0}}</a></li>
+						{{/if}}
+						{{/foreach}}
+                    </ul>
+                </div>
+			{{/if}}
+		</div>
+			
+	</div>
+	<div class="contact-entry-photo-end" ></div>
+		<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div>
+{{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
+	<div class="contact-entry-details" id="contact-entry-url-{{$contact.id}}" >
+		<a href="{{$contact.itemurl}}" title="{{$contact.itemurl}}">Profile URL</a></div>
+	<div class="contact-entry-details" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>
+
+	<div class="contact-entry-end" ></div>
+</div>
+
diff --git a/view/theme/dispy/templates/conversation.tpl b/view/theme/dispy/templates/conversation.tpl
new file mode 100644
index 000000000..e8cf72071
--- /dev/null
+++ b/view/theme/dispy/templates/conversation.tpl
@@ -0,0 +1,34 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$live_update}}
+
+{{foreach $threads as $thread}}
+<div id="tread-wrapper-{{$thread.id}}" class="tread-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="conversation-end"></div>
+
+{{if $dropping}}
+<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems(); return false;">
+  <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
+  <div id="item-delete-selected-desc" >{{$dropping}}</div>
+</div>
+<div id="item-delete-selected-end"></div>
+{{/if}}
diff --git a/view/theme/dispy/templates/group_side.tpl b/view/theme/dispy/templates/group_side.tpl
new file mode 100644
index 000000000..33250b694
--- /dev/null
+++ b/view/theme/dispy/templates/group_side.tpl
@@ -0,0 +1,34 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id="group-sidebar" class="widget">
+<h3 class="label">{{$title}}</h3>
+
+<div id="sidebar-group-list">
+	<ul id="sidebar-group-ul">
+		{{foreach $groups as $group}}
+			<li class="sidebar-group-li">
+				<a href="{{$group.href}}" class="sidebar-group-element {{if $group.selected}}group-selected{{else}}group-other{{/if}}">{{$group.text}}</a>
+				{{if $group.edit}}
+					<a class="groupsideedit"
+                        href="{{$group.edit.href}}" title="{{$group.edit.title}}"><span class="icon small-pencil"></span></a>
+				{{/if}}
+				{{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}}
+			</li>
+		{{/foreach}}
+	</ul>
+	</div>
+  <div id="sidebar-new-group">
+  <a href="group/new" title="{{$createtext}}"><span class="action text add">{{$createtext}}</span></a>
+  </div>
+</div>
+
+
diff --git a/view/theme/dispy/templates/header.tpl b/view/theme/dispy/templates/header.tpl
new file mode 100644
index 000000000..a7fb96108
--- /dev/null
+++ b/view/theme/dispy/templates/header.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/theme/dispy/templates/jot-header.tpl b/view/theme/dispy/templates/jot-header.tpl
new file mode 100644
index 000000000..4aafc2175
--- /dev/null
+++ b/view/theme/dispy/templates/jot-header.tpl
@@ -0,0 +1,350 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script type="text/javascript">
+var editor=false;
+var textlen = 0;
+var plaintext = '{{$editselect}}';
+
+function initEditor(cb) {
+	if (editor==false) {
+		$("#profile-jot-text-loading").show();
+		if(plaintext == 'none') {
+			$("#profile-jot-text-loading").hide();
+			$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+			$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
+			editor = true;
+			$("a#jot-perms-icon").colorbox({
+				'inline' : true,
+				'transition' : 'elastic'
+			});
+			$(".jothidden").show();
+			if (typeof cb!="undefined") cb();
+			return;
+		}
+		tinyMCE.init({
+			theme : "advanced",
+			mode : "specific_textareas",
+			editor_selector: {{$editselect}},
+			auto_focus: "profile-jot-text",
+			plugins : "bbcode,paste,fullscreen,autoresize,inlinepopups,contextmenu,style",
+			theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen,charmap",
+			theme_advanced_buttons2 : "",
+			theme_advanced_buttons3 : "",
+			theme_advanced_toolbar_location : "top",
+			theme_advanced_toolbar_align : "center",
+			theme_advanced_blockformats : "blockquote,code",
+			gecko_spellcheck : true,
+			paste_text_sticky : true,
+			entity_encoding : "raw",
+			add_unload_trigger : false,
+			remove_linebreaks : false,
+			//force_p_newlines : false,
+			//force_br_newlines : true,
+			forced_root_block : 'div',
+			convert_urls: false,
+			content_css: "{{$baseurl}}/view/custom_tinymce.css",
+			theme_advanced_path : false,
+			file_browser_callback : "fcFileBrowser",
+			setup : function(ed) {
+				cPopup = null;
+				ed.onKeyDown.add(function(ed,e) {
+					if(cPopup !== null)
+						cPopup.onkey(e);
+				});
+
+				ed.onKeyUp.add(function(ed, e) {
+					var txt = tinyMCE.activeEditor.getContent();
+					match = txt.match(/@([^ \n]+)$/);
+					if(match!==null) {
+						if(cPopup === null) {
+							cPopup = new ACPopup(this,baseurl+"/acl");
+						}
+						if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
+						if(! cPopup.ready) cPopup = null;
+					}
+					else {
+						if(cPopup !== null) { cPopup.close(); cPopup = null; }
+					}
+
+					textlen = txt.length;
+					if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
+						$('#profile-jot-desc').html(ispublic);
+					}
+					else {
+						$('#profile-jot-desc').html('&#160;');
+					}	 
+
+				 //Character count
+
+					if(textlen <= 140) {
+						$('#character-counter').removeClass('red');
+						$('#character-counter').removeClass('orange');
+						$('#character-counter').addClass('grey');
+					}
+					if((textlen > 140) && (textlen <= 420)) {
+						$('#character-counter').removeClass('grey');
+						$('#character-counter').removeClass('red');
+						$('#character-counter').addClass('orange');
+					}
+					if(textlen > 420) {
+						$('#character-counter').removeClass('grey');
+						$('#character-counter').removeClass('orange');
+						$('#character-counter').addClass('red');
+					}
+					$('#character-counter').text(textlen);
+				});
+
+				ed.onInit.add(function(ed) {
+					ed.pasteAsPlainText = true;
+					$("#profile-jot-text-loading").hide();
+					$(".jothidden").show();
+					if (typeof cb!="undefined") cb();
+				});
+			}
+		});
+		editor = true;
+		// setup acl popup
+		$("a#jot-perms-icon").colorbox({
+			'inline' : true,
+			'transition' : 'elastic'
+		}); 
+	} else {
+		if (typeof cb!="undefined") cb();
+	}
+}
+
+function enableOnUser(){
+	if (editor) return;
+	$(this).val("");
+	initEditor();
+}
+
+</script>
+<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.js"></script>
+<script type="text/javascript">
+	var ispublic = '{{$ispublic}}';
+	var addtitle = '{{$addtitle}}';
+
+	$(document).ready(function() {
+		
+		/* enable tinymce on focus and click */
+		$("#profile-jot-text").focus(enableOnUser);
+		$("#profile-jot-text").click(enableOnUser);
+		/* enable character counter */
+		$("#profile-jot-text").focus(charCounter);
+		$("#profile-jot-text").click(charCounter);
+
+		var uploader = new window.AjaxUpload(
+			'wall-image-upload',
+			{ action: 'wall_upload/{{$nickname}}',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					addeditortext(response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);
+		var file_uploader = new window.AjaxUpload(
+			'wall-file-upload',
+			{ action: 'wall_attach/{{$nickname}}',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					addeditortext(response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);
+	});
+
+	function deleteCheckedItems() {
+		var checkedstr = '';
+
+		$('.item-select').each( function() {
+			if($(this).is(':checked')) {
+				if(checkedstr.length != 0) {
+					checkedstr = checkedstr + ',' + $(this).val();
+				}
+				else {
+					checkedstr = $(this).val();
+				}
+			}	
+		});
+		$.post('item', { dropitems: checkedstr }, function(data) {
+			window.location.reload();
+		});
+	}
+
+	function jotGetLink() {
+		reply = prompt("{{$linkurl}}");
+		if(reply && reply.length) {
+			reply = bin2hex(reply);
+			$('#profile-rotator').show();
+			$.get('parse_url?binurl=' + reply, function(data) {
+				addeditortext(data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+	function jotVideoURL() {
+		reply = prompt("{{$vidurl}}");
+		if(reply && reply.length) {
+			addeditortext('[video]' + reply + '[/video]');
+		}
+	}
+
+	function jotAudioURL() {
+		reply = prompt("{{$audurl}}");
+		if(reply && reply.length) {
+			addeditortext('[audio]' + reply + '[/audio]');
+		}
+	}
+
+
+	function jotGetLocation() {
+		reply = prompt("{{$whereareu}}", $('#jot-location').val());
+		if(reply && reply.length) {
+			$('#jot-location').val(reply);
+		}
+	}
+
+	function jotShare(id) {
+		if ($('#jot-popup').length != 0) $('#jot-popup').show();
+
+		$('#like-rotator-' + id).show();
+		$.get('share/' + id, function(data) {
+			if (!editor) $("#profile-jot-text").val("");
+			initEditor(function(){
+				addeditortext(data);
+				$('#like-rotator-' + id).hide();
+				$(window).scrollTop(0);
+			});
+
+		});
+	}
+
+	function linkdropper(event) {
+		var linkFound = event.dataTransfer.types.contains("text/uri-list");
+		if(linkFound)
+			event.preventDefault();
+	}
+
+	function linkdrop(event) {
+		var reply = event.dataTransfer.getData("text/uri-list");
+		event.target.textContent = reply;
+		event.preventDefault();
+		if(reply && reply.length) {
+			reply = bin2hex(reply);
+			$('#profile-rotator').show();
+			$.get('parse_url?binurl=' + reply, function(data) {
+				if (!editor) $("#profile-jot-text").val("");
+				initEditor(function(){
+					addeditortext(data);
+					$('#profile-rotator').hide();
+				});
+			});
+		}
+	}
+
+	function itemTag(id) {
+		reply = prompt("{{$term}}");
+		if(reply && reply.length) {
+			reply = reply.replace('#','');
+			if(reply.length) {
+
+				commentBusy = true;
+				$('body').css('cursor', 'wait');
+
+				$.get('tagger/' + id + '?term=' + reply);
+				if(timer) clearTimeout(timer);
+				timer = setTimeout(NavUpdate,3000);
+				liking = 1;
+			}
+		}
+	}
+
+	function itemFiler(id) {
+		
+		var bordercolor = $("input").css("border-color");
+		
+		$.get('filer/', function(data){
+			$.colorbox({html:data});
+			$("#id_term").keypress(function(){
+				$(this).css("border-color",bordercolor);
+			})
+			$("#select_term").change(function(){
+				$("#id_term").css("border-color",bordercolor);
+			})
+			
+			$("#filer_save").click(function(e){
+				e.preventDefault();
+				reply = $("#id_term").val();
+				if(reply && reply.length) {
+					commentBusy = true;
+					$('body').css('cursor', 'wait');
+					$.get('filer/' + id + '?term=' + reply);
+					if(timer) clearTimeout(timer);
+					timer = setTimeout(NavUpdate,3000);
+					liking = 1;
+					$.colorbox.close();
+				} else {
+					$("#id_term").css("border-color","#FF0000");
+				}
+				return false;
+			});
+		});
+		
+	}
+
+	function jotClearLocation() {
+		$('#jot-coord').val('');
+		$('#profile-nolocation-wrapper').hide();
+	}
+
+	function addeditortext(data) {
+		if(plaintext == 'none') {
+			var currentText = $("#profile-jot-text").val();
+			$("#profile-jot-text").val(currentText + data);
+		}
+		else
+			tinyMCE.execCommand('mceInsertRawHTML',false,data);
+	}	
+
+	{{$geotag}}
+
+	function charCounter() {
+		// character count part deux
+		//$(this).val().length is not a function Line 282(3)
+		$('#profile-jot-text').keyup(function() {
+			var textlen = 0;
+			var maxLen1 = 140;
+			var maxLen2 = 420;
+
+			$('#character-counter').removeClass('jothidden');
+
+			textLen = $(this).val().length;
+			if(textLen <= maxLen1) {
+				$('#character-counter').removeClass('red');
+				$('#character-counter').removeClass('orange');
+				$('#character-counter').addClass('grey');
+			}
+			if((textLen > maxLen1) && (textlen <= maxLen2)) {
+				$('#character-counter').removeClass('grey');
+				$('#character-counter').removeClass('red');
+				$('#character-counter').addClass('orange');
+			}
+			if(textLen > maxLen2) {
+				$('#character-counter').removeClass('grey');
+				$('#character-counter').removeClass('orange');
+				$('#character-counter').addClass('red');
+			}
+			$('#character-counter').text( textLen );
+		});
+		$('#profile-jot-text').keyup();
+	}
+</script>
diff --git a/view/theme/dispy/templates/jot.tpl b/view/theme/dispy/templates/jot.tpl
new file mode 100644
index 000000000..24dc68462
--- /dev/null
+++ b/view/theme/dispy/templates/jot.tpl
@@ -0,0 +1,84 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<form id="profile-jot-form" action="{{$action}}" method="post">
+	<div id="jot">
+		<div id="profile-jot-desc" class="jothidden">&#160;</div>
+
+		<input type="hidden" name="type" value="{{$ptyp}}" />
+		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+		<input type="hidden" name="return" value="{{$return_path}}" />
+		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
+		<input type="hidden" name="coord" id="jot-coord" value="" />
+		<input type="hidden" name="post_id" value="{{$post_id}}" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none" /></div>
+		<div id="character-counter" class="grey jothidden"></div>
+		{{if $placeholdercategory}}
+		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" /></div>
+		{{/if}}
+		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body">{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}
+		</textarea>
+
+<div id="profile-jot-submit-wrapper" class="jothidden">
+<div id="jot-tools" class="jothidden" style="display:none">
+	<div id="profile-jot-submit-wrapper" class="jothidden">
+
+	<div id="profile-upload-wrapper" style="display: {{$visitor}};">
+		<div id="wall-image-upload-div"><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="{{$upload}}"></a></div>
+	</div>
+	<div id="profile-attach-wrapper" style="display: {{$visitor}};">
+		<div id="wall-file-upload-div"><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="{{$attach}}"></a></div>
+	</div>
+
+	<div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);">
+		<a id="profile-link" class="icon link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="{{$weblink}}"></a>
+	</div>
+	<div id="profile-video-wrapper" style="display: {{$visitor}};">
+		<a id="profile-video" class="icon video" onclick="jotVideoURL();return false;" title="{{$video}}"></a>
+	</div>
+	<div id="profile-audio-wrapper" style="display: {{$visitor}};">
+		<a id="profile-audio" class="icon audio" onclick="jotAudioURL();return false;" title="{{$audio}}"></a>
+	</div>
+	<div id="profile-location-wrapper" style="display: {{$visitor}};">
+		<a id="profile-location" class="icon globe" onclick="jotGetLocation();return false;" title="{{$setloc}}"></a>
+	</div>
+	<div id="profile-nolocation-wrapper" style="display: none;">
+		<a id="profile-nolocation" class="icon noglobe" onclick="jotClearLocation();return false;" title="{{$noloc}}"></a>
+	</div>
+
+	<div id="profile-jot-plugin-wrapper">
+  	{{$jotplugins}}
+	</div>
+
+	<a class="icon-text-preview pointer"></a><a id="jot-preview-link" class="pointer" onclick="preview_post(); return false;" title="{{$preview}}">{{$preview}}</a>
+	<input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" />
+	<div id="profile-jot-perms" class="profile-jot-perms">
+		<a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon {{$lockstate}} {{$bang}}" title="{{$permset}}"></a>
+	</div>
+	<span id="profile-rotator" class="loading" style="display: none"><img src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" /></span>
+	</div>
+
+	</div> <!-- /#profile-jot-submit-wrapper -->
+</div> <!-- /#jot-tools -->
+	
+	<div id="jot-preview-content" style="display:none;"></div>
+
+	<div style="display: none;">
+		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+			{{$acl}}
+			<hr style="clear:both" />
+			<div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
+			<div id="profile-jot-email-end"></div>
+			{{$jotnets}}
+		</div>
+	</div>
+</div>
+
+<div id="profile-jot-end"></div>
+</form>
+</div>
+		{{if $content}}<script>initEditor();</script>{{/if}}
diff --git a/view/theme/dispy/templates/lang_selector.tpl b/view/theme/dispy/templates/lang_selector.tpl
new file mode 100644
index 000000000..a1aee8277
--- /dev/null
+++ b/view/theme/dispy/templates/lang_selector.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	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/theme/dispy/templates/mail_head.tpl b/view/theme/dispy/templates/mail_head.tpl
new file mode 100644
index 000000000..54a0cd471
--- /dev/null
+++ b/view/theme/dispy/templates/mail_head.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$messages}}</h3>
+
+<div class="tabs-wrapper">
+{{$tab_content}}
+</div>
diff --git a/view/theme/dispy/templates/nav.tpl b/view/theme/dispy/templates/nav.tpl
new file mode 100644
index 000000000..e24082105
--- /dev/null
+++ b/view/theme/dispy/templates/nav.tpl
@@ -0,0 +1,150 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<nav id="pagenav">
+
+<div id="banner">{{$banner}}</div>
+<div id="site-location">{{$sitelocation}}</div>
+
+<a name="top" id="top"></a>
+<div id="nav-floater">
+    <ul id="nav-buttons">
+    {{if $nav.login}}
+    <li><a id="nav-login-link" class="nav-login-link {{$nav.login.2}}"
+            href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a></li>
+    {{/if}}
+    {{if $nav.home}}
+    <li><a id="nav-home-link" class="nav-link {{$nav.home.2}}"
+            href="{{$nav.home.0}}" title="{{$nav.home.1}}">{{$nav.home.1}}</a></li>
+    {{/if}}
+    {{if $nav.network}}
+    <li><a id="nav-network-link" class="nav-link {{$nav.network.2}}"
+            href="{{$nav.network.0}}" title="{{$nav.network.1}}">{{$nav.network.1}}</a></li>
+    {{/if}}
+    {{if $nav.notifications}}
+    <li><a id="nav-notifications-linkmenu" class="nav-link {{$nav.notifications.2}}"
+            href="{{$nav.notifications.0}}"
+            rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a></li>
+        <ul id="nav-notifications-menu" class="menu-popup">
+            <li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
+            <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
+            <li class="empty">{{$emptynotifications}}</li>
+        </ul>
+    {{/if}}
+    {{if $nav.messages}}
+    <li><a id="nav-messages-link" class="nav-link {{$nav.messages.2}}"
+            href="{{$nav.messages.0}}" title="{{$nav.messages.1}}">{{$nav.messages.1}}</a></li>
+    {{/if}}
+    {{if $nav.community}}
+    <li><a id="nav-community-link" class="nav-link {{$nav.community.2}}"
+            href="{{$nav.community.0}}" title="{{$nav.community.1}}">{{$nav.community.1}}</a></li>
+    {{/if}}
+    <li><a id="nav-directory-link" class="nav-link {{$nav.directory.2}}"
+            href="{{$nav.directory.0}}" title="{{$nav.directory.1}}">{{$nav.directory.1}}</a></li>
+    <li><a id="nav-search-link" class="nav-link {{$nav.search.2}}"
+            href="{{$nav.search.0}}" title="{{$nav.search.1}}">{{$nav.search.1}}</a></li>
+    {{if $nav.apps}}
+    <li><a id="nav-apps-link" class="nav-link {{$nav.apps.2}}"
+        href="{{$nav.apps.0}}" title="{{$nav.apps.1}}">{{$nav.apps.1}}</a></li>
+    {{/if}}
+    </ul>
+
+    <div id="user-menu">
+        <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false;" href="{{$nav.home.0}}"><span class="">User Menu</span></a>
+        <ul id="user-menu-popup"
+            onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')"
+            onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
+
+        {{if $nav.register}}
+        <li>
+        <a id="nav-register-link" class="nav-commlink {{$nav.register.2}}" href="{{$nav.register.0}}" title="{{$nav.register.1}}"></a>
+        </li>
+        {{/if}}
+        {{if $nav.contacts}}
+        <li><a id="nav-contacts-link" class="nav-commlink {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.1}}">{{$nav.contacts.1}}</a></li>
+        {{/if}}
+        {{if $nav.profiles}}
+        <li><a id="nav-profiles-link" class="nav-commlink {{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.1}}">{{$nav.profiles.1}}</a></li>
+        {{/if}}
+        {{if $nav.settings}}
+        <li><a id="nav-settings-link" class="nav-commlink {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.1}}">{{$nav.settings.1}}</a></li>
+        {{/if}}
+        {{if $nav.login}}
+        <li><a id="nav-login-link" class="nav-commlink {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.1}}">{{$nav.login.1}}</a></li>
+        {{/if}}
+        {{if $nav.logout}}
+        <li><a id="nav-logout-link" class="nav-commlink {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>
+        {{/if}}
+        </ul>
+    </div>
+
+    <ul id="nav-buttons-2">
+    {{if $nav.introductions}}
+    <li><a id="nav-intro-link" class="nav-link {{$nav.introductions.2}} {{$sel.introductions}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a></li>
+    {{/if}}
+    {{if $nav.admin}}
+    <li><a id="nav-admin-link" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.1}}">{{$nav.admin.1}}</a></li>
+    {{/if}}
+    {{if $nav.manage}}
+    <li><a id="nav-manage-link" class="nav-link {{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.1}}">{{$nav.manage.1}}</a></li>
+    {{/if}}
+    {{if $nav.help}}
+    <li><a id="nav-help-link" class="nav-link {{$nav.help.2}}"
+            href="{{$nav.help.0}}" title="{{$nav.help.1}}">{{$nav.help.1}}</a></li>
+    {{/if}}
+    </ul>
+
+{{if $userinfo}}
+        <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}}
+        </ul>
+{{/if}}
+
+    <div id="notifications">
+        {{if $nav.home}}
+        <a id="home-update" class="nav-ajax-left" href="{{$nav.home.0}}" title="{{$nav.home.1}}"></a>
+        {{/if}}
+        {{if $nav.network}}
+        <a id="net-update" class="nav-ajax-left" href="{{$nav.network.0}}" title="{{$nav.network.1}}"></a>
+        {{/if}}
+        {{if $nav.notifications}}
+        <a id="notify-update" class="nav-ajax-left" href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"></a>
+        {{/if}}
+        {{if $nav.messages}}
+        <a id="mail-update" class="nav-ajax-left" href="{{$nav.messages.0}}" title="{{$nav.messages.1}}"></a>
+        {{/if}}
+        {{if $nav.introductions}}
+        <a id="intro-update" class="nav-ajax-left" href="{{$nav.introductions.0}}"></a>
+        {{/if}}
+    </div>
+</div>
+    <a href="#" class="floaterflip"></a>
+</nav>
+
+<div id="lang-sel-wrap">
+{{$langselector}}
+</div>
+
+<div id="scrollup">
+<a href="#top"><img src="view/theme/dispy/icons/scroll_top.png"
+    alt="back to top" title="Back to top" /></a>
+</div>
+
+<div class="search-box">
+    <form method="get" action="{{$nav.search.0}}">
+        <input id="mini-search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" />
+    </form>
+</div>
+
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+    <li class="{4}">
+    <a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a>
+    </li>
+</ul>
+
diff --git a/view/theme/dispy/templates/photo_edit.tpl b/view/theme/dispy/templates/photo_edit.tpl
new file mode 100644
index 000000000..b9a92fda8
--- /dev/null
+++ b/view/theme/dispy/templates/photo_edit.tpl
@@ -0,0 +1,58 @@
+{{*
+ *	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" name="albname" value="{{$album}}" />
+
+	<div id="photo-edit-albumname-end"></div>
+
+	<label id="photo-edit-caption-label" for="photo-edit-caption">{{$capt_label}}</label>
+	<input id="photo-edit-caption" type="text" name="desc" value="{{$caption}}" />
+
+	<div id="photo-edit-caption-end"></div>
+
+	<label id="photo-edit-tags-label" for="photo-edit-newtag" >{{$tag_label}}</label>
+	<input name="newtag" id="photo-edit-newtag" title="{{$help_tags}}" type="text" />
+
+	<div id="photo-edit-tags-end"></div>
+	<div id="photo-edit-rotate-wrapper">
+		<div id="photo-edit-rotate-label">{{$rotate}}</div>
+		<input type="checkbox" name="rotate" value="1" />
+	</div>
+	<div id="photo-edit-rotate-end"></div>
+
+	<div id="photo-edit-perms" class="photo-edit-perms" >
+		<a href="#photo-edit-perms-select"
+			id="photo-edit-perms-menu"
+			class="button"
+			title="{{$permissions}}"/><span id="jot-perms-icon"
+			class="icon {{$lockstate}}" ></span>{{$permissions}}</a>
+		<div id="photo-edit-perms-menu-end"></div>
+
+		<div style="display: none;">
+			<div id="photo-edit-perms-select" >
+				{{$aclselect}}
+			</div>
+		</div>
+	</div>
+	<div id="photo-edit-perms-end"></div>
+
+	<input id="photo-edit-submit-button" type="submit" name="submit" value="{{$submit}}" />
+	<input id="photo-edit-delete-button" type="submit" name="delete" value="{{$delete}}" onclick="return confirmDelete()"; />
+
+	<div id="photo-edit-end"></div>
+</form>
+
+<script type="text/javascript">
+	$("a#photo-edit-perms-menu").colorbox({
+		'inline' : true,
+		'transition' : 'none'
+	}); 
+</script>
diff --git a/view/theme/dispy/templates/photo_view.tpl b/view/theme/dispy/templates/photo_view.tpl
new file mode 100644
index 000000000..cfc8868ed
--- /dev/null
+++ b/view/theme/dispy/templates/photo_view.tpl
@@ -0,0 +1,41 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<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}}" class="lightbox" title="{{$photo.title}}"><img src="{{$photo.src}}" /></a></div>
+{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}">{{$nextlink.1}}</a></div>{{/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}}
+<div id="wall-photo-container">
+{{$comments}}
+</div>
+
+{{$paginate}}
+
diff --git a/view/theme/dispy/templates/profile_vcard.tpl b/view/theme/dispy/templates/profile_vcard.tpl
new file mode 100644
index 000000000..01633716d
--- /dev/null
+++ b/view/theme/dispy/templates/profile_vcard.tpl
@@ -0,0 +1,87 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="vcard">
+
+	{{if $profile.edit}}
+	<div class="action">
+	<span class="icon-profile-edit" rel="#profiles-menu"></span>
+	<a href="#" rel="#profiles-menu" class="ttright" id="profiles-menu-trigger" title="{{$profile.edit.3}}">{{$profile.edit.1}}</a>
+	<ul id="profiles-menu" class="menu-popup">
+		{{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}}
+		<div class="location">
+        <span class="location-label">{{$location}}</span>
+		<div 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}}
+		</div>
+		</div>
+	{{/if}}
+
+	{{if $gender}}
+    <div class="mf">
+        <span class="gender-label">{{$gender}}</span>
+        <span class="x-gender">{{$profile.gender}}</span>
+    </div>
+    {{/if}}
+	
+	{{if $profile.pubkey}}
+    <div class="key" style="display:none;">{{$profile.pubkey}}</div>
+    {{/if}}
+
+	{{if $marital}}
+    <div class="marital">
+    <span class="marital-label">
+    <span class="heart">&hearts;</span>{{$marital}}</span>
+    <span class="marital-text">{{$profile.marital}}</span>
+    </div>
+    {{/if}}
+
+	{{if $homepage}}
+    <div class="homepage">
+    <span class="homepage-label">{{$homepage}}</span>
+    <span class="homepage-url"><a href="{{$profile.homepage}}"
+    target="external-link">{{$profile.homepage}}</a></span>
+    </div>{{/if}}
+
+	{{include file="diaspora_vcard.tpl"}}
+	
+	<div id="profile-extra-links">
+		<ul>
+			{{if $connect}}
+				<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
+			{{/if}}
+		</ul>
+	</div>
+</div>
+
+{{$contact_block}}
+
diff --git a/view/theme/dispy/templates/saved_searches_aside.tpl b/view/theme/dispy/templates/saved_searches_aside.tpl
new file mode 100644
index 000000000..0d9c0747f
--- /dev/null
+++ b/view/theme/dispy/templates/saved_searches_aside.tpl
@@ -0,0 +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}}
+	
+	<ul id="saved-search-ul">
+		{{foreach $saved as $search}}
+		<li class="saved-search-li clear">
+			<a title="{{$search.delete}}" onclick="return confirmDelete();" onmouseout="imgdull(this);" onmouseover="imgbright(this);" id="drop-saved-search-term-{{$search.id}}" class="icon savedsearchdrop drophide" href="network/?f=&amp;remove=1&amp;search={{$search.encodedterm}}"></a>
+			<a id="saved-search-term-{{$search.id}}" class="savedsearchterm" href="network/?f=&amp;search={{$search.encodedterm}}">{{$search.term}}</a>
+		</li>
+		{{/foreach}}
+	</ul>
+	<div class="clear"></div>
+</div>
diff --git a/view/theme/dispy/templates/search_item.tpl b/view/theme/dispy/templates/search_item.tpl
new file mode 100644
index 000000000..8d406514c
--- /dev/null
+++ b/view/theme/dispy/templates/search_item.tpl
@@ -0,0 +1,69 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="wall-item-outside-wrapper {{$item.indent}} {{$item.shiny}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
+	<div class="wall-item-content-wrapper {{$item.indent}} {{$item.shiny}}" id="wall-item-content-wrapper-{{$item.id}}" >
+		<div class="wall-item-info" id="wall-item-info-{{$item.id}}">
+			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$item.id}}" 
+				 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
+				 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
+				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+				<div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+					<ul>
+						{{$item.item_photo_menu}}
+					</ul>
+				</div>
+			</div>
+			<div class="wall-item-photo-end"></div>	
+			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
+				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
+				{{else}}<div class="wall-item-lock"></div>{{/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}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>
+				
+		</div>			
+		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			<div class="wall-item-title-end"></div>
+			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
+			{{if $item.has_cats}}
+			<div class="categorytags"><span>{{$item.txt_cats}} {{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 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.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-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}} {{$item.shiny}}" ></div>
+
+</div>
+
+
diff --git a/view/theme/dispy/templates/theme_settings.tpl b/view/theme/dispy/templates/theme_settings.tpl
new file mode 100644
index 000000000..7475db28b
--- /dev/null
+++ b/view/theme/dispy/templates/theme_settings.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{include file="field_select.tpl" field=$colour}}
+
+{{include file="field_select.tpl" field=$font_size}}
+
+{{include file="field_select.tpl" field=$line_height}}
+
+<div class="settings-submit-wrapper">
+	<input type="submit" value="{{$submit}}" class="settings-submit" name="dispy-settings-submit" />
+</div>
+
diff --git a/view/theme/dispy/templates/threaded_conversation.tpl b/view/theme/dispy/templates/threaded_conversation.tpl
new file mode 100644
index 000000000..9718d0e85
--- /dev/null
+++ b/view/theme/dispy/templates/threaded_conversation.tpl
@@ -0,0 +1,20 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$live_update}}
+
+{{foreach $threads as $thread}}
+{{include file="{{$thread.template}}" item=$thread}}
+{{/foreach}}
+
+<div id="conversation-end"></div>
+
+{{if $dropping}}
+<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems(); return false;">
+  <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
+  <div id="item-delete-selected-desc" >{{$dropping}}</div>
+</div>
+<div id="item-delete-selected-end"></div>
+{{/if}}
diff --git a/view/theme/dispy/templates/wall_thread.tpl b/view/theme/dispy/templates/wall_thread.tpl
new file mode 100644
index 000000000..94620ad53
--- /dev/null
+++ b/view/theme/dispy/templates/wall_thread.tpl
@@ -0,0 +1,144 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{if $item.comment_firstcollapsed}}
+	<div class="hide-comments-outer">
+	<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> <span id="hide-comments-{{$item.id}}" class="hide-comments fakelink" onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
+	</div>
+	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
+{{/if}}
+<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
+<a name="{{$item.id}}" ></a>
+<div class="wall-item-outside-wrapper {{$item.indent}} {{$item.shiny}}{{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" >
+	<div class="wall-item-content-wrapper {{$item.indent}} {{$item.shiny}}" id="wall-item-content-wrapper-{{$item.id}}" >
+		<div class="wall-item-info{{if $item.owner_url}} wallwall{{/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}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
+				<img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" /></a>
+			</div>
+			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
+			{{/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}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
+				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+                <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+                    <ul>
+                        {{$item.item_photo_menu}}
+                    </ul>
+                </div>
+
+			</div>
+			<div class="wall-item-photo-end"></div>
+			<div class="wall-item-location" id="wall-item-location-{{$item.id}}">
+				{{if $item.location}}<span class="icon globe"></span>{{$item.location}} {{/if}}
+			</div>
+			<div class="wall-item-author">
+				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}">{{$item.name}}</span></a>
+			</div>
+			<div class="wall-item-ago" id="wall-item-ago-{{$item.id}}">
+				{{$item.ago}}
+			</div>
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
+			<div class="wall-item-lock-wrapper">
+				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
+				{{else}}<div class="wall-item-lock"></div>{{/if}}
+			</div>
+			<ul class="wall-item-subtools1">
+				{{if $item.star}}
+				<li>
+					<a href="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}"></a>
+				</li>
+				{{/if}}
+				{{if $item.tagger}}
+				<li>
+					<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon tagged" title="{{$item.tagger.add}}"></a>
+				</li>
+				{{/if}}
+				{{if $item.vote}}
+				<li class="wall-item-like-buttons" id="wall-item-like-buttons-{{$item.id}}">
+					<a href="#" class="icon like" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></a>
+					{{if $item.vote.dislike}}
+					<a href="#" class="icon dislike" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>
+					{{/if}}
+					{{if $item.vote.share}}
+					<a href="#" id="share-{{$item.id}}"
+class="icon recycle wall-item-share-buttons"  title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>{{/if}}
+					<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+				</li>
+				{{/if}}
+			</ul><br style="clear:left;" />
+			<ul class="wall-item-subtools2">
+			{{if $item.filer}}
+				<li class="wall-item-filer-wrapper"><a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item icon file-as" title="{{$item.star.filer}}"></a></li>
+			{{/if}}
+			{{if $item.plink}}
+				<li class="wall-item-links-wrapper{{$item.sparkle}}"><a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="icon remote-link"></a></li>
+			{{/if}}
+			{{if $item.edpost}}
+				<li><a class="editpost icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a></li>
+			{{/if}}
+
+			<li class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
+				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
+			</li>
+			</ul>
+			<div class="wall-item-delete-end"></div>
+		</div>
+		<div class="wall-item-content" id="wall-item-content-{{$item.id}}">
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			<div class="wall-item-title-end"></div>
+			<div class="wall-item-body" id="wall-item-body-{{$item.id}}">
+				{{$item.body}}
+				<div class="body-tag">
+					{{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>	
+	<div class="wall-item-wrapper-end"></div>
+	<div class="wall-item-like {{$item.indent}} {{$item.shiny}}" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
+	<div class="wall-item-dislike {{$item.indent}} {{$item.shiny}}" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
+	<div class="wall-item-comment-separator"></div>
+
+	{{if $item.threaded}}
+	{{if $item.comment}}
+	<div class="wall-item-comment-wrapper {{$item.indent}} {{$item.shiny}}" >
+		{{$item.comment}}
+	</div>
+	{{/if}}
+	{{/if}}
+
+	{{if $item.flatten}}
+	<div class="wall-item-comment-wrapper" >
+		{{$item.comment}}
+	</div>
+	{{/if}}
+
+<div class="wall-item-outside-wrapper-end {{$item.indent}} {{$item.shiny}}" ></div>
+</div>
+{{foreach $item.children as $child}}
+	{{include file="{{$child.template}}" item=$child}}
+{{/foreach}}
+
+</div>
+{{if $item.comment_lastcollapsed}}</div>{{/if}}
diff --git a/view/theme/duepuntozero/templates/comment_item.tpl b/view/theme/duepuntozero/templates/comment_item.tpl
new file mode 100644
index 000000000..f4655078d
--- /dev/null
+++ b/view/theme/duepuntozero/templates/comment_item.tpl
@@ -0,0 +1,71 @@
+{{*
+ *	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" />
+				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
+					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<ul class="comment-edit-bb-{{$id}}">
+					<li><a class="editicon boldbb shadow"
+						style="cursor: pointer;" title="{{$edbold}}"
+						onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
+					<li><a class="editicon italicbb shadow"
+						style="cursor: pointer;" title="{{$editalic}}"
+						onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
+					<li><a class="editicon underlinebb shadow"
+						style="cursor: pointer;" title="{{$eduline}}"
+						onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
+					<li><a class="editicon quotebb shadow"
+						style="cursor: pointer;" title="{{$edquote}}"
+						onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
+					<li><a class="editicon codebb shadow"
+						style="cursor: pointer;" title="{{$edcode}}"
+						onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
+					<li><a class="editicon imagebb shadow"
+						style="cursor: pointer;" title="{{$edimg}}"
+						onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
+					<li><a class="editicon urlbb shadow"
+						style="cursor: pointer;" title="{{$edurl}}"
+						onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
+					<li><a class="editicon videobb shadow"
+						style="cursor: pointer;" title="{{$edvideo}}"
+						onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
+				</ul>	
+				<div class="comment-edit-bb-end"></div>
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen(this, {{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose(this,{{$id}});" >{{$comment}}</textarea>			
+				{{if $qcomment}}
+					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
+					<option value=""></option>
+				{{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}}" />
+					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
+					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/theme/duepuntozero/templates/lang_selector.tpl b/view/theme/duepuntozero/templates/lang_selector.tpl
new file mode 100644
index 000000000..a1aee8277
--- /dev/null
+++ b/view/theme/duepuntozero/templates/lang_selector.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	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/theme/duepuntozero/templates/moderated_comment.tpl b/view/theme/duepuntozero/templates/moderated_comment.tpl
new file mode 100644
index 000000000..b2401ca48
--- /dev/null
+++ b/view/theme/duepuntozero/templates/moderated_comment.tpl
@@ -0,0 +1,66 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
+			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
+				<input type="hidden" name="type" value="{{$type}}" />
+				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+				<input type="hidden" name="parent" value="{{$parent}}" />
+				<input type="hidden" name="return" value="{{$return_path}}" />
+				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
+				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
+					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<div id="mod-cmnt-wrap-{{$id}}" class="mod-cmnt-wrap" style="display:none">
+					<div id="mod-cmnt-name-lbl-{{$id}}" class="mod-cmnt-name-lbl">{{$lbl_modname}}</div>
+					<input type="text" id="mod-cmnt-name-{{$id}}" class="mod-cmnt-name" name="mod-cmnt-name" value="{{$modname}}" />
+					<div id="mod-cmnt-email-lbl-{{$id}}" class="mod-cmnt-email-lbl">{{$lbl_modemail}}</div>
+					<input type="text" id="mod-cmnt-email-{{$id}}" class="mod-cmnt-email" name="mod-cmnt-email" value="{{$modemail}}" />
+					<div id="mod-cmnt-url-lbl-{{$id}}" class="mod-cmnt-url-lbl">{{$lbl_modurl}}</div>
+					<input type="text" id="mod-cmnt-url-{{$id}}" class="mod-cmnt-url" name="mod-cmnt-url" value="{{$modurl}}" />
+				</div>
+				<ul class="comment-edit-bb-{{$id}}">
+					<li><a class="editicon boldbb shadow"
+						style="cursor: pointer;" title="{{$edbold}}"
+						onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
+					<li><a class="editicon italicbb shadow"
+						style="cursor: pointer;" title="{{$editalic}}"
+						onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
+					<li><a class="editicon underlinebb shadow"
+						style="cursor: pointer;" title="{{$eduline}}"
+						onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
+					<li><a class="editicon quotebb shadow"
+						style="cursor: pointer;" title="{{$edquote}}"
+						onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
+					<li><a class="editicon codebb shadow"
+						style="cursor: pointer;" title="{{$edcode}}"
+						onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
+					<li><a class="editicon imagebb shadow"
+						style="cursor: pointer;" title="{{$edimg}}"
+						onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
+					<li><a class="editicon urlbb shadow"
+						style="cursor: pointer;" title="{{$edurl}}"
+						onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
+					<li><a class="editicon videobb shadow"
+						style="cursor: pointer;" title="{{$edvideo}}"
+						onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
+				</ul>	
+				<div class="comment-edit-bb-end"></div>
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>			
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
+					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
+					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
+					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/theme/duepuntozero/templates/nav.tpl b/view/theme/duepuntozero/templates/nav.tpl
new file mode 100644
index 000000000..24c48403f
--- /dev/null
+++ b/view/theme/duepuntozero/templates/nav.tpl
@@ -0,0 +1,75 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<nav>
+	{{$langselector}}
+
+	<div id="site-location">{{$sitelocation}}</div>
+
+	{{if $nav.logout}}<a id="nav-logout-link" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a> {{/if}}
+	{{if $nav.login}}<a id="nav-login-link" class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a> {{/if}}
+
+	<span id="nav-link-wrapper" >
+
+	{{if $nav.register}}<a id="nav-register-link" class="nav-commlink {{$nav.register.2}} {{$sel.register}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a>{{/if}}
+		
+	{{if $nav.help}} <a id="nav-help-link" class="nav-link {{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a>{{/if}}
+		
+	{{if $nav.apps}}<a id="nav-apps-link" class="nav-link {{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a>{{/if}}
+
+	<a id="nav-search-link" class="nav-link {{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a>
+	<a id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a>
+
+	{{if $nav.admin}}<a id="nav-admin-link" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a>{{/if}}
+
+	{{if $nav.network}}
+	<a id="nav-network-link" class="nav-commlink {{$nav.network.2}} {{$sel.network}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
+	<span id="net-update" class="nav-ajax-left"></span>
+	{{/if}}
+	{{if $nav.home}}
+	<a id="nav-home-link" class="nav-commlink {{$nav.home.2}} {{$sel.home}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a>
+	<span id="home-update" class="nav-ajax-left"></span>
+	{{/if}}
+	{{if $nav.community}}
+	<a id="nav-community-link" class="nav-commlink {{$nav.community.2}} {{$sel.community}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
+	{{/if}}
+	{{if $nav.introductions}}
+	<a id="nav-notify-link" class="nav-commlink {{$nav.introductions.2}} {{$sel.introductions}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a>
+	<span id="intro-update" class="nav-ajax-left"></span>
+	{{/if}}
+	{{if $nav.messages}}
+	<a id="nav-messages-link" class="nav-commlink {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>
+	<span id="mail-update" class="nav-ajax-left"></span>
+	{{/if}}
+
+
+
+
+
+		{{if $nav.notifications}}
+			<a id="nav-notifications-linkmenu" class="nav-commlink" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a>
+				<span id="notify-update" class="nav-ajax-left"></span>
+				<ul id="nav-notifications-menu" class="menu-popup">
+					<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
+					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
+					<li class="empty">{{$emptynotifications}}</li>
+				</ul>
+		{{/if}}		
+
+	{{if $nav.settings}}<a id="nav-settings-link" class="nav-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a>{{/if}}
+	{{if $nav.profiles}}<a id="nav-profiles-link" class="nav-link {{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a>{{/if}}
+
+	{{if $nav.contacts}}<a id="nav-contacts-link" class="nav-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a>{{/if}}
+
+
+	{{if $nav.manage}}<a id="nav-manage-link" class="nav-link {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a>{{/if}}
+	</span>
+	<span id="nav-end"></span>
+	<span id="banner">{{$banner}}</span>
+</nav>
+
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
+</ul>
diff --git a/view/theme/duepuntozero/templates/profile_vcard.tpl b/view/theme/duepuntozero/templates/profile_vcard.tpl
new file mode 100644
index 000000000..85c6345d6
--- /dev/null
+++ b/view/theme/duepuntozero/templates/profile_vcard.tpl
@@ -0,0 +1,56 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="vcard">
+
+	<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 $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/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}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
+
+	{{include file="diaspora_vcard.tpl"}}
+
+	<div id="profile-vcard-break"></div>	
+	<div id="profile-extra-links">
+		<ul>
+			{{if $connect}}
+				<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
+			{{/if}}
+			{{if $wallmessage}}
+				<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
+			{{/if}}
+		</ul>
+	</div>
+</div>
+
+{{$contact_block}}
+
+
diff --git a/view/theme/duepuntozero/templates/prv_message.tpl b/view/theme/duepuntozero/templates/prv_message.tpl
new file mode 100644
index 000000000..1f41d2662
--- /dev/null
+++ b/view/theme/duepuntozero/templates/prv_message.tpl
@@ -0,0 +1,44 @@
+{{*
+ *	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/theme/facepark/templates/comment_item.tpl b/view/theme/facepark/templates/comment_item.tpl
new file mode 100644
index 000000000..50bbd89e4
--- /dev/null
+++ b/view/theme/facepark/templates/comment_item.tpl
@@ -0,0 +1,38 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
+			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
+				<input type="hidden" name="type" value="{{$type}}" />
+				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+				<input type="hidden" name="parent" value="{{$parent}}" />
+				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
+				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
+				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
+					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>
+				{{if $qcomment}}
+				{{foreach $qcomment as $qc}}				
+					<span class="fakelink qcomment" onclick="commentInsert(this,{{$id}}); return false;" >{{$qc}}</span>
+					&nbsp;
+				{{/foreach}}
+				{{/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}}" />
+					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
+					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/theme/facepark/templates/group_side.tpl b/view/theme/facepark/templates/group_side.tpl
new file mode 100644
index 000000000..139798bee
--- /dev/null
+++ b/view/theme/facepark/templates/group_side.tpl
@@ -0,0 +1,33 @@
+{{*
+ *	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>
+</div>
+
+
diff --git a/view/theme/facepark/templates/jot.tpl b/view/theme/facepark/templates/jot.tpl
new file mode 100644
index 000000000..16cc822bd
--- /dev/null
+++ b/view/theme/facepark/templates/jot.tpl
@@ -0,0 +1,90 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div id="profile-jot-wrapper" >
+	<div id="profile-jot-banner-wrapper">
+		<div id="profile-jot-desc" >&nbsp;</div>
+		<div id="character-counter" class="grey"></div>
+	</div>
+	<div id="profile-jot-banner-end"></div>
+
+	<form id="profile-jot-form" action="{{$action}}" method="post" >
+		<input type="hidden" name="type" value="{{$ptyp}}" />
+		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+		<input type="hidden" name="return" value="{{$return_path}}" />
+		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
+		<input type="hidden" name="coord" id="jot-coord" value="" />
+		<input type="hidden" name="post_id" value="{{$post_id}}" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none"></div>
+		<div id="jot-text-wrap">
+		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{if $content}}{{$content}}{{else}}{{$share}}{{/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> 
+
+	<div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" >
+		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}}"  title="{{$permset}}" ></a>{{$bang}}
+	</div>
+
+	<span onclick="preview_post();" id="jot-preview-link" class="fakelink">{{$preview}}</span>
+
+	<div id="profile-jot-perms-end"></div>
+
+
+	<div id="profile-jot-plugin-wrapper">
+  	{{$jotplugins}}
+	</div>
+
+	<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
+		<img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+	</div> 
+	
+	<div id="jot-preview-content" style="display:none;"></div>
+
+	<div style="display: none;">
+		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+			{{$acl}}
+			<hr style="clear:both"/>
+			<div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
+			<div id="profile-jot-email-end"></div>
+			{{$jotnets}}
+		</div>
+	</div>
+
+
+</div>
+
+<div id="profile-jot-end"></div>
+</form>
+</div>
+		{{if $content}}<script>initEditor();</script>{{/if}}
diff --git a/view/theme/facepark/templates/nav.tpl b/view/theme/facepark/templates/nav.tpl
new file mode 100644
index 000000000..6119a1a93
--- /dev/null
+++ b/view/theme/facepark/templates/nav.tpl
@@ -0,0 +1,73 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<nav>
+	{{$langselector}}
+
+	<div id="site-location">{{$sitelocation}}</div>
+
+	{{if $nav.logout}}<a id="nav-logout-link" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a> {{/if}}
+	{{if $nav.login}}<a id="nav-login-link" class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a> {{/if}}
+
+	<span id="nav-link-wrapper" >
+
+	{{if $nav.register}}<a id="nav-register-link" class="nav-commlink {{$nav.register.2}} {{$sel.register}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a>{{/if}}
+		
+	{{if $nav.help}} <a id="nav-help-link" class="nav-link {{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a>{{/if}}
+		
+	{{if $nav.apps}}<a id="nav-apps-link" class="nav-link {{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a>{{/if}}
+
+	<a id="nav-search-link" class="nav-link {{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a>
+	<a id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a>
+
+	{{if $nav.admin}}<a id="nav-admin-link" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a>{{/if}}
+
+	{{if $nav.network}}
+	<a id="nav-network-link" class="nav-commlink {{$nav.network.2}} {{$sel.network}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
+	<span id="net-update" class="nav-ajax-left"></span>
+	{{/if}}
+	{{if $nav.home}}
+	<a id="nav-home-link" class="nav-commlink {{$nav.home.2}} {{$sel.home}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a>
+	<span id="home-update" class="nav-ajax-left"></span>
+	{{/if}}
+	{{if $nav.community}}
+	<a id="nav-community-link" class="nav-commlink {{$nav.community.2}} {{$sel.community}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
+	{{/if}}
+	{{if $nav.introductions}}
+	<a id="nav-notify-link" class="nav-commlink {{$nav.introductions.2}} {{$sel.introductions}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a>
+	<span id="intro-update" class="nav-ajax-left"></span>
+	{{/if}}
+	{{if $nav.messages}}
+	<a id="nav-messages-link" class="nav-commlink {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>
+	<span id="mail-update" class="nav-ajax-left"></span>
+	{{/if}}
+
+
+
+	{{if $nav.manage}}<a id="nav-manage-link" class="nav-commlink {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a>{{/if}}
+
+
+		{{if $nav.notifications}}
+			<a id="nav-notifications-linkmenu" class="nav-commlink" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a>
+				<span id="notify-update" class="nav-ajax-left"></span>
+				<ul id="nav-notifications-menu" class="menu-popup">
+					<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
+					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
+					<li class="empty">{{$emptynotifications}}</li>
+				</ul>
+		{{/if}}		
+
+	{{if $nav.settings}}<a id="nav-settings-link" class="nav-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a>{{/if}}
+	{{if $nav.profiles}}<a id="nav-profiles-link" class="nav-link {{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a>{{/if}}
+
+	{{if $nav.contacts}}<a id="nav-contacts-link" class="nav-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a>{{/if}}
+	</span>
+	<span id="nav-end"></span>
+	<span id="banner">{{$banner}}</span>
+</nav>
+
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
+</ul>
diff --git a/view/theme/facepark/templates/profile_vcard.tpl b/view/theme/facepark/templates/profile_vcard.tpl
new file mode 100644
index 000000000..343a0aafa
--- /dev/null
+++ b/view/theme/facepark/templates/profile_vcard.tpl
@@ -0,0 +1,52 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="vcard">
+
+	<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 $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/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}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
+
+	{{include file="diaspora_vcard.tpl"}}
+	
+	<div id="profile-extra-links">
+		<ul>
+			{{if $connect}}
+				<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
+			{{/if}}
+		</ul>
+	</div>
+</div>
+
+{{$contact_block}}
+
+
diff --git a/view/theme/facepark/templates/search_item.tpl b/view/theme/facepark/templates/search_item.tpl
new file mode 100644
index 000000000..d6bf55007
--- /dev/null
+++ b/view/theme/facepark/templates/search_item.tpl
@@ -0,0 +1,59 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
+	<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" >
+		<div class="wall-item-info" id="wall-item-info-{{$item.id}}">
+			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$item.id}}" 
+				 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
+				 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
+				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+				<div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+					<ul>
+						{{$item.item_photo_menu}}
+					</ul>
+				</div>
+			</div>
+			<div class="wall-item-photo-end"></div>	
+			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
+				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
+				{{else}}<div class="wall-item-lock"></div>{{/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}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>
+				
+		</div>			
+		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			<div class="wall-item-title-end"></div>
+			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/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-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>
+
+
diff --git a/view/theme/frost-mobile/settings.tpl.BASE.8446.tpl b/view/theme/frost-mobile/settings.tpl.BASE.8446.tpl
new file mode 100644
index 000000000..3e8b33d7f
--- /dev/null
+++ b/view/theme/frost-mobile/settings.tpl.BASE.8446.tpl
@@ -0,0 +1,144 @@
+<h1>$ptitle</h1>
+
+$nickname_block
+
+<form action="settings" id="settings-form" method="post" autocomplete="off" >
+<input type='hidden' name='form_security_token' value='$form_security_token'>
+
+<h3 class="settings-heading">$h_pass</h3>
+
+{{inc field_password.tpl with $field=$password1 }}{{endinc}}
+{{inc field_password.tpl with $field=$password2 }}{{endinc}}
+
+{{ if $oid_enable }}
+{{inc field_input.tpl with $field=$openid }}{{endinc}}
+{{ endif }}
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+
+<h3 class="settings-heading">$h_basic</h3>
+
+{{inc field_input.tpl with $field=$username }}{{endinc}}
+{{inc field_input.tpl with $field=$email }}{{endinc}}
+{{inc field_custom.tpl with $field=$timezone }}{{endinc}}
+{{inc field_input.tpl with $field=$defloc }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}}
+
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+
+<h3 class="settings-heading">$h_prv</h3>
+
+
+<input type="hidden" name="visibility" value="$visibility" />
+
+{{inc field_input.tpl with $field=$maxreq }}{{endinc}}
+
+$profile_in_dir
+
+$profile_in_net_dir
+
+$hide_friends
+
+$hide_wall
+
+$blockwall
+
+$blocktags
+
+$suggestme
+
+$unkmail
+
+
+{{inc field_input.tpl with $field=$cntunkmail }}{{endinc}}
+
+{{inc field_input.tpl with $field=$expire.days }}{{endinc}}
+
+
+<div class="field input">
+	<span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span>
+	<div style="display: none;">
+		<div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
+			<h3>$expire.advanced</h3>
+			{{ inc field_yesno.tpl with $field=$expire.items }}{{endinc}}
+			{{ inc field_yesno.tpl with $field=$expire.notes }}{{endinc}}
+			{{ inc field_yesno.tpl with $field=$expire.starred }}{{endinc}}
+			{{ inc field_yesno.tpl with $field=$expire.network_only }}{{endinc}}
+		</div>
+	</div>
+
+</div>
+
+
+<div id="settings-default-perms" class="settings-default-perms" >
+	<a href="#settings-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>$permissions $permdesc</a>
+	<div id="settings-default-perms-menu-end"></div>
+
+{#<!--	<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >-->#}
+	
+	<div style="display: none;">
+		<div id="settings-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;margin-bottom: 20px">
+			$aclselect
+		</div>
+	</div>
+
+{#<!--	</div>-->#}
+</div>
+<br/>
+<div id="settings-default-perms-end"></div>
+
+$group_select
+
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+
+
+<h3 class="settings-heading">$h_not</h3>
+<div id="settings-notifications">
+
+<div id="settings-activity-desc">$activity_options</div>
+
+{{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$post_joingroup }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}}
+
+
+<div id="settings-notify-desc">$lbl_not</div>
+
+<div class="group">
+{{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify2 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify3 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify4 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify6 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}}
+</div>
+
+</div>
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+
+<h3 class="settings-heading">$h_advn</h3>
+<div id="settings-pagetype-desc">$h_descadvn</div>
+
+$pagetype
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+
diff --git a/view/theme/frost-mobile/settings.tpl.LOCAL.8446.tpl b/view/theme/frost-mobile/settings.tpl.LOCAL.8446.tpl
new file mode 100644
index 000000000..8e5aff019
--- /dev/null
+++ b/view/theme/frost-mobile/settings.tpl.LOCAL.8446.tpl
@@ -0,0 +1,147 @@
+<h1>$ptitle</h1>
+
+$nickname_block
+
+<form action="settings" id="settings-form" method="post" autocomplete="off" >
+<input type='hidden' name='form_security_token' value='$form_security_token'>
+
+<h3 class="settings-heading">$h_pass</h3>
+
+{{inc field_password.tpl with $field=$password1 }}{{endinc}}
+{{inc field_password.tpl with $field=$password2 }}{{endinc}}
+{{inc field_password.tpl with $field=$password3 }}{{endinc}}
+
+{{ if $oid_enable }}
+{{inc field_input.tpl with $field=$openid }}{{endinc}}
+{{ endif }}
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+
+<h3 class="settings-heading">$h_basic</h3>
+
+{{inc field_input.tpl with $field=$username }}{{endinc}}
+{{inc field_input.tpl with $field=$email }}{{endinc}}
+{{inc field_password.tpl with $field=$password4 }}{{endinc}}
+{{inc field_custom.tpl with $field=$timezone }}{{endinc}}
+{{inc field_input.tpl with $field=$defloc }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}}
+
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+
+<h3 class="settings-heading">$h_prv</h3>
+
+
+<input type="hidden" name="visibility" value="$visibility" />
+
+{{inc field_input.tpl with $field=$maxreq }}{{endinc}}
+
+$profile_in_dir
+
+$profile_in_net_dir
+
+$hide_friends
+
+$hide_wall
+
+$blockwall
+
+$blocktags
+
+$suggestme
+
+$unkmail
+
+
+{{inc field_input.tpl with $field=$cntunkmail }}{{endinc}}
+
+{{inc field_input.tpl with $field=$expire.days }}{{endinc}}
+
+
+<div class="field input">
+	<span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span>
+	<div style="display: none;">
+		<div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
+			<h3>$expire.advanced</h3>
+			{{ inc field_yesno.tpl with $field=$expire.items }}{{endinc}}
+			{{ inc field_yesno.tpl with $field=$expire.notes }}{{endinc}}
+			{{ inc field_yesno.tpl with $field=$expire.starred }}{{endinc}}
+			{{ inc field_yesno.tpl with $field=$expire.network_only }}{{endinc}}
+		</div>
+	</div>
+
+</div>
+
+
+<div id="settings-default-perms" class="settings-default-perms" >
+	<a href="#settings-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>$permissions $permdesc</a>
+	<div id="settings-default-perms-menu-end"></div>
+
+{#<!--	<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >-->#}
+	
+	<div style="display: none;">
+		<div id="settings-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;margin-bottom: 20px">
+			$aclselect
+		</div>
+	</div>
+
+{#<!--	</div>-->#}
+</div>
+<br/>
+<div id="settings-default-perms-end"></div>
+
+$group_select
+
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+
+
+<h3 class="settings-heading">$h_not</h3>
+<div id="settings-notifications">
+
+<div id="settings-activity-desc">$activity_options</div>
+
+{{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$post_joingroup }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}}
+
+
+<div id="settings-notify-desc">$lbl_not</div>
+
+<div class="group">
+{{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify2 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify3 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify4 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify6 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify8 }}{{endinc}}
+</div>
+
+</div>
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+
+<h3 class="settings-heading">$h_advn</h3>
+<div id="settings-pagetype-desc">$h_descadvn</div>
+
+$pagetype
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
+</div>
+
+
diff --git a/view/theme/frost-mobile/templates/acl_selector.tpl b/view/theme/frost-mobile/templates/acl_selector.tpl
new file mode 100644
index 000000000..d18776e36
--- /dev/null
+++ b/view/theme/frost-mobile/templates/acl_selector.tpl
@@ -0,0 +1,28 @@
+{{*
+ *	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 data-src="{0}"><p>{1}</p>
+	<a href="#" class='acl-button-show'>{{$show}}</a>
+	<a href="#" class='acl-button-hide'>{{$hide}}</a>
+</div>
+
+<script>
+	window.allowCID = {{$allowcid}};
+	window.allowGID = {{$allowgid}};
+	window.denyCID = {{$denycid}};
+	window.denyGID = {{$denygid}};
+	window.aclInit = "true";
+</script>
diff --git a/view/theme/frost-mobile/templates/admin_aside.tpl b/view/theme/frost-mobile/templates/admin_aside.tpl
new file mode 100644
index 000000000..024d6195b
--- /dev/null
+++ b/view/theme/frost-mobile/templates/admin_aside.tpl
@@ -0,0 +1,36 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h4><a href="{{$admurl}}">{{$admtxt}}</a></h4>
+<ul class='admin linklist'>
+	<li class='admin button {{$admin.site.2}}'><a href='{{$admin.site.0}}'>{{$admin.site.1}}</a></li>
+	<li class='admin button {{$admin.users.2}}'><a href='{{$admin.users.0}}'>{{$admin.users.1}}</a><span id='pending-update' title='{{$h_pending}}'></span></li>
+	<li class='admin button {{$admin.plugins.2}}'><a href='{{$admin.plugins.0}}'>{{$admin.plugins.1}}</a></li>
+	<li class='admin button {{$admin.themes.2}}'><a href='{{$admin.themes.0}}'>{{$admin.themes.1}}</a></li>
+	<li class='admin button {{$admin.dbsync.2}}'><a href='{{$admin.dbsync.0}}'>{{$admin.dbsync.1}}</a></li>
+</ul>
+
+{{if $admin.update}}
+<ul class='admin linklist'>
+	<li class='admin button {{$admin.update.2}}'><a href='{{$admin.update.0}}'>{{$admin.update.1}}</a></li>
+	<li class='admin button {{$admin.update.2}}'><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li>
+</ul>
+{{/if}}
+
+
+{{if $admin.plugins_admin}}<h4>{{$plugadmtxt}}</h4>{{/if}}
+<ul class='admin linklist'>
+	{{foreach $admin.plugins_admin as $l}}
+	<li class='admin button {{$l.2}}'><a href='{{$l.0}}'>{{$l.1}}</a></li>
+	{{/foreach}}
+</ul>
+	
+	
+<h4>{{$logtxt}}</h4>
+<ul class='admin linklist'>
+	<li class='admin button {{$admin.logs.2}}'><a href='{{$admin.logs.0}}'>{{$admin.logs.1}}</a></li>
+</ul>
+
diff --git a/view/theme/frost-mobile/templates/admin_site.tpl b/view/theme/frost-mobile/templates/admin_site.tpl
new file mode 100644
index 000000000..035024e68
--- /dev/null
+++ b/view/theme/frost-mobile/templates/admin_site.tpl
@@ -0,0 +1,72 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+	
+	<form action="{{$baseurl}}/admin/site" method="post">
+    <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+	{{include file="field_input.tpl" field=$sitename}}
+	{{include file="field_textarea.tpl" field=$banner}}
+	{{include file="field_select.tpl" field=$language}}
+	{{include file="field_select.tpl" field=$theme}}
+	{{include file="field_select.tpl" field=$theme_mobile}}
+	{{include file="field_select.tpl" field=$ssl_policy}}
+	{{include file="field_checkbox.tpl" field=$new_share}}
+	{{include file="field_checkbox.tpl" field=$hide_help}} 
+	{{include file="field_select.tpl" field=$singleuser}} 
+	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	
+	<h3>{{$registration}}</h3>
+	{{include file="field_input.tpl" field=$register_text}}
+	{{include file="field_select.tpl" field=$register_policy}}
+	
+	{{include file="field_checkbox.tpl" field=$no_multi_reg}}
+	{{include file="field_checkbox.tpl" field=$no_openid}}
+	{{include file="field_checkbox.tpl" field=$no_regfullname}}
+	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+
+	<h3>{{$upload}}</h3>
+	{{include file="field_input.tpl" field=$maximagesize}}
+	{{include file="field_input.tpl" field=$maximagelength}}
+	{{include file="field_input.tpl" field=$jpegimagequality}}
+	
+	<h3>{{$corporate}}</h3>
+	{{include file="field_input.tpl" field=$allowed_sites}}
+	{{include file="field_input.tpl" field=$allowed_email}}
+	{{include file="field_checkbox.tpl" field=$block_public}}
+	{{include file="field_checkbox.tpl" field=$force_publish}}
+	{{include file="field_checkbox.tpl" field=$no_community_page}}
+	{{include file="field_checkbox.tpl" field=$ostatus_disabled}}
+	{{include file="field_select.tpl" field=$ostatus_poll_interval}} 
+	{{include file="field_checkbox.tpl" field=$diaspora_enabled}}
+	{{include file="field_checkbox.tpl" field=$dfrn_only}}
+	{{include file="field_input.tpl" field=$global_directory}}
+	{{include file="field_checkbox.tpl" field=$thread_allow}}
+	{{include file="field_checkbox.tpl" field=$newuser_private}}
+	{{include file="field_checkbox.tpl" field=$enotify_no_content}}
+	{{include file="field_checkbox.tpl" field=$private_addons}}	
+	{{include file="field_checkbox.tpl" field=$disable_embedded}}	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	
+	<h3>{{$advanced}}</h3>
+	{{include file="field_checkbox.tpl" field=$no_utf}}
+	{{include file="field_checkbox.tpl" field=$verifyssl}}
+	{{include file="field_input.tpl" field=$proxy}}
+	{{include file="field_input.tpl" field=$proxyuser}}
+	{{include file="field_input.tpl" field=$timeout}}
+	{{include file="field_input.tpl" field=$delivery_interval}}
+	{{include file="field_input.tpl" field=$poll_interval}}
+	{{include file="field_input.tpl" field=$maxloadavg}}
+	{{include file="field_input.tpl" field=$abandon_days}}
+	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	
+	</form>
+</div>
diff --git a/view/theme/frost-mobile/templates/admin_users.tpl b/view/theme/frost-mobile/templates/admin_users.tpl
new file mode 100644
index 000000000..4d88670c1
--- /dev/null
+++ b/view/theme/frost-mobile/templates/admin_users.tpl
@@ -0,0 +1,103 @@
+{{*
+ *	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){
+		$j("."+cls).attr('checked','checked');
+		return false;
+	}
+</script>
+<div id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+	
+	<form action="{{$baseurl}}/admin/users" method="post">
+        <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+		
+		<h3>{{$h_pending}}</h3>
+		{{if $pending}}
+			<table id='pending'>
+				<thead>
+				<tr>
+					{{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+			{{foreach $pending as $u}}
+				<tr>
+					<td class="created">{{$u.created}}</td>
+					<td class="name">{{$u.name}}</td>
+					<td class="email">{{$u.email}}</td>
+					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}" /></td>
+					<td class="tools">
+						<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title='{{$approve}}'><span class='tool like'></span></a>
+						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><span class='tool dislike'></span></a>
+					</td>
+				</tr>
+			{{/foreach}}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">{{$select_all}}</a></div>
+			<div class="submit"><input type="submit" name="page_users_deny" value="{{$deny}}"/> <input type="submit" name="page_users_approve" value="{{$approve}}" /></div>			
+		{{else}}
+			<p>{{$no_pending}}</p>
+		{{/if}}
+	
+	
+		
+	
+		<h3>{{$h_users}}</h3>
+		{{if $users}}
+			<table id='users'>
+				<thead>
+				<tr>
+					<th></th>
+					{{foreach $th_users as $th}}<th>{{$th}}</th>{{/foreach}}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+				{{foreach $users as $u}}
+					<tr>
+						<td><img src="{{$u.micro}}" alt="{{$u.nickname}}" title="{{$u.nickname}}"></td>
+						<td class='name'><a href="{{$u.url}}" title="{{$u.nickname}}" >{{$u.name}}</a></td>
+						<td class='email'>{{$u.email}}</td>
+						<td class='register_date'>{{$u.register_date}}</td>
+						<td class='login_date'>{{$u.login_date}}</td>
+						<td class='lastitem_date'>{{$u.lastitem_date}}</td>
+						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}</td>
+						<td class="checkbox"> 
+                                    {{if $u.is_admin}}
+                                        &nbsp;
+                                    {{else}}
+                                        <input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
+                                    {{/if}}
+						<td class="tools">
+                                    {{if $u.is_admin}}
+                                        &nbsp;
+                                    {{else}}
+                                        <a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><span class='icon block {{if $u.blocked==0}}dim{{/if}}'></span></a>
+                                        <a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><span class='icon drop'></span></a>
+                                    {{/if}}
+						</td>
+					</tr>
+				{{/foreach}}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">{{$select_all}}</a></div>
+			<div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div>						
+		{{else}}
+			NO USERS?!?
+		{{/if}}
+	</form>
+</div>
diff --git a/view/theme/frost-mobile/templates/categories_widget.tpl b/view/theme/frost-mobile/templates/categories_widget.tpl
new file mode 100644
index 000000000..1749fced3
--- /dev/null
+++ b/view/theme/frost-mobile/templates/categories_widget.tpl
@@ -0,0 +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="nets-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=&category={{$term.name}}" class="categories-link{{if $term.selected}} categories-selected{{/if}}">{{$term.name}}</a></li>
+		{{/foreach}}
+	</ul>
+	
+</div>-->*}}
diff --git a/view/theme/frost-mobile/templates/comment_item.tpl b/view/theme/frost-mobile/templates/comment_item.tpl
new file mode 100644
index 000000000..1b22ea9c6
--- /dev/null
+++ b/view/theme/frost-mobile/templates/comment_item.tpl
@@ -0,0 +1,83 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--		<script>
+		$(document).ready( function () {
+			$(document).mouseup(function(e) {
+				var container = $("#comment-edit-wrapper-{{$id}}");
+				if( container.has(e.target).length === 0) {
+					commentClose(document.getElementById('comment-edit-text-{{$id}}'),{{$id}});
+					cmtBbClose({{$id}});
+				}
+			});
+		});
+		</script>-->*}}
+
+		<div class="comment-wwedit-wrapper {{$indent}}" id="comment-edit-wrapper-{{$id}}" style="display: block;" >
+			<form class="comment-edit-form {{$indent}}" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;" >
+{{*<!--			<span id="hide-commentbox-{{$id}}" class="hide-commentbox fakelink" onclick="showHideCommentBox({{$id}});">{{$comment}}</span>
+			<form class="comment-edit-form" style="display: none;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">-->*}}
+				<input type="hidden" name="type" value="{{$type}}" />
+				<input type="hidden" name="source" value="{{$sourceapp}}" />
+				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+				<input type="hidden" name="parent" value="{{$parent}}" />
+				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
+				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
+				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+
+				{{*<!--<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >-->*}}
+					<a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-{{$id}}" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+				{{*<!--</div>-->*}}
+				{{*<!--<div class="comment-edit-photo-end"></div>-->*}}
+				<ul class="comment-edit-bb-{{$id}}">
+					<li><a class="editicon boldbb shadow"
+						style="cursor: pointer;" title="{{$edbold}}"
+						onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
+					<li><a class="editicon italicbb shadow"
+						style="cursor: pointer;" title="{{$editalic}}"
+						onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
+					<li><a class="editicon underlinebb shadow"
+						style="cursor: pointer;" title="{{$eduline}}"
+						onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
+					<li><a class="editicon quotebb shadow"
+						style="cursor: pointer;" title="{{$edquote}}"
+						onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
+					<li><a class="editicon codebb shadow"
+						style="cursor: pointer;" title="{{$edcode}}"
+						onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
+{{*<!--					<li><a class="editicon imagebb shadow"
+						style="cursor: pointer;" title="{{$edimg}}"
+						onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
+					<li><a class="editicon urlbb shadow"
+						style="cursor: pointer;" title="{{$edurl}}"
+						onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
+					<li><a class="editicon videobb shadow"
+						style="cursor: pointer;" title="{{$edvideo}}"
+						onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>-->*}}
+				</ul>	
+				{{*<!--<div class="comment-edit-bb-end"></div>-->*}}
+{{*<!--				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose({{$id}});" >{{$comment}}</textarea>-->*}}
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" >{{$comment}}</textarea>
+				{{if $qcomment}}
+					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
+					<option value=""></option>
+				{{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}}" />
+					{{*<!--<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="preview-link fakelink">{{$preview}}</span>
+					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>-->*}}
+				</div>
+
+				{{*<!--<div class="comment-edit-end"></div>-->*}}
+			</form>
+
+		</div>
diff --git a/view/theme/frost-mobile/templates/common_tabs.tpl b/view/theme/frost-mobile/templates/common_tabs.tpl
new file mode 100644
index 000000000..9fa4ed41d
--- /dev/null
+++ b/view/theme/frost-mobile/templates/common_tabs.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<ul class="tabs">
+	{{foreach $tabs as $tab}}
+		<li id="{{$tab.id}}"><a href="{{$tab.url}}" class="tab button {{$tab.sel}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
+	{{/foreach}}
+	<div id="tabs-end"></div>
+</ul>
diff --git a/view/theme/frost-mobile/templates/contact_block.tpl b/view/theme/frost-mobile/templates/contact_block.tpl
new file mode 100644
index 000000000..5a0a26b87
--- /dev/null
+++ b/view/theme/frost-mobile/templates/contact_block.tpl
@@ -0,0 +1,17 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--<div id="contact-block">
+<h4 class="contact-block-h4">{{$contacts}}</h4>
+{{if $micropro}}
+		<a class="allcontact-link" href="viewcontacts/{{$nickname}}">{{$viewcontacts}}</a>
+		<div class='contact-block-content'>
+		{{foreach $micropro as $m}}
+			{{$m}}
+		{{/foreach}}
+		</div>
+{{/if}}
+</div>
+<div class="clear"></div>-->*}}
diff --git a/view/theme/frost-mobile/templates/contact_edit.tpl b/view/theme/frost-mobile/templates/contact_edit.tpl
new file mode 100644
index 000000000..924acb0c1
--- /dev/null
+++ b/view/theme/frost-mobile/templates/contact_edit.tpl
@@ -0,0 +1,98 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h2>{{$header}}</h2>
+
+<div id="contact-edit-wrapper" >
+
+	{{$tab_str}}
+
+	<div id="contact-edit-drop-link" >
+		<a href="contacts/{{$contact_id}}/drop" class="icon drophide" id="contact-edit-drop-link" onclick="return confirmDelete();"  title="{{$delete}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}}></a>
+	</div>
+
+	<div id="contact-edit-drop-link-end"></div>
+
+	<div class="vcard">
+		<div class="fn">{{$name}}</div>
+		<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="{{$photo}}" alt="{{$name}}" /></div>
+	</div>
+
+
+	<div id="contact-edit-nav-wrapper" >
+		<div id="contact-edit-links">
+			<ul>
+				<li><div id="contact-edit-rel">{{$relation_text}}</div></li>
+				<li><div id="contact-edit-nettype">{{$nettype}}</div></li>
+				{{if $lost_contact}}
+					<li><div id="lost-contact-message">{{$lost_contact}}</div></li>
+				{{/if}}
+				{{if $insecure}}
+					<li><div id="insecure-message">{{$insecure}}</div></li>
+				{{/if}}
+				{{if $blocked}}
+					<li><div id="block-message">{{$blocked}}</div></li>
+				{{/if}}
+				{{if $ignored}}
+					<li><div id="ignore-message">{{$ignored}}</div></li>
+				{{/if}}
+				{{if $archived}}
+					<li><div id="archive-message">{{$archived}}</div></li>
+				{{/if}}
+
+				<li>&nbsp;</li>
+
+				{{if $common_text}}
+					<li><div id="contact-edit-common"><a href="{{$common_link}}">{{$common_text}}</a></div></li>
+				{{/if}}
+				{{if $all_friends}}
+					<li><div id="contact-edit-allfriends"><a href="allfriends/{{$contact_id}}">{{$all_friends}}</a></div></li>
+				{{/if}}
+
+
+				<li><a href="network/0?nets=all&cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li>
+				{{if $lblsuggest}}
+					<li><a href="fsuggest/{{$contact_id}}" id="contact-edit-suggest">{{$lblsuggest}}</a></li>
+				{{/if}}
+
+			</ul>
+		</div>
+	</div>
+	<div id="contact-edit-nav-end"></div>
+
+
+<form action="contacts/{{$contact_id}}" method="post" >
+<input type="hidden" name="contact_id" value="{{$contact_id}}">
+
+	{{if $poll_enabled}}
+		<div id="contact-edit-poll-wrapper">
+			<div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
+			<span id="contact-edit-poll-text">{{$updpub}} {{$poll_interval}}</span> <span id="contact-edit-update-now" class="button"><a id="update_now_link" href="contacts/{{$contact_id}}/update" >{{$udnow}}</a></span>
+		</div>
+	{{/if}}
+	<div id="contact-edit-end" ></div>
+
+	{{include file="field_checkbox.tpl" field=$hidden}}
+
+<div id="contact-edit-info-wrapper">
+<h4>{{$lbl_info1}}</h4>
+	<textarea id="contact-edit-info" rows="8"{{* cols="35"*}} name="info">{{$info}}</textarea>
+	<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
+</div>
+<div id="contact-edit-info-end"></div>
+
+
+<div id="contact-edit-profile-select-text">
+<h4>{{$lbl_vis1}}</h4>
+<p>{{$lbl_vis2}}</p> 
+</div>
+{{$profile_select}}
+<div id="contact-edit-profile-select-end"></div>
+
+<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
+
+</form>
+</div>
diff --git a/view/theme/frost-mobile/templates/contact_head.tpl b/view/theme/frost-mobile/templates/contact_head.tpl
new file mode 100644
index 000000000..a7fb96108
--- /dev/null
+++ b/view/theme/frost-mobile/templates/contact_head.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/theme/frost-mobile/templates/contact_template.tpl b/view/theme/frost-mobile/templates/contact_template.tpl
new file mode 100644
index 000000000..7d257dabc
--- /dev/null
+++ b/view/theme/frost-mobile/templates/contact_template.tpl
@@ -0,0 +1,41 @@
+{{*
+ *	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" >
+		<div class="contact-entry-photo mframe" id="contact-entry-photo-{{$contact.id}}"
+		onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}});" 
+		onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)" >
+
+{{*<!--			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>-->*}}
+			<span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">
+			<img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" />
+			</span>
+
+			{{if $contact.photo_menu}}
+{{*<!--			<span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">menu</span>-->*}}
+                <div class="contact-photo-menu" id="contact-photo-menu-{{$contact.id}}">
+                    <ul>
+						{{foreach $contact.photo_menu as $c}}
+						{{if $c.2}}
+						<li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+						{{else}}
+						<li><a href="{{$c.1}}">{{$c.0}}</a></li>
+						{{/if}}
+						{{/foreach}}
+                    </ul>
+                </div>
+			{{/if}}
+		</div>
+			
+	</div>
+	<div class="contact-entry-photo-end" ></div>
+		<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div><br />
+{{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
+	<div class="contact-entry-network" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>
+
+	<div class="contact-entry-end" ></div>
+</div>
diff --git a/view/theme/frost-mobile/templates/contacts-end.tpl b/view/theme/frost-mobile/templates/contacts-end.tpl
new file mode 100644
index 000000000..9298a4245
--- /dev/null
+++ b/view/theme/frost-mobile/templates/contacts-end.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script src="{{$baseurl}}/library/jquery_ac/friendica.complete.min.js" ></script>
+
+
diff --git a/view/theme/frost-mobile/templates/contacts-head.tpl b/view/theme/frost-mobile/templates/contacts-head.tpl
new file mode 100644
index 000000000..dd66b71d3
--- /dev/null
+++ b/view/theme/frost-mobile/templates/contacts-head.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script>
+	window.autocompleteType = 'contacts-head';
+</script>
+
diff --git a/view/theme/frost-mobile/templates/contacts-template.tpl b/view/theme/frost-mobile/templates/contacts-template.tpl
new file mode 100644
index 000000000..b9162c2e9
--- /dev/null
+++ b/view/theme/frost-mobile/templates/contacts-template.tpl
@@ -0,0 +1,33 @@
+{{*
+ *	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}}
+
+
+<div id="contacts-display-wrapper">
+{{foreach $contacts as $contact}}
+	{{include file="contact_template.tpl"}}
+{{/foreach}}
+</div>
+<div id="contact-edit-end"></div>
+
+{{$paginate}}
+
+
+
+
diff --git a/view/theme/frost-mobile/templates/contacts-widget-sidebar.tpl b/view/theme/frost-mobile/templates/contacts-widget-sidebar.tpl
new file mode 100644
index 000000000..bda321896
--- /dev/null
+++ b/view/theme/frost-mobile/templates/contacts-widget-sidebar.tpl
@@ -0,0 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$follow_widget}}
+
diff --git a/view/theme/frost-mobile/templates/conversation.tpl b/view/theme/frost-mobile/templates/conversation.tpl
new file mode 100644
index 000000000..f6810bb10
--- /dev/null
+++ b/view/theme/frost-mobile/templates/conversation.tpl
@@ -0,0 +1,34 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$live_update}}
+
+{{foreach $threads as $thread}}
+<div id="tread-wrapper-{{$thread.id}}" class="tread-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="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/theme/frost-mobile/templates/cropbody.tpl b/view/theme/frost-mobile/templates/cropbody.tpl
new file mode 100644
index 000000000..5ace9a1aa
--- /dev/null
+++ b/view/theme/frost-mobile/templates/cropbody.tpl
@@ -0,0 +1,32 @@
+{{*
+ *	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>
+
+<form action="profile_photo/{{$resource}}" id="crop-image-form" method="post" />
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+<input type="hidden" name="cropfinal" value="1" />
+<input type="hidden" name="xstart" id="x1" />
+<input type="hidden" name="ystart" id="y1" />
+<input type="hidden" name="xfinal" id="x2" />
+<input type="hidden" name="yfinal" id="y2" />
+<input type="hidden" name="height" id="height" />
+<input type="hidden" name="width"  id="width" />
+
+<div id="crop-image-submit-wrapper" >
+<input type="submit" name="submit" value="{{$done}}" />
+</div>
+
+</form>
diff --git a/view/theme/frost-mobile/templates/cropend.tpl b/view/theme/frost-mobile/templates/cropend.tpl
new file mode 100644
index 000000000..7a828815b
--- /dev/null
+++ b/view/theme/frost-mobile/templates/cropend.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	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>
+      <script type="text/javascript" language="javascript">initCrop();</script>
diff --git a/view/theme/frost-mobile/templates/crophead.tpl b/view/theme/frost-mobile/templates/crophead.tpl
new file mode 100644
index 000000000..6438cfb35
--- /dev/null
+++ b/view/theme/frost-mobile/templates/crophead.tpl
@@ -0,0 +1,6 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+      <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />
diff --git a/view/theme/frost-mobile/templates/display-head.tpl b/view/theme/frost-mobile/templates/display-head.tpl
new file mode 100644
index 000000000..17d17dd7d
--- /dev/null
+++ b/view/theme/frost-mobile/templates/display-head.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script>
+	window.autoCompleteType = 'display-head';
+</script>
+
diff --git a/view/theme/frost-mobile/templates/end.tpl b/view/theme/frost-mobile/templates/end.tpl
new file mode 100644
index 000000000..435c190fb
--- /dev/null
+++ b/view/theme/frost-mobile/templates/end.tpl
@@ -0,0 +1,27 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<!--[if IE]>
+<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+<![endif]-->
+{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></script>
+<script type="text/javascript">
+  tinyMCE.init({ mode : "none"});
+</script>-->*}}
+<script type="text/javascript" src="{{$baseurl}}/js/jquery.js" ></script>
+<script type="text/javascript">var $j = jQuery.noConflict();</script>
+<script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/jquery.divgrow-1.3.1.f1.min.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/js/jquery.textinputs.js" ></script>
+{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
+<script type="text/javascript" src="{{$baseurl}}/library/colorbox/jquery.colorbox-min.js"></script>-->*}}
+{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/tiptip/jquery.tipTip.minified.js"></script>-->*}}
+<script type="text/javascript" src="{{$baseurl}}/library/jgrowl/jquery.jgrowl_minimized.js"></script>
+
+<script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/fk.autocomplete.min.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/acl.min.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/js/webtoolkit.base64.min.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/main.min.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/theme.min.js"></script>
+
diff --git a/view/theme/frost-mobile/templates/event.tpl b/view/theme/frost-mobile/templates/event.tpl
new file mode 100644
index 000000000..15c4e2b93
--- /dev/null
+++ b/view/theme/frost-mobile/templates/event.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{foreach $events as $event}}
+	<div class="event">
+	
+	{{if $event.item.author_name}}<a href="{{$event.item.author_link}}" ><img src="{{$event.item.author_avatar}}" height="32" width="32" />{{$event.item.author_name}}</a>{{/if}}
+	{{$event.html}}
+	{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" target="external-link" class="plink-event-link icon s22 remote-link"></a>{{/if}}
+	{{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link tool s22 pencil"></a>{{/if}}
+	</div>
+	<div class="clear"></div>
+{{/foreach}}
diff --git a/view/theme/frost-mobile/templates/event_end.tpl b/view/theme/frost-mobile/templates/event_end.tpl
new file mode 100644
index 000000000..c275be923
--- /dev/null
+++ b/view/theme/frost-mobile/templates/event_end.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script language="javascript" type="text/javascript"
+          src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script>
+
+
diff --git a/view/theme/frost-mobile/templates/event_head.tpl b/view/theme/frost-mobile/templates/event_head.tpl
new file mode 100644
index 000000000..9d1c4b5f9
--- /dev/null
+++ b/view/theme/frost-mobile/templates/event_head.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	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">
+window.aclType = 'event_head';
+</script>
+
diff --git a/view/theme/frost-mobile/templates/field_checkbox.tpl b/view/theme/frost-mobile/templates/field_checkbox.tpl
new file mode 100644
index 000000000..f7f857f59
--- /dev/null
+++ b/view/theme/frost-mobile/templates/field_checkbox.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	
+	<div class='field checkbox' id='div_id_{{$field.0}}'>
+		<label id='label_id_{{$field.0}}' for='id_{{$field.0}}'>{{$field.1}}</label>
+		<input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}}><br />
+		<span class='field_help' id='help_id_{{$field.0}}'>{{$field.3}}</span>
+	</div>
diff --git a/view/theme/frost-mobile/templates/field_input.tpl b/view/theme/frost-mobile/templates/field_input.tpl
new file mode 100644
index 000000000..240bed249
--- /dev/null
+++ b/view/theme/frost-mobile/templates/field_input.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	
+	<div class='field input' id='wrapper_{{$field.0}}'>
+		<label for='id_{{$field.0}}'>{{$field.1}}</label><br />
+		<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/theme/frost-mobile/templates/field_openid.tpl b/view/theme/frost-mobile/templates/field_openid.tpl
new file mode 100644
index 000000000..d5ebd9a3b
--- /dev/null
+++ b/view/theme/frost-mobile/templates/field_openid.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	
+	<div class='field input openid' id='wrapper_{{$field.0}}'>
+		<label for='id_{{$field.0}}'>{{$field.1}}</label><br />
+		<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/theme/frost-mobile/templates/field_password.tpl b/view/theme/frost-mobile/templates/field_password.tpl
new file mode 100644
index 000000000..f1352f27b
--- /dev/null
+++ b/view/theme/frost-mobile/templates/field_password.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	
+	<div class='field password' id='wrapper_{{$field.0}}'>
+		<label for='id_{{$field.0}}'>{{$field.1}}</label><br />
+		<input type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/theme/frost-mobile/templates/field_themeselect.tpl b/view/theme/frost-mobile/templates/field_themeselect.tpl
new file mode 100644
index 000000000..0d4552c3b
--- /dev/null
+++ b/view/theme/frost-mobile/templates/field_themeselect.tpl
@@ -0,0 +1,14 @@
+{{*
+ *	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}}' {{if $field.5}}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/theme/frost-mobile/templates/generic_links_widget.tpl b/view/theme/frost-mobile/templates/generic_links_widget.tpl
new file mode 100644
index 000000000..705ddb57c
--- /dev/null
+++ b/view/theme/frost-mobile/templates/generic_links_widget.tpl
@@ -0,0 +1,17 @@
+{{*
+ *	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 class="tabs links-widget">
+		{{foreach $items as $item}}
+			<li class="tool"><a href="{{$item.url}}" class="tab {{if $item.selected}}selected{{/if}}">{{$item.label}}</a></li>
+		{{/foreach}}
+		<div id="tabs-end"></div>
+	</ul>
+	
+</div>
diff --git a/view/theme/frost-mobile/templates/group_drop.tpl b/view/theme/frost-mobile/templates/group_drop.tpl
new file mode 100644
index 000000000..269322815
--- /dev/null
+++ b/view/theme/frost-mobile/templates/group_drop.tpl
@@ -0,0 +1,14 @@
+{{*
+ *	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/theme/frost-mobile/templates/head.tpl b/view/theme/frost-mobile/templates/head.tpl
new file mode 100644
index 000000000..d11d072f2
--- /dev/null
+++ b/view/theme/frost-mobile/templates/head.tpl
@@ -0,0 +1,36 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+{{*<!--<meta content='width=device-width, minimum-scale=1 maximum-scale=1' name='viewport'>
+<meta content='True' name='HandheldFriendly'>
+<meta content='320' name='MobileOptimized'>-->*}}
+<meta name="viewport" content="width=device-width; initial-scale = 1.0; maximum-scale=1.0; user-scalable=no" />
+{{*<!--<meta name="viewport" content="width=100%;  initial-scale=1; maximum-scale=1; minimum-scale=1; user-scalable=no;" />-->*}}
+
+<base href="{{$baseurl}}/" />
+<meta name="generator" content="{{$generator}}" />
+{{*<!--<link rel="stylesheet" href="{{$baseurl}}/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="{{$baseurl}}/library/colorbox/colorbox.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="{{$baseurl}}/library/tiptip/tipTip.css" type="text/css" media="screen" />-->*}}
+<link rel="stylesheet" href="{{$baseurl}}/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
+
+<link rel="stylesheet" type="text/css" href="{{$stylesheet}}" media="all" />
+
+<link rel="shortcut icon" href="{{$baseurl}}/images/friendica-32.png" />
+<link rel="search"
+         href="{{$baseurl}}/opensearch" 
+         type="application/opensearchdescription+xml" 
+         title="Search in Friendica" />
+
+<script>
+	window.delItem = "{{$delitem}}";
+	window.commentEmptyText = "{{$comment}}";
+	window.showMore = "{{$showmore}}";
+	window.showFewer = "{{$showfewer}}";
+	var updateInterval = {{$update_interval}};
+	var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}};
+</script>
+
diff --git a/view/theme/frost-mobile/templates/jot-end.tpl b/view/theme/frost-mobile/templates/jot-end.tpl
new file mode 100644
index 000000000..055ecc5e6
--- /dev/null
+++ b/view/theme/frost-mobile/templates/jot-end.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.min.js" ></script>
+
+<script>if(typeof window.jotInit != 'undefined') initEditor();</script>
+
diff --git a/view/theme/frost-mobile/templates/jot-header.tpl b/view/theme/frost-mobile/templates/jot-header.tpl
new file mode 100644
index 000000000..bfaf3d5e0
--- /dev/null
+++ b/view/theme/frost-mobile/templates/jot-header.tpl
@@ -0,0 +1,23 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script>
+	var none = "none"; // ugly hack: {{$editselect}} shouldn't be a string if TinyMCE is enabled, but should if it isn't
+	window.editSelect = {{$editselect}};
+	window.isPublic = "{{$ispublic}}";
+	window.nickname = "{{$nickname}}";
+	window.linkURL = "{{$linkurl}}";
+	window.vidURL = "{{$vidurl}}";
+	window.audURL = "{{$audurl}}";
+	window.whereAreU = "{{$whereareu}}";
+	window.term = "{{$term}}";
+	window.baseURL = "{{$baseurl}}";
+	window.geoTag = function () { {{$geotag}} }
+	window.jotId = "#profile-jot-text";
+	window.imageUploadButton = 'wall-image-upload';
+</script>
+
+
diff --git a/view/theme/frost-mobile/templates/jot.tpl b/view/theme/frost-mobile/templates/jot.tpl
new file mode 100644
index 000000000..1dcfc0b21
--- /dev/null
+++ b/view/theme/frost-mobile/templates/jot.tpl
@@ -0,0 +1,96 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div id="profile-jot-wrapper" >
+	<div id="profile-jot-banner-wrapper">
+		<div id="profile-jot-desc" >&nbsp;</div>
+		<div id="character-counter" class="grey"></div>
+	</div>
+	<div id="profile-jot-banner-end"></div>
+
+	<form id="profile-jot-form" action="{{$action}}" method="post" >
+		<input type="hidden" name="type" value="{{$ptyp}}" />
+		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+		<input type="hidden" name="return" value="{{$return_path}}" />
+		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
+		<input type="hidden" name="coord" id="jot-coord" value="" />
+		<input type="hidden" name="post_id" value="{{$post_id}}" />
+		<input type="hidden" name="source" value="{{$sourceapp}}" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none"></div>
+		{{if $placeholdercategory}}
+		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" /></div>
+		{{/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-rotator-wrapper" style="display: {{$visitor}};" >
+		<img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+	</div> 
+	
+	<div id="profile-upload-wrapper" style="display: {{$visitor}};" >
+		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="{{$upload}}"></a></div>
+	</div> 
+	<div id="profile-attach-wrapper" style="display: {{$visitor}};" >
+		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="{{$attach}}"></a></div>
+	</div> 
+
+	{{*<!--<div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
+		<a id="profile-link" class="icon link" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>-->*}}
+	<div id="profile-link-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-link" class="icon link" title="{{$weblink}}" onclick="jotGetLink(); return false;"></a>
+	</div> 
+	<div id="profile-video-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-video" class="icon video" title="{{$video}}" onclick="jotVideoURL();return false;"></a>
+	</div> 
+	<div id="profile-audio-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-audio" class="icon audio" title="{{$audio}}" onclick="jotAudioURL();return false;"></a>
+	</div> 
+	<div id="profile-location-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-location" class="icon globe" title="{{$setloc}}" onclick="jotGetLocation();return false;"></a>
+	</div> 
+	<div id="profile-nolocation-wrapper" style="display: none;" >
+		<a id="profile-nolocation" class="icon noglobe" title="{{$noloc}}" onclick="jotClearLocation();return false;"></a>
+	</div> 
+
+	<div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" >
+		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}}"  title="{{$permset}}" ></a>{{$bang}}
+	</div>
+
+	<span onclick="preview_post();" id="jot-preview-link" class="fakelink">{{$preview}}</span>
+
+	<div id="profile-jot-perms-end"></div>
+
+
+	<div id="profile-jot-plugin-wrapper">
+  	{{$jotplugins}}
+	</div>
+
+	<div id="jot-preview-content" style="display:none;"></div>
+
+	<div style="display: none;">
+		<div id="profile-jot-acl-wrapper">
+			{{$acl}}
+			<hr/>
+			<div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
+			{{$jotnets}}
+			<div id="profile-jot-networks-end"></div>
+		</div>
+	</div>
+
+
+</div>
+
+<div id="profile-jot-end"></div>
+</form>
+</div>
+		{{if $content}}<script>window.jotInit = true;</script>{{/if}}
diff --git a/view/theme/frost-mobile/templates/jot_geotag.tpl b/view/theme/frost-mobile/templates/jot_geotag.tpl
new file mode 100644
index 000000000..d828980e5
--- /dev/null
+++ b/view/theme/frost-mobile/templates/jot_geotag.tpl
@@ -0,0 +1,16 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+	if(navigator.geolocation) {
+		navigator.geolocation.getCurrentPosition(function(position) {
+			var lat = position.coords.latitude.toFixed(4);
+			var lon = position.coords.longitude.toFixed(4);
+
+			$j('#jot-coord').val(lat + ', ' + lon);
+			$j('#profile-nolocation-wrapper').show();
+		});
+	}
+
diff --git a/view/theme/frost-mobile/templates/lang_selector.tpl b/view/theme/frost-mobile/templates/lang_selector.tpl
new file mode 100644
index 000000000..a1aee8277
--- /dev/null
+++ b/view/theme/frost-mobile/templates/lang_selector.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	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/theme/frost-mobile/templates/like_noshare.tpl b/view/theme/frost-mobile/templates/like_noshare.tpl
new file mode 100644
index 000000000..1ad1eeaee
--- /dev/null
+++ b/view/theme/frost-mobile/templates/like_noshare.tpl
@@ -0,0 +1,12 @@
+{{*
+ *	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="tool like" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false"></a>
+	{{if $nolike}}
+	<a href="#" class="tool dislike" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false"></a>
+	{{/if}}
+	<img id="like-rotator-{{$id}}" class="like-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+</div>
diff --git a/view/theme/frost-mobile/templates/login.tpl b/view/theme/frost-mobile/templates/login.tpl
new file mode 100644
index 000000000..a361f3e27
--- /dev/null
+++ b/view/theme/frost-mobile/templates/login.tpl
@@ -0,0 +1,50 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div class="login-form">
+<form action="{{$dest_url}}" 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>
+	
+	{{if $openid}}
+			<div id="login_openid">
+			{{include file="field_openid.tpl" field=$lopenid}}
+			</div>
+	{{/if}}
+
+	<br />
+	<div id='login-footer'>
+<!--	<div class="login-extra-links">
+	By signing in you agree to the latest <a href="tos.html" title="{{$tostitle}}" id="terms-of-service-link" >{{$toslink}}</a> and <a href="privacy.html" title="{{$privacytitle}}" id="privacy-link" >{{$privacylink}}</a>
+	</div>-->
+
+	<br />
+	{{include file="field_checkbox.tpl" field=$lremember}}
+
+	<div id="login-submit-wrapper" >
+		<input type="submit" name="submit" id="login-submit-button" value="{{$login}}" />
+	</div>
+
+	<br /><br />
+	<div class="login-extra-links">
+		{{if $register}}<a href="register" title="{{$register.title}}" id="register-link">{{$register.desc}}</a>{{/if}}
+        <a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
+	</div>
+	</div>
+	
+	{{foreach $hiddens as $k=>$v}}
+		<input type="hidden" name="{{$k}}" value="{{$v}}" />
+	{{/foreach}}
+	
+	
+</form>
+</div>
+
+<script type="text/javascript">window.loginName = "{{$lname.0}}";</script>
diff --git a/view/theme/frost-mobile/templates/login_head.tpl b/view/theme/frost-mobile/templates/login_head.tpl
new file mode 100644
index 000000000..c2d9504ad
--- /dev/null
+++ b/view/theme/frost-mobile/templates/login_head.tpl
@@ -0,0 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--<link rel="stylesheet" href="{{$baseurl}}/view/theme/frost-mobile/login-style.css" type="text/css" media="all" />-->*}}
+
diff --git a/view/theme/frost-mobile/templates/lostpass.tpl b/view/theme/frost-mobile/templates/lostpass.tpl
new file mode 100644
index 000000000..5a22c245b
--- /dev/null
+++ b/view/theme/frost-mobile/templates/lostpass.tpl
@@ -0,0 +1,26 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="lostpass-form">
+<h2>{{$title}}</h2>
+<br /><br /><br />
+
+<form action="lostpass" method="post" >
+<div id="login-name-wrapper" class="field input">
+        <label for="login-name" id="label-login-name">{{$name}}</label><br />
+        <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
+</div>
+<div id="login-extra-end"></div>
+<p id="lostpass-desc">
+{{$desc}}
+</p>
+<br />
+
+<div id="login-submit-wrapper" >
+        <input type="submit" name="submit" id="lostpass-submit-button" value="{{$submit}}" />
+</div>
+<div id="login-submit-end"></div>
+</form>
+</div>
diff --git a/view/theme/frost-mobile/templates/mail_conv.tpl b/view/theme/frost-mobile/templates/mail_conv.tpl
new file mode 100644
index 000000000..c6d9aa03a
--- /dev/null
+++ b/view/theme/frost-mobile/templates/mail_conv.tpl
@@ -0,0 +1,23 @@
+{{*
+ *	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>
+	<div class="mail-conv-detail" >
+		<div class="mail-conv-sender-name" >{{$mail.from_name}}</div>
+		<div class="mail-conv-date">{{$mail.date}}</div>
+		<div class="mail-conv-subject">{{$mail.subject}}</div>
+	</div>
+	<div class="mail-conv-body">{{$mail.body}}</div>
+</div>
+<div class="mail-conv-outside-wrapper-end"></div>
+
+
+<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}} ></a></div>
+<div class="mail-conv-delete-end"></div>
+
+<hr class="mail-conv-break" />
diff --git a/view/theme/frost-mobile/templates/mail_list.tpl b/view/theme/frost-mobile/templates/mail_list.tpl
new file mode 100644
index 000000000..0607c15c7
--- /dev/null
+++ b/view/theme/frost-mobile/templates/mail_list.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="mail-list-outside-wrapper">
+	<div class="mail-list-sender" >
+		<a href="{{$from_url}}" class="mail-list-sender-url" ><img class="mail-list-sender-photo{{$sparkle}}" src="{{$from_photo}}" height="80" width="80" alt="{{$from_name}}" /></a>
+	</div>
+	<div class="mail-list-detail">
+		<div class="mail-list-sender-name" >{{$from_name}}</div>
+		<div class="mail-list-date">{{$date}}</div>
+		<div class="mail-list-subject"><a href="message/{{$id}}" class="mail-list-link">{{$subject}}</a></div>
+	<div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-{{$id}}" >
+		<a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="icon drophide mail-list-delete	delete-icon" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}} ></a>
+	</div>
+</div>
+</div>
+<div class="mail-list-delete-end"></div>
+
+<div class="mail-list-outside-wrapper-end"></div>
diff --git a/view/theme/frost-mobile/templates/message-end.tpl b/view/theme/frost-mobile/templates/message-end.tpl
new file mode 100644
index 000000000..9298a4245
--- /dev/null
+++ b/view/theme/frost-mobile/templates/message-end.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script src="{{$baseurl}}/library/jquery_ac/friendica.complete.min.js" ></script>
+
+
diff --git a/view/theme/frost-mobile/templates/message-head.tpl b/view/theme/frost-mobile/templates/message-head.tpl
new file mode 100644
index 000000000..a7fb96108
--- /dev/null
+++ b/view/theme/frost-mobile/templates/message-head.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/theme/frost-mobile/templates/moderated_comment.tpl b/view/theme/frost-mobile/templates/moderated_comment.tpl
new file mode 100644
index 000000000..b2401ca48
--- /dev/null
+++ b/view/theme/frost-mobile/templates/moderated_comment.tpl
@@ -0,0 +1,66 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
+			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
+				<input type="hidden" name="type" value="{{$type}}" />
+				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+				<input type="hidden" name="parent" value="{{$parent}}" />
+				<input type="hidden" name="return" value="{{$return_path}}" />
+				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
+				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
+					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<div id="mod-cmnt-wrap-{{$id}}" class="mod-cmnt-wrap" style="display:none">
+					<div id="mod-cmnt-name-lbl-{{$id}}" class="mod-cmnt-name-lbl">{{$lbl_modname}}</div>
+					<input type="text" id="mod-cmnt-name-{{$id}}" class="mod-cmnt-name" name="mod-cmnt-name" value="{{$modname}}" />
+					<div id="mod-cmnt-email-lbl-{{$id}}" class="mod-cmnt-email-lbl">{{$lbl_modemail}}</div>
+					<input type="text" id="mod-cmnt-email-{{$id}}" class="mod-cmnt-email" name="mod-cmnt-email" value="{{$modemail}}" />
+					<div id="mod-cmnt-url-lbl-{{$id}}" class="mod-cmnt-url-lbl">{{$lbl_modurl}}</div>
+					<input type="text" id="mod-cmnt-url-{{$id}}" class="mod-cmnt-url" name="mod-cmnt-url" value="{{$modurl}}" />
+				</div>
+				<ul class="comment-edit-bb-{{$id}}">
+					<li><a class="editicon boldbb shadow"
+						style="cursor: pointer;" title="{{$edbold}}"
+						onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
+					<li><a class="editicon italicbb shadow"
+						style="cursor: pointer;" title="{{$editalic}}"
+						onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
+					<li><a class="editicon underlinebb shadow"
+						style="cursor: pointer;" title="{{$eduline}}"
+						onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
+					<li><a class="editicon quotebb shadow"
+						style="cursor: pointer;" title="{{$edquote}}"
+						onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
+					<li><a class="editicon codebb shadow"
+						style="cursor: pointer;" title="{{$edcode}}"
+						onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
+					<li><a class="editicon imagebb shadow"
+						style="cursor: pointer;" title="{{$edimg}}"
+						onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
+					<li><a class="editicon urlbb shadow"
+						style="cursor: pointer;" title="{{$edurl}}"
+						onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
+					<li><a class="editicon videobb shadow"
+						style="cursor: pointer;" title="{{$edvideo}}"
+						onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
+				</ul>	
+				<div class="comment-edit-bb-end"></div>
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>			
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
+					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
+					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
+					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/theme/frost-mobile/templates/msg-end.tpl b/view/theme/frost-mobile/templates/msg-end.tpl
new file mode 100644
index 000000000..594f3f79b
--- /dev/null
+++ b/view/theme/frost-mobile/templates/msg-end.tpl
@@ -0,0 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.min.js" ></script>
+
diff --git a/view/theme/frost-mobile/templates/msg-header.tpl b/view/theme/frost-mobile/templates/msg-header.tpl
new file mode 100644
index 000000000..b0a0f7945
--- /dev/null
+++ b/view/theme/frost-mobile/templates/msg-header.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script language="javascript" type="text/javascript">
+	window.nickname = "{{$nickname}}";
+	window.linkURL = "{{$linkurl}}";
+	var plaintext = "none";
+	window.jotId = "#prvmail-text";
+	window.imageUploadButton = 'prvmail-upload';
+	window.autocompleteType = 'msg-header';
+</script>
+
diff --git a/view/theme/frost-mobile/templates/nav.tpl b/view/theme/frost-mobile/templates/nav.tpl
new file mode 100644
index 000000000..2c9f29d50
--- /dev/null
+++ b/view/theme/frost-mobile/templates/nav.tpl
@@ -0,0 +1,151 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<nav>
+{{*<!--	{{$langselector}} -->*}}
+
+{{*<!--	<div id="site-location">{{$sitelocation}}</div> -->*}}
+
+	<span id="nav-link-wrapper" >
+
+{{*<!--	<a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>-->*}}
+	<div class="nav-button-container">
+{{*<!--	<a class="system-menu-link nav-link" href="#system-menu" title="Menu">-->*}}
+	<img rel="#system-menu-list" class="nav-link" src="{{$baseurl}}/view/theme/frost-mobile/images/menu.png">
+{{*<!--	</a>-->*}}
+	<ul id="system-menu-list" class="nav-menu-list">
+		{{if $nav.login}}
+		<a id="nav-login-link" class="nav-load-page-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a>
+		{{/if}}
+
+		{{if $nav.register}}
+		<a id="nav-register-link" class="nav-load-page-link {{$nav.register.2}} {{$sel.register}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a>
+		{{/if}}
+
+		{{if $nav.settings}}
+		<li><a id="nav-settings-link" class="{{$nav.settings.2}} nav-load-page-link" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>
+		{{/if}}
+
+		{{if $nav.manage}}
+		<li>
+		<a id="nav-manage-link" class="nav-load-page-link {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a>
+		</li>
+		{{/if}}
+
+		{{if $nav.profiles}}
+		<li><a id="nav-profiles-link" class="{{$nav.profiles.2}} nav-load-page-link" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a></li>
+		{{/if}}
+
+		{{if $nav.admin}}
+		<li><a id="nav-admin-link" class="{{$nav.admin.2}} nav-load-page-link" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a></li>
+		{{/if}}
+
+		<li><a id="nav-search-link" class="{{$nav.search.2}} nav-load-page-link" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a></li>
+
+		{{if $nav.apps}}
+		<li><a id="nav-apps-link" class="{{$nav.apps.2}} nav-load-page-link" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a></li>
+		{{/if}}
+
+		{{if $nav.help}}
+		<li><a id="nav-help-link" class="{{$nav.help.2}} nav-load-page-link" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a></li>
+		{{/if}}
+		
+		{{if $nav.logout}}
+		<li><a id="nav-logout-link" class="{{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>
+		{{/if}}
+	</ul>
+	</div>
+
+	{{if $nav.notifications}}
+{{*<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a>-->*}}
+	<div class="nav-button-container">
+{{*<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">-->*}}
+	<img rel="#nav-notifications-menu" class="nav-link" src="{{$baseurl}}/view/theme/frost-mobile/images/notifications.png">
+{{*<!--	</a>-->*}}
+	<span id="notify-update" class="nav-ajax-left"></span>
+	<ul id="nav-notifications-menu" class="notifications-menu-popup">
+		<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
+		<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
+		<li class="empty">{{$emptynotifications}}</li>
+	</ul>
+	</div>
+	{{/if}}		
+
+{{*<!--	<a id="contacts-menu-link" class="nav-link" href="#contacts-menu" title="Contacts">Contacts</a>-->*}}
+	<div class="nav-button-container">
+{{*<!--	<a class="contacts-menu-link nav-link" href="#contacts-menu" title="Contacts">-->*}}
+	<img rel="#contacts-menu-list"  class="nav-link" src="{{$baseurl}}/view/theme/frost-mobile/images/contacts.png">
+	{{*<!--</a>-->*}}
+	{{if $nav.introductions}}
+	<span id="intro-update" class="nav-ajax-left"></span>
+	{{/if}}
+	<ul id="contacts-menu-list" class="nav-menu-list">
+		{{if $nav.contacts}}
+		<li><a id="nav-contacts-link" class="{{$nav.contacts.2}} nav-load-page-link" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a><li>
+		{{/if}}
+
+		<li><a id="nav-directory-link" class="{{$nav.directory.2}} nav-load-page-link" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a><li>
+
+		{{if $nav.introductions}}
+		<li>
+		<a id="nav-notify-link" class="{{$nav.introductions.2}} {{$sel.introductions}} nav-load-page-link" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a>
+		</li>
+		{{/if}}
+	</ul>
+	</div>
+
+	{{if $nav.messages}}
+{{*<!--	<a id="nav-messages-link" class="nav-link {{$nav.messages.2}} {{$sel.messages}} nav-load-page-link" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>-->*}}
+	<div class="nav-button-container">
+	<a id="nav-messages-link" class="{{$nav.messages.2}} {{$sel.messages}} nav-load-page-link" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >
+	<img src="{{$baseurl}}/view/theme/frost-mobile/images/message.png" class="nav-link">
+	</a>
+	<span id="mail-update" class="nav-ajax-left"></span>
+	</div>
+	{{/if}}
+
+{{*<!--	<a id="network-menu-link" class="nav-link" href="#network-menu" title="Network">Network</a>-->*}}
+	<div class="nav-button-container">
+{{*<!--	<a class="network-menu-link nav-link" href="#network-menu" title="Network">-->*}}
+	<img rel="#network-menu-list" class="nav-link" src="{{$baseurl}}/view/theme/frost-mobile/images/network.png">
+{{*<!--	</a>-->*}}
+	{{if $nav.network}}
+	<span id="net-update" class="nav-ajax-left"></span>
+	{{/if}}
+	<ul id="network-menu-list" class="nav-menu-list">
+		{{if $nav.network}}
+		<li>
+		<a id="nav-network-link" class="{{$nav.network.2}} {{$sel.network}} nav-load-page-link" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
+		</li>
+		{{*<!--<span id="net-update" class="nav-ajax-left"></span>-->*}}
+		{{/if}}
+
+		{{if $nav.network}}
+		<li>
+		<a class="nav-menu-icon network-reset-link nav-link" href="{{$nav.net_reset.0}}" title="{{$nav.net_reset.3}}">{{$nav.net_reset.1}}</a>
+		</li>
+		{{/if}}
+
+		{{if $nav.home}}
+		<li><a id="nav-home-link" class="{{$nav.home.2}} {{$sel.home}} nav-load-page-link" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a></li>
+		{{*<!--<span id="home-update" class="nav-ajax-left"></span>-->*}}
+		{{/if}}
+
+		{{if $nav.community}}
+		<li>
+		<a id="nav-community-link" class="{{$nav.community.2}} {{$sel.community}} nav-load-page-link" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
+		</li>
+		{{/if}}
+	</ul>
+	</div>
+
+	</span>
+	{{*<!--<span id="nav-end"></span>-->*}}
+	<span id="banner">{{$banner}}</span>
+</nav>
+
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
+</ul>
diff --git a/view/theme/frost-mobile/templates/photo_drop.tpl b/view/theme/frost-mobile/templates/photo_drop.tpl
new file mode 100644
index 000000000..96fa27880
--- /dev/null
+++ b/view/theme/frost-mobile/templates/photo_drop.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	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/theme/frost-mobile/templates/photo_edit.tpl b/view/theme/frost-mobile/templates/photo_edit.tpl
new file mode 100644
index 000000000..87df97b4b
--- /dev/null
+++ b/view/theme/frost-mobile/templates/photo_edit.tpl
@@ -0,0 +1,63 @@
+{{*
+ *	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}}" />
+
+	<div class="photo-edit-input-text">
+	<label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$newalbum}}</label>
+	<input id="photo-edit-albumname" type="text" size="32" name="albname" value="{{$album}}" />
+	</div>
+
+	<div id="photo-edit-albumname-end"></div>
+
+	<div class="photo-edit-input-text">
+	<label id="photo-edit-caption-label" for="photo-edit-caption">{{$capt_label}}</label>
+	<input id="photo-edit-caption" type="text" size="32" name="desc" value="{{$caption}}" />
+	</div>
+
+	<div id="photo-edit-caption-end"></div>
+
+	<div class="photo-edit-input-text">
+	<label id="photo-edit-tags-label" for="photo-edit-newtag" >{{$tag_label}}</label>
+	<input name="newtag" id="photo-edit-newtag" size="32" title="{{$help_tags}}" type="text" />
+	</div>
+
+	<div id="photo-edit-tags-end"></div>
+
+	<div class="photo-edit-rotate-choice">
+	<label id="photo-edit-rotate-cw-label" for="photo-edit-rotate-cw">{{$rotatecw}}</label>
+	<input id="photo-edit-rotate-cw" class="photo-edit-rotate" type="radio" name="rotate" value="1" /><br />
+	</div>
+
+	<div class="photo-edit-rotate-choice">
+	<label id="photo-edit-rotate-ccw-label" for="photo-edit-rotate-ccw">{{$rotateccw}}</label>
+	<input id="photo-edit-rotate-ccw" class="photo-edit-rotate" type="radio" name="rotate" value="2" />
+	</div>
+	<div id="photo-edit-rotate-end"></div>
+
+	<div id="photo-edit-perms" class="photo-edit-perms" >
+		<a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="popupbox button" title="{{$permissions}}"/>
+			<span id="jot-perms-icon" class="icon {{$lockstate}} photo-perms-icon" ></span><div class="photo-jot-perms-text">{{$permissions}}</div>
+		</a>
+		<div id="photo-edit-perms-menu-end"></div>
+		
+		<div style="display: none;">
+			<div id="photo-edit-perms-select" >
+				{{$aclselect}}
+			</div>
+		</div>
+	</div>
+	<div id="photo-edit-perms-end"></div>
+
+	<input id="photo-edit-submit-button" type="submit" name="submit" value="{{$submit}}" />
+	<input id="photo-edit-delete-button" type="submit" name="delete" value="{{$delete}}" onclick="return confirmDelete()"; />
+
+	<div id="photo-edit-end"></div>
+</form>
+
+
diff --git a/view/theme/frost-mobile/templates/photo_edit_head.tpl b/view/theme/frost-mobile/templates/photo_edit_head.tpl
new file mode 100644
index 000000000..857e6e63a
--- /dev/null
+++ b/view/theme/frost-mobile/templates/photo_edit_head.tpl
@@ -0,0 +1,12 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script>
+	window.prevLink = "{{$prevlink}}";
+	window.nextLink = "{{$nextlink}}";
+	window.photoEdit = true;
+
+</script>
diff --git a/view/theme/frost-mobile/templates/photo_view.tpl b/view/theme/frost-mobile/templates/photo_view.tpl
new file mode 100644
index 000000000..354fb9c28
--- /dev/null
+++ b/view/theme/frost-mobile/templates/photo_view.tpl
@@ -0,0 +1,47 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<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>
+
+<div id="photo-nav">
+	{{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}"><img src="view/theme/frost-mobile/images/arrow-left.png"></a></div>{{/if}}
+	{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}"><img src="view/theme/frost-mobile/images/arrow-right.png"></a></div>{{/if}}
+</div>
+<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}"><img src="{{$photo.src}}" /></a></div>
+<div id="photo-photo-end"></div>
+<div id="photo-caption">{{$desc}}</div>
+{{if $tags}}
+<div id="in-this-photo-text">{{$tags.0}}</div>
+<div id="in-this-photo">{{$tags.1}}</div>
+{{/if}}
+{{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}}
+
+{{if $edit}}
+{{$edit}}
+{{else}}
+
+{{if $likebuttons}}
+<div id="photo-like-div">
+	{{$likebuttons}}
+	{{$like}}
+	{{$dislike}}	
+</div>
+{{/if}}
+
+{{$comments}}
+
+{{$paginate}}
+{{/if}}
+
diff --git a/view/theme/frost-mobile/templates/photos_head.tpl b/view/theme/frost-mobile/templates/photos_head.tpl
new file mode 100644
index 000000000..5d7e0152d
--- /dev/null
+++ b/view/theme/frost-mobile/templates/photos_head.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script>
+	window.isPublic = "{{$ispublic}}";
+</script>
+
diff --git a/view/theme/frost-mobile/templates/photos_upload.tpl b/view/theme/frost-mobile/templates/photos_upload.tpl
new file mode 100644
index 000000000..d0b5135cb
--- /dev/null
+++ b/view/theme/frost-mobile/templates/photos_upload.tpl
@@ -0,0 +1,55 @@
+{{*
+ *	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" >
+	<div id="photos-upload-new-wrapper" >
+		<div id="photos-upload-newalbum-div">
+			<label id="photos-upload-newalbum-text" for="photos-upload-newalbum" >{{$newalbum}}</label>
+		</div>
+		<input id="photos-upload-newalbum" type="text" name="newalbum" />
+	</div>
+	<div id="photos-upload-new-end"></div>
+	<div id="photos-upload-exist-wrapper">
+		<div id="photos-upload-existing-album-text">{{$existalbumtext}}</div>
+		<select id="photos-upload-album-select" name="album">
+		{{$albumselect}}
+		</select>
+	</div>
+	<div id="photos-upload-exist-end"></div>
+
+	{{$default_upload_box}}
+
+	<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
+		<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" checked />
+		<label id="photos-upload-noshare-text" for="photos-upload-noshare" >{{$nosharetext}}</label>
+	</div>
+
+
+	<div id="photos-upload-perms" class="photos-upload-perms" >
+		<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button popupbox" />
+		<span id="jot-perms-icon" class="icon {{$lockstate}}" ></span>{{$permissions}}
+		</a>
+	</div>
+	<div id="photos-upload-perms-end"></div>
+
+	<div style="display: none;">
+		<div id="photos-upload-permissions-wrapper">
+			{{$aclselect}}
+		</div>
+	</div>
+
+	<div id="photos-upload-spacer"></div>
+
+	{{$alt_uploader}}
+
+	{{$default_upload_submit}}
+
+	<div class="photos-upload-end" ></div>
+</form>
+
diff --git a/view/theme/frost-mobile/templates/profed_end.tpl b/view/theme/frost-mobile/templates/profed_end.tpl
new file mode 100644
index 000000000..048c52c44
--- /dev/null
+++ b/view/theme/frost-mobile/templates/profed_end.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script type="text/javascript" src="js/country.min.js" ></script>
+
+<script language="javascript" type="text/javascript">
+	Fill_Country('{{$country_name}}');
+	Fill_States('{{$region}}');
+</script>
+
diff --git a/view/theme/frost-mobile/templates/profed_head.tpl b/view/theme/frost-mobile/templates/profed_head.tpl
new file mode 100644
index 000000000..e4fef64d6
--- /dev/null
+++ b/view/theme/frost-mobile/templates/profed_head.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script language="javascript" type="text/javascript">
+	window.editSelect = "none";
+</script>
+
diff --git a/view/theme/frost-mobile/templates/profile_edit.tpl b/view/theme/frost-mobile/templates/profile_edit.tpl
new file mode 100644
index 000000000..2a38795d6
--- /dev/null
+++ b/view/theme/frost-mobile/templates/profile_edit.tpl
@@ -0,0 +1,327 @@
+{{*
+ *	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/{{$profile_id}}/view?tab=profile" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></li>
+<li><a href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a></li>
+<li></li>
+<li><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" {{$disabled}} >{{$del_prof}}</a></li>
+
+</ul>
+</div>
+
+<div id="profile-edit-links-end"></div>
+
+
+<div id="profile-edit-wrapper" >
+<form id="profile-edit-form" name="form1" action="profiles/{{$profile_id}}" method="post" >
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+<div id="profile-edit-profile-name-wrapper" >
+<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$lbl_profname}} </label>
+<input type="text" size="28" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name}}" /><div class="required">*</div>
+</div>
+<div id="profile-edit-profile-name-end"></div>
+
+<div id="profile-edit-name-wrapper" >
+<label id="profile-edit-name-label" for="profile-edit-name" >{{$lbl_fullname}} </label>
+<input type="text" size="28" name="name" id="profile-edit-name" value="{{$name}}" />
+</div>
+<div id="profile-edit-name-end"></div>
+
+<div id="profile-edit-pdesc-wrapper" >
+<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >{{$lbl_title}} </label>
+<input type="text" size="28" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc}}" />
+</div>
+<div id="profile-edit-pdesc-end"></div>
+
+
+<div id="profile-edit-gender-wrapper" >
+<label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}} </label>
+{{$gender}}
+</div>
+<div id="profile-edit-gender-end"></div>
+
+<div id="profile-edit-dob-wrapper" >
+<label id="profile-edit-dob-label" for="dob-select" >{{$lbl_bd}} </label>
+<div id="profile-edit-dob" >
+{{$dob}} {{$age}}
+</div>
+</div>
+<div id="profile-edit-dob-end"></div>
+
+{{$hide_friends}}
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="profile-edit-address-wrapper" >
+<label id="profile-edit-address-label" for="profile-edit-address" >{{$lbl_address}} </label>
+<input type="text" size="28" name="address" id="profile-edit-address" value="{{$address}}" />
+</div>
+<div id="profile-edit-address-end"></div>
+
+<div id="profile-edit-locality-wrapper" >
+<label id="profile-edit-locality-label" for="profile-edit-locality" >{{$lbl_city}} </label>
+<input type="text" size="28" name="locality" id="profile-edit-locality" value="{{$locality}}" />
+</div>
+<div id="profile-edit-locality-end"></div>
+
+
+<div id="profile-edit-postal-code-wrapper" >
+<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$lbl_zip}} </label>
+<input type="text" size="28" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code}}" />
+</div>
+<div id="profile-edit-postal-code-end"></div>
+
+<div id="profile-edit-country-name-wrapper" >
+<label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$lbl_country}} </label>
+<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('{{$region}}');">
+<option selected="selected" >{{$country_name}}</option>
+<option>temp</option>
+</select>
+</div>
+<div id="profile-edit-country-name-end"></div>
+
+<div id="profile-edit-region-wrapper" >
+<label id="profile-edit-region-label" for="profile-edit-region" >{{$lbl_region}} </label>
+<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
+<option selected="selected" >{{$region}}</option>
+<option>temp</option>
+</select>
+</div>
+<div id="profile-edit-region-end"></div>
+
+<div id="profile-edit-hometown-wrapper" >
+<label id="profile-edit-hometown-label" for="profile-edit-hometown" >{{$lbl_hometown}} </label>
+<input type="text" size="28" name="hometown" id="profile-edit-hometown" value="{{$hometown}}" />
+</div>
+<div id="profile-edit-hometown-end"></div>
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+<div id="profile-edit-marital-wrapper" >
+<label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}} </label>
+{{$marital}}
+</div>
+<label id="profile-edit-with-label" for="profile-edit-with" > {{$lbl_with}} </label>
+<input type="text" size="28" name="with" id="profile-edit-with" title="{{$lbl_ex1}}" value="{{$with}}" />
+<label id="profile-edit-howlong-label" for="profile-edit-howlong" > {{$lbl_howlong}} </label>
+<input type="text" size="28" name="howlong" id="profile-edit-howlong" title="{{$lbl_howlong}}" value="{{$howlong}}" />
+
+<div id="profile-edit-marital-end"></div>
+
+<div id="profile-edit-sexual-wrapper" >
+<label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}} </label>
+{{$sexual}}
+</div>
+<div id="profile-edit-sexual-end"></div>
+
+
+
+<div id="profile-edit-homepage-wrapper" >
+<label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$lbl_homepage}} </label>
+<input type="text" size="28" name="homepage" id="profile-edit-homepage" value="{{$homepage}}" />
+</div>
+<div id="profile-edit-homepage-end"></div>
+
+<div id="profile-edit-politic-wrapper" >
+<label id="profile-edit-politic-label" for="profile-edit-politic" >{{$lbl_politic}} </label>
+<input type="text" size="28" name="politic" id="profile-edit-politic" value="{{$politic}}" />
+</div>
+<div id="profile-edit-politic-end"></div>
+
+<div id="profile-edit-religion-wrapper" >
+<label id="profile-edit-religion-label" for="profile-edit-religion" >{{$lbl_religion}} </label>
+<input type="text" size="28" name="religion" id="profile-edit-religion" value="{{$religion}}" />
+</div>
+<div id="profile-edit-religion-end"></div>
+
+<div id="profile-edit-pubkeywords-wrapper" >
+<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$lbl_pubkey}} </label>
+<input type="text" size="28" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords}}" />
+</div><div id="profile-edit-pubkeywords-desc">{{$lbl_pubdsc}}</div>
+<div id="profile-edit-pubkeywords-end"></div>
+
+<div id="profile-edit-prvkeywords-wrapper" >
+<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >{{$lbl_prvkey}} </label>
+<input type="text" size="28" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords}}" />
+</div><div id="profile-edit-prvkeywords-desc">{{$lbl_prvdsc}}</div>
+<div id="profile-edit-prvkeywords-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+<div id="about-jot-wrapper" class="profile-jot-box">
+<p id="about-jot-desc" >
+{{$lbl_about}}
+</p>
+
+<textarea rows="10" cols="30" id="profile-about-text" class="profile-edit-textarea" name="about" >{{$about}}</textarea>
+
+</div>
+<div id="about-jot-end"></div>
+
+
+<div id="interest-jot-wrapper" class="profile-jot-box" >
+<p id="interest-jot-desc" >
+{{$lbl_hobbies}}
+</p>
+
+<textarea rows="10" cols="30" id="interest-jot-text" class="profile-edit-textarea" name="interest" >{{$interest}}</textarea>
+
+</div>
+<div id="interest-jot-end"></div>
+
+
+<div id="likes-jot-wrapper" class="profile-jot-box" >
+<p id="likes-jot-desc" >
+{{$lbl_likes}}
+</p>
+
+<textarea rows="10" cols="30" id="likes-jot-text" class="profile-edit-textarea" name="likes" >{{$likes}}</textarea>
+
+</div>
+<div id="likes-jot-end"></div>
+
+
+<div id="dislikes-jot-wrapper" class="profile-jot-box" >
+<p id="dislikes-jot-desc" >
+{{$lbl_dislikes}}
+</p>
+
+<textarea rows="10" cols="30" id="dislikes-jot-text" class="profile-edit-textarea" name="dislikes" >{{$dislikes}}</textarea>
+
+</div>
+<div id="dislikes-jot-end"></div>
+
+
+<div id="contact-jot-wrapper" class="profile-jot-box" >
+<p id="contact-jot-desc" >
+{{$lbl_social}}
+</p>
+
+<textarea rows="10" cols="30" id="contact-jot-text" class="profile-edit-textarea" name="contact" >{{$contact}}</textarea>
+
+</div>
+<div id="contact-jot-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="music-jot-wrapper" class="profile-jot-box" >
+<p id="music-jot-desc" >
+{{$lbl_music}}
+</p>
+
+<textarea rows="10" cols="30" id="music-jot-text" class="profile-edit-textarea" name="music" >{{$music}}</textarea>
+
+</div>
+<div id="music-jot-end"></div>
+
+<div id="book-jot-wrapper" class="profile-jot-box" >
+<p id="book-jot-desc" >
+{{$lbl_book}}
+</p>
+
+<textarea rows="10" cols="30" id="book-jot-text" class="profile-edit-textarea" name="book" >{{$book}}</textarea>
+
+</div>
+<div id="book-jot-end"></div>
+
+
+
+<div id="tv-jot-wrapper" class="profile-jot-box" >
+<p id="tv-jot-desc" >
+{{$lbl_tv}} 
+</p>
+
+<textarea rows="10" cols="30" id="tv-jot-text" class="profile-edit-textarea" name="tv" >{{$tv}}</textarea>
+
+</div>
+<div id="tv-jot-end"></div>
+
+
+
+<div id="film-jot-wrapper" class="profile-jot-box" >
+<p id="film-jot-desc" >
+{{$lbl_film}}
+</p>
+
+<textarea rows="10" cols="30" id="film-jot-text" class="profile-edit-textarea" name="film" >{{$film}}</textarea>
+
+</div>
+<div id="film-jot-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="romance-jot-wrapper" class="profile-jot-box" >
+<p id="romance-jot-desc" >
+{{$lbl_love}}
+</p>
+
+<textarea rows="10" cols="30" id="romance-jot-text" class="profile-edit-textarea" name="romance" >{{$romance}}</textarea>
+
+</div>
+<div id="romance-jot-end"></div>
+
+
+
+<div id="work-jot-wrapper" class="profile-jot-box" >
+<p id="work-jot-desc" >
+{{$lbl_work}}
+</p>
+
+<textarea rows="10" cols="30" id="work-jot-text" class="profile-edit-textarea" name="work" >{{$work}}</textarea>
+
+</div>
+<div id="work-jot-end"></div>
+
+
+
+<div id="education-jot-wrapper" class="profile-jot-box" >
+<p id="education-jot-desc" >
+{{$lbl_school}} 
+</p>
+
+<textarea rows="10" cols="30" id="education-jot-text" class="profile-edit-textarea" name="education" >{{$education}}</textarea>
+
+</div>
+<div id="education-jot-end"></div>
+
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+</form>
+</div>
+
diff --git a/view/theme/frost-mobile/templates/profile_photo.tpl b/view/theme/frost-mobile/templates/profile_photo.tpl
new file mode 100644
index 000000000..6bcb3cf85
--- /dev/null
+++ b/view/theme/frost-mobile/templates/profile_photo.tpl
@@ -0,0 +1,24 @@
+{{*
+ *	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" for="profile-photo-upload">{{$lbl_upfile}} </label>
+<input name="userfile" type="file" id="profile-photo-upload" size="25" />
+</div>
+
+<div id="profile-photo-submit-wrapper">
+<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}">
+</div>
+
+</form>
+
+<div id="profile-photo-link-select-wrapper">
+{{$select}}
+</div>
diff --git a/view/theme/frost-mobile/templates/profile_vcard.tpl b/view/theme/frost-mobile/templates/profile_vcard.tpl
new file mode 100644
index 000000000..85c6345d6
--- /dev/null
+++ b/view/theme/frost-mobile/templates/profile_vcard.tpl
@@ -0,0 +1,56 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="vcard">
+
+	<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 $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/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}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
+
+	{{include file="diaspora_vcard.tpl"}}
+
+	<div id="profile-vcard-break"></div>	
+	<div id="profile-extra-links">
+		<ul>
+			{{if $connect}}
+				<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
+			{{/if}}
+			{{if $wallmessage}}
+				<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
+			{{/if}}
+		</ul>
+	</div>
+</div>
+
+{{$contact_block}}
+
+
diff --git a/view/theme/frost-mobile/templates/prv_message.tpl b/view/theme/frost-mobile/templates/prv_message.tpl
new file mode 100644
index 000000000..17699414e
--- /dev/null
+++ b/view/theme/frost-mobile/templates/prv_message.tpl
@@ -0,0 +1,44 @@
+{{*
+ *	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="messageto" 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="28" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
+
+<div id="prvmail-message-label">{{$yourmessage}}</div>
+<textarea rows="8" cols="32" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
+
+
+<div id="prvmail-submit-wrapper" >
+	<input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" />
+	<div id="prvmail-upload-wrapper" >
+		<div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
+	</div> 
+	<div id="prvmail-link-wrapper" >
+		<div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
+	</div> 
+	<div id="prvmail-rotator-wrapper" >
+		<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+	</div> 
+</div>
+<div id="prvmail-end"></div>
+</form>
+</div>
diff --git a/view/theme/frost-mobile/templates/register.tpl b/view/theme/frost-mobile/templates/register.tpl
new file mode 100644
index 000000000..3cd6dbda1
--- /dev/null
+++ b/view/theme/frost-mobile/templates/register.tpl
@@ -0,0 +1,85 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class='register-form'>
+<h2>{{$regtitle}}</h2>
+<br />
+
+<form action="register" method="post" id="register-form">
+
+	<input type="hidden" name="photo" value="{{$photo}}" />
+
+	{{$registertext}}
+
+	<p id="register-realpeople">{{$realpeople}}</p>
+
+	<br />
+{{if $oidlabel}}
+	<div id="register-openid-wrapper" >
+    	<label for="register-openid" id="label-register-openid" >{{$oidlabel}}</label><input 	type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="{{$openid}}" >
+	</div>
+	<div id="register-openid-end" ></div>
+{{/if}}
+
+	<div class="register-explain-wrapper">
+	<p id="register-fill-desc">{{$fillwith}} {{$fillext}}</p>
+	</div>
+
+	<br /><br />
+
+{{if $invitations}}
+
+	<p id="register-invite-desc">{{$invite_desc}}</p>
+	<div id="register-invite-wrapper" >
+		<label for="register-invite" id="label-register-invite" >{{$invite_label}}</label>
+		<input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" value="{{$invite_id}}" >
+	</div>
+	<div id="register-name-end" ></div>
+
+{{/if}}
+
+
+	<div id="register-name-wrapper" class="field input" >
+		<label for="register-name" id="label-register-name" >{{$namelabel}}</label><br />
+		<input type="text" maxlength="60" size="32" name="username" id="register-name" value="{{$username}}" >
+	</div>
+	<div id="register-name-end" ></div>
+
+
+	<div id="register-email-wrapper"  class="field input" >
+		<label for="register-email" id="label-register-email" >{{$addrlabel}}</label><br />
+		<input type="text" maxlength="60" size="32" name="email" id="register-email" value="{{$email}}" >
+	</div>
+	<div id="register-email-end" ></div>
+
+	<div id="register-nickname-wrapper" class="field input" >
+		<label for="register-nickname" id="label-register-nickname" >{{$nicklabel}}</label><br />
+		<input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" value="{{$nickname}}" >
+	</div>
+	<div id="register-nickname-end" ></div>
+
+	<div class="register-explain-wrapper">
+	<p id="register-nickname-desc" >{{$nickdesc}}</p>
+	</div>
+
+	{{$publish}}
+
+	<div id="register-footer">
+<!--	<div class="agreement">
+	By clicking '{{$regbutt}}' you are agreeing to the latest <a href="tos.html" title="{{$tostitle}}" id="terms-of-service-link" >{{$toslink}}</a> and <a href="privacy.html" title="{{$privacytitle}}" id="privacy-link" >{{$privacylink}}</a>
+	</div>-->
+	<br />
+
+	<div id="register-submit-wrapper">
+		<input type="submit" name="submit" id="register-submit-button" value="{{$regbutt}}" />
+	</div>
+	<div id="register-submit-end" ></div>
+	</div>
+</form>
+<br /><br /><br />
+
+{{$license}}
+
+</div>
diff --git a/view/theme/frost-mobile/templates/search_item.tpl b/view/theme/frost-mobile/templates/search_item.tpl
new file mode 100644
index 000000000..21f4c1adc
--- /dev/null
+++ b/view/theme/frost-mobile/templates/search_item.tpl
@@ -0,0 +1,69 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<a name="{{$item.id}}" ></a>
+{{*<!--<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >-->*}}
+	<div class="wall-item-content-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-content-wrapper-{{$item.id}}" >
+		<div class="wall-item-info" id="wall-item-info-{{$item.id}}">
+			{{*<!--<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$item.id}}" 
+				 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
+				 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">-->*}}
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
+				{{*<!--<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+				<div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+					<ul>
+						{{$item.item_photo_menu}}
+					</ul>
+				</div>
+			</div>-->*}}
+			{{*<!--<div class="wall-item-photo-end"></div>	-->*}}
+			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
+				{{if $item.lock}}{{*<!--<div class="wall-item-lock">-->*}}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" />{{*<!--</div>-->*}}
+				{{else}}<div class="wall-item-lock"></div>{{/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}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}">{{$item.ago}}</div>
+				
+		{{*<!--</div>			-->*}}
+		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			{{*<!--<div class="wall-item-title-end"></div>-->*}}
+			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
+			{{if $item.has_cats}}
+			<div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}} {{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}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}}{{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+		</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.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-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>
+
+-->*}}
diff --git a/view/theme/frost-mobile/templates/settings-head.tpl b/view/theme/frost-mobile/templates/settings-head.tpl
new file mode 100644
index 000000000..5d7e0152d
--- /dev/null
+++ b/view/theme/frost-mobile/templates/settings-head.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script>
+	window.isPublic = "{{$ispublic}}";
+</script>
+
diff --git a/view/theme/frost-mobile/templates/settings.tpl b/view/theme/frost-mobile/templates/settings.tpl
new file mode 100644
index 000000000..16a67039b
--- /dev/null
+++ b/view/theme/frost-mobile/templates/settings.tpl
@@ -0,0 +1,152 @@
+{{*
+ *	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_pass}}</h3>
+
+{{include file="field_password.tpl" field=$password1}}
+{{include file="field_password.tpl" field=$password2}}
+{{include file="field_password.tpl" field=$password3}}
+
+{{if $oid_enable}}
+{{include file="field_input.tpl" field=$openid}}
+{{/if}}
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+</div>
+
+
+<h3 class="settings-heading">{{$h_basic}}</h3>
+
+{{include file="field_input.tpl" field=$username}}
+{{include file="field_input.tpl" field=$email}}
+{{include file="field_password.tpl" field=$password4}}
+{{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>
+
+
+<input type="hidden" name="visibility" value="{{$visibility}}" />
+
+{{include file="field_input.tpl" field=$maxreq}}
+
+{{$profile_in_dir}}
+
+{{$profile_in_net_dir}}
+
+{{$hide_friends}}
+
+{{$hide_wall}}
+
+{{$blockwall}}
+
+{{$blocktags}}
+
+{{$suggestme}}
+
+{{$unkmail}}
+
+
+{{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.notes}}
+			{{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="#settings-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>{{$permissions}} {{$permdesc}}</a>
+	<div id="settings-default-perms-menu-end"></div>
+
+{{*<!--	<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >-->*}}
+	
+	<div style="display: none;">
+		<div id="settings-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;margin-bottom: 20px">
+			{{$aclselect}}
+		</div>
+	</div>
+
+{{*<!--	</div>-->*}}
+</div>
+<br/>
+<div id="settings-default-perms-end"></div>
+
+{{$group_select}}
+
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+</div>
+
+
+
+<h3 class="settings-heading">{{$h_not}}</h3>
+<div id="settings-notifications">
+
+<div id="settings-activity-desc">{{$activity_options}}</div>
+
+{{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>
+
+
+<h3 class="settings-heading">{{$h_advn}}</h3>
+<div id="settings-pagetype-desc">{{$h_descadvn}}</div>
+
+{{$pagetype}}
+
+<div class="settings-submit-wrapper" >
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+</div>
+
+
diff --git a/view/theme/frost-mobile/templates/settings_display_end.tpl b/view/theme/frost-mobile/templates/settings_display_end.tpl
new file mode 100644
index 000000000..4b3db00f5
--- /dev/null
+++ b/view/theme/frost-mobile/templates/settings_display_end.tpl
@@ -0,0 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	<script>$j(function(){ previewTheme($j("#id_{{$theme.0}}")[0]); });</script>
+
diff --git a/view/theme/frost-mobile/templates/suggest_friends.tpl b/view/theme/frost-mobile/templates/suggest_friends.tpl
new file mode 100644
index 000000000..8843d5128
--- /dev/null
+++ b/view/theme/frost-mobile/templates/suggest_friends.tpl
@@ -0,0 +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}}" width="80" height="80" title="{{$name}} [{{$url}}]" onError="this.src='../../../images/person-48.jpg';" />
+		</a>
+	</div>
+	<div class="profile-match-break"></div>
+	<div class="profile-match-name">
+		<a href="{{$url}}" title="{{$name}}">{{$name}}</a>
+	</div>
+	<div class="profile-match-end"></div>
+	{{if $connlnk}}
+	<div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}">{{$conntxt}}</a></div>
+	{{/if}}
+	<a href="{{$ignlnk}}" title="{{$ignore}}" class="icon drophide profile-match-ignore" {{*onmouseout="imgdull(this);" onmouseover="imgbright(this);" *}}onclick="return confirmDelete();" ></a>
+</div>
diff --git a/view/theme/frost-mobile/templates/threaded_conversation.tpl b/view/theme/frost-mobile/templates/threaded_conversation.tpl
new file mode 100644
index 000000000..bf6eab47a
--- /dev/null
+++ b/view/theme/frost-mobile/templates/threaded_conversation.tpl
@@ -0,0 +1,20 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$live_update}}
+
+{{foreach $threads as $thread}}
+{{include file="{{$thread.template}}" item=$thread}}
+{{/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/theme/frost-mobile/templates/voting_fakelink.tpl b/view/theme/frost-mobile/templates/voting_fakelink.tpl
new file mode 100644
index 000000000..1e073916e
--- /dev/null
+++ b/view/theme/frost-mobile/templates/voting_fakelink.tpl
@@ -0,0 +1,6 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<span class="fakelink-wrapper"  id="{{$type}}list-{{$id}}-wrapper">{{$phrase}}</span>
diff --git a/view/theme/frost-mobile/templates/wall_thread.tpl b/view/theme/frost-mobile/templates/wall_thread.tpl
new file mode 100644
index 000000000..18246114d
--- /dev/null
+++ b/view/theme/frost-mobile/templates/wall_thread.tpl
@@ -0,0 +1,131 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{if $item.comment_firstcollapsed}}
+	<div class="hide-comments-outer">
+	<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> <span id="hide-comments-{{$item.id}}" class="hide-comments fakelink" onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
+	</div>
+	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
+{{/if}}
+<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
+<a name="{{$item.id}}" ></a>
+{{*<!--<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}} wallwall" id="wall-item-outside-wrapper-{{$item.id}}" >-->*}}
+	<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" >
+		<div class="wall-item-info{{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}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
+				<img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" onError="this.src='../../../images/person-48.jpg';" />
+				</a>
+			</div>
+			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
+			{{/if}}
+			{{*<!--<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-{{$item.id}}" 
+				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
+                onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">-->*}}
+			{{*<!--<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">-->*}}
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" onError="this.src='../../../images/person-48.jpg';" />
+				</a>
+				{{*<!--<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+                <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+                    <ul class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+                        {{$item.item_photo_menu}}
+                    </ul>
+                </div>-->*}}
+
+			{{*<!--</div>-->*}}
+			{{*<!--<div class="wall-item-photo-end"></div>-->*}}
+			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
+				{{if $item.lock}}{{*<!--<div class="wall-item-lock">-->*}}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" />{{*<!--</div>-->*}}
+				{{else}}<div class="wall-item-lock"></div>{{/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}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}{{/if}}<br />
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>				
+		{{*<!--</div>-->*}}
+		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			{{*<!--<div class="wall-item-title-end"></div>-->*}}
+			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}
+					{{*<!--<div class="body-tag">-->*}}
+						{{foreach $item.tags as $tag}}
+							<span class='body-tag tag'>{{$tag}}</span>
+						{{/foreach}}
+					{{*<!--</div>-->*}}
+			{{if $item.has_cats}}
+			<div class="categorytags">{{$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">{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+			</div>
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
+			{{if $item.vote}}
+			<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$item.id}}">
+				<a href="#" class="icon like" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></a>
+				{{if $item.vote.dislike}}
+				<a href="#" class="icon dislike" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>
+				{{/if}}
+				{{if $item.vote.share}}<a href="#" class="icon recycle wall-item-share-buttons" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>{{/if}}
+				<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+			</div>
+			{{/if}}
+			{{if $item.plink}}
+				{{*<!--<div class="wall-item-links-wrapper">-->*}}<a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="wall-item-links-wrapper icon remote-link{{$item.sparkle}}"></a>{{*<!--</div>-->*}}
+			{{/if}}
+			{{if $item.edpost}}
+				<a class="editpost icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
+			{{/if}}
+			 
+			{{if $item.star}}
+			<a href="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}"></a>
+			{{/if}}
+			{{if $item.tagger}}
+			<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon tagged" title="{{$item.tagger.add}}"></a>
+			{{/if}}
+			{{if $item.filer}}
+			<a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"></a>
+			{{/if}}			
+			
+			{{*<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >-->*}}
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="wall-item-delete-wrapper icon drophide" title="{{$item.drop.delete}}" id="wall-item-delete-wrapper-{{$item.id}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);" *}}></a>{{/if}}
+			{{*<!--</div>-->*}}
+				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
+			{{*<!--<div class="wall-item-delete-end"></div>-->*}}
+		</div>
+	</div>	
+	{{*<!--<div class="wall-item-wrapper-end"></div>-->*}}
+	<div class="wall-item-like {{$item.indent}}" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
+	<div class="wall-item-dislike {{$item.indent}}" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
+
+	{{if $item.threaded}}
+	{{if $item.comment}}
+	{{*<!--<div class="wall-item-comment-wrapper {{$item.indent}}" >-->*}}
+		{{$item.comment}}
+	{{*<!--</div>-->*}}
+	{{/if}}
+	{{/if}}
+
+{{*<!--<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>-->*}}
+{{*<!--</div>-->*}}
+{{foreach $item.children as $child}}
+	{{include file="{{$child.template}}" item=$child}}
+{{/foreach}}
+
+{{if $item.flatten}}
+{{*<!--<div class="wall-item-comment-wrapper" >-->*}}
+	{{$item.comment}}
+{{*<!--</div>-->*}}
+{{/if}}
+</div>
+{{if $item.comment_lastcollapsed}}</div>{{/if}}
+
diff --git a/view/theme/frost-mobile/templates/wallmsg-end.tpl b/view/theme/frost-mobile/templates/wallmsg-end.tpl
new file mode 100644
index 000000000..594f3f79b
--- /dev/null
+++ b/view/theme/frost-mobile/templates/wallmsg-end.tpl
@@ -0,0 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.min.js" ></script>
+
diff --git a/view/theme/frost-mobile/templates/wallmsg-header.tpl b/view/theme/frost-mobile/templates/wallmsg-header.tpl
new file mode 100644
index 000000000..5f65cc001
--- /dev/null
+++ b/view/theme/frost-mobile/templates/wallmsg-header.tpl
@@ -0,0 +1,12 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script language="javascript" type="text/javascript">
+window.editSelect = "none";
+window.jotId = "#prvmail-text";
+window.imageUploadButton = 'prvmail-upload';
+</script>
+
diff --git a/view/theme/frost/templates/acl_selector.tpl b/view/theme/frost/templates/acl_selector.tpl
new file mode 100644
index 000000000..d18776e36
--- /dev/null
+++ b/view/theme/frost/templates/acl_selector.tpl
@@ -0,0 +1,28 @@
+{{*
+ *	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 data-src="{0}"><p>{1}</p>
+	<a href="#" class='acl-button-show'>{{$show}}</a>
+	<a href="#" class='acl-button-hide'>{{$hide}}</a>
+</div>
+
+<script>
+	window.allowCID = {{$allowcid}};
+	window.allowGID = {{$allowgid}};
+	window.denyCID = {{$denycid}};
+	window.denyGID = {{$denygid}};
+	window.aclInit = "true";
+</script>
diff --git a/view/theme/frost/templates/admin_aside.tpl b/view/theme/frost/templates/admin_aside.tpl
new file mode 100644
index 000000000..024d6195b
--- /dev/null
+++ b/view/theme/frost/templates/admin_aside.tpl
@@ -0,0 +1,36 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h4><a href="{{$admurl}}">{{$admtxt}}</a></h4>
+<ul class='admin linklist'>
+	<li class='admin button {{$admin.site.2}}'><a href='{{$admin.site.0}}'>{{$admin.site.1}}</a></li>
+	<li class='admin button {{$admin.users.2}}'><a href='{{$admin.users.0}}'>{{$admin.users.1}}</a><span id='pending-update' title='{{$h_pending}}'></span></li>
+	<li class='admin button {{$admin.plugins.2}}'><a href='{{$admin.plugins.0}}'>{{$admin.plugins.1}}</a></li>
+	<li class='admin button {{$admin.themes.2}}'><a href='{{$admin.themes.0}}'>{{$admin.themes.1}}</a></li>
+	<li class='admin button {{$admin.dbsync.2}}'><a href='{{$admin.dbsync.0}}'>{{$admin.dbsync.1}}</a></li>
+</ul>
+
+{{if $admin.update}}
+<ul class='admin linklist'>
+	<li class='admin button {{$admin.update.2}}'><a href='{{$admin.update.0}}'>{{$admin.update.1}}</a></li>
+	<li class='admin button {{$admin.update.2}}'><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li>
+</ul>
+{{/if}}
+
+
+{{if $admin.plugins_admin}}<h4>{{$plugadmtxt}}</h4>{{/if}}
+<ul class='admin linklist'>
+	{{foreach $admin.plugins_admin as $l}}
+	<li class='admin button {{$l.2}}'><a href='{{$l.0}}'>{{$l.1}}</a></li>
+	{{/foreach}}
+</ul>
+	
+	
+<h4>{{$logtxt}}</h4>
+<ul class='admin linklist'>
+	<li class='admin button {{$admin.logs.2}}'><a href='{{$admin.logs.0}}'>{{$admin.logs.1}}</a></li>
+</ul>
+
diff --git a/view/theme/frost/templates/admin_site.tpl b/view/theme/frost/templates/admin_site.tpl
new file mode 100644
index 000000000..af0eebacc
--- /dev/null
+++ b/view/theme/frost/templates/admin_site.tpl
@@ -0,0 +1,81 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+	
+	<form action="{{$baseurl}}/admin/site" method="post">
+    <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+	{{include file="field_input.tpl" field=$sitename}}
+	{{include file="field_textarea.tpl" field=$banner}}
+	{{include file="field_select.tpl" field=$language}}
+	{{include file="field_select.tpl" field=$theme}}
+	{{include file="field_select.tpl" field=$theme_mobile}}
+	{{include file="field_select.tpl" field=$ssl_policy}}
+	{{include file="field_checkbox.tpl" field=$new_share}}
+	{{include file="field_checkbox.tpl" field=$hide_help}} 
+	{{include file="field_select.tpl" field=$singleuser}}
+	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	
+	<h3>{{$registration}}</h3>
+	{{include file="field_input.tpl" field=$register_text}}
+	{{include file="field_select.tpl" field=$register_policy}}
+	{{include file="field_input.tpl" field=$daily_registrations}}
+	{{include file="field_checkbox.tpl" field=$no_multi_reg}}
+	{{include file="field_checkbox.tpl" field=$no_openid}}
+	{{include file="field_checkbox.tpl" field=$no_regfullname}}
+	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+
+	<h3>{{$upload}}</h3>
+	{{include file="field_input.tpl" field=$maximagesize}}
+	{{include file="field_input.tpl" field=$maximagelength}}
+	{{include file="field_input.tpl" field=$jpegimagequality}}
+	
+	<h3>{{$corporate}}</h3>
+	{{include file="field_input.tpl" field=$allowed_sites}}
+	{{include file="field_input.tpl" field=$allowed_email}}
+	{{include file="field_checkbox.tpl" field=$block_public}}
+	{{include file="field_checkbox.tpl" field=$force_publish}}
+	{{include file="field_checkbox.tpl" field=$no_community_page}}
+	{{include file="field_checkbox.tpl" field=$ostatus_disabled}}
+	{{include file="field_select.tpl" field=$ostatus_poll_interval}} 
+	{{include file="field_checkbox.tpl" field=$diaspora_enabled}}
+	{{include file="field_checkbox.tpl" field=$dfrn_only}}
+	{{include file="field_input.tpl" field=$global_directory}}
+	{{include file="field_checkbox.tpl" field=$thread_allow}}
+	{{include file="field_checkbox.tpl" field=$newuser_private}}
+	{{include file="field_checkbox.tpl" field=$enotify_no_content}}
+	{{include file="field_checkbox.tpl" field=$private_addons}}	
+	{{include file="field_checkbox.tpl" field=$disable_embedded}}	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	
+	<h3>{{$advanced}}</h3>
+	{{include file="field_checkbox.tpl" field=$no_utf}}
+	{{include file="field_checkbox.tpl" field=$verifyssl}}
+	{{include file="field_input.tpl" field=$proxy}}
+	{{include file="field_input.tpl" field=$proxyuser}}
+	{{include file="field_input.tpl" field=$timeout}}
+	{{include file="field_input.tpl" field=$delivery_interval}}
+	{{include file="field_input.tpl" field=$poll_interval}}
+	{{include file="field_input.tpl" field=$maxloadavg}}
+	{{include file="field_input.tpl" field=$abandon_days}}
+	{{include file="field_input.tpl" field=$lockpath}}
+	{{include file="field_input.tpl" field=$temppath}}
+	{{include file="field_input.tpl" field=$basepath}}
+
+	<h3>{{$performance}}</h3>
+	{{include file="field_checkbox.tpl" field=$use_fulltext_engine}}
+	{{include file="field_input.tpl" field=$itemcache}}
+	{{include file="field_input.tpl" field=$itemcache_duration}}
+
+	
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
+	
+	</form>
+</div>
diff --git a/view/theme/frost/templates/admin_users.tpl b/view/theme/frost/templates/admin_users.tpl
new file mode 100644
index 000000000..4d88670c1
--- /dev/null
+++ b/view/theme/frost/templates/admin_users.tpl
@@ -0,0 +1,103 @@
+{{*
+ *	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){
+		$j("."+cls).attr('checked','checked');
+		return false;
+	}
+</script>
+<div id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+	
+	<form action="{{$baseurl}}/admin/users" method="post">
+        <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+		
+		<h3>{{$h_pending}}</h3>
+		{{if $pending}}
+			<table id='pending'>
+				<thead>
+				<tr>
+					{{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+			{{foreach $pending as $u}}
+				<tr>
+					<td class="created">{{$u.created}}</td>
+					<td class="name">{{$u.name}}</td>
+					<td class="email">{{$u.email}}</td>
+					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}" /></td>
+					<td class="tools">
+						<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title='{{$approve}}'><span class='tool like'></span></a>
+						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><span class='tool dislike'></span></a>
+					</td>
+				</tr>
+			{{/foreach}}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">{{$select_all}}</a></div>
+			<div class="submit"><input type="submit" name="page_users_deny" value="{{$deny}}"/> <input type="submit" name="page_users_approve" value="{{$approve}}" /></div>			
+		{{else}}
+			<p>{{$no_pending}}</p>
+		{{/if}}
+	
+	
+		
+	
+		<h3>{{$h_users}}</h3>
+		{{if $users}}
+			<table id='users'>
+				<thead>
+				<tr>
+					<th></th>
+					{{foreach $th_users as $th}}<th>{{$th}}</th>{{/foreach}}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+				{{foreach $users as $u}}
+					<tr>
+						<td><img src="{{$u.micro}}" alt="{{$u.nickname}}" title="{{$u.nickname}}"></td>
+						<td class='name'><a href="{{$u.url}}" title="{{$u.nickname}}" >{{$u.name}}</a></td>
+						<td class='email'>{{$u.email}}</td>
+						<td class='register_date'>{{$u.register_date}}</td>
+						<td class='login_date'>{{$u.login_date}}</td>
+						<td class='lastitem_date'>{{$u.lastitem_date}}</td>
+						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}</td>
+						<td class="checkbox"> 
+                                    {{if $u.is_admin}}
+                                        &nbsp;
+                                    {{else}}
+                                        <input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
+                                    {{/if}}
+						<td class="tools">
+                                    {{if $u.is_admin}}
+                                        &nbsp;
+                                    {{else}}
+                                        <a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><span class='icon block {{if $u.blocked==0}}dim{{/if}}'></span></a>
+                                        <a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><span class='icon drop'></span></a>
+                                    {{/if}}
+						</td>
+					</tr>
+				{{/foreach}}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">{{$select_all}}</a></div>
+			<div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div>						
+		{{else}}
+			NO USERS?!?
+		{{/if}}
+	</form>
+</div>
diff --git a/view/theme/frost/templates/comment_item.tpl b/view/theme/frost/templates/comment_item.tpl
new file mode 100644
index 000000000..4b18abce2
--- /dev/null
+++ b/view/theme/frost/templates/comment_item.tpl
@@ -0,0 +1,82 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--		<script>
+		$(document).ready( function () {
+			$(document).mouseup(function(e) {
+				var container = $("#comment-edit-wrapper-{{$id}}");
+				if( container.has(e.target).length === 0) {
+					commentClose(document.getElementById('comment-edit-text-{{$id}}'),{{$id}});
+					cmtBbClose({{$id}});
+				}
+			});
+		});
+		</script>-->*}}
+
+		<div class="comment-wwedit-wrapper {{$indent}}" id="comment-edit-wrapper-{{$id}}" style="display: block;">
+			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
+{{*<!--			<span id="hide-commentbox-{{$id}}" class="hide-commentbox fakelink" onclick="showHideCommentBox({{$id}});">{{$comment}}</span>
+			<form class="comment-edit-form" style="display: none;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">-->*}}
+				<input type="hidden" name="type" value="{{$type}}" />
+				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+				<input type="hidden" name="parent" value="{{$parent}}" />
+				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
+				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
+				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+
+{{*<!--				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >-->*}}
+					<a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-{{$id}}" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+{{*<!--				</div>-->*}}
+				{{*<!--<div class="comment-edit-photo-end"></div>-->*}}
+				<ul class="comment-edit-bb" id="comment-edit-bb-{{$id}}">
+					<li><a class="editicon boldbb shadow"
+						style="cursor: pointer;" title="{{$edbold}}"
+						onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
+					<li><a class="editicon italicbb shadow"
+						style="cursor: pointer;" title="{{$editalic}}"
+						onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
+					<li><a class="editicon underlinebb shadow"
+						style="cursor: pointer;" title="{{$eduline}}"
+						onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
+					<li><a class="editicon quotebb shadow"
+						style="cursor: pointer;" title="{{$edquote}}"
+						onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
+					<li><a class="editicon codebb shadow"
+						style="cursor: pointer;" title="{{$edcode}}"
+						onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
+					<li><a class="editicon imagebb shadow"
+						style="cursor: pointer;" title="{{$edimg}}"
+						onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
+					<li><a class="editicon urlbb shadow"
+						style="cursor: pointer;" title="{{$edurl}}"
+						onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
+					<li><a class="editicon videobb shadow"
+						style="cursor: pointer;" title="{{$edvideo}}"
+						onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
+				</ul>	
+{{*<!--				<div class="comment-edit-bb-end"></div>-->*}}
+{{*<!--				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose({{$id}});" >{{$comment}}</textarea>-->*}}
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" >{{$comment}}</textarea>
+				{{if $qcomment}}
+					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
+					<option value=""></option>
+				{{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}}" />
+					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
+					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				{{*<!--<div class="comment-edit-end"></div>-->*}}
+			</form>
+
+		</div>
diff --git a/view/theme/frost/templates/contact_edit.tpl b/view/theme/frost/templates/contact_edit.tpl
new file mode 100644
index 000000000..7105d0057
--- /dev/null
+++ b/view/theme/frost/templates/contact_edit.tpl
@@ -0,0 +1,93 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<h2>{{$header}}</h2>
+
+<div id="contact-edit-wrapper" >
+
+	{{$tab_str}}
+
+	<div id="contact-edit-drop-link" >
+		<a href="contacts/{{$contact_id}}/drop" class="icon drophide" id="contact-edit-drop-link" onclick="return confirmDelete();"  title="{{$delete}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}}></a>
+	</div>
+
+	<div id="contact-edit-drop-link-end"></div>
+
+
+	<div id="contact-edit-nav-wrapper" >
+		<div id="contact-edit-links">
+			<ul>
+				<li><div id="contact-edit-rel">{{$relation_text}}</div></li>
+				<li><div id="contact-edit-nettype">{{$nettype}}</div></li>
+				{{if $lost_contact}}
+					<li><div id="lost-contact-message">{{$lost_contact}}</div></li>
+				{{/if}}
+				{{if $insecure}}
+					<li><div id="insecure-message">{{$insecure}}</div></li>
+				{{/if}}
+				{{if $blocked}}
+					<li><div id="block-message">{{$blocked}}</div></li>
+				{{/if}}
+				{{if $ignored}}
+					<li><div id="ignore-message">{{$ignored}}</div></li>
+				{{/if}}
+				{{if $archived}}
+					<li><div id="archive-message">{{$archived}}</div></li>
+				{{/if}}
+
+				<li>&nbsp;</li>
+
+				{{if $common_text}}
+					<li><div id="contact-edit-common"><a href="{{$common_link}}">{{$common_text}}</a></div></li>
+				{{/if}}
+				{{if $all_friends}}
+					<li><div id="contact-edit-allfriends"><a href="allfriends/{{$contact_id}}">{{$all_friends}}</a></div></li>
+				{{/if}}
+
+
+				<li><a href="network/?cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li>
+				{{if $lblsuggest}}
+					<li><a href="fsuggest/{{$contact_id}}" id="contact-edit-suggest">{{$lblsuggest}}</a></li>
+				{{/if}}
+
+			</ul>
+		</div>
+	</div>
+	<div id="contact-edit-nav-end"></div>
+
+
+<form action="contacts/{{$contact_id}}" method="post" >
+<input type="hidden" name="contact_id" value="{{$contact_id}}">
+
+	{{if $poll_enabled}}
+		<div id="contact-edit-poll-wrapper">
+			<div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
+			<span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval}} <span id="contact-edit-update-now" class="button"><a href="contacts/{{$contact_id}}/update" >{{$udnow}}</a></span>
+		</div>
+	{{/if}}
+	<div id="contact-edit-end" ></div>
+
+	{{include file="field_checkbox.tpl" field=$hidden}}
+
+<div id="contact-edit-info-wrapper">
+<h4>{{$lbl_info1}}</h4>
+	<textarea id="contact-edit-info" rows="8" cols="60" name="info">{{$info}}</textarea>
+	<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
+</div>
+<div id="contact-edit-info-end"></div>
+
+
+<div id="contact-edit-profile-select-text">
+<h4>{{$lbl_vis1}}</h4>
+<p>{{$lbl_vis2}}</p> 
+</div>
+{{$profile_select}}
+<div id="contact-edit-profile-select-end"></div>
+
+<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
+
+</form>
+</div>
diff --git a/view/theme/frost/templates/contact_end.tpl b/view/theme/frost/templates/contact_end.tpl
new file mode 100644
index 000000000..962f0c346
--- /dev/null
+++ b/view/theme/frost/templates/contact_end.tpl
@@ -0,0 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script language="javascript" type="text/javascript">contactInitEditor();</script>
+
diff --git a/view/theme/frost/templates/contact_head.tpl b/view/theme/frost/templates/contact_head.tpl
new file mode 100644
index 000000000..959c4e2b4
--- /dev/null
+++ b/view/theme/frost/templates/contact_head.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script language="javascript" type="text/javascript">
+window.editSelect = "{{$editselect}}";
+</script>
+
diff --git a/view/theme/frost/templates/contact_template.tpl b/view/theme/frost/templates/contact_template.tpl
new file mode 100644
index 000000000..7eba7efee
--- /dev/null
+++ b/view/theme/frost/templates/contact_template.tpl
@@ -0,0 +1,38 @@
+{{*
+ *	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" >
+		<div class="contact-entry-photo mframe" id="contact-entry-photo-{{$contact.id}}"
+		onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}}); openMenu('contact-photo-menu-button-{{$contact.id}}')" 
+		onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$contact.id}}\'); closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)" >
+
+			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>
+
+			{{if $contact.photo_menu}}
+			<span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">menu</span>
+                <div class="contact-photo-menu" id="contact-photo-menu-{{$contact.id}}">
+                    <ul>
+						{{foreach $contact.photo_menu as $c}}
+						{{if $c.2}}
+						<li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+						{{else}}
+						<li><a href="{{$c.1}}">{{$c.0}}</a></li>
+						{{/if}}
+						{{/foreach}}
+                    </ul>
+                </div>
+			{{/if}}
+		</div>
+			
+	</div>
+	<div class="contact-entry-photo-end" ></div>
+		<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div><br />
+{{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
+	<div class="contact-entry-network" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>
+
+	<div class="contact-entry-end" ></div>
+</div>
diff --git a/view/theme/frost/templates/contacts-end.tpl b/view/theme/frost/templates/contacts-end.tpl
new file mode 100644
index 000000000..9298a4245
--- /dev/null
+++ b/view/theme/frost/templates/contacts-end.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script src="{{$baseurl}}/library/jquery_ac/friendica.complete.min.js" ></script>
+
+
diff --git a/view/theme/frost/templates/contacts-head.tpl b/view/theme/frost/templates/contacts-head.tpl
new file mode 100644
index 000000000..dd66b71d3
--- /dev/null
+++ b/view/theme/frost/templates/contacts-head.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script>
+	window.autocompleteType = 'contacts-head';
+</script>
+
diff --git a/view/theme/frost/templates/contacts-template.tpl b/view/theme/frost/templates/contacts-template.tpl
new file mode 100644
index 000000000..de33d141b
--- /dev/null
+++ b/view/theme/frost/templates/contacts-template.tpl
@@ -0,0 +1,33 @@
+{{*
+ *	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}}
+
+{{$tabs}}
+
+<div id="contacts-search-wrapper">
+<form id="contacts-search-form" action="{{$cmd}}" method="get" >
+<span class="contacts-search-desc">{{$desc}}</span>
+<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="{{$search}}" />
+<input type="submit" name="submit" id="contacts-search-submit" value="{{$submit}}" />
+</form>
+</div>
+<div id="contacts-search-end"></div>
+
+
+<div id="contacts-display-wrapper">
+{{foreach $contacts as $contact}}
+	{{include file="contact_template.tpl"}}
+{{/foreach}}
+</div>
+<div id="contact-edit-end"></div>
+
+{{$paginate}}
+
+
+
+
diff --git a/view/theme/frost/templates/cropbody.tpl b/view/theme/frost/templates/cropbody.tpl
new file mode 100644
index 000000000..5ace9a1aa
--- /dev/null
+++ b/view/theme/frost/templates/cropbody.tpl
@@ -0,0 +1,32 @@
+{{*
+ *	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>
+
+<form action="profile_photo/{{$resource}}" id="crop-image-form" method="post" />
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+<input type="hidden" name="cropfinal" value="1" />
+<input type="hidden" name="xstart" id="x1" />
+<input type="hidden" name="ystart" id="y1" />
+<input type="hidden" name="xfinal" id="x2" />
+<input type="hidden" name="yfinal" id="y2" />
+<input type="hidden" name="height" id="height" />
+<input type="hidden" name="width"  id="width" />
+
+<div id="crop-image-submit-wrapper" >
+<input type="submit" name="submit" value="{{$done}}" />
+</div>
+
+</form>
diff --git a/view/theme/frost/templates/cropend.tpl b/view/theme/frost/templates/cropend.tpl
new file mode 100644
index 000000000..7a828815b
--- /dev/null
+++ b/view/theme/frost/templates/cropend.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	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>
+      <script type="text/javascript" language="javascript">initCrop();</script>
diff --git a/view/theme/frost/templates/crophead.tpl b/view/theme/frost/templates/crophead.tpl
new file mode 100644
index 000000000..6438cfb35
--- /dev/null
+++ b/view/theme/frost/templates/crophead.tpl
@@ -0,0 +1,6 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+      <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />
diff --git a/view/theme/frost/templates/display-head.tpl b/view/theme/frost/templates/display-head.tpl
new file mode 100644
index 000000000..17d17dd7d
--- /dev/null
+++ b/view/theme/frost/templates/display-head.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script>
+	window.autoCompleteType = 'display-head';
+</script>
+
diff --git a/view/theme/frost/templates/end.tpl b/view/theme/frost/templates/end.tpl
new file mode 100644
index 000000000..7cdb2e3f7
--- /dev/null
+++ b/view/theme/frost/templates/end.tpl
@@ -0,0 +1,30 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<!--[if IE]>
+<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+<![endif]-->
+{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></script>-->*}}
+{{*<!--<script type="text/javascript">
+  tinyMCE.init({ mode : "none"});
+</script>-->*}}
+
+<script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce.js" ></script>
+
+<script type="text/javascript" src="{{$baseurl}}/js/jquery.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/jquery.divgrow-1.3.1.f1.min.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/js/jquery.textinputs.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/library/colorbox/jquery.colorbox-min.js"></script>
+{{*<!--<script type="text/javascript" src="{{$baseurl}}/library/tiptip/jquery.tipTip.minified.js"></script>-->*}}
+<script type="text/javascript" src="{{$baseurl}}/library/jgrowl/jquery.jgrowl_minimized.js"></script>
+
+<script type="text/javascript">var $j = jQuery.noConflict();</script>
+
+<script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/acl.min.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/js/webtoolkit.base64.min.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/fk.autocomplete.min.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/main.min.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/theme.min.js"></script>
+
diff --git a/view/theme/frost/templates/event.tpl b/view/theme/frost/templates/event.tpl
new file mode 100644
index 000000000..15c4e2b93
--- /dev/null
+++ b/view/theme/frost/templates/event.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{foreach $events as $event}}
+	<div class="event">
+	
+	{{if $event.item.author_name}}<a href="{{$event.item.author_link}}" ><img src="{{$event.item.author_avatar}}" height="32" width="32" />{{$event.item.author_name}}</a>{{/if}}
+	{{$event.html}}
+	{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" target="external-link" class="plink-event-link icon s22 remote-link"></a>{{/if}}
+	{{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link tool s22 pencil"></a>{{/if}}
+	</div>
+	<div class="clear"></div>
+{{/foreach}}
diff --git a/view/theme/frost/templates/event_end.tpl b/view/theme/frost/templates/event_end.tpl
new file mode 100644
index 000000000..813047e6a
--- /dev/null
+++ b/view/theme/frost/templates/event_end.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script language="javascript" type="text/javascript"
+          src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script>
+
+<script language="javascript" type="text/javascript">eventInitEditor();</script>
+
diff --git a/view/theme/frost/templates/event_form.tpl b/view/theme/frost/templates/event_form.tpl
new file mode 100644
index 000000000..f4a9719eb
--- /dev/null
+++ b/view/theme/frost/templates/event_form.tpl
@@ -0,0 +1,55 @@
+{{*
+ *	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="uri" value="{{$uri}}" />
+
+<div id="event-start-text">{{$s_text}}</div>
+{{$s_dsel}} {{$s_tsel}}
+
+<div id="event-finish-text">{{$f_text}}</div>
+{{$f_dsel}} {{$f_tsel}}
+
+<div id="event-datetime-break"></div>
+
+<input type="checkbox" name="nofinish" value="1" id="event-nofinish-checkbox" {{$n_checked}} /> <div id="event-nofinish-text">{{$n_text}}</div>
+
+<div id="event-nofinish-break"></div>
+
+<input type="checkbox" name="adjust" value="1" id="event-adjust-checkbox" {{$a_checked}} /> <div id="event-adjust-text">{{$a_text}}</div>
+
+<div id="event-adjust-break"></div>
+
+<div id="event-summary-text">{{$t_text}}</div>
+<input type="text" id="event-summary" name="summary" value="{{$t_orig}}" />
+
+
+<div id="event-desc-text">{{$d_text}}</div>
+<textarea id="event-desc-textarea" rows="10" cols="70" name="desc">{{$d_orig}}</textarea>
+
+
+<div id="event-location-text">{{$l_text}}</div>
+<textarea id="event-location-textarea" rows="10" cols="70" name="location">{{$l_orig}}</textarea>
+<br />
+
+<input type="checkbox" name="share" value="1" id="event-share-checkbox" {{$sh_checked}} /> <div id="event-share-text">{{$sh_text}}</div>
+<div id="event-share-break"></div>
+
+{{$acl}}
+
+<div class="clear"></div>
+<input id="event-submit" type="submit" name="submit" value="{{$submit}}" />
+</form>
+
+
diff --git a/view/theme/frost/templates/event_head.tpl b/view/theme/frost/templates/event_head.tpl
new file mode 100644
index 000000000..ee23e4305
--- /dev/null
+++ b/view/theme/frost/templates/event_head.tpl
@@ -0,0 +1,12 @@
+{{*
+ *	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">
+window.aclType = 'event_head';
+window.editSelect = "{{$editselect}}";
+</script>
+
diff --git a/view/theme/frost/templates/field_combobox.tpl b/view/theme/frost/templates/field_combobox.tpl
new file mode 100644
index 000000000..8f0e17619
--- /dev/null
+++ b/view/theme/frost/templates/field_combobox.tpl
@@ -0,0 +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}}" >
+		   {{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="$j('#id_{{$field.0}}').val($j(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/theme/frost/templates/field_input.tpl b/view/theme/frost/templates/field_input.tpl
new file mode 100644
index 000000000..084796188
--- /dev/null
+++ b/view/theme/frost/templates/field_input.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	
+	<div class='field input' id='wrapper_{{$field.0}}'>
+		<label for='id_{{$field.0}}'>{{$field.1}}</label>
+		<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/theme/frost/templates/field_openid.tpl b/view/theme/frost/templates/field_openid.tpl
new file mode 100644
index 000000000..ed94fad7a
--- /dev/null
+++ b/view/theme/frost/templates/field_openid.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	
+	<div class='field input openid' id='wrapper_{{$field.0}}'>
+		<label for='id_{{$field.0}}'>{{$field.1}}</label>
+		<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/theme/frost/templates/field_password.tpl b/view/theme/frost/templates/field_password.tpl
new file mode 100644
index 000000000..c88d3ef58
--- /dev/null
+++ b/view/theme/frost/templates/field_password.tpl
@@ -0,0 +1,11 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	
+	<div class='field password' id='wrapper_{{$field.0}}'>
+		<label for='id_{{$field.0}}'>{{$field.1}}</label>
+		<input type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">
+		<span class='field_help'>{{$field.3}}</span>
+	</div>
diff --git a/view/theme/frost/templates/field_themeselect.tpl b/view/theme/frost/templates/field_themeselect.tpl
new file mode 100644
index 000000000..0d4552c3b
--- /dev/null
+++ b/view/theme/frost/templates/field_themeselect.tpl
@@ -0,0 +1,14 @@
+{{*
+ *	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}}' {{if $field.5}}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/theme/frost/templates/filebrowser.tpl b/view/theme/frost/templates/filebrowser.tpl
new file mode 100644
index 000000000..c9e1df974
--- /dev/null
+++ b/view/theme/frost/templates/filebrowser.tpl
@@ -0,0 +1,89 @@
+{{*
+ *	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:100px;}
+		.filebrowser.files.image li { display: block; padding: 5px; float: left; }
+		.filebrowser.files.image span { display: none;}
+		.filebrowser.files.file img { height:16px; vertical-align: bottom;}
+		.filebrowser.files a { display: block;  padding: 0.3em}
+		.filebrowser.files a:hover { background-color: #f0f0ee; }
+		.filebrowser a { text-decoration: none; }
+	</style>
+	<script>
+		var FileBrowserDialogue = {
+			init : function () {
+				// Here goes your code for setting your custom things onLoad.
+			},
+			mySubmit : function (URL) {
+				//var URL = document.my_form.my_field.value;
+				var win = tinyMCEPopup.getWindowArg("window");
+
+				// insert information now
+				win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = URL;
+
+				// are we an image browser
+				if (typeof(win.ImageDialog) != "undefined") {
+					// we are, so update image dimensions...
+					if (win.ImageDialog.getImageData)
+						win.ImageDialog.getImageData();
+
+					// ... and preview if necessary
+					if (win.ImageDialog.showPreviewImage)
+						win.ImageDialog.showPreviewImage(URL);
+				}
+
+				// close popup window
+				tinyMCEPopup.close();
+			}
+		}
+
+		tinyMCEPopup.onInit.add(FileBrowserDialogue.init, FileBrowserDialogue);
+	</script>
+	</head>
+	<body>
+	
+	<div class="tabs">
+		<ul >
+			<li class="current"><span>FileBrowser</span></li>
+		</ul>
+	</div>
+	<div class="panel_wrapper">
+
+		<div id="general_panel" class="panel current">
+			<div class="filebrowser path">
+				{{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/theme/frost/templates/group_drop.tpl b/view/theme/frost/templates/group_drop.tpl
new file mode 100644
index 000000000..269322815
--- /dev/null
+++ b/view/theme/frost/templates/group_drop.tpl
@@ -0,0 +1,14 @@
+{{*
+ *	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/theme/frost/templates/head.tpl b/view/theme/frost/templates/head.tpl
new file mode 100644
index 000000000..095743e9b
--- /dev/null
+++ b/view/theme/frost/templates/head.tpl
@@ -0,0 +1,28 @@
+{{*
+ *	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}}" />
+<link rel="stylesheet" href="{{$baseurl}}/library/colorbox/colorbox.css" type="text/css" media="screen" />
+{{*<!--<link rel="stylesheet" href="{{$baseurl}}/library/tiptip/tipTip.css" type="text/css" media="screen" />-->*}}
+<link rel="stylesheet" href="{{$baseurl}}/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
+
+<link rel="stylesheet" type="text/css" href="{{$stylesheet}}" media="all" />
+
+<link rel="shortcut icon" href="{{$baseurl}}/images/friendica-32.png" />
+<link rel="search"
+         href="{{$baseurl}}/opensearch" 
+         type="application/opensearchdescription+xml" 
+         title="Search in Friendica" />
+
+<script>
+	window.delItem = "{{$delitem}}";
+	window.commentEmptyText = "{{$comment}}";
+	window.showMore = "{{$showmore}}";
+	window.showFewer = "{{$showfewer}}";
+	var updateInterval = {{$update_interval}};
+	var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}};
+</script>
diff --git a/view/theme/frost/templates/jot-end.tpl b/view/theme/frost/templates/jot-end.tpl
new file mode 100644
index 000000000..ebbef166d
--- /dev/null
+++ b/view/theme/frost/templates/jot-end.tpl
@@ -0,0 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.min.js" ></script>
+
+<script language="javascript" type="text/javascript">if(typeof window.jotInit != 'undefined') initEditor();</script>
diff --git a/view/theme/frost/templates/jot-header.tpl b/view/theme/frost/templates/jot-header.tpl
new file mode 100644
index 000000000..92a6aed1d
--- /dev/null
+++ b/view/theme/frost/templates/jot-header.tpl
@@ -0,0 +1,22 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script>
+	window.editSelect = "{{$editselect}}";
+	window.isPublic = "{{$ispublic}}";
+	window.nickname = "{{$nickname}}";
+	window.linkURL = "{{$linkurl}}";
+	window.vidURL = "{{$vidurl}}";
+	window.audURL = "{{$audurl}}";
+	window.whereAreU = "{{$whereareu}}";
+	window.term = "{{$term}}";
+	window.baseURL = "{{$baseurl}}";
+	window.geoTag = function () { {{$geotag}} }
+	window.jotId = "#profile-jot-text";
+	window.imageUploadButton = 'wall-image-upload';
+	window.delItems = '{{$delitems}}';
+</script>
+
diff --git a/view/theme/frost/templates/jot.tpl b/view/theme/frost/templates/jot.tpl
new file mode 100644
index 000000000..dc4f2cfe1
--- /dev/null
+++ b/view/theme/frost/templates/jot.tpl
@@ -0,0 +1,96 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div id="profile-jot-wrapper" >
+	<div id="profile-jot-banner-wrapper">
+		<div id="profile-jot-desc" >&nbsp;</div>
+		<div id="character-counter" class="grey"></div>
+	</div>
+	<div id="profile-jot-banner-end"></div>
+
+	<form id="profile-jot-form" action="{{$action}}" method="post" >
+		<input type="hidden" name="type" value="{{$ptyp}}" />
+		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+		<input type="hidden" name="return" value="{{$return_path}}" />
+		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
+		<input type="hidden" name="coord" id="jot-coord" value="" />
+		<input type="hidden" name="post_id" value="{{$post_id}}" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none"></div>
+		{{if $placeholdercategory}}
+		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" /></div>
+		{{/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-rotator-wrapper" style="display: {{$visitor}};" >
+		<img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+	</div> 
+	
+	<div id="profile-upload-wrapper" style="display: {{$visitor}};" >
+		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="{{$upload}}"></a></div>
+	</div> 
+	<div id="profile-attach-wrapper" style="display: {{$visitor}};" >
+		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="{{$attach}}"></a></div>
+	</div> 
+
+	{{*<!--<div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >-->*}}
+	<div id="profile-link-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-link" class="icon link" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
+	</div> 
+	<div id="profile-video-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-video" class="icon video" title="{{$video}}" onclick="jotVideoURL();return false;"></a>
+	</div> 
+	<div id="profile-audio-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-audio" class="icon audio" title="{{$audio}}" onclick="jotAudioURL();return false;"></a>
+	</div> 
+	<div id="profile-location-wrapper" style="display: {{$visitor}};" >
+		<a id="profile-location" class="icon globe" title="{{$setloc}}" onclick="jotGetLocation();return false;"></a>
+	</div> 
+	<div id="profile-nolocation-wrapper" style="display: none;" >
+		<a id="profile-nolocation" class="icon noglobe" title="{{$noloc}}" onclick="jotClearLocation();return false;"></a>
+	</div> 
+
+	<div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" >
+		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}}"  title="{{$permset}}" ></a>{{$bang}}
+	</div>
+
+	<span onclick="preview_post();" id="jot-preview-link" class="fakelink">{{$preview}}</span>
+
+	<div id="profile-jot-perms-end"></div>
+
+
+	<div id="profile-jot-plugin-wrapper">
+  	{{$jotplugins}}
+	</div>
+
+{{*<!--	<span id="jot-display-location" style="display: none;"></span>-->*}}
+
+	<div id="jot-preview-content" style="display:none;"></div>
+
+	<div style="display: none;">
+		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+			{{$acl}}
+			<hr style="clear:both"/>
+			<div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
+			<div id="profile-jot-email-end"></div>
+			{{$jotnets}}
+		</div>
+	</div>
+
+
+</div>
+
+<div id="profile-jot-end"></div>
+</form>
+</div>
+		{{if $content}}<script>window.jotInit = true;</script>{{/if}}
diff --git a/view/theme/frost/templates/jot_geotag.tpl b/view/theme/frost/templates/jot_geotag.tpl
new file mode 100644
index 000000000..d828980e5
--- /dev/null
+++ b/view/theme/frost/templates/jot_geotag.tpl
@@ -0,0 +1,16 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+	if(navigator.geolocation) {
+		navigator.geolocation.getCurrentPosition(function(position) {
+			var lat = position.coords.latitude.toFixed(4);
+			var lon = position.coords.longitude.toFixed(4);
+
+			$j('#jot-coord').val(lat + ', ' + lon);
+			$j('#profile-nolocation-wrapper').show();
+		});
+	}
+
diff --git a/view/theme/frost/templates/lang_selector.tpl b/view/theme/frost/templates/lang_selector.tpl
new file mode 100644
index 000000000..a1aee8277
--- /dev/null
+++ b/view/theme/frost/templates/lang_selector.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	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/theme/frost/templates/like_noshare.tpl b/view/theme/frost/templates/like_noshare.tpl
new file mode 100644
index 000000000..1ad1eeaee
--- /dev/null
+++ b/view/theme/frost/templates/like_noshare.tpl
@@ -0,0 +1,12 @@
+{{*
+ *	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="tool like" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false"></a>
+	{{if $nolike}}
+	<a href="#" class="tool dislike" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false"></a>
+	{{/if}}
+	<img id="like-rotator-{{$id}}" class="like-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+</div>
diff --git a/view/theme/frost/templates/login.tpl b/view/theme/frost/templates/login.tpl
new file mode 100644
index 000000000..872f1455e
--- /dev/null
+++ b/view/theme/frost/templates/login.tpl
@@ -0,0 +1,50 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div class="login-form">
+<form action="{{$dest_url}}" 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>
+	
+	{{if $openid}}
+			<br /><br />
+			<div id="login_openid">
+			{{include file="field_openid.tpl" field=$lopenid}}
+			</div>
+	{{/if}}
+
+<!--	<br /><br />
+	<div class="login-extra-links">
+	By signing in you agree to the latest <a href="tos.html" title="{{$tostitle}}" id="terms-of-service-link" >{{$toslink}}</a> and <a href="privacy.html" title="{{$privacytitle}}" id="privacy-link" >{{$privacylink}}</a>
+	</div>-->
+
+	<br /><br />
+	{{include file="field_checkbox.tpl" field=$lremember}}
+
+	<div id="login-submit-wrapper" >
+		<input type="submit" name="submit" id="login-submit-button" value="{{$login}}" />
+	</div>
+
+	<br /><br />
+
+	<div class="login-extra-links">
+		{{if $register}}<a href="register" title="{{$register.title}}" id="register-link">{{$register.desc}}</a>{{/if}}
+        <a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
+	</div>
+	
+	{{foreach $hiddens as $k=>$v}}
+		<input type="hidden" name="{{$k}}" value="{{$v}}" />
+	{{/foreach}}
+	
+	
+</form>
+</div>
+
+<script type="text/javascript">window.loginName = "{{$lname.0}}";</script>
diff --git a/view/theme/frost/templates/login_head.tpl b/view/theme/frost/templates/login_head.tpl
new file mode 100644
index 000000000..5cac7bd1d
--- /dev/null
+++ b/view/theme/frost/templates/login_head.tpl
@@ -0,0 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*<!--<link rel="stylesheet" href="{{$baseurl}}/view/theme/frost/login-style.css" type="text/css" media="all" />-->*}}
+
diff --git a/view/theme/frost/templates/lostpass.tpl b/view/theme/frost/templates/lostpass.tpl
new file mode 100644
index 000000000..bbcdbdb53
--- /dev/null
+++ b/view/theme/frost/templates/lostpass.tpl
@@ -0,0 +1,26 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="lostpass-form">
+<h2>{{$title}}</h2>
+<br /><br /><br />
+
+<form action="lostpass" method="post" >
+<div id="login-name-wrapper" class="field input">
+        <label for="login-name" id="label-login-name">{{$name}}</label>
+        <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
+</div>
+<div id="login-extra-end"></div>
+<p id="lostpass-desc">
+{{$desc}}
+</p>
+<br />
+
+<div id="login-submit-wrapper" >
+        <input type="submit" name="submit" id="lostpass-submit-button" value="{{$submit}}" />
+</div>
+<div id="login-submit-end"></div>
+</form>
+</div>
diff --git a/view/theme/frost/templates/mail_conv.tpl b/view/theme/frost/templates/mail_conv.tpl
new file mode 100644
index 000000000..effaa73c2
--- /dev/null
+++ b/view/theme/frost/templates/mail_conv.tpl
@@ -0,0 +1,19 @@
+{{*
+ *	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>
+	<div class="mail-conv-detail" >
+		<div class="mail-conv-sender-name" >{{$mail.from_name}}</div>
+		<div class="mail-conv-date">{{$mail.date}}</div>
+		<div class="mail-conv-subject">{{$mail.subject}}</div>
+		<div class="mail-conv-body">{{$mail.body}}</div>
+	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}} ></a></div><div class="mail-conv-delete-end"></div>
+	<div class="mail-conv-outside-wrapper-end"></div>
+</div>
+</div>
+<hr class="mail-conv-break" />
diff --git a/view/theme/frost/templates/mail_list.tpl b/view/theme/frost/templates/mail_list.tpl
new file mode 100644
index 000000000..0607c15c7
--- /dev/null
+++ b/view/theme/frost/templates/mail_list.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="mail-list-outside-wrapper">
+	<div class="mail-list-sender" >
+		<a href="{{$from_url}}" class="mail-list-sender-url" ><img class="mail-list-sender-photo{{$sparkle}}" src="{{$from_photo}}" height="80" width="80" alt="{{$from_name}}" /></a>
+	</div>
+	<div class="mail-list-detail">
+		<div class="mail-list-sender-name" >{{$from_name}}</div>
+		<div class="mail-list-date">{{$date}}</div>
+		<div class="mail-list-subject"><a href="message/{{$id}}" class="mail-list-link">{{$subject}}</a></div>
+	<div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-{{$id}}" >
+		<a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="icon drophide mail-list-delete	delete-icon" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);"*}} ></a>
+	</div>
+</div>
+</div>
+<div class="mail-list-delete-end"></div>
+
+<div class="mail-list-outside-wrapper-end"></div>
diff --git a/view/theme/frost/templates/message-end.tpl b/view/theme/frost/templates/message-end.tpl
new file mode 100644
index 000000000..9298a4245
--- /dev/null
+++ b/view/theme/frost/templates/message-end.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script src="{{$baseurl}}/library/jquery_ac/friendica.complete.min.js" ></script>
+
+
diff --git a/view/theme/frost/templates/message-head.tpl b/view/theme/frost/templates/message-head.tpl
new file mode 100644
index 000000000..a7fb96108
--- /dev/null
+++ b/view/theme/frost/templates/message-head.tpl
@@ -0,0 +1,5 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
diff --git a/view/theme/frost/templates/moderated_comment.tpl b/view/theme/frost/templates/moderated_comment.tpl
new file mode 100644
index 000000000..b2401ca48
--- /dev/null
+++ b/view/theme/frost/templates/moderated_comment.tpl
@@ -0,0 +1,66 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
+			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
+				<input type="hidden" name="type" value="{{$type}}" />
+				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+				<input type="hidden" name="parent" value="{{$parent}}" />
+				<input type="hidden" name="return" value="{{$return_path}}" />
+				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
+				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
+					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<div id="mod-cmnt-wrap-{{$id}}" class="mod-cmnt-wrap" style="display:none">
+					<div id="mod-cmnt-name-lbl-{{$id}}" class="mod-cmnt-name-lbl">{{$lbl_modname}}</div>
+					<input type="text" id="mod-cmnt-name-{{$id}}" class="mod-cmnt-name" name="mod-cmnt-name" value="{{$modname}}" />
+					<div id="mod-cmnt-email-lbl-{{$id}}" class="mod-cmnt-email-lbl">{{$lbl_modemail}}</div>
+					<input type="text" id="mod-cmnt-email-{{$id}}" class="mod-cmnt-email" name="mod-cmnt-email" value="{{$modemail}}" />
+					<div id="mod-cmnt-url-lbl-{{$id}}" class="mod-cmnt-url-lbl">{{$lbl_modurl}}</div>
+					<input type="text" id="mod-cmnt-url-{{$id}}" class="mod-cmnt-url" name="mod-cmnt-url" value="{{$modurl}}" />
+				</div>
+				<ul class="comment-edit-bb-{{$id}}">
+					<li><a class="editicon boldbb shadow"
+						style="cursor: pointer;" title="{{$edbold}}"
+						onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
+					<li><a class="editicon italicbb shadow"
+						style="cursor: pointer;" title="{{$editalic}}"
+						onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
+					<li><a class="editicon underlinebb shadow"
+						style="cursor: pointer;" title="{{$eduline}}"
+						onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
+					<li><a class="editicon quotebb shadow"
+						style="cursor: pointer;" title="{{$edquote}}"
+						onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
+					<li><a class="editicon codebb shadow"
+						style="cursor: pointer;" title="{{$edcode}}"
+						onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
+					<li><a class="editicon imagebb shadow"
+						style="cursor: pointer;" title="{{$edimg}}"
+						onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
+					<li><a class="editicon urlbb shadow"
+						style="cursor: pointer;" title="{{$edurl}}"
+						onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
+					<li><a class="editicon videobb shadow"
+						style="cursor: pointer;" title="{{$edvideo}}"
+						onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
+				</ul>	
+				<div class="comment-edit-bb-end"></div>
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>			
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
+					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
+					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
+					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/theme/frost/templates/msg-end.tpl b/view/theme/frost/templates/msg-end.tpl
new file mode 100644
index 000000000..0115bfad4
--- /dev/null
+++ b/view/theme/frost/templates/msg-end.tpl
@@ -0,0 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.min.js" ></script>
+
+<script language="javascript" type="text/javascript">msgInitEditor();</script>
diff --git a/view/theme/frost/templates/msg-header.tpl b/view/theme/frost/templates/msg-header.tpl
new file mode 100644
index 000000000..bb7cac0e4
--- /dev/null
+++ b/view/theme/frost/templates/msg-header.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script language="javascript" type="text/javascript">
+	window.nickname = "{{$nickname}}";
+	window.linkURL = "{{$linkurl}}";
+	window.editSelect = "{{$editselect}}";
+	window.jotId = "#prvmail-text";
+	window.imageUploadButton = 'prvmail-upload';
+	window.autocompleteType = 'msg-header';
+</script>
+
diff --git a/view/theme/frost/templates/nav.tpl b/view/theme/frost/templates/nav.tpl
new file mode 100644
index 000000000..db5f696ba
--- /dev/null
+++ b/view/theme/frost/templates/nav.tpl
@@ -0,0 +1,155 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<nav>
+	{{$langselector}}
+
+	<div id="site-location">{{$sitelocation}}</div>
+
+	<span id="nav-link-wrapper" >
+
+{{*<!--	<a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>-->*}}
+	<div class="nav-button-container nav-menu-link" rel="#system-menu-list">
+	<a class="system-menu-link nav-link nav-menu-icon" href="{{$nav.settings.0}}" title="Main Menu" point="#system-menu-list">
+	<img class="system-menu-link" src="{{$baseurl}}/view/theme/frost/images/menu.png">
+	</a>
+	<ul id="system-menu-list" class="nav-menu-list" point="#system-menu-list">
+		{{if $nav.login}}
+		<a id="nav-login-link" class="nav-load-page-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a>
+		{{/if}}
+
+		{{if $nav.register}}
+		<a id="nav-register-link" class="nav-load-page-link {{$nav.register.2}} {{$sel.register}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a>
+		{{/if}}
+
+		{{if $nav.settings}}
+		<li><a id="nav-settings-link" class="{{$nav.settings.2}} nav-load-page-link" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>
+		{{/if}}
+
+		{{if $nav.manage}}
+		<li>
+		<a id="nav-manage-link" class="nav-load-page-link {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a>
+		</li>
+		{{/if}}
+
+		{{if $nav.profiles}}
+		<li><a id="nav-profiles-link" class="{{$nav.profiles.2}} nav-load-page-link" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a></li>
+		{{/if}}
+
+		{{if $nav.admin}}
+		<li><a id="nav-admin-link" class="{{$nav.admin.2}} nav-load-page-link" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a></li>
+		{{/if}}
+
+		<li><a id="nav-search-link" class="{{$nav.search.2}} nav-load-page-link" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a></li>
+
+		{{if $nav.apps}}
+		<li><a id="nav-apps-link" class="{{$nav.apps.2}} nav-load-page-link" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a></li>
+		{{/if}}
+
+		{{if $nav.help}}
+		<li><a id="nav-help-link" class="{{$nav.help.2}} nav-load-page-link" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a></li>
+		{{/if}}
+		
+		{{if $nav.logout}}
+		<li><a id="nav-logout-link" class="{{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>
+		{{/if}}
+	</ul>
+	</div>
+
+	{{if $nav.notifications}}
+{{*<!--	<a id="nav-notifications-linkmenu" class="nav-link" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a>-->*}}
+	<div class="nav-button-container">
+	<a id="nav-notifications-linkmenu" class="nav-link" href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}">
+	<img rel="#nav-notifications-menu" src="{{$baseurl}}/view/theme/frost/images/notifications.png">
+	</a>
+	<span id="notify-update" class="nav-ajax-left" rel="#nav-network-notifications-popup"></span>
+	<ul id="nav-notifications-menu" class="notifications-menu-popup">
+		<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
+		<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
+		<li class="empty">{{$emptynotifications}}</li>
+	</ul>
+	</div>
+	{{/if}}		
+
+{{*<!--	<a id="contacts-menu-link" class="nav-link" href="#contacts-menu" title="Contacts">Contacts</a>-->*}}
+	<div class="nav-button-container nav-menu-link" rel="#contacts-menu-list">
+	<a class="contacts-menu-link nav-link nav-menu-icon" href="{{$nav.contacts.0}}" title="Contacts" point="#contacts-menu-list">
+	<img class="contacts-menu-link" src="{{$baseurl}}/view/theme/frost/images/contacts.png">
+	</a>
+	{{if $nav.introductions}}
+	<a id="nav-notify-link" class="{{$nav.introductions.2}} {{$sel.introductions}} nav-load-page-link" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >
+	<span id="intro-update" class="nav-ajax-left"></span>
+	</a>
+	{{/if}}
+	<ul id="contacts-menu-list" class="nav-menu-list" point="#contacts-menu-list">
+		{{if $nav.contacts}}
+		<li><a id="nav-contacts-link" class="{{$nav.contacts.2}} nav-load-page-link" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a><li>
+		{{/if}}
+
+		<li><a id="nav-directory-link" class="{{$nav.directory.2}} nav-load-page-link" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a><li>
+
+		{{if $nav.introductions}}
+		<li>
+		<a id="nav-notify-link" class="{{$nav.introductions.2}} {{$sel.introductions}} nav-load-page-link" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a>
+		</li>
+		{{/if}}
+	</ul>
+	</div>
+
+	{{if $nav.messages}}
+{{*<!--	<a id="nav-messages-link" class="nav-link {{$nav.messages.2}} {{$sel.messages}} nav-load-page-link" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>-->*}}
+	<div class="nav-button-container">
+	<a id="nav-messages-link" class="nav-link {{$nav.messages.2}} {{$sel.messages}} nav-load-page-link" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >
+	<img src="{{$baseurl}}/view/theme/frost/images/message.png">
+	</a>
+	<span id="mail-update" class="nav-ajax-left"></span>
+	</div>
+	{{/if}}
+
+{{*<!--	<a id="network-menu-link" class="nav-link" href="#network-menu" title="Network">Network</a>-->*}}
+	<div class="nav-button-container nav-menu-link" rel="#network-menu-list">
+	<a class="nav-menu-icon network-menu-link nav-link" href="{{$nav.network.0}}" title="Network" point="#network-menu-list">
+	<img class="network-menu-link" src="{{$baseurl}}/view/theme/frost/images/network.png">
+	</a>
+	{{if $nav.network}}
+	<span id="net-update" class="nav-ajax-left"></span>
+	{{/if}}
+	<ul id="network-menu-list" class="nav-menu-list" point="#network-menu-list">
+		{{if $nav.network}}
+		<li>
+		<a id="nav-network-link" class="{{$nav.network.2}} {{$sel.network}} nav-load-page-link" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
+		</li>
+		{{*<!--<span id="net-update" class="nav-ajax-left"></span>-->*}}
+		{{/if}}
+
+		{{if $nav.home}}
+		<li><a id="nav-home-link" class="{{$nav.home.2}} {{$sel.home}} nav-load-page-link" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a></li>
+		{{*<!--<span id="home-update" class="nav-ajax-left"></span>-->*}}
+		{{/if}}
+
+		{{if $nav.community}}
+		<li>
+		<a id="nav-community-link" class="{{$nav.community.2}} {{$sel.community}} nav-load-page-link" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
+		</li>
+		{{/if}}
+	</ul>
+	</div>
+
+	{{if $nav.network}}
+	<div class="nav-button-container nav-menu-link" rel="#network-reset-button">
+	<a class="nav-menu-icon network-reset-link nav-link" href="{{$nav.net_reset.0}}" title="{{$nav.net_reset.3}}">
+	<img class="network-reset-link" src="{{$baseurl}}/view/theme/frost/images/net-reset.png">
+	</a>
+	</div>
+	{{/if}}
+		
+	</span>
+	{{*<!--<span id="nav-end"></span>-->*}}
+	<span id="banner">{{$banner}}</span>
+</nav>
+
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
+</ul>
diff --git a/view/theme/frost/templates/photo_drop.tpl b/view/theme/frost/templates/photo_drop.tpl
new file mode 100644
index 000000000..9b037d4cd
--- /dev/null
+++ b/view/theme/frost/templates/photo_drop.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	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/theme/frost/templates/photo_edit.tpl b/view/theme/frost/templates/photo_edit.tpl
new file mode 100644
index 000000000..890c829fa
--- /dev/null
+++ b/view/theme/frost/templates/photo_edit.tpl
@@ -0,0 +1,63 @@
+{{*
+ *	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="32" name="desc" value="{{$caption}}" />
+
+	<div id="photo-edit-caption-end"></div>
+
+	<label id="photo-edit-tags-label" for="photo-edit-newtag" >{{$tag_label}}</label>
+	<input name="newtag" id="photo-edit-newtag" size="32" title="{{$help_tags}}" type="text" />
+
+	<div id="photo-edit-tags-end"></div>
+	<div id="photo-edit-rotate-wrapper">
+		<div class="photo-edit-rotate-label">
+			{{$rotatecw}}
+		</div>
+		<input class="photo-edit-rotate" type="radio" name="rotate" value="1" /><br />
+
+		<div class="photo-edit-rotate-label">
+			{{$rotateccw}}
+		</div>
+		<input class="photo-edit-rotate" type="radio" name="rotate" value="2" />
+	</div>
+	<div id="photo-edit-rotate-end"></div>
+
+	<div id="photo-edit-perms" class="photo-edit-perms" >
+		<a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="popupbox button" title="{{$permissions}}"/>
+			<span id="jot-perms-icon" class="icon {{$lockstate}} photo-perms-icon" ></span><div class="photo-jot-perms-text">{{$permissions}}</div>
+		</a>
+		<div id="photo-edit-perms-menu-end"></div>
+		
+		<div style="display: none;">
+			<div id="photo-edit-perms-select" >
+				{{$aclselect}}
+			</div>
+		</div>
+	</div>
+	<div id="photo-edit-perms-end"></div>
+
+	<input id="photo-edit-submit-button" type="submit" name="submit" value="{{$submit}}" />
+	<input id="photo-edit-delete-button" type="submit" name="delete" value="{{$delete}}" onclick="return confirmDelete()"; />
+
+	<div id="photo-edit-end"></div>
+</form>
+
+{{*<!--<script>
+	$("a#photo-edit-perms-menu").colorbox({
+		'inline' : true,
+		'transition' : 'none'
+	}); 
+</script>-->*}}
diff --git a/view/theme/frost/templates/photo_edit_head.tpl b/view/theme/frost/templates/photo_edit_head.tpl
new file mode 100644
index 000000000..857e6e63a
--- /dev/null
+++ b/view/theme/frost/templates/photo_edit_head.tpl
@@ -0,0 +1,12 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script>
+	window.prevLink = "{{$prevlink}}";
+	window.nextLink = "{{$nextlink}}";
+	window.photoEdit = true;
+
+</script>
diff --git a/view/theme/frost/templates/photo_view.tpl b/view/theme/frost/templates/photo_view.tpl
new file mode 100644
index 000000000..354fb9c28
--- /dev/null
+++ b/view/theme/frost/templates/photo_view.tpl
@@ -0,0 +1,47 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<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>
+
+<div id="photo-nav">
+	{{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}"><img src="view/theme/frost-mobile/images/arrow-left.png"></a></div>{{/if}}
+	{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}"><img src="view/theme/frost-mobile/images/arrow-right.png"></a></div>{{/if}}
+</div>
+<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}"><img src="{{$photo.src}}" /></a></div>
+<div id="photo-photo-end"></div>
+<div id="photo-caption">{{$desc}}</div>
+{{if $tags}}
+<div id="in-this-photo-text">{{$tags.0}}</div>
+<div id="in-this-photo">{{$tags.1}}</div>
+{{/if}}
+{{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}}
+
+{{if $edit}}
+{{$edit}}
+{{else}}
+
+{{if $likebuttons}}
+<div id="photo-like-div">
+	{{$likebuttons}}
+	{{$like}}
+	{{$dislike}}	
+</div>
+{{/if}}
+
+{{$comments}}
+
+{{$paginate}}
+{{/if}}
+
diff --git a/view/theme/frost/templates/photos_head.tpl b/view/theme/frost/templates/photos_head.tpl
new file mode 100644
index 000000000..5d7e0152d
--- /dev/null
+++ b/view/theme/frost/templates/photos_head.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script>
+	window.isPublic = "{{$ispublic}}";
+</script>
+
diff --git a/view/theme/frost/templates/photos_upload.tpl b/view/theme/frost/templates/photos_upload.tpl
new file mode 100644
index 000000000..4c829a296
--- /dev/null
+++ b/view/theme/frost/templates/photos_upload.tpl
@@ -0,0 +1,57 @@
+{{*
+ *	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" >
+	<div id="photos-upload-new-wrapper" >
+		<div id="photos-upload-newalbum-div">
+			<label id="photos-upload-newalbum-text" for="photos-upload-newalbum" >{{$newalbum}}</label>
+		</div>
+		<input id="photos-upload-newalbum" type="text" name="newalbum" />
+	</div>
+	<div id="photos-upload-new-end"></div>
+	<div id="photos-upload-exist-wrapper">
+		<div id="photos-upload-existing-album-text">{{$existalbumtext}}</div>
+		<select id="photos-upload-album-select" name="album" size="4">
+		{{$albumselect}}
+		</select>
+	</div>
+	<div id="photos-upload-exist-end"></div>
+
+	<div id="photos-upload-choosefile-outer-wrapper">
+	{{$default_upload_box}}
+	<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
+		<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" checked />
+		<div id="photos-upload-noshare-label">
+		<label id="photos-upload-noshare-text" for="photos-upload-noshare" >{{$nosharetext}}</label>
+		</div>
+	</div>
+
+	<div id="photos-upload-perms" class="photos-upload-perms" >
+		<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="popupbox button" />
+		<span id="jot-perms-icon" class="icon {{$lockstate}}  photo-perms-icon" ></span><div class="photo-jot-perms-text">{{$permissions}}</div>
+		</a>
+	</div>
+	<div id="photos-upload-perms-end"></div>
+
+	<div style="display: none;">
+		<div id="photos-upload-permissions-wrapper">
+			{{$aclselect}}
+		</div>
+	</div>
+
+	<div id="photos-upload-spacer"></div>
+
+	{{$alt_uploader}}
+
+	{{$default_upload_submit}}
+
+	<div class="photos-upload-end" ></div>
+	</div>
+</form>
+
diff --git a/view/theme/frost/templates/posted_date_widget.tpl b/view/theme/frost/templates/posted_date_widget.tpl
new file mode 100644
index 000000000..6482f6655
--- /dev/null
+++ b/view/theme/frost/templates/posted_date_widget.tpl
@@ -0,0 +1,14 @@
+{{*
+ *	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($j(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/theme/frost/templates/profed_end.tpl b/view/theme/frost/templates/profed_end.tpl
new file mode 100644
index 000000000..dac8db42d
--- /dev/null
+++ b/view/theme/frost/templates/profed_end.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script type="text/javascript" src="js/country.min.js" ></script>
+
+<script language="javascript" type="text/javascript">
+profInitEditor();
+Fill_Country('{{$country_name}}');
+Fill_States('{{$region}}');
+</script>
+
diff --git a/view/theme/frost/templates/profed_head.tpl b/view/theme/frost/templates/profed_head.tpl
new file mode 100644
index 000000000..c8dbe562f
--- /dev/null
+++ b/view/theme/frost/templates/profed_head.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script language="javascript" type="text/javascript">
+	window.editSelect = "{{$editselect}}";
+</script>
+
diff --git a/view/theme/frost/templates/profile_edit.tpl b/view/theme/frost/templates/profile_edit.tpl
new file mode 100644
index 000000000..1d25a0d9d
--- /dev/null
+++ b/view/theme/frost/templates/profile_edit.tpl
@@ -0,0 +1,327 @@
+{{*
+ *	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/{{$profile_id}}/view?tab=profile" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></li>
+<li><a href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a></li>
+<li></li>
+<li><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" {{$disabled}} >{{$del_prof}}</a></li>
+
+</ul>
+</div>
+
+<div id="profile-edit-links-end"></div>
+
+
+<div id="profile-edit-wrapper" >
+<form id="profile-edit-form" name="form1" action="profiles/{{$profile_id}}" method="post" >
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+<div id="profile-edit-profile-name-wrapper" >
+<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$lbl_profname}} </label>
+<input type="text" size="28" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name}}" /><div class="required">*</div>
+</div>
+<div id="profile-edit-profile-name-end"></div>
+
+<div id="profile-edit-name-wrapper" >
+<label id="profile-edit-name-label" for="profile-edit-name" >{{$lbl_fullname}} </label>
+<input type="text" size="28" name="name" id="profile-edit-name" value="{{$name}}" />
+</div>
+<div id="profile-edit-name-end"></div>
+
+<div id="profile-edit-pdesc-wrapper" >
+<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >{{$lbl_title}} </label>
+<input type="text" size="28" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc}}" />
+</div>
+<div id="profile-edit-pdesc-end"></div>
+
+
+<div id="profile-edit-gender-wrapper" >
+<label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}} </label>
+{{$gender}}
+</div>
+<div id="profile-edit-gender-end"></div>
+
+<div id="profile-edit-dob-wrapper" >
+<label id="profile-edit-dob-label" for="dob-select" >{{$lbl_bd}} </label>
+<div id="profile-edit-dob" >
+{{$dob}} {{$age}}
+</div>
+</div>
+<div id="profile-edit-dob-end"></div>
+
+{{$hide_friends}}
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="profile-edit-address-wrapper" >
+<label id="profile-edit-address-label" for="profile-edit-address" >{{$lbl_address}} </label>
+<input type="text" size="28" name="address" id="profile-edit-address" value="{{$address}}" />
+</div>
+<div id="profile-edit-address-end"></div>
+
+<div id="profile-edit-locality-wrapper" >
+<label id="profile-edit-locality-label" for="profile-edit-locality" >{{$lbl_city}} </label>
+<input type="text" size="28" name="locality" id="profile-edit-locality" value="{{$locality}}" />
+</div>
+<div id="profile-edit-locality-end"></div>
+
+
+<div id="profile-edit-postal-code-wrapper" >
+<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$lbl_zip}} </label>
+<input type="text" size="28" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code}}" />
+</div>
+<div id="profile-edit-postal-code-end"></div>
+
+<div id="profile-edit-country-name-wrapper" >
+<label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$lbl_country}} </label>
+<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('{{$region}}');">
+<option selected="selected" >{{$country_name}}</option>
+<option>temp</option>
+</select>
+</div>
+<div id="profile-edit-country-name-end"></div>
+
+<div id="profile-edit-region-wrapper" >
+<label id="profile-edit-region-label" for="profile-edit-region" >{{$lbl_region}} </label>
+<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
+<option selected="selected" >{{$region}}</option>
+<option>temp</option>
+</select>
+</div>
+<div id="profile-edit-region-end"></div>
+
+<div id="profile-edit-hometown-wrapper" >
+<label id="profile-edit-hometown-label" for="profile-edit-hometown" >{{$lbl_hometown}} </label>
+<input type="text" size="28" name="hometown" id="profile-edit-hometown" value="{{$hometown}}" />
+</div>
+<div id="profile-edit-hometown-end"></div>
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+<div id="profile-edit-marital-wrapper" >
+<label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}} </label>
+{{$marital}}
+</div>
+<label id="profile-edit-with-label" for="profile-edit-with" > {{$lbl_with}} </label>
+<input type="text" size="28" name="with" id="profile-edit-with" title="{{$lbl_ex1}}" value="{{$with}}" />
+<label id="profile-edit-howlong-label" for="profile-edit-howlong" > {{$lbl_howlong}} </label>
+<input type="text" size="28" name="howlong" id="profile-edit-howlong" title="{{$lbl_howlong}}" value="{{$howlong}}" />
+
+<div id="profile-edit-marital-end"></div>
+
+<div id="profile-edit-sexual-wrapper" >
+<label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}} </label>
+{{$sexual}}
+</div>
+<div id="profile-edit-sexual-end"></div>
+
+
+
+<div id="profile-edit-homepage-wrapper" >
+<label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$lbl_homepage}} </label>
+<input type="text" size="28" name="homepage" id="profile-edit-homepage" value="{{$homepage}}" />
+</div>
+<div id="profile-edit-homepage-end"></div>
+
+<div id="profile-edit-politic-wrapper" >
+<label id="profile-edit-politic-label" for="profile-edit-politic" >{{$lbl_politic}} </label>
+<input type="text" size="28" name="politic" id="profile-edit-politic" value="{{$politic}}" />
+</div>
+<div id="profile-edit-politic-end"></div>
+
+<div id="profile-edit-religion-wrapper" >
+<label id="profile-edit-religion-label" for="profile-edit-religion" >{{$lbl_religion}} </label>
+<input type="text" size="28" name="religion" id="profile-edit-religion" value="{{$religion}}" />
+</div>
+<div id="profile-edit-religion-end"></div>
+
+<div id="profile-edit-pubkeywords-wrapper" >
+<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$lbl_pubkey}} </label>
+<input type="text" size="28" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords}}" />
+</div><div id="profile-edit-pubkeywords-desc">{{$lbl_pubdsc}}</div>
+<div id="profile-edit-pubkeywords-end"></div>
+
+<div id="profile-edit-prvkeywords-wrapper" >
+<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >{{$lbl_prvkey}} </label>
+<input type="text" size="28" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords}}" />
+</div><div id="profile-edit-prvkeywords-desc">{{$lbl_prvdsc}}</div>
+<div id="profile-edit-prvkeywords-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+<div id="about-jot-wrapper" class="profile-jot-box">
+<p id="about-jot-desc" >
+{{$lbl_about}}
+</p>
+
+<textarea rows="10" cols="70" id="profile-about-text" class="profile-edit-textarea" name="about" >{{$about}}</textarea>
+
+</div>
+<div id="about-jot-end"></div>
+
+
+<div id="interest-jot-wrapper" class="profile-jot-box" >
+<p id="interest-jot-desc" >
+{{$lbl_hobbies}}
+</p>
+
+<textarea rows="10" cols="70" id="interest-jot-text" class="profile-edit-textarea" name="interest" >{{$interest}}</textarea>
+
+</div>
+<div id="interest-jot-end"></div>
+
+
+<div id="likes-jot-wrapper" class="profile-jot-box" >
+<p id="likes-jot-desc" >
+{{$lbl_likes}}
+</p>
+
+<textarea rows="10" cols="70" id="likes-jot-text" class="profile-edit-textarea" name="likes" >{{$likes}}</textarea>
+
+</div>
+<div id="likes-jot-end"></div>
+
+
+<div id="dislikes-jot-wrapper" class="profile-jot-box" >
+<p id="dislikes-jot-desc" >
+{{$lbl_dislikes}}
+</p>
+
+<textarea rows="10" cols="70" id="dislikes-jot-text" class="profile-edit-textarea" name="dislikes" >{{$dislikes}}</textarea>
+
+</div>
+<div id="dislikes-jot-end"></div>
+
+
+<div id="contact-jot-wrapper" class="profile-jot-box" >
+<p id="contact-jot-desc" >
+{{$lbl_social}}
+</p>
+
+<textarea rows="10" cols="70" id="contact-jot-text" class="profile-edit-textarea" name="contact" >{{$contact}}</textarea>
+
+</div>
+<div id="contact-jot-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="music-jot-wrapper" class="profile-jot-box" >
+<p id="music-jot-desc" >
+{{$lbl_music}}
+</p>
+
+<textarea rows="10" cols="70" id="music-jot-text" class="profile-edit-textarea" name="music" >{{$music}}</textarea>
+
+</div>
+<div id="music-jot-end"></div>
+
+<div id="book-jot-wrapper" class="profile-jot-box" >
+<p id="book-jot-desc" >
+{{$lbl_book}}
+</p>
+
+<textarea rows="10" cols="70" id="book-jot-text" class="profile-edit-textarea" name="book" >{{$book}}</textarea>
+
+</div>
+<div id="book-jot-end"></div>
+
+
+
+<div id="tv-jot-wrapper" class="profile-jot-box" >
+<p id="tv-jot-desc" >
+{{$lbl_tv}} 
+</p>
+
+<textarea rows="10" cols="70" id="tv-jot-text" class="profile-edit-textarea" name="tv" >{{$tv}}</textarea>
+
+</div>
+<div id="tv-jot-end"></div>
+
+
+
+<div id="film-jot-wrapper" class="profile-jot-box" >
+<p id="film-jot-desc" >
+{{$lbl_film}}
+</p>
+
+<textarea rows="10" cols="70" id="film-jot-text" class="profile-edit-textarea" name="film" >{{$film}}</textarea>
+
+</div>
+<div id="film-jot-end"></div>
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+<div id="romance-jot-wrapper" class="profile-jot-box" >
+<p id="romance-jot-desc" >
+{{$lbl_love}}
+</p>
+
+<textarea rows="10" cols="70" id="romance-jot-text" class="profile-edit-textarea" name="romance" >{{$romance}}</textarea>
+
+</div>
+<div id="romance-jot-end"></div>
+
+
+
+<div id="work-jot-wrapper" class="profile-jot-box" >
+<p id="work-jot-desc" >
+{{$lbl_work}}
+</p>
+
+<textarea rows="10" cols="70" id="work-jot-text" class="profile-edit-textarea" name="work" >{{$work}}</textarea>
+
+</div>
+<div id="work-jot-end"></div>
+
+
+
+<div id="education-jot-wrapper" class="profile-jot-box" >
+<p id="education-jot-desc" >
+{{$lbl_school}} 
+</p>
+
+<textarea rows="10" cols="70" id="education-jot-text" class="profile-edit-textarea" name="education" >{{$education}}</textarea>
+
+</div>
+<div id="education-jot-end"></div>
+
+
+
+<div class="profile-edit-submit-wrapper" >
+<input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
+</div>
+<div class="profile-edit-submit-end"></div>
+
+
+</form>
+</div>
+
diff --git a/view/theme/frost/templates/profile_vcard.tpl b/view/theme/frost/templates/profile_vcard.tpl
new file mode 100644
index 000000000..85c6345d6
--- /dev/null
+++ b/view/theme/frost/templates/profile_vcard.tpl
@@ -0,0 +1,56 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="vcard">
+
+	<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 $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/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}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
+
+	{{include file="diaspora_vcard.tpl"}}
+
+	<div id="profile-vcard-break"></div>	
+	<div id="profile-extra-links">
+		<ul>
+			{{if $connect}}
+				<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
+			{{/if}}
+			{{if $wallmessage}}
+				<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
+			{{/if}}
+		</ul>
+	</div>
+</div>
+
+{{$contact_block}}
+
+
diff --git a/view/theme/frost/templates/prv_message.tpl b/view/theme/frost/templates/prv_message.tpl
new file mode 100644
index 000000000..363ca4e26
--- /dev/null
+++ b/view/theme/frost/templates/prv_message.tpl
@@ -0,0 +1,44 @@
+{{*
+ *	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="messageto" 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/theme/frost/templates/register.tpl b/view/theme/frost/templates/register.tpl
new file mode 100644
index 000000000..6cb4c6d85
--- /dev/null
+++ b/view/theme/frost/templates/register.tpl
@@ -0,0 +1,85 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class='register-form'>
+<h2>{{$regtitle}}</h2>
+<br /><br />
+
+<form action="register" method="post" id="register-form">
+
+	<input type="hidden" name="photo" value="{{$photo}}" />
+
+	{{$registertext}}
+
+	<p id="register-realpeople">{{$realpeople}}</p>
+
+	<br />
+{{if $oidlabel}}
+	<div id="register-openid-wrapper" >
+    	<label for="register-openid" id="label-register-openid" >{{$oidlabel}}</label><input 	type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="{{$openid}}" >
+	</div>
+	<div id="register-openid-end" ></div>
+{{/if}}
+
+	<div class="register-explain-wrapper">
+	<p id="register-fill-desc">{{$fillwith}} {{$fillext}}</p>
+	</div>
+
+	<br /><br />
+
+{{if $invitations}}
+
+	<p id="register-invite-desc">{{$invite_desc}}</p>
+	<div id="register-invite-wrapper" >
+		<label for="register-invite" id="label-register-invite" >{{$invite_label}}</label>
+		<input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" value="{{$invite_id}}" >
+	</div>
+	<div id="register-name-end" ></div>
+
+{{/if}}
+
+
+	<div id="register-name-wrapper" class="field input" >
+		<label for="register-name" id="label-register-name" >{{$namelabel}}</label>
+		<input type="text" maxlength="60" size="32" name="username" id="register-name" value="{{$username}}" >
+	</div>
+	<div id="register-name-end" ></div>
+
+
+	<div id="register-email-wrapper"  class="field input" >
+		<label for="register-email" id="label-register-email" >{{$addrlabel}}</label>
+		<input type="text" maxlength="60" size="32" name="email" id="register-email" value="{{$email}}" >
+	</div>
+	<div id="register-email-end" ></div>
+	<br /><br />
+
+	<div id="register-nickname-wrapper" class="field input" >
+		<label for="register-nickname" id="label-register-nickname" >{{$nicklabel}}</label>
+		<input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" value="{{$nickname}}" >
+	</div>
+	<div id="register-nickname-end" ></div>
+
+	<div class="register-explain-wrapper">
+	<p id="register-nickname-desc" >{{$nickdesc}}</p>
+	</div>
+
+	{{$publish}}
+
+	<br />
+<!--	<br><br>
+	<div class="agreement">
+	By clicking '{{$regbutt}}' you are agreeing to the latest <a href="tos.html" title="{{$tostitle}}" id="terms-of-service-link" >{{$toslink}}</a> and <a href="privacy.html" title="{{$privacytitle}}" id="privacy-link" >{{$privacylink}}</a>
+	</div>-->
+	<br><br>
+
+	<div id="register-submit-wrapper">
+		<input type="submit" name="submit" id="register-submit-button" value="{{$regbutt}}" />
+	</div>
+	<div id="register-submit-end" ></div>
+</form>
+
+{{$license}}
+
+</div>
diff --git a/view/theme/frost/templates/search_item.tpl b/view/theme/frost/templates/search_item.tpl
new file mode 100644
index 000000000..2b37b2458
--- /dev/null
+++ b/view/theme/frost/templates/search_item.tpl
@@ -0,0 +1,69 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<a name="{{$item.id}}" ></a>
+{{*<!--<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >-->*}}
+	<div class="wall-item-content-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-content-wrapper-{{$item.id}}" >
+		<div class="wall-item-info" id="wall-item-info-{{$item.id}}">
+			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$item.id}}" 
+				 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
+				 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
+				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+				{{*<!--<div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">-->*}}
+					<ul class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+						{{$item.item_photo_menu}}
+					</ul>
+				{{*<!--</div>-->*}}
+			</div>
+			{{*<!--<div class="wall-item-photo-end"></div>	-->*}}
+			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
+				{{if $item.lock}}{{*<!--<div class="wall-item-lock">-->*}}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" />{{*<!--</div>-->*}}
+				{{else}}<div class="wall-item-lock"></div>{{/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}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}">{{$item.ago}}</div>
+				
+		{{*<!--</div>			-->*}}
+		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			{{*<!--<div class="wall-item-title-end"></div>-->*}}
+			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
+			{{if $item.has_cats}}
+			<div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}} {{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}}{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}}{{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+		</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.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-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>
+
+-->*}}
diff --git a/view/theme/frost/templates/settings-head.tpl b/view/theme/frost/templates/settings-head.tpl
new file mode 100644
index 000000000..5d7e0152d
--- /dev/null
+++ b/view/theme/frost/templates/settings-head.tpl
@@ -0,0 +1,10 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script>
+	window.isPublic = "{{$ispublic}}";
+</script>
+
diff --git a/view/theme/frost/templates/settings_display_end.tpl b/view/theme/frost/templates/settings_display_end.tpl
new file mode 100644
index 000000000..4b3db00f5
--- /dev/null
+++ b/view/theme/frost/templates/settings_display_end.tpl
@@ -0,0 +1,7 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+	<script>$j(function(){ previewTheme($j("#id_{{$theme.0}}")[0]); });</script>
+
diff --git a/view/theme/frost/templates/suggest_friends.tpl b/view/theme/frost/templates/suggest_friends.tpl
new file mode 100644
index 000000000..8843d5128
--- /dev/null
+++ b/view/theme/frost/templates/suggest_friends.tpl
@@ -0,0 +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}}" width="80" height="80" title="{{$name}} [{{$url}}]" onError="this.src='../../../images/person-48.jpg';" />
+		</a>
+	</div>
+	<div class="profile-match-break"></div>
+	<div class="profile-match-name">
+		<a href="{{$url}}" title="{{$name}}">{{$name}}</a>
+	</div>
+	<div class="profile-match-end"></div>
+	{{if $connlnk}}
+	<div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}">{{$conntxt}}</a></div>
+	{{/if}}
+	<a href="{{$ignlnk}}" title="{{$ignore}}" class="icon drophide profile-match-ignore" {{*onmouseout="imgdull(this);" onmouseover="imgbright(this);" *}}onclick="return confirmDelete();" ></a>
+</div>
diff --git a/view/theme/frost/templates/threaded_conversation.tpl b/view/theme/frost/templates/threaded_conversation.tpl
new file mode 100644
index 000000000..fbaafa267
--- /dev/null
+++ b/view/theme/frost/templates/threaded_conversation.tpl
@@ -0,0 +1,33 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{if $dropping}}
+<div id="item-delete-selected-top" class="fakelink" onclick="deleteCheckedItems('#item-delete-selected-top');">
+  <div id="item-delete-selected-top-icon" class="icon drophide" title="{{$dropping}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);" *}}></div>
+  <div id="item-delete-selected-top-desc" >{{$dropping}}</div>
+</div>
+<img id="item-delete-selected-top-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
+{{else}}
+{{if $mode==display}}
+<div id="display-top-padding"></div>
+{{/if}}
+{{/if}}
+
+{{$live_update}}
+
+{{foreach $threads as $thread}}
+{{include file="{{$thread.template}}" item=$thread}}
+{{/foreach}}
+
+<div id="conversation-end"></div>
+
+{{if $dropping}}
+<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems('#item-delete-selected');">
+  <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);" *}}></div>
+  <div id="item-delete-selected-desc" >{{$dropping}}</div>
+</div>
+<img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
+<div id="item-delete-selected-end"></div>
+{{/if}}
diff --git a/view/theme/frost/templates/voting_fakelink.tpl b/view/theme/frost/templates/voting_fakelink.tpl
new file mode 100644
index 000000000..1e073916e
--- /dev/null
+++ b/view/theme/frost/templates/voting_fakelink.tpl
@@ -0,0 +1,6 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<span class="fakelink-wrapper"  id="{{$type}}list-{{$id}}-wrapper">{{$phrase}}</span>
diff --git a/view/theme/frost/templates/wall_thread.tpl b/view/theme/frost/templates/wall_thread.tpl
new file mode 100644
index 000000000..d6fbb3cf0
--- /dev/null
+++ b/view/theme/frost/templates/wall_thread.tpl
@@ -0,0 +1,130 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{if $item.comment_firstcollapsed}}
+	<div class="hide-comments-outer">
+	<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> <span id="hide-comments-{{$item.id}}" class="hide-comments fakelink" onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
+	</div>
+	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
+{{/if}}
+<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
+<a name="{{$item.id}}" ></a>
+{{*<!--<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}} wallwall" id="wall-item-outside-wrapper-{{$item.id}}" >-->*}}
+	<div class="wall-item-content-wrapper {{$item.indent}} {{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" 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}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
+				<img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" onError="this.src='../../../images/person-48.jpg';" />
+				</a>
+			</div>
+			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
+			{{/if}}
+			<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-{{$item.id}}" 
+				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
+                onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" onError="this.src='../../../images/person-48.jpg';" />
+				</a>
+				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+{{*<!--                <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">-->*}}
+                    <ul class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+                        {{$item.item_photo_menu}}
+                    </ul>
+{{*<!--                </div>-->*}}
+
+			</div>
+			{{*<!--<div class="wall-item-photo-end"></div>-->*}}
+			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
+				{{if $item.lock}}{{*<!--<div class="wall-item-lock">-->*}}<img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" />{{*<!--</div>-->*}}
+				{{else}}<div class="wall-item-lock"></div>{{/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}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}{{/if}}<br />
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}" ><a href="display/{{$user.nickname}}/{{$item.id}}">{{$item.ago}}</a></div>
+		{{*<!--</div>-->*}}
+		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			{{*<!--<div class="wall-item-title-end"></div>-->*}}
+			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}
+					{{*<!--<div class="body-tag">-->*}}
+						{{foreach $item.tags as $tag}}
+							<span class='body-tag tag'>{{$tag}}</span>
+						{{/foreach}}
+					{{*<!--</div>-->*}}
+			{{if $item.has_cats}}
+			<div class="categorytags">{{$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">{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+			</div>
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
+			{{if $item.vote}}
+			<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$item.id}}">
+				<a href="#" class="tool like" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></a>
+				{{if $item.vote.dislike}}
+				<a href="#" class="tool dislike" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>
+				{{/if}}
+				{{if $item.vote.share}}<a href="#" class="tool recycle wall-item-share-buttons" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>{{/if}}
+				<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+			</div>
+			{{/if}}
+			{{if $item.plink}}
+				{{*<!--<div class="wall-item-links-wrapper">-->*}}<a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="wall-item-links-wrapper icon remote-link{{$item.sparkle}}"></a>{{*<!--</div>-->*}}
+			{{/if}}
+			{{if $item.edpost}}
+				<a class="editpost tool pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
+			{{/if}}
+			 
+			{{if $item.star}}
+			<a href="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item tool {{$item.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 tool tagged" title="{{$item.tagger.add}}"></a>
+			{{/if}}
+			{{if $item.filer}}
+			<a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"></a>
+			{{/if}}			
+			
+			{{*<!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >-->*}}
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="wall-item-delete-wrapper icon drophide" title="{{$item.drop.delete}}" id="wall-item-delete-wrapper-{{$item.id}}" {{*onmouseover="imgbright(this);" onmouseout="imgdull(this);" *}}></a>{{/if}}
+			{{*<!--</div>-->*}}
+				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
+			{{*<!--<div class="wall-item-delete-end"></div>-->*}}
+		</div>
+	</div>	
+	{{*<!--<div class="wall-item-wrapper-end"></div>-->*}}
+	<div class="wall-item-like {{$item.indent}}" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
+	<div class="wall-item-dislike {{$item.indent}}" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
+
+	{{if $item.threaded}}
+	{{if $item.comment}}
+	{{*<!--<div class="wall-item-comment-wrapper {{$item.indent}}" >-->*}}
+		{{$item.comment}}
+	{{*<!--</div>-->*}}
+	{{/if}}
+	{{/if}}
+
+{{*<!--<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>-->*}}
+{{*<!--</div>-->*}}
+{{foreach $item.children as $child}}
+	{{include file="{{$child.template}}" item=$child}}
+{{/foreach}}
+
+{{if $item.flatten}}
+{{*<!--<div class="wall-item-comment-wrapper" >-->*}}
+	{{$item.comment}}
+{{*<!--</div>-->*}}
+{{/if}}
+</div>
+{{if $item.comment_lastcollapsed}}</div>{{/if}}
+
diff --git a/view/theme/frost/templates/wallmsg-end.tpl b/view/theme/frost/templates/wallmsg-end.tpl
new file mode 100644
index 000000000..c7ad27401
--- /dev/null
+++ b/view/theme/frost/templates/wallmsg-end.tpl
@@ -0,0 +1,9 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script type="text/javascript" src="{{$baseurl}}/js/ajaxupload.min.js" ></script>
+
+<script language="javascript" type="text/javascript">msgInitEditor();</script>
+
diff --git a/view/theme/frost/templates/wallmsg-header.tpl b/view/theme/frost/templates/wallmsg-header.tpl
new file mode 100644
index 000000000..6107a8a08
--- /dev/null
+++ b/view/theme/frost/templates/wallmsg-header.tpl
@@ -0,0 +1,12 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<script language="javascript" type="text/javascript">
+window.editSelect = "{{$editselect}}";
+window.jotId = "#prvmail-text";
+window.imageUploadButton = 'prvmail-upload';
+</script>
+
diff --git a/view/theme/oldtest/app/app.js b/view/theme/oldtest/app/app.js
new file mode 100644
index 000000000..eae90c57b
--- /dev/null
+++ b/view/theme/oldtest/app/app.js
@@ -0,0 +1,85 @@
+
+function menuItem (data){
+	if (!data) data = ['','','','']
+	this.url = ko.observable(data[0]);
+	this.text = ko.observable(data[1]);
+	this.style = ko.observable(data[2]);
+	this.title = ko.observable(data[3]);
+}
+
+
+function navModel(data) {
+	this.nav = ko.observableArray([]);
+	
+	if (data) {
+		for (k in data.nav) {
+			var n = new menuItem(data.nav[k]);
+			console.log(k, data.nav[k], n);
+			this.nav.push(n);
+		}
+	}
+	
+}
+
+function App() {
+	var self = this;
+	this.nav = ko.observable();
+	
+	$.getJSON(window.location, function(data) {
+		for(k in data){
+			//console.log(k);
+			switch(k) {
+				case 'nav':
+					var n = new navModel(data[k][0]);
+					self.nav(n);
+					break;
+			}
+			
+		}
+	});
+	
+}
+
+ko.applyBindings(new App());
+
+
+/*var App = {
+
+	menuItem : function(data){
+		if (!data) data = ['','','','']
+		this.url = ko.observable(data[0]);
+		this.text = ko.observable(data[1]);
+		this.style = ko.observable(data[2]);
+		this.title = ko.observable(data[3]);
+	},
+	
+	navModel : function() {
+		
+		
+	},
+
+}*/
+
+
+
+
+// Activates knockout.js
+//ko.applyBindings(new navModel());
+
+/*
+$(document).ready(function(){
+	$.getJSON(window.location, function(data) {
+		for(k in data){
+			var model = k+"Model";
+			if (model in App) {
+				for (kk in data[k][0]) {
+					console.log(kk);
+				}
+				
+				
+			} 				
+		}
+		
+	}); 
+})
+*/
\ No newline at end of file
diff --git a/view/theme/oldtest/bootstrap.zip b/view/theme/oldtest/bootstrap.zip
new file mode 100644
index 000000000..e4f27746a
Binary files /dev/null and b/view/theme/oldtest/bootstrap.zip differ
diff --git a/view/theme/oldtest/css/bootstrap-responsive.css b/view/theme/oldtest/css/bootstrap-responsive.css
new file mode 100644
index 000000000..fcd72f7a7
--- /dev/null
+++ b/view/theme/oldtest/css/bootstrap-responsive.css
@@ -0,0 +1,1109 @@
+/*!
+ * Bootstrap Responsive v2.3.1
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */
+
+.clearfix {
+  *zoom: 1;
+}
+
+.clearfix:before,
+.clearfix:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.clearfix:after {
+  clear: both;
+}
+
+.hide-text {
+  font: 0/0 a;
+  color: transparent;
+  text-shadow: none;
+  background-color: transparent;
+  border: 0;
+}
+
+.input-block-level {
+  display: block;
+  width: 100%;
+  min-height: 30px;
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+@-ms-viewport {
+  width: device-width;
+}
+
+.hidden {
+  display: none;
+  visibility: hidden;
+}
+
+.visible-phone {
+  display: none !important;
+}
+
+.visible-tablet {
+  display: none !important;
+}
+
+.hidden-desktop {
+  display: none !important;
+}
+
+.visible-desktop {
+  display: inherit !important;
+}
+
+@media (min-width: 768px) and (max-width: 979px) {
+  .hidden-desktop {
+    display: inherit !important;
+  }
+  .visible-desktop {
+    display: none !important ;
+  }
+  .visible-tablet {
+    display: inherit !important;
+  }
+  .hidden-tablet {
+    display: none !important;
+  }
+}
+
+@media (max-width: 767px) {
+  .hidden-desktop {
+    display: inherit !important;
+  }
+  .visible-desktop {
+    display: none !important;
+  }
+  .visible-phone {
+    display: inherit !important;
+  }
+  .hidden-phone {
+    display: none !important;
+  }
+}
+
+.visible-print {
+  display: none !important;
+}
+
+@media print {
+  .visible-print {
+    display: inherit !important;
+  }
+  .hidden-print {
+    display: none !important;
+  }
+}
+
+@media (min-width: 1200px) {
+  .row {
+    margin-left: -30px;
+    *zoom: 1;
+  }
+  .row:before,
+  .row:after {
+    display: table;
+    line-height: 0;
+    content: "";
+  }
+  .row:after {
+    clear: both;
+  }
+  [class*="span"] {
+    float: left;
+    min-height: 1px;
+    margin-left: 30px;
+  }
+  .container,
+  .navbar-static-top .container,
+  .navbar-fixed-top .container,
+  .navbar-fixed-bottom .container {
+    width: 1170px;
+  }
+  .span12 {
+    width: 1170px;
+  }
+  .span11 {
+    width: 1070px;
+  }
+  .span10 {
+    width: 970px;
+  }
+  .span9 {
+    width: 870px;
+  }
+  .span8 {
+    width: 770px;
+  }
+  .span7 {
+    width: 670px;
+  }
+  .span6 {
+    width: 570px;
+  }
+  .span5 {
+    width: 470px;
+  }
+  .span4 {
+    width: 370px;
+  }
+  .span3 {
+    width: 270px;
+  }
+  .span2 {
+    width: 170px;
+  }
+  .span1 {
+    width: 70px;
+  }
+  .offset12 {
+    margin-left: 1230px;
+  }
+  .offset11 {
+    margin-left: 1130px;
+  }
+  .offset10 {
+    margin-left: 1030px;
+  }
+  .offset9 {
+    margin-left: 930px;
+  }
+  .offset8 {
+    margin-left: 830px;
+  }
+  .offset7 {
+    margin-left: 730px;
+  }
+  .offset6 {
+    margin-left: 630px;
+  }
+  .offset5 {
+    margin-left: 530px;
+  }
+  .offset4 {
+    margin-left: 430px;
+  }
+  .offset3 {
+    margin-left: 330px;
+  }
+  .offset2 {
+    margin-left: 230px;
+  }
+  .offset1 {
+    margin-left: 130px;
+  }
+  .row-fluid {
+    width: 100%;
+    *zoom: 1;
+  }
+  .row-fluid:before,
+  .row-fluid:after {
+    display: table;
+    line-height: 0;
+    content: "";
+  }
+  .row-fluid:after {
+    clear: both;
+  }
+  .row-fluid [class*="span"] {
+    display: block;
+    float: left;
+    width: 100%;
+    min-height: 30px;
+    margin-left: 2.564102564102564%;
+    *margin-left: 2.5109110747408616%;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .row-fluid [class*="span"]:first-child {
+    margin-left: 0;
+  }
+  .row-fluid .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 2.564102564102564%;
+  }
+  .row-fluid .span12 {
+    width: 100%;
+    *width: 99.94680851063829%;
+  }
+  .row-fluid .span11 {
+    width: 91.45299145299145%;
+    *width: 91.39979996362975%;
+  }
+  .row-fluid .span10 {
+    width: 82.90598290598291%;
+    *width: 82.8527914166212%;
+  }
+  .row-fluid .span9 {
+    width: 74.35897435897436%;
+    *width: 74.30578286961266%;
+  }
+  .row-fluid .span8 {
+    width: 65.81196581196582%;
+    *width: 65.75877432260411%;
+  }
+  .row-fluid .span7 {
+    width: 57.26495726495726%;
+    *width: 57.21176577559556%;
+  }
+  .row-fluid .span6 {
+    width: 48.717948717948715%;
+    *width: 48.664757228587014%;
+  }
+  .row-fluid .span5 {
+    width: 40.17094017094017%;
+    *width: 40.11774868157847%;
+  }
+  .row-fluid .span4 {
+    width: 31.623931623931625%;
+    *width: 31.570740134569924%;
+  }
+  .row-fluid .span3 {
+    width: 23.076923076923077%;
+    *width: 23.023731587561375%;
+  }
+  .row-fluid .span2 {
+    width: 14.52991452991453%;
+    *width: 14.476723040552828%;
+  }
+  .row-fluid .span1 {
+    width: 5.982905982905983%;
+    *width: 5.929714493544281%;
+  }
+  .row-fluid .offset12 {
+    margin-left: 105.12820512820512%;
+    *margin-left: 105.02182214948171%;
+  }
+  .row-fluid .offset12:first-child {
+    margin-left: 102.56410256410257%;
+    *margin-left: 102.45771958537915%;
+  }
+  .row-fluid .offset11 {
+    margin-left: 96.58119658119658%;
+    *margin-left: 96.47481360247316%;
+  }
+  .row-fluid .offset11:first-child {
+    margin-left: 94.01709401709402%;
+    *margin-left: 93.91071103837061%;
+  }
+  .row-fluid .offset10 {
+    margin-left: 88.03418803418803%;
+    *margin-left: 87.92780505546462%;
+  }
+  .row-fluid .offset10:first-child {
+    margin-left: 85.47008547008548%;
+    *margin-left: 85.36370249136206%;
+  }
+  .row-fluid .offset9 {
+    margin-left: 79.48717948717949%;
+    *margin-left: 79.38079650845607%;
+  }
+  .row-fluid .offset9:first-child {
+    margin-left: 76.92307692307693%;
+    *margin-left: 76.81669394435352%;
+  }
+  .row-fluid .offset8 {
+    margin-left: 70.94017094017094%;
+    *margin-left: 70.83378796144753%;
+  }
+  .row-fluid .offset8:first-child {
+    margin-left: 68.37606837606839%;
+    *margin-left: 68.26968539734497%;
+  }
+  .row-fluid .offset7 {
+    margin-left: 62.393162393162385%;
+    *margin-left: 62.28677941443899%;
+  }
+  .row-fluid .offset7:first-child {
+    margin-left: 59.82905982905982%;
+    *margin-left: 59.72267685033642%;
+  }
+  .row-fluid .offset6 {
+    margin-left: 53.84615384615384%;
+    *margin-left: 53.739770867430444%;
+  }
+  .row-fluid .offset6:first-child {
+    margin-left: 51.28205128205128%;
+    *margin-left: 51.175668303327875%;
+  }
+  .row-fluid .offset5 {
+    margin-left: 45.299145299145295%;
+    *margin-left: 45.1927623204219%;
+  }
+  .row-fluid .offset5:first-child {
+    margin-left: 42.73504273504273%;
+    *margin-left: 42.62865975631933%;
+  }
+  .row-fluid .offset4 {
+    margin-left: 36.75213675213675%;
+    *margin-left: 36.645753773413354%;
+  }
+  .row-fluid .offset4:first-child {
+    margin-left: 34.18803418803419%;
+    *margin-left: 34.081651209310785%;
+  }
+  .row-fluid .offset3 {
+    margin-left: 28.205128205128204%;
+    *margin-left: 28.0987452264048%;
+  }
+  .row-fluid .offset3:first-child {
+    margin-left: 25.641025641025642%;
+    *margin-left: 25.53464266230224%;
+  }
+  .row-fluid .offset2 {
+    margin-left: 19.65811965811966%;
+    *margin-left: 19.551736679396257%;
+  }
+  .row-fluid .offset2:first-child {
+    margin-left: 17.094017094017094%;
+    *margin-left: 16.98763411529369%;
+  }
+  .row-fluid .offset1 {
+    margin-left: 11.11111111111111%;
+    *margin-left: 11.004728132387708%;
+  }
+  .row-fluid .offset1:first-child {
+    margin-left: 8.547008547008547%;
+    *margin-left: 8.440625568285142%;
+  }
+  input,
+  textarea,
+  .uneditable-input {
+    margin-left: 0;
+  }
+  .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 30px;
+  }
+  input.span12,
+  textarea.span12,
+  .uneditable-input.span12 {
+    width: 1156px;
+  }
+  input.span11,
+  textarea.span11,
+  .uneditable-input.span11 {
+    width: 1056px;
+  }
+  input.span10,
+  textarea.span10,
+  .uneditable-input.span10 {
+    width: 956px;
+  }
+  input.span9,
+  textarea.span9,
+  .uneditable-input.span9 {
+    width: 856px;
+  }
+  input.span8,
+  textarea.span8,
+  .uneditable-input.span8 {
+    width: 756px;
+  }
+  input.span7,
+  textarea.span7,
+  .uneditable-input.span7 {
+    width: 656px;
+  }
+  input.span6,
+  textarea.span6,
+  .uneditable-input.span6 {
+    width: 556px;
+  }
+  input.span5,
+  textarea.span5,
+  .uneditable-input.span5 {
+    width: 456px;
+  }
+  input.span4,
+  textarea.span4,
+  .uneditable-input.span4 {
+    width: 356px;
+  }
+  input.span3,
+  textarea.span3,
+  .uneditable-input.span3 {
+    width: 256px;
+  }
+  input.span2,
+  textarea.span2,
+  .uneditable-input.span2 {
+    width: 156px;
+  }
+  input.span1,
+  textarea.span1,
+  .uneditable-input.span1 {
+    width: 56px;
+  }
+  .thumbnails {
+    margin-left: -30px;
+  }
+  .thumbnails > li {
+    margin-left: 30px;
+  }
+  .row-fluid .thumbnails {
+    margin-left: 0;
+  }
+}
+
+@media (min-width: 768px) and (max-width: 979px) {
+  .row {
+    margin-left: -20px;
+    *zoom: 1;
+  }
+  .row:before,
+  .row:after {
+    display: table;
+    line-height: 0;
+    content: "";
+  }
+  .row:after {
+    clear: both;
+  }
+  [class*="span"] {
+    float: left;
+    min-height: 1px;
+    margin-left: 20px;
+  }
+  .container,
+  .navbar-static-top .container,
+  .navbar-fixed-top .container,
+  .navbar-fixed-bottom .container {
+    width: 724px;
+  }
+  .span12 {
+    width: 724px;
+  }
+  .span11 {
+    width: 662px;
+  }
+  .span10 {
+    width: 600px;
+  }
+  .span9 {
+    width: 538px;
+  }
+  .span8 {
+    width: 476px;
+  }
+  .span7 {
+    width: 414px;
+  }
+  .span6 {
+    width: 352px;
+  }
+  .span5 {
+    width: 290px;
+  }
+  .span4 {
+    width: 228px;
+  }
+  .span3 {
+    width: 166px;
+  }
+  .span2 {
+    width: 104px;
+  }
+  .span1 {
+    width: 42px;
+  }
+  .offset12 {
+    margin-left: 764px;
+  }
+  .offset11 {
+    margin-left: 702px;
+  }
+  .offset10 {
+    margin-left: 640px;
+  }
+  .offset9 {
+    margin-left: 578px;
+  }
+  .offset8 {
+    margin-left: 516px;
+  }
+  .offset7 {
+    margin-left: 454px;
+  }
+  .offset6 {
+    margin-left: 392px;
+  }
+  .offset5 {
+    margin-left: 330px;
+  }
+  .offset4 {
+    margin-left: 268px;
+  }
+  .offset3 {
+    margin-left: 206px;
+  }
+  .offset2 {
+    margin-left: 144px;
+  }
+  .offset1 {
+    margin-left: 82px;
+  }
+  .row-fluid {
+    width: 100%;
+    *zoom: 1;
+  }
+  .row-fluid:before,
+  .row-fluid:after {
+    display: table;
+    line-height: 0;
+    content: "";
+  }
+  .row-fluid:after {
+    clear: both;
+  }
+  .row-fluid [class*="span"] {
+    display: block;
+    float: left;
+    width: 100%;
+    min-height: 30px;
+    margin-left: 2.7624309392265194%;
+    *margin-left: 2.709239449864817%;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .row-fluid [class*="span"]:first-child {
+    margin-left: 0;
+  }
+  .row-fluid .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 2.7624309392265194%;
+  }
+  .row-fluid .span12 {
+    width: 100%;
+    *width: 99.94680851063829%;
+  }
+  .row-fluid .span11 {
+    width: 91.43646408839778%;
+    *width: 91.38327259903608%;
+  }
+  .row-fluid .span10 {
+    width: 82.87292817679558%;
+    *width: 82.81973668743387%;
+  }
+  .row-fluid .span9 {
+    width: 74.30939226519337%;
+    *width: 74.25620077583166%;
+  }
+  .row-fluid .span8 {
+    width: 65.74585635359117%;
+    *width: 65.69266486422946%;
+  }
+  .row-fluid .span7 {
+    width: 57.18232044198895%;
+    *width: 57.12912895262725%;
+  }
+  .row-fluid .span6 {
+    width: 48.61878453038674%;
+    *width: 48.56559304102504%;
+  }
+  .row-fluid .span5 {
+    width: 40.05524861878453%;
+    *width: 40.00205712942283%;
+  }
+  .row-fluid .span4 {
+    width: 31.491712707182323%;
+    *width: 31.43852121782062%;
+  }
+  .row-fluid .span3 {
+    width: 22.92817679558011%;
+    *width: 22.87498530621841%;
+  }
+  .row-fluid .span2 {
+    width: 14.3646408839779%;
+    *width: 14.311449394616199%;
+  }
+  .row-fluid .span1 {
+    width: 5.801104972375691%;
+    *width: 5.747913483013988%;
+  }
+  .row-fluid .offset12 {
+    margin-left: 105.52486187845304%;
+    *margin-left: 105.41847889972962%;
+  }
+  .row-fluid .offset12:first-child {
+    margin-left: 102.76243093922652%;
+    *margin-left: 102.6560479605031%;
+  }
+  .row-fluid .offset11 {
+    margin-left: 96.96132596685082%;
+    *margin-left: 96.8549429881274%;
+  }
+  .row-fluid .offset11:first-child {
+    margin-left: 94.1988950276243%;
+    *margin-left: 94.09251204890089%;
+  }
+  .row-fluid .offset10 {
+    margin-left: 88.39779005524862%;
+    *margin-left: 88.2914070765252%;
+  }
+  .row-fluid .offset10:first-child {
+    margin-left: 85.6353591160221%;
+    *margin-left: 85.52897613729868%;
+  }
+  .row-fluid .offset9 {
+    margin-left: 79.8342541436464%;
+    *margin-left: 79.72787116492299%;
+  }
+  .row-fluid .offset9:first-child {
+    margin-left: 77.07182320441989%;
+    *margin-left: 76.96544022569647%;
+  }
+  .row-fluid .offset8 {
+    margin-left: 71.2707182320442%;
+    *margin-left: 71.16433525332079%;
+  }
+  .row-fluid .offset8:first-child {
+    margin-left: 68.50828729281768%;
+    *margin-left: 68.40190431409427%;
+  }
+  .row-fluid .offset7 {
+    margin-left: 62.70718232044199%;
+    *margin-left: 62.600799341718584%;
+  }
+  .row-fluid .offset7:first-child {
+    margin-left: 59.94475138121547%;
+    *margin-left: 59.838368402492065%;
+  }
+  .row-fluid .offset6 {
+    margin-left: 54.14364640883978%;
+    *margin-left: 54.037263430116376%;
+  }
+  .row-fluid .offset6:first-child {
+    margin-left: 51.38121546961326%;
+    *margin-left: 51.27483249088986%;
+  }
+  .row-fluid .offset5 {
+    margin-left: 45.58011049723757%;
+    *margin-left: 45.47372751851417%;
+  }
+  .row-fluid .offset5:first-child {
+    margin-left: 42.81767955801105%;
+    *margin-left: 42.71129657928765%;
+  }
+  .row-fluid .offset4 {
+    margin-left: 37.01657458563536%;
+    *margin-left: 36.91019160691196%;
+  }
+  .row-fluid .offset4:first-child {
+    margin-left: 34.25414364640884%;
+    *margin-left: 34.14776066768544%;
+  }
+  .row-fluid .offset3 {
+    margin-left: 28.45303867403315%;
+    *margin-left: 28.346655695309746%;
+  }
+  .row-fluid .offset3:first-child {
+    margin-left: 25.69060773480663%;
+    *margin-left: 25.584224756083227%;
+  }
+  .row-fluid .offset2 {
+    margin-left: 19.88950276243094%;
+    *margin-left: 19.783119783707537%;
+  }
+  .row-fluid .offset2:first-child {
+    margin-left: 17.12707182320442%;
+    *margin-left: 17.02068884448102%;
+  }
+  .row-fluid .offset1 {
+    margin-left: 11.32596685082873%;
+    *margin-left: 11.219583872105325%;
+  }
+  .row-fluid .offset1:first-child {
+    margin-left: 8.56353591160221%;
+    *margin-left: 8.457152932878806%;
+  }
+  input,
+  textarea,
+  .uneditable-input {
+    margin-left: 0;
+  }
+  .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 20px;
+  }
+  input.span12,
+  textarea.span12,
+  .uneditable-input.span12 {
+    width: 710px;
+  }
+  input.span11,
+  textarea.span11,
+  .uneditable-input.span11 {
+    width: 648px;
+  }
+  input.span10,
+  textarea.span10,
+  .uneditable-input.span10 {
+    width: 586px;
+  }
+  input.span9,
+  textarea.span9,
+  .uneditable-input.span9 {
+    width: 524px;
+  }
+  input.span8,
+  textarea.span8,
+  .uneditable-input.span8 {
+    width: 462px;
+  }
+  input.span7,
+  textarea.span7,
+  .uneditable-input.span7 {
+    width: 400px;
+  }
+  input.span6,
+  textarea.span6,
+  .uneditable-input.span6 {
+    width: 338px;
+  }
+  input.span5,
+  textarea.span5,
+  .uneditable-input.span5 {
+    width: 276px;
+  }
+  input.span4,
+  textarea.span4,
+  .uneditable-input.span4 {
+    width: 214px;
+  }
+  input.span3,
+  textarea.span3,
+  .uneditable-input.span3 {
+    width: 152px;
+  }
+  input.span2,
+  textarea.span2,
+  .uneditable-input.span2 {
+    width: 90px;
+  }
+  input.span1,
+  textarea.span1,
+  .uneditable-input.span1 {
+    width: 28px;
+  }
+}
+
+@media (max-width: 767px) {
+  body {
+    padding-right: 20px;
+    padding-left: 20px;
+  }
+  .navbar-fixed-top,
+  .navbar-fixed-bottom,
+  .navbar-static-top {
+    margin-right: -20px;
+    margin-left: -20px;
+  }
+  .container-fluid {
+    padding: 0;
+  }
+  .dl-horizontal dt {
+    float: none;
+    width: auto;
+    clear: none;
+    text-align: left;
+  }
+  .dl-horizontal dd {
+    margin-left: 0;
+  }
+  .container {
+    width: auto;
+  }
+  .row-fluid {
+    width: 100%;
+  }
+  .row,
+  .thumbnails {
+    margin-left: 0;
+  }
+  .thumbnails > li {
+    float: none;
+    margin-left: 0;
+  }
+  [class*="span"],
+  .uneditable-input[class*="span"],
+  .row-fluid [class*="span"] {
+    display: block;
+    float: none;
+    width: 100%;
+    margin-left: 0;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .span12,
+  .row-fluid .span12 {
+    width: 100%;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .row-fluid [class*="offset"]:first-child {
+    margin-left: 0;
+  }
+  .input-large,
+  .input-xlarge,
+  .input-xxlarge,
+  input[class*="span"],
+  select[class*="span"],
+  textarea[class*="span"],
+  .uneditable-input {
+    display: block;
+    width: 100%;
+    min-height: 30px;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .input-prepend input,
+  .input-append input,
+  .input-prepend input[class*="span"],
+  .input-append input[class*="span"] {
+    display: inline-block;
+    width: auto;
+  }
+  .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 0;
+  }
+  .modal {
+    position: fixed;
+    top: 20px;
+    right: 20px;
+    left: 20px;
+    width: auto;
+    margin: 0;
+  }
+  .modal.fade {
+    top: -100px;
+  }
+  .modal.fade.in {
+    top: 20px;
+  }
+}
+
+@media (max-width: 480px) {
+  .nav-collapse {
+    -webkit-transform: translate3d(0, 0, 0);
+  }
+  .page-header h1 small {
+    display: block;
+    line-height: 20px;
+  }
+  input[type="checkbox"],
+  input[type="radio"] {
+    border: 1px solid #ccc;
+  }
+  .form-horizontal .control-label {
+    float: none;
+    width: auto;
+    padding-top: 0;
+    text-align: left;
+  }
+  .form-horizontal .controls {
+    margin-left: 0;
+  }
+  .form-horizontal .control-list {
+    padding-top: 0;
+  }
+  .form-horizontal .form-actions {
+    padding-right: 10px;
+    padding-left: 10px;
+  }
+  .media .pull-left,
+  .media .pull-right {
+    display: block;
+    float: none;
+    margin-bottom: 10px;
+  }
+  .media-object {
+    margin-right: 0;
+    margin-left: 0;
+  }
+  .modal {
+    top: 10px;
+    right: 10px;
+    left: 10px;
+  }
+  .modal-header .close {
+    padding: 10px;
+    margin: -10px;
+  }
+  .carousel-caption {
+    position: static;
+  }
+}
+
+@media (max-width: 979px) {
+  body {
+    padding-top: 0;
+  }
+  .navbar-fixed-top,
+  .navbar-fixed-bottom {
+    position: static;
+  }
+  .navbar-fixed-top {
+    margin-bottom: 20px;
+  }
+  .navbar-fixed-bottom {
+    margin-top: 20px;
+  }
+  .navbar-fixed-top .navbar-inner,
+  .navbar-fixed-bottom .navbar-inner {
+    padding: 5px;
+  }
+  .navbar .container {
+    width: auto;
+    padding: 0;
+  }
+  .navbar .brand {
+    padding-right: 10px;
+    padding-left: 10px;
+    margin: 0 0 0 -5px;
+  }
+  .nav-collapse {
+    clear: both;
+  }
+  .nav-collapse .nav {
+    float: none;
+    margin: 0 0 10px;
+  }
+  .nav-collapse .nav > li {
+    float: none;
+  }
+  .nav-collapse .nav > li > a {
+    margin-bottom: 2px;
+  }
+  .nav-collapse .nav > .divider-vertical {
+    display: none;
+  }
+  .nav-collapse .nav .nav-header {
+    color: #777777;
+    text-shadow: none;
+  }
+  .nav-collapse .nav > li > a,
+  .nav-collapse .dropdown-menu a {
+    padding: 9px 15px;
+    font-weight: bold;
+    color: #777777;
+    -webkit-border-radius: 3px;
+       -moz-border-radius: 3px;
+            border-radius: 3px;
+  }
+  .nav-collapse .btn {
+    padding: 4px 10px 4px;
+    font-weight: normal;
+    -webkit-border-radius: 4px;
+       -moz-border-radius: 4px;
+            border-radius: 4px;
+  }
+  .nav-collapse .dropdown-menu li + li a {
+    margin-bottom: 2px;
+  }
+  .nav-collapse .nav > li > a:hover,
+  .nav-collapse .nav > li > a:focus,
+  .nav-collapse .dropdown-menu a:hover,
+  .nav-collapse .dropdown-menu a:focus {
+    background-color: #f2f2f2;
+  }
+  .navbar-inverse .nav-collapse .nav > li > a,
+  .navbar-inverse .nav-collapse .dropdown-menu a {
+    color: #999999;
+  }
+  .navbar-inverse .nav-collapse .nav > li > a:hover,
+  .navbar-inverse .nav-collapse .nav > li > a:focus,
+  .navbar-inverse .nav-collapse .dropdown-menu a:hover,
+  .navbar-inverse .nav-collapse .dropdown-menu a:focus {
+    background-color: #111111;
+  }
+  .nav-collapse.in .btn-group {
+    padding: 0;
+    margin-top: 5px;
+  }
+  .nav-collapse .dropdown-menu {
+    position: static;
+    top: auto;
+    left: auto;
+    display: none;
+    float: none;
+    max-width: none;
+    padding: 0;
+    margin: 0 15px;
+    background-color: transparent;
+    border: none;
+    -webkit-border-radius: 0;
+       -moz-border-radius: 0;
+            border-radius: 0;
+    -webkit-box-shadow: none;
+       -moz-box-shadow: none;
+            box-shadow: none;
+  }
+  .nav-collapse .open > .dropdown-menu {
+    display: block;
+  }
+  .nav-collapse .dropdown-menu:before,
+  .nav-collapse .dropdown-menu:after {
+    display: none;
+  }
+  .nav-collapse .dropdown-menu .divider {
+    display: none;
+  }
+  .nav-collapse .nav > li > .dropdown-menu:before,
+  .nav-collapse .nav > li > .dropdown-menu:after {
+    display: none;
+  }
+  .nav-collapse .navbar-form,
+  .nav-collapse .navbar-search {
+    float: none;
+    padding: 10px 15px;
+    margin: 10px 0;
+    border-top: 1px solid #f2f2f2;
+    border-bottom: 1px solid #f2f2f2;
+    -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+       -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+            box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+  }
+  .navbar-inverse .nav-collapse .navbar-form,
+  .navbar-inverse .nav-collapse .navbar-search {
+    border-top-color: #111111;
+    border-bottom-color: #111111;
+  }
+  .navbar .nav-collapse .nav.pull-right {
+    float: none;
+    margin-left: 0;
+  }
+  .nav-collapse,
+  .nav-collapse.collapse {
+    height: 0;
+    overflow: hidden;
+  }
+  .navbar .btn-navbar {
+    display: block;
+  }
+  .navbar-static .navbar-inner {
+    padding-right: 10px;
+    padding-left: 10px;
+  }
+}
+
+@media (min-width: 980px) {
+  .nav-collapse.collapse {
+    height: auto !important;
+    overflow: visible !important;
+  }
+}
diff --git a/view/theme/oldtest/css/bootstrap-responsive.min.css b/view/theme/oldtest/css/bootstrap-responsive.min.css
new file mode 100644
index 000000000..d1b7f4b0b
--- /dev/null
+++ b/view/theme/oldtest/css/bootstrap-responsive.min.css
@@ -0,0 +1,9 @@
+/*!
+ * Bootstrap Responsive v2.3.1
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;line-height:0;content:""}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}@-ms-viewport{width:device-width}.hidden{display:none;visibility:hidden}.visible-phone{display:none!important}.visible-tablet{display:none!important}.hidden-desktop{display:none!important}.visible-desktop{display:inherit!important}@media(min-width:768px) and (max-width:979px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-tablet{display:inherit!important}.hidden-tablet{display:none!important}}@media(max-width:767px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-phone{display:inherit!important}.hidden-phone{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:inherit!important}.hidden-print{display:none!important}}@media(min-width:1200px){.row{margin-left:-30px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:30px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:1170px}.span12{width:1170px}.span11{width:1070px}.span10{width:970px}.span9{width:870px}.span8{width:770px}.span7{width:670px}.span6{width:570px}.span5{width:470px}.span4{width:370px}.span3{width:270px}.span2{width:170px}.span1{width:70px}.offset12{margin-left:1230px}.offset11{margin-left:1130px}.offset10{margin-left:1030px}.offset9{margin-left:930px}.offset8{margin-left:830px}.offset7{margin-left:730px}.offset6{margin-left:630px}.offset5{margin-left:530px}.offset4{margin-left:430px}.offset3{margin-left:330px}.offset2{margin-left:230px}.offset1{margin-left:130px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.564102564102564%;*margin-left:2.5109110747408616%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.564102564102564%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.45299145299145%;*width:91.39979996362975%}.row-fluid .span10{width:82.90598290598291%;*width:82.8527914166212%}.row-fluid .span9{width:74.35897435897436%;*width:74.30578286961266%}.row-fluid .span8{width:65.81196581196582%;*width:65.75877432260411%}.row-fluid .span7{width:57.26495726495726%;*width:57.21176577559556%}.row-fluid .span6{width:48.717948717948715%;*width:48.664757228587014%}.row-fluid .span5{width:40.17094017094017%;*width:40.11774868157847%}.row-fluid .span4{width:31.623931623931625%;*width:31.570740134569924%}.row-fluid .span3{width:23.076923076923077%;*width:23.023731587561375%}.row-fluid .span2{width:14.52991452991453%;*width:14.476723040552828%}.row-fluid .span1{width:5.982905982905983%;*width:5.929714493544281%}.row-fluid .offset12{margin-left:105.12820512820512%;*margin-left:105.02182214948171%}.row-fluid .offset12:first-child{margin-left:102.56410256410257%;*margin-left:102.45771958537915%}.row-fluid .offset11{margin-left:96.58119658119658%;*margin-left:96.47481360247316%}.row-fluid .offset11:first-child{margin-left:94.01709401709402%;*margin-left:93.91071103837061%}.row-fluid .offset10{margin-left:88.03418803418803%;*margin-left:87.92780505546462%}.row-fluid .offset10:first-child{margin-left:85.47008547008548%;*margin-left:85.36370249136206%}.row-fluid .offset9{margin-left:79.48717948717949%;*margin-left:79.38079650845607%}.row-fluid .offset9:first-child{margin-left:76.92307692307693%;*margin-left:76.81669394435352%}.row-fluid .offset8{margin-left:70.94017094017094%;*margin-left:70.83378796144753%}.row-fluid .offset8:first-child{margin-left:68.37606837606839%;*margin-left:68.26968539734497%}.row-fluid .offset7{margin-left:62.393162393162385%;*margin-left:62.28677941443899%}.row-fluid .offset7:first-child{margin-left:59.82905982905982%;*margin-left:59.72267685033642%}.row-fluid .offset6{margin-left:53.84615384615384%;*margin-left:53.739770867430444%}.row-fluid .offset6:first-child{margin-left:51.28205128205128%;*margin-left:51.175668303327875%}.row-fluid .offset5{margin-left:45.299145299145295%;*margin-left:45.1927623204219%}.row-fluid .offset5:first-child{margin-left:42.73504273504273%;*margin-left:42.62865975631933%}.row-fluid .offset4{margin-left:36.75213675213675%;*margin-left:36.645753773413354%}.row-fluid .offset4:first-child{margin-left:34.18803418803419%;*margin-left:34.081651209310785%}.row-fluid .offset3{margin-left:28.205128205128204%;*margin-left:28.0987452264048%}.row-fluid .offset3:first-child{margin-left:25.641025641025642%;*margin-left:25.53464266230224%}.row-fluid .offset2{margin-left:19.65811965811966%;*margin-left:19.551736679396257%}.row-fluid .offset2:first-child{margin-left:17.094017094017094%;*margin-left:16.98763411529369%}.row-fluid .offset1{margin-left:11.11111111111111%;*margin-left:11.004728132387708%}.row-fluid .offset1:first-child{margin-left:8.547008547008547%;*margin-left:8.440625568285142%}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:30px}input.span12,textarea.span12,.uneditable-input.span12{width:1156px}input.span11,textarea.span11,.uneditable-input.span11{width:1056px}input.span10,textarea.span10,.uneditable-input.span10{width:956px}input.span9,textarea.span9,.uneditable-input.span9{width:856px}input.span8,textarea.span8,.uneditable-input.span8{width:756px}input.span7,textarea.span7,.uneditable-input.span7{width:656px}input.span6,textarea.span6,.uneditable-input.span6{width:556px}input.span5,textarea.span5,.uneditable-input.span5{width:456px}input.span4,textarea.span4,.uneditable-input.span4{width:356px}input.span3,textarea.span3,.uneditable-input.span3{width:256px}input.span2,textarea.span2,.uneditable-input.span2{width:156px}input.span1,textarea.span1,.uneditable-input.span1{width:56px}.thumbnails{margin-left:-30px}.thumbnails>li{margin-left:30px}.row-fluid .thumbnails{margin-left:0}}@media(min-width:768px) and (max-width:979px){.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:724px}.span12{width:724px}.span11{width:662px}.span10{width:600px}.span9{width:538px}.span8{width:476px}.span7{width:414px}.span6{width:352px}.span5{width:290px}.span4{width:228px}.span3{width:166px}.span2{width:104px}.span1{width:42px}.offset12{margin-left:764px}.offset11{margin-left:702px}.offset10{margin-left:640px}.offset9{margin-left:578px}.offset8{margin-left:516px}.offset7{margin-left:454px}.offset6{margin-left:392px}.offset5{margin-left:330px}.offset4{margin-left:268px}.offset3{margin-left:206px}.offset2{margin-left:144px}.offset1{margin-left:82px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.7624309392265194%;*margin-left:2.709239449864817%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.7624309392265194%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.43646408839778%;*width:91.38327259903608%}.row-fluid .span10{width:82.87292817679558%;*width:82.81973668743387%}.row-fluid .span9{width:74.30939226519337%;*width:74.25620077583166%}.row-fluid .span8{width:65.74585635359117%;*width:65.69266486422946%}.row-fluid .span7{width:57.18232044198895%;*width:57.12912895262725%}.row-fluid .span6{width:48.61878453038674%;*width:48.56559304102504%}.row-fluid .span5{width:40.05524861878453%;*width:40.00205712942283%}.row-fluid .span4{width:31.491712707182323%;*width:31.43852121782062%}.row-fluid .span3{width:22.92817679558011%;*width:22.87498530621841%}.row-fluid .span2{width:14.3646408839779%;*width:14.311449394616199%}.row-fluid .span1{width:5.801104972375691%;*width:5.747913483013988%}.row-fluid .offset12{margin-left:105.52486187845304%;*margin-left:105.41847889972962%}.row-fluid .offset12:first-child{margin-left:102.76243093922652%;*margin-left:102.6560479605031%}.row-fluid .offset11{margin-left:96.96132596685082%;*margin-left:96.8549429881274%}.row-fluid .offset11:first-child{margin-left:94.1988950276243%;*margin-left:94.09251204890089%}.row-fluid .offset10{margin-left:88.39779005524862%;*margin-left:88.2914070765252%}.row-fluid .offset10:first-child{margin-left:85.6353591160221%;*margin-left:85.52897613729868%}.row-fluid .offset9{margin-left:79.8342541436464%;*margin-left:79.72787116492299%}.row-fluid .offset9:first-child{margin-left:77.07182320441989%;*margin-left:76.96544022569647%}.row-fluid .offset8{margin-left:71.2707182320442%;*margin-left:71.16433525332079%}.row-fluid .offset8:first-child{margin-left:68.50828729281768%;*margin-left:68.40190431409427%}.row-fluid .offset7{margin-left:62.70718232044199%;*margin-left:62.600799341718584%}.row-fluid .offset7:first-child{margin-left:59.94475138121547%;*margin-left:59.838368402492065%}.row-fluid .offset6{margin-left:54.14364640883978%;*margin-left:54.037263430116376%}.row-fluid .offset6:first-child{margin-left:51.38121546961326%;*margin-left:51.27483249088986%}.row-fluid .offset5{margin-left:45.58011049723757%;*margin-left:45.47372751851417%}.row-fluid .offset5:first-child{margin-left:42.81767955801105%;*margin-left:42.71129657928765%}.row-fluid .offset4{margin-left:37.01657458563536%;*margin-left:36.91019160691196%}.row-fluid .offset4:first-child{margin-left:34.25414364640884%;*margin-left:34.14776066768544%}.row-fluid .offset3{margin-left:28.45303867403315%;*margin-left:28.346655695309746%}.row-fluid .offset3:first-child{margin-left:25.69060773480663%;*margin-left:25.584224756083227%}.row-fluid .offset2{margin-left:19.88950276243094%;*margin-left:19.783119783707537%}.row-fluid .offset2:first-child{margin-left:17.12707182320442%;*margin-left:17.02068884448102%}.row-fluid .offset1{margin-left:11.32596685082873%;*margin-left:11.219583872105325%}.row-fluid .offset1:first-child{margin-left:8.56353591160221%;*margin-left:8.457152932878806%}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:20px}input.span12,textarea.span12,.uneditable-input.span12{width:710px}input.span11,textarea.span11,.uneditable-input.span11{width:648px}input.span10,textarea.span10,.uneditable-input.span10{width:586px}input.span9,textarea.span9,.uneditable-input.span9{width:524px}input.span8,textarea.span8,.uneditable-input.span8{width:462px}input.span7,textarea.span7,.uneditable-input.span7{width:400px}input.span6,textarea.span6,.uneditable-input.span6{width:338px}input.span5,textarea.span5,.uneditable-input.span5{width:276px}input.span4,textarea.span4,.uneditable-input.span4{width:214px}input.span3,textarea.span3,.uneditable-input.span3{width:152px}input.span2,textarea.span2,.uneditable-input.span2{width:90px}input.span1,textarea.span1,.uneditable-input.span1{width:28px}}@media(max-width:767px){body{padding-right:20px;padding-left:20px}.navbar-fixed-top,.navbar-fixed-bottom,.navbar-static-top{margin-right:-20px;margin-left:-20px}.container-fluid{padding:0}.dl-horizontal dt{float:none;width:auto;clear:none;text-align:left}.dl-horizontal dd{margin-left:0}.container{width:auto}.row-fluid{width:100%}.row,.thumbnails{margin-left:0}.thumbnails>li{float:none;margin-left:0}[class*="span"],.uneditable-input[class*="span"],.row-fluid [class*="span"]{display:block;float:none;width:100%;margin-left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.span12,.row-fluid .span12{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="offset"]:first-child{margin-left:0}.input-large,.input-xlarge,.input-xxlarge,input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.input-prepend input,.input-append input,.input-prepend input[class*="span"],.input-append input[class*="span"]{display:inline-block;width:auto}.controls-row [class*="span"]+[class*="span"]{margin-left:0}.modal{position:fixed;top:20px;right:20px;left:20px;width:auto;margin:0}.modal.fade{top:-100px}.modal.fade.in{top:20px}}@media(max-width:480px){.nav-collapse{-webkit-transform:translate3d(0,0,0)}.page-header h1 small{display:block;line-height:20px}input[type="checkbox"],input[type="radio"]{border:1px solid #ccc}.form-horizontal .control-label{float:none;width:auto;padding-top:0;text-align:left}.form-horizontal .controls{margin-left:0}.form-horizontal .control-list{padding-top:0}.form-horizontal .form-actions{padding-right:10px;padding-left:10px}.media .pull-left,.media .pull-right{display:block;float:none;margin-bottom:10px}.media-object{margin-right:0;margin-left:0}.modal{top:10px;right:10px;left:10px}.modal-header .close{padding:10px;margin:-10px}.carousel-caption{position:static}}@media(max-width:979px){body{padding-top:0}.navbar-fixed-top,.navbar-fixed-bottom{position:static}.navbar-fixed-top{margin-bottom:20px}.navbar-fixed-bottom{margin-top:20px}.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding:5px}.navbar .container{width:auto;padding:0}.navbar .brand{padding-right:10px;padding-left:10px;margin:0 0 0 -5px}.nav-collapse{clear:both}.nav-collapse .nav{float:none;margin:0 0 10px}.nav-collapse .nav>li{float:none}.nav-collapse .nav>li>a{margin-bottom:2px}.nav-collapse .nav>.divider-vertical{display:none}.nav-collapse .nav .nav-header{color:#777;text-shadow:none}.nav-collapse .nav>li>a,.nav-collapse .dropdown-menu a{padding:9px 15px;font-weight:bold;color:#777;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.nav-collapse .btn{padding:4px 10px 4px;font-weight:normal;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.nav-collapse .dropdown-menu li+li a{margin-bottom:2px}.nav-collapse .nav>li>a:hover,.nav-collapse .nav>li>a:focus,.nav-collapse .dropdown-menu a:hover,.nav-collapse .dropdown-menu a:focus{background-color:#f2f2f2}.navbar-inverse .nav-collapse .nav>li>a,.navbar-inverse .nav-collapse .dropdown-menu a{color:#999}.navbar-inverse .nav-collapse .nav>li>a:hover,.navbar-inverse .nav-collapse .nav>li>a:focus,.navbar-inverse .nav-collapse .dropdown-menu a:hover,.navbar-inverse .nav-collapse .dropdown-menu a:focus{background-color:#111}.nav-collapse.in .btn-group{padding:0;margin-top:5px}.nav-collapse .dropdown-menu{position:static;top:auto;left:auto;display:none;float:none;max-width:none;padding:0;margin:0 15px;background-color:transparent;border:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.nav-collapse .open>.dropdown-menu{display:block}.nav-collapse .dropdown-menu:before,.nav-collapse .dropdown-menu:after{display:none}.nav-collapse .dropdown-menu .divider{display:none}.nav-collapse .nav>li>.dropdown-menu:before,.nav-collapse .nav>li>.dropdown-menu:after{display:none}.nav-collapse .navbar-form,.nav-collapse .navbar-search{float:none;padding:10px 15px;margin:10px 0;border-top:1px solid #f2f2f2;border-bottom:1px solid #f2f2f2;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1)}.navbar-inverse .nav-collapse .navbar-form,.navbar-inverse .nav-collapse .navbar-search{border-top-color:#111;border-bottom-color:#111}.navbar .nav-collapse .nav.pull-right{float:none;margin-left:0}.nav-collapse,.nav-collapse.collapse{height:0;overflow:hidden}.navbar .btn-navbar{display:block}.navbar-static .navbar-inner{padding-right:10px;padding-left:10px}}@media(min-width:980px){.nav-collapse.collapse{height:auto!important;overflow:visible!important}}
diff --git a/view/theme/oldtest/css/bootstrap.css b/view/theme/oldtest/css/bootstrap.css
new file mode 100644
index 000000000..2f56af33f
--- /dev/null
+++ b/view/theme/oldtest/css/bootstrap.css
@@ -0,0 +1,6158 @@
+/*!
+ * Bootstrap v2.3.1
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */
+
+.clearfix {
+  *zoom: 1;
+}
+
+.clearfix:before,
+.clearfix:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.clearfix:after {
+  clear: both;
+}
+
+.hide-text {
+  font: 0/0 a;
+  color: transparent;
+  text-shadow: none;
+  background-color: transparent;
+  border: 0;
+}
+
+.input-block-level {
+  display: block;
+  width: 100%;
+  min-height: 30px;
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+nav,
+section {
+  display: block;
+}
+
+audio,
+canvas,
+video {
+  display: inline-block;
+  *display: inline;
+  *zoom: 1;
+}
+
+audio:not([controls]) {
+  display: none;
+}
+
+html {
+  font-size: 100%;
+  -webkit-text-size-adjust: 100%;
+      -ms-text-size-adjust: 100%;
+}
+
+a:focus {
+  outline: thin dotted #333;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+
+a:hover,
+a:active {
+  outline: 0;
+}
+
+sub,
+sup {
+  position: relative;
+  font-size: 75%;
+  line-height: 0;
+  vertical-align: baseline;
+}
+
+sup {
+  top: -0.5em;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+img {
+  width: auto\9;
+  height: auto;
+  max-width: 100%;
+  vertical-align: middle;
+  border: 0;
+  -ms-interpolation-mode: bicubic;
+}
+
+#map_canvas img,
+.google-maps img {
+  max-width: none;
+}
+
+button,
+input,
+select,
+textarea {
+  margin: 0;
+  font-size: 100%;
+  vertical-align: middle;
+}
+
+button,
+input {
+  *overflow: visible;
+  line-height: normal;
+}
+
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+  padding: 0;
+  border: 0;
+}
+
+button,
+html input[type="button"],
+input[type="reset"],
+input[type="submit"] {
+  cursor: pointer;
+  -webkit-appearance: button;
+}
+
+label,
+select,
+button,
+input[type="button"],
+input[type="reset"],
+input[type="submit"],
+input[type="radio"],
+input[type="checkbox"] {
+  cursor: pointer;
+}
+
+input[type="search"] {
+  -webkit-box-sizing: content-box;
+     -moz-box-sizing: content-box;
+          box-sizing: content-box;
+  -webkit-appearance: textfield;
+}
+
+input[type="search"]::-webkit-search-decoration,
+input[type="search"]::-webkit-search-cancel-button {
+  -webkit-appearance: none;
+}
+
+textarea {
+  overflow: auto;
+  vertical-align: top;
+}
+
+@media print {
+  * {
+    color: #000 !important;
+    text-shadow: none !important;
+    background: transparent !important;
+    box-shadow: none !important;
+  }
+  a,
+  a:visited {
+    text-decoration: underline;
+  }
+  a[href]:after {
+    content: " (" attr(href) ")";
+  }
+  abbr[title]:after {
+    content: " (" attr(title) ")";
+  }
+  .ir a:after,
+  a[href^="javascript:"]:after,
+  a[href^="#"]:after {
+    content: "";
+  }
+  pre,
+  blockquote {
+    border: 1px solid #999;
+    page-break-inside: avoid;
+  }
+  thead {
+    display: table-header-group;
+  }
+  tr,
+  img {
+    page-break-inside: avoid;
+  }
+  img {
+    max-width: 100% !important;
+  }
+  @page  {
+    margin: 0.5cm;
+  }
+  p,
+  h2,
+  h3 {
+    orphans: 3;
+    widows: 3;
+  }
+  h2,
+  h3 {
+    page-break-after: avoid;
+  }
+}
+
+body {
+  margin: 0;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 14px;
+  line-height: 20px;
+  color: #333333;
+  background-color: #ffffff;
+}
+
+a {
+  color: #0088cc;
+  text-decoration: none;
+}
+
+a:hover,
+a:focus {
+  color: #005580;
+  text-decoration: underline;
+}
+
+.img-rounded {
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+}
+
+.img-polaroid {
+  padding: 4px;
+  background-color: #fff;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+     -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+          box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+}
+
+.img-circle {
+  -webkit-border-radius: 500px;
+     -moz-border-radius: 500px;
+          border-radius: 500px;
+}
+
+.row {
+  margin-left: -20px;
+  *zoom: 1;
+}
+
+.row:before,
+.row:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.row:after {
+  clear: both;
+}
+
+[class*="span"] {
+  float: left;
+  min-height: 1px;
+  margin-left: 20px;
+}
+
+.container,
+.navbar-static-top .container,
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
+  width: 940px;
+}
+
+.span12 {
+  width: 940px;
+}
+
+.span11 {
+  width: 860px;
+}
+
+.span10 {
+  width: 780px;
+}
+
+.span9 {
+  width: 700px;
+}
+
+.span8 {
+  width: 620px;
+}
+
+.span7 {
+  width: 540px;
+}
+
+.span6 {
+  width: 460px;
+}
+
+.span5 {
+  width: 380px;
+}
+
+.span4 {
+  width: 300px;
+}
+
+.span3 {
+  width: 220px;
+}
+
+.span2 {
+  width: 140px;
+}
+
+.span1 {
+  width: 60px;
+}
+
+.offset12 {
+  margin-left: 980px;
+}
+
+.offset11 {
+  margin-left: 900px;
+}
+
+.offset10 {
+  margin-left: 820px;
+}
+
+.offset9 {
+  margin-left: 740px;
+}
+
+.offset8 {
+  margin-left: 660px;
+}
+
+.offset7 {
+  margin-left: 580px;
+}
+
+.offset6 {
+  margin-left: 500px;
+}
+
+.offset5 {
+  margin-left: 420px;
+}
+
+.offset4 {
+  margin-left: 340px;
+}
+
+.offset3 {
+  margin-left: 260px;
+}
+
+.offset2 {
+  margin-left: 180px;
+}
+
+.offset1 {
+  margin-left: 100px;
+}
+
+.row-fluid {
+  width: 100%;
+  *zoom: 1;
+}
+
+.row-fluid:before,
+.row-fluid:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.row-fluid:after {
+  clear: both;
+}
+
+.row-fluid [class*="span"] {
+  display: block;
+  float: left;
+  width: 100%;
+  min-height: 30px;
+  margin-left: 2.127659574468085%;
+  *margin-left: 2.074468085106383%;
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+.row-fluid [class*="span"]:first-child {
+  margin-left: 0;
+}
+
+.row-fluid .controls-row [class*="span"] + [class*="span"] {
+  margin-left: 2.127659574468085%;
+}
+
+.row-fluid .span12 {
+  width: 100%;
+  *width: 99.94680851063829%;
+}
+
+.row-fluid .span11 {
+  width: 91.48936170212765%;
+  *width: 91.43617021276594%;
+}
+
+.row-fluid .span10 {
+  width: 82.97872340425532%;
+  *width: 82.92553191489361%;
+}
+
+.row-fluid .span9 {
+  width: 74.46808510638297%;
+  *width: 74.41489361702126%;
+}
+
+.row-fluid .span8 {
+  width: 65.95744680851064%;
+  *width: 65.90425531914893%;
+}
+
+.row-fluid .span7 {
+  width: 57.44680851063829%;
+  *width: 57.39361702127659%;
+}
+
+.row-fluid .span6 {
+  width: 48.93617021276595%;
+  *width: 48.88297872340425%;
+}
+
+.row-fluid .span5 {
+  width: 40.42553191489362%;
+  *width: 40.37234042553192%;
+}
+
+.row-fluid .span4 {
+  width: 31.914893617021278%;
+  *width: 31.861702127659576%;
+}
+
+.row-fluid .span3 {
+  width: 23.404255319148934%;
+  *width: 23.351063829787233%;
+}
+
+.row-fluid .span2 {
+  width: 14.893617021276595%;
+  *width: 14.840425531914894%;
+}
+
+.row-fluid .span1 {
+  width: 6.382978723404255%;
+  *width: 6.329787234042553%;
+}
+
+.row-fluid .offset12 {
+  margin-left: 104.25531914893617%;
+  *margin-left: 104.14893617021275%;
+}
+
+.row-fluid .offset12:first-child {
+  margin-left: 102.12765957446808%;
+  *margin-left: 102.02127659574467%;
+}
+
+.row-fluid .offset11 {
+  margin-left: 95.74468085106382%;
+  *margin-left: 95.6382978723404%;
+}
+
+.row-fluid .offset11:first-child {
+  margin-left: 93.61702127659574%;
+  *margin-left: 93.51063829787232%;
+}
+
+.row-fluid .offset10 {
+  margin-left: 87.23404255319149%;
+  *margin-left: 87.12765957446807%;
+}
+
+.row-fluid .offset10:first-child {
+  margin-left: 85.1063829787234%;
+  *margin-left: 84.99999999999999%;
+}
+
+.row-fluid .offset9 {
+  margin-left: 78.72340425531914%;
+  *margin-left: 78.61702127659572%;
+}
+
+.row-fluid .offset9:first-child {
+  margin-left: 76.59574468085106%;
+  *margin-left: 76.48936170212764%;
+}
+
+.row-fluid .offset8 {
+  margin-left: 70.2127659574468%;
+  *margin-left: 70.10638297872339%;
+}
+
+.row-fluid .offset8:first-child {
+  margin-left: 68.08510638297872%;
+  *margin-left: 67.9787234042553%;
+}
+
+.row-fluid .offset7 {
+  margin-left: 61.70212765957446%;
+  *margin-left: 61.59574468085106%;
+}
+
+.row-fluid .offset7:first-child {
+  margin-left: 59.574468085106375%;
+  *margin-left: 59.46808510638297%;
+}
+
+.row-fluid .offset6 {
+  margin-left: 53.191489361702125%;
+  *margin-left: 53.085106382978715%;
+}
+
+.row-fluid .offset6:first-child {
+  margin-left: 51.063829787234035%;
+  *margin-left: 50.95744680851063%;
+}
+
+.row-fluid .offset5 {
+  margin-left: 44.68085106382979%;
+  *margin-left: 44.57446808510638%;
+}
+
+.row-fluid .offset5:first-child {
+  margin-left: 42.5531914893617%;
+  *margin-left: 42.4468085106383%;
+}
+
+.row-fluid .offset4 {
+  margin-left: 36.170212765957444%;
+  *margin-left: 36.06382978723405%;
+}
+
+.row-fluid .offset4:first-child {
+  margin-left: 34.04255319148936%;
+  *margin-left: 33.93617021276596%;
+}
+
+.row-fluid .offset3 {
+  margin-left: 27.659574468085104%;
+  *margin-left: 27.5531914893617%;
+}
+
+.row-fluid .offset3:first-child {
+  margin-left: 25.53191489361702%;
+  *margin-left: 25.425531914893618%;
+}
+
+.row-fluid .offset2 {
+  margin-left: 19.148936170212764%;
+  *margin-left: 19.04255319148936%;
+}
+
+.row-fluid .offset2:first-child {
+  margin-left: 17.02127659574468%;
+  *margin-left: 16.914893617021278%;
+}
+
+.row-fluid .offset1 {
+  margin-left: 10.638297872340425%;
+  *margin-left: 10.53191489361702%;
+}
+
+.row-fluid .offset1:first-child {
+  margin-left: 8.51063829787234%;
+  *margin-left: 8.404255319148938%;
+}
+
+[class*="span"].hide,
+.row-fluid [class*="span"].hide {
+  display: none;
+}
+
+[class*="span"].pull-right,
+.row-fluid [class*="span"].pull-right {
+  float: right;
+}
+
+.container {
+  margin-right: auto;
+  margin-left: auto;
+  *zoom: 1;
+}
+
+.container:before,
+.container:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.container:after {
+  clear: both;
+}
+
+.container-fluid {
+  padding-right: 20px;
+  padding-left: 20px;
+  *zoom: 1;
+}
+
+.container-fluid:before,
+.container-fluid:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.container-fluid:after {
+  clear: both;
+}
+
+p {
+  margin: 0 0 10px;
+}
+
+.lead {
+  margin-bottom: 20px;
+  font-size: 21px;
+  font-weight: 200;
+  line-height: 30px;
+}
+
+small {
+  font-size: 85%;
+}
+
+strong {
+  font-weight: bold;
+}
+
+em {
+  font-style: italic;
+}
+
+cite {
+  font-style: normal;
+}
+
+.muted {
+  color: #999999;
+}
+
+a.muted:hover,
+a.muted:focus {
+  color: #808080;
+}
+
+.text-warning {
+  color: #c09853;
+}
+
+a.text-warning:hover,
+a.text-warning:focus {
+  color: #a47e3c;
+}
+
+.text-error {
+  color: #b94a48;
+}
+
+a.text-error:hover,
+a.text-error:focus {
+  color: #953b39;
+}
+
+.text-info {
+  color: #3a87ad;
+}
+
+a.text-info:hover,
+a.text-info:focus {
+  color: #2d6987;
+}
+
+.text-success {
+  color: #468847;
+}
+
+a.text-success:hover,
+a.text-success:focus {
+  color: #356635;
+}
+
+.text-left {
+  text-align: left;
+}
+
+.text-right {
+  text-align: right;
+}
+
+.text-center {
+  text-align: center;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  margin: 10px 0;
+  font-family: inherit;
+  font-weight: bold;
+  line-height: 20px;
+  color: inherit;
+  text-rendering: optimizelegibility;
+}
+
+h1 small,
+h2 small,
+h3 small,
+h4 small,
+h5 small,
+h6 small {
+  font-weight: normal;
+  line-height: 1;
+  color: #999999;
+}
+
+h1,
+h2,
+h3 {
+  line-height: 40px;
+}
+
+h1 {
+  font-size: 38.5px;
+}
+
+h2 {
+  font-size: 31.5px;
+}
+
+h3 {
+  font-size: 24.5px;
+}
+
+h4 {
+  font-size: 17.5px;
+}
+
+h5 {
+  font-size: 14px;
+}
+
+h6 {
+  font-size: 11.9px;
+}
+
+h1 small {
+  font-size: 24.5px;
+}
+
+h2 small {
+  font-size: 17.5px;
+}
+
+h3 small {
+  font-size: 14px;
+}
+
+h4 small {
+  font-size: 14px;
+}
+
+.page-header {
+  padding-bottom: 9px;
+  margin: 20px 0 30px;
+  border-bottom: 1px solid #eeeeee;
+}
+
+ul,
+ol {
+  padding: 0;
+  margin: 0 0 10px 25px;
+}
+
+ul ul,
+ul ol,
+ol ol,
+ol ul {
+  margin-bottom: 0;
+}
+
+li {
+  line-height: 20px;
+}
+
+ul.unstyled,
+ol.unstyled {
+  margin-left: 0;
+  list-style: none;
+}
+
+ul.inline,
+ol.inline {
+  margin-left: 0;
+  list-style: none;
+}
+
+ul.inline > li,
+ol.inline > li {
+  display: inline-block;
+  *display: inline;
+  padding-right: 5px;
+  padding-left: 5px;
+  *zoom: 1;
+}
+
+dl {
+  margin-bottom: 20px;
+}
+
+dt,
+dd {
+  line-height: 20px;
+}
+
+dt {
+  font-weight: bold;
+}
+
+dd {
+  margin-left: 10px;
+}
+
+.dl-horizontal {
+  *zoom: 1;
+}
+
+.dl-horizontal:before,
+.dl-horizontal:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.dl-horizontal:after {
+  clear: both;
+}
+
+.dl-horizontal dt {
+  float: left;
+  width: 160px;
+  overflow: hidden;
+  clear: left;
+  text-align: right;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.dl-horizontal dd {
+  margin-left: 180px;
+}
+
+hr {
+  margin: 20px 0;
+  border: 0;
+  border-top: 1px solid #eeeeee;
+  border-bottom: 1px solid #ffffff;
+}
+
+abbr[title],
+abbr[data-original-title] {
+  cursor: help;
+  border-bottom: 1px dotted #999999;
+}
+
+abbr.initialism {
+  font-size: 90%;
+  text-transform: uppercase;
+}
+
+blockquote {
+  padding: 0 0 0 15px;
+  margin: 0 0 20px;
+  border-left: 5px solid #eeeeee;
+}
+
+blockquote p {
+  margin-bottom: 0;
+  font-size: 17.5px;
+  font-weight: 300;
+  line-height: 1.25;
+}
+
+blockquote small {
+  display: block;
+  line-height: 20px;
+  color: #999999;
+}
+
+blockquote small:before {
+  content: '\2014 \00A0';
+}
+
+blockquote.pull-right {
+  float: right;
+  padding-right: 15px;
+  padding-left: 0;
+  border-right: 5px solid #eeeeee;
+  border-left: 0;
+}
+
+blockquote.pull-right p,
+blockquote.pull-right small {
+  text-align: right;
+}
+
+blockquote.pull-right small:before {
+  content: '';
+}
+
+blockquote.pull-right small:after {
+  content: '\00A0 \2014';
+}
+
+q:before,
+q:after,
+blockquote:before,
+blockquote:after {
+  content: "";
+}
+
+address {
+  display: block;
+  margin-bottom: 20px;
+  font-style: normal;
+  line-height: 20px;
+}
+
+code,
+pre {
+  padding: 0 3px 2px;
+  font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
+  font-size: 12px;
+  color: #333333;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+
+code {
+  padding: 2px 4px;
+  color: #d14;
+  white-space: nowrap;
+  background-color: #f7f7f9;
+  border: 1px solid #e1e1e8;
+}
+
+pre {
+  display: block;
+  padding: 9.5px;
+  margin: 0 0 10px;
+  font-size: 13px;
+  line-height: 20px;
+  word-break: break-all;
+  word-wrap: break-word;
+  white-space: pre;
+  white-space: pre-wrap;
+  background-color: #f5f5f5;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+pre.prettyprint {
+  margin-bottom: 20px;
+}
+
+pre code {
+  padding: 0;
+  color: inherit;
+  white-space: pre;
+  white-space: pre-wrap;
+  background-color: transparent;
+  border: 0;
+}
+
+.pre-scrollable {
+  max-height: 340px;
+  overflow-y: scroll;
+}
+
+form {
+  margin: 0 0 20px;
+}
+
+fieldset {
+  padding: 0;
+  margin: 0;
+  border: 0;
+}
+
+legend {
+  display: block;
+  width: 100%;
+  padding: 0;
+  margin-bottom: 20px;
+  font-size: 21px;
+  line-height: 40px;
+  color: #333333;
+  border: 0;
+  border-bottom: 1px solid #e5e5e5;
+}
+
+legend small {
+  font-size: 15px;
+  color: #999999;
+}
+
+label,
+input,
+button,
+select,
+textarea {
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 20px;
+}
+
+input,
+button,
+select,
+textarea {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+
+label {
+  display: block;
+  margin-bottom: 5px;
+}
+
+select,
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input {
+  display: inline-block;
+  height: 20px;
+  padding: 4px 6px;
+  margin-bottom: 10px;
+  font-size: 14px;
+  line-height: 20px;
+  color: #555555;
+  vertical-align: middle;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+input,
+textarea,
+.uneditable-input {
+  width: 206px;
+}
+
+textarea {
+  height: auto;
+}
+
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input {
+  background-color: #ffffff;
+  border: 1px solid #cccccc;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
+     -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
+       -o-transition: border linear 0.2s, box-shadow linear 0.2s;
+          transition: border linear 0.2s, box-shadow linear 0.2s;
+}
+
+textarea:focus,
+input[type="text"]:focus,
+input[type="password"]:focus,
+input[type="datetime"]:focus,
+input[type="datetime-local"]:focus,
+input[type="date"]:focus,
+input[type="month"]:focus,
+input[type="time"]:focus,
+input[type="week"]:focus,
+input[type="number"]:focus,
+input[type="email"]:focus,
+input[type="url"]:focus,
+input[type="search"]:focus,
+input[type="tel"]:focus,
+input[type="color"]:focus,
+.uneditable-input:focus {
+  border-color: rgba(82, 168, 236, 0.8);
+  outline: 0;
+  outline: thin dotted \9;
+  /* IE6-9 */
+
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+}
+
+input[type="radio"],
+input[type="checkbox"] {
+  margin: 4px 0 0;
+  margin-top: 1px \9;
+  *margin-top: 0;
+  line-height: normal;
+}
+
+input[type="file"],
+input[type="image"],
+input[type="submit"],
+input[type="reset"],
+input[type="button"],
+input[type="radio"],
+input[type="checkbox"] {
+  width: auto;
+}
+
+select,
+input[type="file"] {
+  height: 30px;
+  /* In IE7, the height of the select element cannot be changed by height, only font-size */
+
+  *margin-top: 4px;
+  /* For IE7, add top margin to align select with labels */
+
+  line-height: 30px;
+}
+
+select {
+  width: 220px;
+  background-color: #ffffff;
+  border: 1px solid #cccccc;
+}
+
+select[multiple],
+select[size] {
+  height: auto;
+}
+
+select:focus,
+input[type="file"]:focus,
+input[type="radio"]:focus,
+input[type="checkbox"]:focus {
+  outline: thin dotted #333;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+
+.uneditable-input,
+.uneditable-textarea {
+  color: #999999;
+  cursor: not-allowed;
+  background-color: #fcfcfc;
+  border-color: #cccccc;
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+}
+
+.uneditable-input {
+  overflow: hidden;
+  white-space: nowrap;
+}
+
+.uneditable-textarea {
+  width: auto;
+  height: auto;
+}
+
+input:-moz-placeholder,
+textarea:-moz-placeholder {
+  color: #999999;
+}
+
+input:-ms-input-placeholder,
+textarea:-ms-input-placeholder {
+  color: #999999;
+}
+
+input::-webkit-input-placeholder,
+textarea::-webkit-input-placeholder {
+  color: #999999;
+}
+
+.radio,
+.checkbox {
+  min-height: 20px;
+  padding-left: 20px;
+}
+
+.radio input[type="radio"],
+.checkbox input[type="checkbox"] {
+  float: left;
+  margin-left: -20px;
+}
+
+.controls > .radio:first-child,
+.controls > .checkbox:first-child {
+  padding-top: 5px;
+}
+
+.radio.inline,
+.checkbox.inline {
+  display: inline-block;
+  padding-top: 5px;
+  margin-bottom: 0;
+  vertical-align: middle;
+}
+
+.radio.inline + .radio.inline,
+.checkbox.inline + .checkbox.inline {
+  margin-left: 10px;
+}
+
+.input-mini {
+  width: 60px;
+}
+
+.input-small {
+  width: 90px;
+}
+
+.input-medium {
+  width: 150px;
+}
+
+.input-large {
+  width: 210px;
+}
+
+.input-xlarge {
+  width: 270px;
+}
+
+.input-xxlarge {
+  width: 530px;
+}
+
+input[class*="span"],
+select[class*="span"],
+textarea[class*="span"],
+.uneditable-input[class*="span"],
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"] {
+  float: none;
+  margin-left: 0;
+}
+
+.input-append input[class*="span"],
+.input-append .uneditable-input[class*="span"],
+.input-prepend input[class*="span"],
+.input-prepend .uneditable-input[class*="span"],
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"],
+.row-fluid .input-prepend [class*="span"],
+.row-fluid .input-append [class*="span"] {
+  display: inline-block;
+}
+
+input,
+textarea,
+.uneditable-input {
+  margin-left: 0;
+}
+
+.controls-row [class*="span"] + [class*="span"] {
+  margin-left: 20px;
+}
+
+input.span12,
+textarea.span12,
+.uneditable-input.span12 {
+  width: 926px;
+}
+
+input.span11,
+textarea.span11,
+.uneditable-input.span11 {
+  width: 846px;
+}
+
+input.span10,
+textarea.span10,
+.uneditable-input.span10 {
+  width: 766px;
+}
+
+input.span9,
+textarea.span9,
+.uneditable-input.span9 {
+  width: 686px;
+}
+
+input.span8,
+textarea.span8,
+.uneditable-input.span8 {
+  width: 606px;
+}
+
+input.span7,
+textarea.span7,
+.uneditable-input.span7 {
+  width: 526px;
+}
+
+input.span6,
+textarea.span6,
+.uneditable-input.span6 {
+  width: 446px;
+}
+
+input.span5,
+textarea.span5,
+.uneditable-input.span5 {
+  width: 366px;
+}
+
+input.span4,
+textarea.span4,
+.uneditable-input.span4 {
+  width: 286px;
+}
+
+input.span3,
+textarea.span3,
+.uneditable-input.span3 {
+  width: 206px;
+}
+
+input.span2,
+textarea.span2,
+.uneditable-input.span2 {
+  width: 126px;
+}
+
+input.span1,
+textarea.span1,
+.uneditable-input.span1 {
+  width: 46px;
+}
+
+.controls-row {
+  *zoom: 1;
+}
+
+.controls-row:before,
+.controls-row:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.controls-row:after {
+  clear: both;
+}
+
+.controls-row [class*="span"],
+.row-fluid .controls-row [class*="span"] {
+  float: left;
+}
+
+.controls-row .checkbox[class*="span"],
+.controls-row .radio[class*="span"] {
+  padding-top: 5px;
+}
+
+input[disabled],
+select[disabled],
+textarea[disabled],
+input[readonly],
+select[readonly],
+textarea[readonly] {
+  cursor: not-allowed;
+  background-color: #eeeeee;
+}
+
+input[type="radio"][disabled],
+input[type="checkbox"][disabled],
+input[type="radio"][readonly],
+input[type="checkbox"][readonly] {
+  background-color: transparent;
+}
+
+.control-group.warning .control-label,
+.control-group.warning .help-block,
+.control-group.warning .help-inline {
+  color: #c09853;
+}
+
+.control-group.warning .checkbox,
+.control-group.warning .radio,
+.control-group.warning input,
+.control-group.warning select,
+.control-group.warning textarea {
+  color: #c09853;
+}
+
+.control-group.warning input,
+.control-group.warning select,
+.control-group.warning textarea {
+  border-color: #c09853;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.control-group.warning input:focus,
+.control-group.warning select:focus,
+.control-group.warning textarea:focus {
+  border-color: #a47e3c;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
+}
+
+.control-group.warning .input-prepend .add-on,
+.control-group.warning .input-append .add-on {
+  color: #c09853;
+  background-color: #fcf8e3;
+  border-color: #c09853;
+}
+
+.control-group.error .control-label,
+.control-group.error .help-block,
+.control-group.error .help-inline {
+  color: #b94a48;
+}
+
+.control-group.error .checkbox,
+.control-group.error .radio,
+.control-group.error input,
+.control-group.error select,
+.control-group.error textarea {
+  color: #b94a48;
+}
+
+.control-group.error input,
+.control-group.error select,
+.control-group.error textarea {
+  border-color: #b94a48;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.control-group.error input:focus,
+.control-group.error select:focus,
+.control-group.error textarea:focus {
+  border-color: #953b39;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
+}
+
+.control-group.error .input-prepend .add-on,
+.control-group.error .input-append .add-on {
+  color: #b94a48;
+  background-color: #f2dede;
+  border-color: #b94a48;
+}
+
+.control-group.success .control-label,
+.control-group.success .help-block,
+.control-group.success .help-inline {
+  color: #468847;
+}
+
+.control-group.success .checkbox,
+.control-group.success .radio,
+.control-group.success input,
+.control-group.success select,
+.control-group.success textarea {
+  color: #468847;
+}
+
+.control-group.success input,
+.control-group.success select,
+.control-group.success textarea {
+  border-color: #468847;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.control-group.success input:focus,
+.control-group.success select:focus,
+.control-group.success textarea:focus {
+  border-color: #356635;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+}
+
+.control-group.success .input-prepend .add-on,
+.control-group.success .input-append .add-on {
+  color: #468847;
+  background-color: #dff0d8;
+  border-color: #468847;
+}
+
+.control-group.info .control-label,
+.control-group.info .help-block,
+.control-group.info .help-inline {
+  color: #3a87ad;
+}
+
+.control-group.info .checkbox,
+.control-group.info .radio,
+.control-group.info input,
+.control-group.info select,
+.control-group.info textarea {
+  color: #3a87ad;
+}
+
+.control-group.info input,
+.control-group.info select,
+.control-group.info textarea {
+  border-color: #3a87ad;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.control-group.info input:focus,
+.control-group.info select:focus,
+.control-group.info textarea:focus {
+  border-color: #2d6987;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
+}
+
+.control-group.info .input-prepend .add-on,
+.control-group.info .input-append .add-on {
+  color: #3a87ad;
+  background-color: #d9edf7;
+  border-color: #3a87ad;
+}
+
+input:focus:invalid,
+textarea:focus:invalid,
+select:focus:invalid {
+  color: #b94a48;
+  border-color: #ee5f5b;
+}
+
+input:focus:invalid:focus,
+textarea:focus:invalid:focus,
+select:focus:invalid:focus {
+  border-color: #e9322d;
+  -webkit-box-shadow: 0 0 6px #f8b9b7;
+     -moz-box-shadow: 0 0 6px #f8b9b7;
+          box-shadow: 0 0 6px #f8b9b7;
+}
+
+.form-actions {
+  padding: 19px 20px 20px;
+  margin-top: 20px;
+  margin-bottom: 20px;
+  background-color: #f5f5f5;
+  border-top: 1px solid #e5e5e5;
+  *zoom: 1;
+}
+
+.form-actions:before,
+.form-actions:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.form-actions:after {
+  clear: both;
+}
+
+.help-block,
+.help-inline {
+  color: #595959;
+}
+
+.help-block {
+  display: block;
+  margin-bottom: 10px;
+}
+
+.help-inline {
+  display: inline-block;
+  *display: inline;
+  padding-left: 5px;
+  vertical-align: middle;
+  *zoom: 1;
+}
+
+.input-append,
+.input-prepend {
+  display: inline-block;
+  margin-bottom: 10px;
+  font-size: 0;
+  white-space: nowrap;
+  vertical-align: middle;
+}
+
+.input-append input,
+.input-prepend input,
+.input-append select,
+.input-prepend select,
+.input-append .uneditable-input,
+.input-prepend .uneditable-input,
+.input-append .dropdown-menu,
+.input-prepend .dropdown-menu,
+.input-append .popover,
+.input-prepend .popover {
+  font-size: 14px;
+}
+
+.input-append input,
+.input-prepend input,
+.input-append select,
+.input-prepend select,
+.input-append .uneditable-input,
+.input-prepend .uneditable-input {
+  position: relative;
+  margin-bottom: 0;
+  *margin-left: 0;
+  vertical-align: top;
+  -webkit-border-radius: 0 4px 4px 0;
+     -moz-border-radius: 0 4px 4px 0;
+          border-radius: 0 4px 4px 0;
+}
+
+.input-append input:focus,
+.input-prepend input:focus,
+.input-append select:focus,
+.input-prepend select:focus,
+.input-append .uneditable-input:focus,
+.input-prepend .uneditable-input:focus {
+  z-index: 2;
+}
+
+.input-append .add-on,
+.input-prepend .add-on {
+  display: inline-block;
+  width: auto;
+  height: 20px;
+  min-width: 16px;
+  padding: 4px 5px;
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 20px;
+  text-align: center;
+  text-shadow: 0 1px 0 #ffffff;
+  background-color: #eeeeee;
+  border: 1px solid #ccc;
+}
+
+.input-append .add-on,
+.input-prepend .add-on,
+.input-append .btn,
+.input-prepend .btn,
+.input-append .btn-group > .dropdown-toggle,
+.input-prepend .btn-group > .dropdown-toggle {
+  vertical-align: top;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.input-append .active,
+.input-prepend .active {
+  background-color: #a9dba9;
+  border-color: #46a546;
+}
+
+.input-prepend .add-on,
+.input-prepend .btn {
+  margin-right: -1px;
+}
+
+.input-prepend .add-on:first-child,
+.input-prepend .btn:first-child {
+  -webkit-border-radius: 4px 0 0 4px;
+     -moz-border-radius: 4px 0 0 4px;
+          border-radius: 4px 0 0 4px;
+}
+
+.input-append input,
+.input-append select,
+.input-append .uneditable-input {
+  -webkit-border-radius: 4px 0 0 4px;
+     -moz-border-radius: 4px 0 0 4px;
+          border-radius: 4px 0 0 4px;
+}
+
+.input-append input + .btn-group .btn:last-child,
+.input-append select + .btn-group .btn:last-child,
+.input-append .uneditable-input + .btn-group .btn:last-child {
+  -webkit-border-radius: 0 4px 4px 0;
+     -moz-border-radius: 0 4px 4px 0;
+          border-radius: 0 4px 4px 0;
+}
+
+.input-append .add-on,
+.input-append .btn,
+.input-append .btn-group {
+  margin-left: -1px;
+}
+
+.input-append .add-on:last-child,
+.input-append .btn:last-child,
+.input-append .btn-group:last-child > .dropdown-toggle {
+  -webkit-border-radius: 0 4px 4px 0;
+     -moz-border-radius: 0 4px 4px 0;
+          border-radius: 0 4px 4px 0;
+}
+
+.input-prepend.input-append input,
+.input-prepend.input-append select,
+.input-prepend.input-append .uneditable-input {
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.input-prepend.input-append input + .btn-group .btn,
+.input-prepend.input-append select + .btn-group .btn,
+.input-prepend.input-append .uneditable-input + .btn-group .btn {
+  -webkit-border-radius: 0 4px 4px 0;
+     -moz-border-radius: 0 4px 4px 0;
+          border-radius: 0 4px 4px 0;
+}
+
+.input-prepend.input-append .add-on:first-child,
+.input-prepend.input-append .btn:first-child {
+  margin-right: -1px;
+  -webkit-border-radius: 4px 0 0 4px;
+     -moz-border-radius: 4px 0 0 4px;
+          border-radius: 4px 0 0 4px;
+}
+
+.input-prepend.input-append .add-on:last-child,
+.input-prepend.input-append .btn:last-child {
+  margin-left: -1px;
+  -webkit-border-radius: 0 4px 4px 0;
+     -moz-border-radius: 0 4px 4px 0;
+          border-radius: 0 4px 4px 0;
+}
+
+.input-prepend.input-append .btn-group:first-child {
+  margin-left: 0;
+}
+
+input.search-query {
+  padding-right: 14px;
+  padding-right: 4px \9;
+  padding-left: 14px;
+  padding-left: 4px \9;
+  /* IE7-8 doesn't have border-radius, so don't indent the padding */
+
+  margin-bottom: 0;
+  -webkit-border-radius: 15px;
+     -moz-border-radius: 15px;
+          border-radius: 15px;
+}
+
+/* Allow for input prepend/append in search forms */
+
+.form-search .input-append .search-query,
+.form-search .input-prepend .search-query {
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.form-search .input-append .search-query {
+  -webkit-border-radius: 14px 0 0 14px;
+     -moz-border-radius: 14px 0 0 14px;
+          border-radius: 14px 0 0 14px;
+}
+
+.form-search .input-append .btn {
+  -webkit-border-radius: 0 14px 14px 0;
+     -moz-border-radius: 0 14px 14px 0;
+          border-radius: 0 14px 14px 0;
+}
+
+.form-search .input-prepend .search-query {
+  -webkit-border-radius: 0 14px 14px 0;
+     -moz-border-radius: 0 14px 14px 0;
+          border-radius: 0 14px 14px 0;
+}
+
+.form-search .input-prepend .btn {
+  -webkit-border-radius: 14px 0 0 14px;
+     -moz-border-radius: 14px 0 0 14px;
+          border-radius: 14px 0 0 14px;
+}
+
+.form-search input,
+.form-inline input,
+.form-horizontal input,
+.form-search textarea,
+.form-inline textarea,
+.form-horizontal textarea,
+.form-search select,
+.form-inline select,
+.form-horizontal select,
+.form-search .help-inline,
+.form-inline .help-inline,
+.form-horizontal .help-inline,
+.form-search .uneditable-input,
+.form-inline .uneditable-input,
+.form-horizontal .uneditable-input,
+.form-search .input-prepend,
+.form-inline .input-prepend,
+.form-horizontal .input-prepend,
+.form-search .input-append,
+.form-inline .input-append,
+.form-horizontal .input-append {
+  display: inline-block;
+  *display: inline;
+  margin-bottom: 0;
+  vertical-align: middle;
+  *zoom: 1;
+}
+
+.form-search .hide,
+.form-inline .hide,
+.form-horizontal .hide {
+  display: none;
+}
+
+.form-search label,
+.form-inline label,
+.form-search .btn-group,
+.form-inline .btn-group {
+  display: inline-block;
+}
+
+.form-search .input-append,
+.form-inline .input-append,
+.form-search .input-prepend,
+.form-inline .input-prepend {
+  margin-bottom: 0;
+}
+
+.form-search .radio,
+.form-search .checkbox,
+.form-inline .radio,
+.form-inline .checkbox {
+  padding-left: 0;
+  margin-bottom: 0;
+  vertical-align: middle;
+}
+
+.form-search .radio input[type="radio"],
+.form-search .checkbox input[type="checkbox"],
+.form-inline .radio input[type="radio"],
+.form-inline .checkbox input[type="checkbox"] {
+  float: left;
+  margin-right: 3px;
+  margin-left: 0;
+}
+
+.control-group {
+  margin-bottom: 10px;
+}
+
+legend + .control-group {
+  margin-top: 20px;
+  -webkit-margin-top-collapse: separate;
+}
+
+.form-horizontal .control-group {
+  margin-bottom: 20px;
+  *zoom: 1;
+}
+
+.form-horizontal .control-group:before,
+.form-horizontal .control-group:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.form-horizontal .control-group:after {
+  clear: both;
+}
+
+.form-horizontal .control-label {
+  float: left;
+  width: 160px;
+  padding-top: 5px;
+  text-align: right;
+}
+
+.form-horizontal .controls {
+  *display: inline-block;
+  *padding-left: 20px;
+  margin-left: 180px;
+  *margin-left: 0;
+}
+
+.form-horizontal .controls:first-child {
+  *padding-left: 180px;
+}
+
+.form-horizontal .help-block {
+  margin-bottom: 0;
+}
+
+.form-horizontal input + .help-block,
+.form-horizontal select + .help-block,
+.form-horizontal textarea + .help-block,
+.form-horizontal .uneditable-input + .help-block,
+.form-horizontal .input-prepend + .help-block,
+.form-horizontal .input-append + .help-block {
+  margin-top: 10px;
+}
+
+.form-horizontal .form-actions {
+  padding-left: 180px;
+}
+
+table {
+  max-width: 100%;
+  background-color: transparent;
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+.table {
+  width: 100%;
+  margin-bottom: 20px;
+}
+
+.table th,
+.table td {
+  padding: 8px;
+  line-height: 20px;
+  text-align: left;
+  vertical-align: top;
+  border-top: 1px solid #dddddd;
+}
+
+.table th {
+  font-weight: bold;
+}
+
+.table thead th {
+  vertical-align: bottom;
+}
+
+.table caption + thead tr:first-child th,
+.table caption + thead tr:first-child td,
+.table colgroup + thead tr:first-child th,
+.table colgroup + thead tr:first-child td,
+.table thead:first-child tr:first-child th,
+.table thead:first-child tr:first-child td {
+  border-top: 0;
+}
+
+.table tbody + tbody {
+  border-top: 2px solid #dddddd;
+}
+
+.table .table {
+  background-color: #ffffff;
+}
+
+.table-condensed th,
+.table-condensed td {
+  padding: 4px 5px;
+}
+
+.table-bordered {
+  border: 1px solid #dddddd;
+  border-collapse: separate;
+  *border-collapse: collapse;
+  border-left: 0;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.table-bordered th,
+.table-bordered td {
+  border-left: 1px solid #dddddd;
+}
+
+.table-bordered caption + thead tr:first-child th,
+.table-bordered caption + tbody tr:first-child th,
+.table-bordered caption + tbody tr:first-child td,
+.table-bordered colgroup + thead tr:first-child th,
+.table-bordered colgroup + tbody tr:first-child th,
+.table-bordered colgroup + tbody tr:first-child td,
+.table-bordered thead:first-child tr:first-child th,
+.table-bordered tbody:first-child tr:first-child th,
+.table-bordered tbody:first-child tr:first-child td {
+  border-top: 0;
+}
+
+.table-bordered thead:first-child tr:first-child > th:first-child,
+.table-bordered tbody:first-child tr:first-child > td:first-child,
+.table-bordered tbody:first-child tr:first-child > th:first-child {
+  -webkit-border-top-left-radius: 4px;
+          border-top-left-radius: 4px;
+  -moz-border-radius-topleft: 4px;
+}
+
+.table-bordered thead:first-child tr:first-child > th:last-child,
+.table-bordered tbody:first-child tr:first-child > td:last-child,
+.table-bordered tbody:first-child tr:first-child > th:last-child {
+  -webkit-border-top-right-radius: 4px;
+          border-top-right-radius: 4px;
+  -moz-border-radius-topright: 4px;
+}
+
+.table-bordered thead:last-child tr:last-child > th:first-child,
+.table-bordered tbody:last-child tr:last-child > td:first-child,
+.table-bordered tbody:last-child tr:last-child > th:first-child,
+.table-bordered tfoot:last-child tr:last-child > td:first-child,
+.table-bordered tfoot:last-child tr:last-child > th:first-child {
+  -webkit-border-bottom-left-radius: 4px;
+          border-bottom-left-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+}
+
+.table-bordered thead:last-child tr:last-child > th:last-child,
+.table-bordered tbody:last-child tr:last-child > td:last-child,
+.table-bordered tbody:last-child tr:last-child > th:last-child,
+.table-bordered tfoot:last-child tr:last-child > td:last-child,
+.table-bordered tfoot:last-child tr:last-child > th:last-child {
+  -webkit-border-bottom-right-radius: 4px;
+          border-bottom-right-radius: 4px;
+  -moz-border-radius-bottomright: 4px;
+}
+
+.table-bordered tfoot + tbody:last-child tr:last-child td:first-child {
+  -webkit-border-bottom-left-radius: 0;
+          border-bottom-left-radius: 0;
+  -moz-border-radius-bottomleft: 0;
+}
+
+.table-bordered tfoot + tbody:last-child tr:last-child td:last-child {
+  -webkit-border-bottom-right-radius: 0;
+          border-bottom-right-radius: 0;
+  -moz-border-radius-bottomright: 0;
+}
+
+.table-bordered caption + thead tr:first-child th:first-child,
+.table-bordered caption + tbody tr:first-child td:first-child,
+.table-bordered colgroup + thead tr:first-child th:first-child,
+.table-bordered colgroup + tbody tr:first-child td:first-child {
+  -webkit-border-top-left-radius: 4px;
+          border-top-left-radius: 4px;
+  -moz-border-radius-topleft: 4px;
+}
+
+.table-bordered caption + thead tr:first-child th:last-child,
+.table-bordered caption + tbody tr:first-child td:last-child,
+.table-bordered colgroup + thead tr:first-child th:last-child,
+.table-bordered colgroup + tbody tr:first-child td:last-child {
+  -webkit-border-top-right-radius: 4px;
+          border-top-right-radius: 4px;
+  -moz-border-radius-topright: 4px;
+}
+
+.table-striped tbody > tr:nth-child(odd) > td,
+.table-striped tbody > tr:nth-child(odd) > th {
+  background-color: #f9f9f9;
+}
+
+.table-hover tbody tr:hover > td,
+.table-hover tbody tr:hover > th {
+  background-color: #f5f5f5;
+}
+
+table td[class*="span"],
+table th[class*="span"],
+.row-fluid table td[class*="span"],
+.row-fluid table th[class*="span"] {
+  display: table-cell;
+  float: none;
+  margin-left: 0;
+}
+
+.table td.span1,
+.table th.span1 {
+  float: none;
+  width: 44px;
+  margin-left: 0;
+}
+
+.table td.span2,
+.table th.span2 {
+  float: none;
+  width: 124px;
+  margin-left: 0;
+}
+
+.table td.span3,
+.table th.span3 {
+  float: none;
+  width: 204px;
+  margin-left: 0;
+}
+
+.table td.span4,
+.table th.span4 {
+  float: none;
+  width: 284px;
+  margin-left: 0;
+}
+
+.table td.span5,
+.table th.span5 {
+  float: none;
+  width: 364px;
+  margin-left: 0;
+}
+
+.table td.span6,
+.table th.span6 {
+  float: none;
+  width: 444px;
+  margin-left: 0;
+}
+
+.table td.span7,
+.table th.span7 {
+  float: none;
+  width: 524px;
+  margin-left: 0;
+}
+
+.table td.span8,
+.table th.span8 {
+  float: none;
+  width: 604px;
+  margin-left: 0;
+}
+
+.table td.span9,
+.table th.span9 {
+  float: none;
+  width: 684px;
+  margin-left: 0;
+}
+
+.table td.span10,
+.table th.span10 {
+  float: none;
+  width: 764px;
+  margin-left: 0;
+}
+
+.table td.span11,
+.table th.span11 {
+  float: none;
+  width: 844px;
+  margin-left: 0;
+}
+
+.table td.span12,
+.table th.span12 {
+  float: none;
+  width: 924px;
+  margin-left: 0;
+}
+
+.table tbody tr.success > td {
+  background-color: #dff0d8;
+}
+
+.table tbody tr.error > td {
+  background-color: #f2dede;
+}
+
+.table tbody tr.warning > td {
+  background-color: #fcf8e3;
+}
+
+.table tbody tr.info > td {
+  background-color: #d9edf7;
+}
+
+.table-hover tbody tr.success:hover > td {
+  background-color: #d0e9c6;
+}
+
+.table-hover tbody tr.error:hover > td {
+  background-color: #ebcccc;
+}
+
+.table-hover tbody tr.warning:hover > td {
+  background-color: #faf2cc;
+}
+
+.table-hover tbody tr.info:hover > td {
+  background-color: #c4e3f3;
+}
+
+[class^="icon-"],
+[class*=" icon-"] {
+  display: inline-block;
+  width: 14px;
+  height: 14px;
+  margin-top: 1px;
+  *margin-right: .3em;
+  line-height: 14px;
+  vertical-align: text-top;
+  background-image: url("../img/glyphicons-halflings.png");
+  background-position: 14px 14px;
+  background-repeat: no-repeat;
+}
+
+/* White icons with optional class, or on hover/focus/active states of certain elements */
+
+.icon-white,
+.nav-pills > .active > a > [class^="icon-"],
+.nav-pills > .active > a > [class*=" icon-"],
+.nav-list > .active > a > [class^="icon-"],
+.nav-list > .active > a > [class*=" icon-"],
+.navbar-inverse .nav > .active > a > [class^="icon-"],
+.navbar-inverse .nav > .active > a > [class*=" icon-"],
+.dropdown-menu > li > a:hover > [class^="icon-"],
+.dropdown-menu > li > a:focus > [class^="icon-"],
+.dropdown-menu > li > a:hover > [class*=" icon-"],
+.dropdown-menu > li > a:focus > [class*=" icon-"],
+.dropdown-menu > .active > a > [class^="icon-"],
+.dropdown-menu > .active > a > [class*=" icon-"],
+.dropdown-submenu:hover > a > [class^="icon-"],
+.dropdown-submenu:focus > a > [class^="icon-"],
+.dropdown-submenu:hover > a > [class*=" icon-"],
+.dropdown-submenu:focus > a > [class*=" icon-"] {
+  background-image: url("../img/glyphicons-halflings-white.png");
+}
+
+.icon-glass {
+  background-position: 0      0;
+}
+
+.icon-music {
+  background-position: -24px 0;
+}
+
+.icon-search {
+  background-position: -48px 0;
+}
+
+.icon-envelope {
+  background-position: -72px 0;
+}
+
+.icon-heart {
+  background-position: -96px 0;
+}
+
+.icon-star {
+  background-position: -120px 0;
+}
+
+.icon-star-empty {
+  background-position: -144px 0;
+}
+
+.icon-user {
+  background-position: -168px 0;
+}
+
+.icon-film {
+  background-position: -192px 0;
+}
+
+.icon-th-large {
+  background-position: -216px 0;
+}
+
+.icon-th {
+  background-position: -240px 0;
+}
+
+.icon-th-list {
+  background-position: -264px 0;
+}
+
+.icon-ok {
+  background-position: -288px 0;
+}
+
+.icon-remove {
+  background-position: -312px 0;
+}
+
+.icon-zoom-in {
+  background-position: -336px 0;
+}
+
+.icon-zoom-out {
+  background-position: -360px 0;
+}
+
+.icon-off {
+  background-position: -384px 0;
+}
+
+.icon-signal {
+  background-position: -408px 0;
+}
+
+.icon-cog {
+  background-position: -432px 0;
+}
+
+.icon-trash {
+  background-position: -456px 0;
+}
+
+.icon-home {
+  background-position: 0 -24px;
+}
+
+.icon-file {
+  background-position: -24px -24px;
+}
+
+.icon-time {
+  background-position: -48px -24px;
+}
+
+.icon-road {
+  background-position: -72px -24px;
+}
+
+.icon-download-alt {
+  background-position: -96px -24px;
+}
+
+.icon-download {
+  background-position: -120px -24px;
+}
+
+.icon-upload {
+  background-position: -144px -24px;
+}
+
+.icon-inbox {
+  background-position: -168px -24px;
+}
+
+.icon-play-circle {
+  background-position: -192px -24px;
+}
+
+.icon-repeat {
+  background-position: -216px -24px;
+}
+
+.icon-refresh {
+  background-position: -240px -24px;
+}
+
+.icon-list-alt {
+  background-position: -264px -24px;
+}
+
+.icon-lock {
+  background-position: -287px -24px;
+}
+
+.icon-flag {
+  background-position: -312px -24px;
+}
+
+.icon-headphones {
+  background-position: -336px -24px;
+}
+
+.icon-volume-off {
+  background-position: -360px -24px;
+}
+
+.icon-volume-down {
+  background-position: -384px -24px;
+}
+
+.icon-volume-up {
+  background-position: -408px -24px;
+}
+
+.icon-qrcode {
+  background-position: -432px -24px;
+}
+
+.icon-barcode {
+  background-position: -456px -24px;
+}
+
+.icon-tag {
+  background-position: 0 -48px;
+}
+
+.icon-tags {
+  background-position: -25px -48px;
+}
+
+.icon-book {
+  background-position: -48px -48px;
+}
+
+.icon-bookmark {
+  background-position: -72px -48px;
+}
+
+.icon-print {
+  background-position: -96px -48px;
+}
+
+.icon-camera {
+  background-position: -120px -48px;
+}
+
+.icon-font {
+  background-position: -144px -48px;
+}
+
+.icon-bold {
+  background-position: -167px -48px;
+}
+
+.icon-italic {
+  background-position: -192px -48px;
+}
+
+.icon-text-height {
+  background-position: -216px -48px;
+}
+
+.icon-text-width {
+  background-position: -240px -48px;
+}
+
+.icon-align-left {
+  background-position: -264px -48px;
+}
+
+.icon-align-center {
+  background-position: -288px -48px;
+}
+
+.icon-align-right {
+  background-position: -312px -48px;
+}
+
+.icon-align-justify {
+  background-position: -336px -48px;
+}
+
+.icon-list {
+  background-position: -360px -48px;
+}
+
+.icon-indent-left {
+  background-position: -384px -48px;
+}
+
+.icon-indent-right {
+  background-position: -408px -48px;
+}
+
+.icon-facetime-video {
+  background-position: -432px -48px;
+}
+
+.icon-picture {
+  background-position: -456px -48px;
+}
+
+.icon-pencil {
+  background-position: 0 -72px;
+}
+
+.icon-map-marker {
+  background-position: -24px -72px;
+}
+
+.icon-adjust {
+  background-position: -48px -72px;
+}
+
+.icon-tint {
+  background-position: -72px -72px;
+}
+
+.icon-edit {
+  background-position: -96px -72px;
+}
+
+.icon-share {
+  background-position: -120px -72px;
+}
+
+.icon-check {
+  background-position: -144px -72px;
+}
+
+.icon-move {
+  background-position: -168px -72px;
+}
+
+.icon-step-backward {
+  background-position: -192px -72px;
+}
+
+.icon-fast-backward {
+  background-position: -216px -72px;
+}
+
+.icon-backward {
+  background-position: -240px -72px;
+}
+
+.icon-play {
+  background-position: -264px -72px;
+}
+
+.icon-pause {
+  background-position: -288px -72px;
+}
+
+.icon-stop {
+  background-position: -312px -72px;
+}
+
+.icon-forward {
+  background-position: -336px -72px;
+}
+
+.icon-fast-forward {
+  background-position: -360px -72px;
+}
+
+.icon-step-forward {
+  background-position: -384px -72px;
+}
+
+.icon-eject {
+  background-position: -408px -72px;
+}
+
+.icon-chevron-left {
+  background-position: -432px -72px;
+}
+
+.icon-chevron-right {
+  background-position: -456px -72px;
+}
+
+.icon-plus-sign {
+  background-position: 0 -96px;
+}
+
+.icon-minus-sign {
+  background-position: -24px -96px;
+}
+
+.icon-remove-sign {
+  background-position: -48px -96px;
+}
+
+.icon-ok-sign {
+  background-position: -72px -96px;
+}
+
+.icon-question-sign {
+  background-position: -96px -96px;
+}
+
+.icon-info-sign {
+  background-position: -120px -96px;
+}
+
+.icon-screenshot {
+  background-position: -144px -96px;
+}
+
+.icon-remove-circle {
+  background-position: -168px -96px;
+}
+
+.icon-ok-circle {
+  background-position: -192px -96px;
+}
+
+.icon-ban-circle {
+  background-position: -216px -96px;
+}
+
+.icon-arrow-left {
+  background-position: -240px -96px;
+}
+
+.icon-arrow-right {
+  background-position: -264px -96px;
+}
+
+.icon-arrow-up {
+  background-position: -289px -96px;
+}
+
+.icon-arrow-down {
+  background-position: -312px -96px;
+}
+
+.icon-share-alt {
+  background-position: -336px -96px;
+}
+
+.icon-resize-full {
+  background-position: -360px -96px;
+}
+
+.icon-resize-small {
+  background-position: -384px -96px;
+}
+
+.icon-plus {
+  background-position: -408px -96px;
+}
+
+.icon-minus {
+  background-position: -433px -96px;
+}
+
+.icon-asterisk {
+  background-position: -456px -96px;
+}
+
+.icon-exclamation-sign {
+  background-position: 0 -120px;
+}
+
+.icon-gift {
+  background-position: -24px -120px;
+}
+
+.icon-leaf {
+  background-position: -48px -120px;
+}
+
+.icon-fire {
+  background-position: -72px -120px;
+}
+
+.icon-eye-open {
+  background-position: -96px -120px;
+}
+
+.icon-eye-close {
+  background-position: -120px -120px;
+}
+
+.icon-warning-sign {
+  background-position: -144px -120px;
+}
+
+.icon-plane {
+  background-position: -168px -120px;
+}
+
+.icon-calendar {
+  background-position: -192px -120px;
+}
+
+.icon-random {
+  width: 16px;
+  background-position: -216px -120px;
+}
+
+.icon-comment {
+  background-position: -240px -120px;
+}
+
+.icon-magnet {
+  background-position: -264px -120px;
+}
+
+.icon-chevron-up {
+  background-position: -288px -120px;
+}
+
+.icon-chevron-down {
+  background-position: -313px -119px;
+}
+
+.icon-retweet {
+  background-position: -336px -120px;
+}
+
+.icon-shopping-cart {
+  background-position: -360px -120px;
+}
+
+.icon-folder-close {
+  width: 16px;
+  background-position: -384px -120px;
+}
+
+.icon-folder-open {
+  width: 16px;
+  background-position: -408px -120px;
+}
+
+.icon-resize-vertical {
+  background-position: -432px -119px;
+}
+
+.icon-resize-horizontal {
+  background-position: -456px -118px;
+}
+
+.icon-hdd {
+  background-position: 0 -144px;
+}
+
+.icon-bullhorn {
+  background-position: -24px -144px;
+}
+
+.icon-bell {
+  background-position: -48px -144px;
+}
+
+.icon-certificate {
+  background-position: -72px -144px;
+}
+
+.icon-thumbs-up {
+  background-position: -96px -144px;
+}
+
+.icon-thumbs-down {
+  background-position: -120px -144px;
+}
+
+.icon-hand-right {
+  background-position: -144px -144px;
+}
+
+.icon-hand-left {
+  background-position: -168px -144px;
+}
+
+.icon-hand-up {
+  background-position: -192px -144px;
+}
+
+.icon-hand-down {
+  background-position: -216px -144px;
+}
+
+.icon-circle-arrow-right {
+  background-position: -240px -144px;
+}
+
+.icon-circle-arrow-left {
+  background-position: -264px -144px;
+}
+
+.icon-circle-arrow-up {
+  background-position: -288px -144px;
+}
+
+.icon-circle-arrow-down {
+  background-position: -312px -144px;
+}
+
+.icon-globe {
+  background-position: -336px -144px;
+}
+
+.icon-wrench {
+  background-position: -360px -144px;
+}
+
+.icon-tasks {
+  background-position: -384px -144px;
+}
+
+.icon-filter {
+  background-position: -408px -144px;
+}
+
+.icon-briefcase {
+  background-position: -432px -144px;
+}
+
+.icon-fullscreen {
+  background-position: -456px -144px;
+}
+
+.dropup,
+.dropdown {
+  position: relative;
+}
+
+.dropdown-toggle {
+  *margin-bottom: -3px;
+}
+
+.dropdown-toggle:active,
+.open .dropdown-toggle {
+  outline: 0;
+}
+
+.caret {
+  display: inline-block;
+  width: 0;
+  height: 0;
+  vertical-align: top;
+  border-top: 4px solid #000000;
+  border-right: 4px solid transparent;
+  border-left: 4px solid transparent;
+  content: "";
+}
+
+.dropdown .caret {
+  margin-top: 8px;
+  margin-left: 2px;
+}
+
+.dropdown-menu {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  z-index: 1000;
+  display: none;
+  float: left;
+  min-width: 160px;
+  padding: 5px 0;
+  margin: 2px 0 0;
+  list-style: none;
+  background-color: #ffffff;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  *border-right-width: 2px;
+  *border-bottom-width: 2px;
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+     -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+          box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -webkit-background-clip: padding-box;
+     -moz-background-clip: padding;
+          background-clip: padding-box;
+}
+
+.dropdown-menu.pull-right {
+  right: 0;
+  left: auto;
+}
+
+.dropdown-menu .divider {
+  *width: 100%;
+  height: 1px;
+  margin: 9px 1px;
+  *margin: -5px 0 5px;
+  overflow: hidden;
+  background-color: #e5e5e5;
+  border-bottom: 1px solid #ffffff;
+}
+
+.dropdown-menu > li > a {
+  display: block;
+  padding: 3px 20px;
+  clear: both;
+  font-weight: normal;
+  line-height: 20px;
+  color: #333333;
+  white-space: nowrap;
+}
+
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus,
+.dropdown-submenu:hover > a,
+.dropdown-submenu:focus > a {
+  color: #ffffff;
+  text-decoration: none;
+  background-color: #0081c2;
+  background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
+  background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
+  background-image: -o-linear-gradient(top, #0088cc, #0077b3);
+  background-image: linear-gradient(to bottom, #0088cc, #0077b3);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
+}
+
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:hover,
+.dropdown-menu > .active > a:focus {
+  color: #ffffff;
+  text-decoration: none;
+  background-color: #0081c2;
+  background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
+  background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
+  background-image: -o-linear-gradient(top, #0088cc, #0077b3);
+  background-image: linear-gradient(to bottom, #0088cc, #0077b3);
+  background-repeat: repeat-x;
+  outline: 0;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
+}
+
+.dropdown-menu > .disabled > a,
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+  color: #999999;
+}
+
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+  text-decoration: none;
+  cursor: default;
+  background-color: transparent;
+  background-image: none;
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.open {
+  *z-index: 1000;
+}
+
+.open > .dropdown-menu {
+  display: block;
+}
+
+.pull-right > .dropdown-menu {
+  right: 0;
+  left: auto;
+}
+
+.dropup .caret,
+.navbar-fixed-bottom .dropdown .caret {
+  border-top: 0;
+  border-bottom: 4px solid #000000;
+  content: "";
+}
+
+.dropup .dropdown-menu,
+.navbar-fixed-bottom .dropdown .dropdown-menu {
+  top: auto;
+  bottom: 100%;
+  margin-bottom: 1px;
+}
+
+.dropdown-submenu {
+  position: relative;
+}
+
+.dropdown-submenu > .dropdown-menu {
+  top: 0;
+  left: 100%;
+  margin-top: -6px;
+  margin-left: -1px;
+  -webkit-border-radius: 0 6px 6px 6px;
+     -moz-border-radius: 0 6px 6px 6px;
+          border-radius: 0 6px 6px 6px;
+}
+
+.dropdown-submenu:hover > .dropdown-menu {
+  display: block;
+}
+
+.dropup .dropdown-submenu > .dropdown-menu {
+  top: auto;
+  bottom: 0;
+  margin-top: 0;
+  margin-bottom: -2px;
+  -webkit-border-radius: 5px 5px 5px 0;
+     -moz-border-radius: 5px 5px 5px 0;
+          border-radius: 5px 5px 5px 0;
+}
+
+.dropdown-submenu > a:after {
+  display: block;
+  float: right;
+  width: 0;
+  height: 0;
+  margin-top: 5px;
+  margin-right: -10px;
+  border-color: transparent;
+  border-left-color: #cccccc;
+  border-style: solid;
+  border-width: 5px 0 5px 5px;
+  content: " ";
+}
+
+.dropdown-submenu:hover > a:after {
+  border-left-color: #ffffff;
+}
+
+.dropdown-submenu.pull-left {
+  float: none;
+}
+
+.dropdown-submenu.pull-left > .dropdown-menu {
+  left: -100%;
+  margin-left: 10px;
+  -webkit-border-radius: 6px 0 6px 6px;
+     -moz-border-radius: 6px 0 6px 6px;
+          border-radius: 6px 0 6px 6px;
+}
+
+.dropdown .dropdown-menu .nav-header {
+  padding-right: 20px;
+  padding-left: 20px;
+}
+
+.typeahead {
+  z-index: 1051;
+  margin-top: 2px;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.well {
+  min-height: 20px;
+  padding: 19px;
+  margin-bottom: 20px;
+  background-color: #f5f5f5;
+  border: 1px solid #e3e3e3;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+}
+
+.well blockquote {
+  border-color: #ddd;
+  border-color: rgba(0, 0, 0, 0.15);
+}
+
+.well-large {
+  padding: 24px;
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+}
+
+.well-small {
+  padding: 9px;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+
+.fade {
+  opacity: 0;
+  -webkit-transition: opacity 0.15s linear;
+     -moz-transition: opacity 0.15s linear;
+       -o-transition: opacity 0.15s linear;
+          transition: opacity 0.15s linear;
+}
+
+.fade.in {
+  opacity: 1;
+}
+
+.collapse {
+  position: relative;
+  height: 0;
+  overflow: hidden;
+  -webkit-transition: height 0.35s ease;
+     -moz-transition: height 0.35s ease;
+       -o-transition: height 0.35s ease;
+          transition: height 0.35s ease;
+}
+
+.collapse.in {
+  height: auto;
+}
+
+.close {
+  float: right;
+  font-size: 20px;
+  font-weight: bold;
+  line-height: 20px;
+  color: #000000;
+  text-shadow: 0 1px 0 #ffffff;
+  opacity: 0.2;
+  filter: alpha(opacity=20);
+}
+
+.close:hover,
+.close:focus {
+  color: #000000;
+  text-decoration: none;
+  cursor: pointer;
+  opacity: 0.4;
+  filter: alpha(opacity=40);
+}
+
+button.close {
+  padding: 0;
+  cursor: pointer;
+  background: transparent;
+  border: 0;
+  -webkit-appearance: none;
+}
+
+.btn {
+  display: inline-block;
+  *display: inline;
+  padding: 4px 12px;
+  margin-bottom: 0;
+  *margin-left: .3em;
+  font-size: 14px;
+  line-height: 20px;
+  color: #333333;
+  text-align: center;
+  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+  vertical-align: middle;
+  cursor: pointer;
+  background-color: #f5f5f5;
+  *background-color: #e6e6e6;
+  background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
+  background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
+  background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
+  background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
+  background-repeat: repeat-x;
+  border: 1px solid #cccccc;
+  *border: 0;
+  border-color: #e6e6e6 #e6e6e6 #bfbfbf;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  border-bottom-color: #b3b3b3;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+  *zoom: 1;
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.btn:hover,
+.btn:focus,
+.btn:active,
+.btn.active,
+.btn.disabled,
+.btn[disabled] {
+  color: #333333;
+  background-color: #e6e6e6;
+  *background-color: #d9d9d9;
+}
+
+.btn:active,
+.btn.active {
+  background-color: #cccccc \9;
+}
+
+.btn:first-child {
+  *margin-left: 0;
+}
+
+.btn:hover,
+.btn:focus {
+  color: #333333;
+  text-decoration: none;
+  background-position: 0 -15px;
+  -webkit-transition: background-position 0.1s linear;
+     -moz-transition: background-position 0.1s linear;
+       -o-transition: background-position 0.1s linear;
+          transition: background-position 0.1s linear;
+}
+
+.btn:focus {
+  outline: thin dotted #333;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+
+.btn.active,
+.btn:active {
+  background-image: none;
+  outline: 0;
+  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.btn.disabled,
+.btn[disabled] {
+  cursor: default;
+  background-image: none;
+  opacity: 0.65;
+  filter: alpha(opacity=65);
+  -webkit-box-shadow: none;
+     -moz-box-shadow: none;
+          box-shadow: none;
+}
+
+.btn-large {
+  padding: 11px 19px;
+  font-size: 17.5px;
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+}
+
+.btn-large [class^="icon-"],
+.btn-large [class*=" icon-"] {
+  margin-top: 4px;
+}
+
+.btn-small {
+  padding: 2px 10px;
+  font-size: 11.9px;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+
+.btn-small [class^="icon-"],
+.btn-small [class*=" icon-"] {
+  margin-top: 0;
+}
+
+.btn-mini [class^="icon-"],
+.btn-mini [class*=" icon-"] {
+  margin-top: -1px;
+}
+
+.btn-mini {
+  padding: 0 6px;
+  font-size: 10.5px;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+
+.btn-block {
+  display: block;
+  width: 100%;
+  padding-right: 0;
+  padding-left: 0;
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+.btn-block + .btn-block {
+  margin-top: 5px;
+}
+
+input[type="submit"].btn-block,
+input[type="reset"].btn-block,
+input[type="button"].btn-block {
+  width: 100%;
+}
+
+.btn-primary.active,
+.btn-warning.active,
+.btn-danger.active,
+.btn-success.active,
+.btn-info.active,
+.btn-inverse.active {
+  color: rgba(255, 255, 255, 0.75);
+}
+
+.btn-primary {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #006dcc;
+  *background-color: #0044cc;
+  background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
+  background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -o-linear-gradient(top, #0088cc, #0044cc);
+  background-image: linear-gradient(to bottom, #0088cc, #0044cc);
+  background-repeat: repeat-x;
+  border-color: #0044cc #0044cc #002a80;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.btn-primary:hover,
+.btn-primary:focus,
+.btn-primary:active,
+.btn-primary.active,
+.btn-primary.disabled,
+.btn-primary[disabled] {
+  color: #ffffff;
+  background-color: #0044cc;
+  *background-color: #003bb3;
+}
+
+.btn-primary:active,
+.btn-primary.active {
+  background-color: #003399 \9;
+}
+
+.btn-warning {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #faa732;
+  *background-color: #f89406;
+  background-image: -moz-linear-gradient(top, #fbb450, #f89406);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
+  background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
+  background-image: -o-linear-gradient(top, #fbb450, #f89406);
+  background-image: linear-gradient(to bottom, #fbb450, #f89406);
+  background-repeat: repeat-x;
+  border-color: #f89406 #f89406 #ad6704;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.btn-warning:hover,
+.btn-warning:focus,
+.btn-warning:active,
+.btn-warning.active,
+.btn-warning.disabled,
+.btn-warning[disabled] {
+  color: #ffffff;
+  background-color: #f89406;
+  *background-color: #df8505;
+}
+
+.btn-warning:active,
+.btn-warning.active {
+  background-color: #c67605 \9;
+}
+
+.btn-danger {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #da4f49;
+  *background-color: #bd362f;
+  background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));
+  background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: -o-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: linear-gradient(to bottom, #ee5f5b, #bd362f);
+  background-repeat: repeat-x;
+  border-color: #bd362f #bd362f #802420;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.btn-danger:hover,
+.btn-danger:focus,
+.btn-danger:active,
+.btn-danger.active,
+.btn-danger.disabled,
+.btn-danger[disabled] {
+  color: #ffffff;
+  background-color: #bd362f;
+  *background-color: #a9302a;
+}
+
+.btn-danger:active,
+.btn-danger.active {
+  background-color: #942a25 \9;
+}
+
+.btn-success {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #5bb75b;
+  *background-color: #51a351;
+  background-image: -moz-linear-gradient(top, #62c462, #51a351);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));
+  background-image: -webkit-linear-gradient(top, #62c462, #51a351);
+  background-image: -o-linear-gradient(top, #62c462, #51a351);
+  background-image: linear-gradient(to bottom, #62c462, #51a351);
+  background-repeat: repeat-x;
+  border-color: #51a351 #51a351 #387038;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.btn-success:hover,
+.btn-success:focus,
+.btn-success:active,
+.btn-success.active,
+.btn-success.disabled,
+.btn-success[disabled] {
+  color: #ffffff;
+  background-color: #51a351;
+  *background-color: #499249;
+}
+
+.btn-success:active,
+.btn-success.active {
+  background-color: #408140 \9;
+}
+
+.btn-info {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #49afcd;
+  *background-color: #2f96b4;
+  background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));
+  background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4);
+  background-image: -o-linear-gradient(top, #5bc0de, #2f96b4);
+  background-image: linear-gradient(to bottom, #5bc0de, #2f96b4);
+  background-repeat: repeat-x;
+  border-color: #2f96b4 #2f96b4 #1f6377;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.btn-info:hover,
+.btn-info:focus,
+.btn-info:active,
+.btn-info.active,
+.btn-info.disabled,
+.btn-info[disabled] {
+  color: #ffffff;
+  background-color: #2f96b4;
+  *background-color: #2a85a0;
+}
+
+.btn-info:active,
+.btn-info.active {
+  background-color: #24748c \9;
+}
+
+.btn-inverse {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #363636;
+  *background-color: #222222;
+  background-image: -moz-linear-gradient(top, #444444, #222222);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222));
+  background-image: -webkit-linear-gradient(top, #444444, #222222);
+  background-image: -o-linear-gradient(top, #444444, #222222);
+  background-image: linear-gradient(to bottom, #444444, #222222);
+  background-repeat: repeat-x;
+  border-color: #222222 #222222 #000000;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.btn-inverse:hover,
+.btn-inverse:focus,
+.btn-inverse:active,
+.btn-inverse.active,
+.btn-inverse.disabled,
+.btn-inverse[disabled] {
+  color: #ffffff;
+  background-color: #222222;
+  *background-color: #151515;
+}
+
+.btn-inverse:active,
+.btn-inverse.active {
+  background-color: #080808 \9;
+}
+
+button.btn,
+input[type="submit"].btn {
+  *padding-top: 3px;
+  *padding-bottom: 3px;
+}
+
+button.btn::-moz-focus-inner,
+input[type="submit"].btn::-moz-focus-inner {
+  padding: 0;
+  border: 0;
+}
+
+button.btn.btn-large,
+input[type="submit"].btn.btn-large {
+  *padding-top: 7px;
+  *padding-bottom: 7px;
+}
+
+button.btn.btn-small,
+input[type="submit"].btn.btn-small {
+  *padding-top: 3px;
+  *padding-bottom: 3px;
+}
+
+button.btn.btn-mini,
+input[type="submit"].btn.btn-mini {
+  *padding-top: 1px;
+  *padding-bottom: 1px;
+}
+
+.btn-link,
+.btn-link:active,
+.btn-link[disabled] {
+  background-color: transparent;
+  background-image: none;
+  -webkit-box-shadow: none;
+     -moz-box-shadow: none;
+          box-shadow: none;
+}
+
+.btn-link {
+  color: #0088cc;
+  cursor: pointer;
+  border-color: transparent;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.btn-link:hover,
+.btn-link:focus {
+  color: #005580;
+  text-decoration: underline;
+  background-color: transparent;
+}
+
+.btn-link[disabled]:hover,
+.btn-link[disabled]:focus {
+  color: #333333;
+  text-decoration: none;
+}
+
+.btn-group {
+  position: relative;
+  display: inline-block;
+  *display: inline;
+  *margin-left: .3em;
+  font-size: 0;
+  white-space: nowrap;
+  vertical-align: middle;
+  *zoom: 1;
+}
+
+.btn-group:first-child {
+  *margin-left: 0;
+}
+
+.btn-group + .btn-group {
+  margin-left: 5px;
+}
+
+.btn-toolbar {
+  margin-top: 10px;
+  margin-bottom: 10px;
+  font-size: 0;
+}
+
+.btn-toolbar > .btn + .btn,
+.btn-toolbar > .btn-group + .btn,
+.btn-toolbar > .btn + .btn-group {
+  margin-left: 5px;
+}
+
+.btn-group > .btn {
+  position: relative;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.btn-group > .btn + .btn {
+  margin-left: -1px;
+}
+
+.btn-group > .btn,
+.btn-group > .dropdown-menu,
+.btn-group > .popover {
+  font-size: 14px;
+}
+
+.btn-group > .btn-mini {
+  font-size: 10.5px;
+}
+
+.btn-group > .btn-small {
+  font-size: 11.9px;
+}
+
+.btn-group > .btn-large {
+  font-size: 17.5px;
+}
+
+.btn-group > .btn:first-child {
+  margin-left: 0;
+  -webkit-border-bottom-left-radius: 4px;
+          border-bottom-left-radius: 4px;
+  -webkit-border-top-left-radius: 4px;
+          border-top-left-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+  -moz-border-radius-topleft: 4px;
+}
+
+.btn-group > .btn:last-child,
+.btn-group > .dropdown-toggle {
+  -webkit-border-top-right-radius: 4px;
+          border-top-right-radius: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+          border-bottom-right-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  -moz-border-radius-bottomright: 4px;
+}
+
+.btn-group > .btn.large:first-child {
+  margin-left: 0;
+  -webkit-border-bottom-left-radius: 6px;
+          border-bottom-left-radius: 6px;
+  -webkit-border-top-left-radius: 6px;
+          border-top-left-radius: 6px;
+  -moz-border-radius-bottomleft: 6px;
+  -moz-border-radius-topleft: 6px;
+}
+
+.btn-group > .btn.large:last-child,
+.btn-group > .large.dropdown-toggle {
+  -webkit-border-top-right-radius: 6px;
+          border-top-right-radius: 6px;
+  -webkit-border-bottom-right-radius: 6px;
+          border-bottom-right-radius: 6px;
+  -moz-border-radius-topright: 6px;
+  -moz-border-radius-bottomright: 6px;
+}
+
+.btn-group > .btn:hover,
+.btn-group > .btn:focus,
+.btn-group > .btn:active,
+.btn-group > .btn.active {
+  z-index: 2;
+}
+
+.btn-group .dropdown-toggle:active,
+.btn-group.open .dropdown-toggle {
+  outline: 0;
+}
+
+.btn-group > .btn + .dropdown-toggle {
+  *padding-top: 5px;
+  padding-right: 8px;
+  *padding-bottom: 5px;
+  padding-left: 8px;
+  -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.btn-group > .btn-mini + .dropdown-toggle {
+  *padding-top: 2px;
+  padding-right: 5px;
+  *padding-bottom: 2px;
+  padding-left: 5px;
+}
+
+.btn-group > .btn-small + .dropdown-toggle {
+  *padding-top: 5px;
+  *padding-bottom: 4px;
+}
+
+.btn-group > .btn-large + .dropdown-toggle {
+  *padding-top: 7px;
+  padding-right: 12px;
+  *padding-bottom: 7px;
+  padding-left: 12px;
+}
+
+.btn-group.open .dropdown-toggle {
+  background-image: none;
+  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.btn-group.open .btn.dropdown-toggle {
+  background-color: #e6e6e6;
+}
+
+.btn-group.open .btn-primary.dropdown-toggle {
+  background-color: #0044cc;
+}
+
+.btn-group.open .btn-warning.dropdown-toggle {
+  background-color: #f89406;
+}
+
+.btn-group.open .btn-danger.dropdown-toggle {
+  background-color: #bd362f;
+}
+
+.btn-group.open .btn-success.dropdown-toggle {
+  background-color: #51a351;
+}
+
+.btn-group.open .btn-info.dropdown-toggle {
+  background-color: #2f96b4;
+}
+
+.btn-group.open .btn-inverse.dropdown-toggle {
+  background-color: #222222;
+}
+
+.btn .caret {
+  margin-top: 8px;
+  margin-left: 0;
+}
+
+.btn-large .caret {
+  margin-top: 6px;
+}
+
+.btn-large .caret {
+  border-top-width: 5px;
+  border-right-width: 5px;
+  border-left-width: 5px;
+}
+
+.btn-mini .caret,
+.btn-small .caret {
+  margin-top: 8px;
+}
+
+.dropup .btn-large .caret {
+  border-bottom-width: 5px;
+}
+
+.btn-primary .caret,
+.btn-warning .caret,
+.btn-danger .caret,
+.btn-info .caret,
+.btn-success .caret,
+.btn-inverse .caret {
+  border-top-color: #ffffff;
+  border-bottom-color: #ffffff;
+}
+
+.btn-group-vertical {
+  display: inline-block;
+  *display: inline;
+  /* IE7 inline-block hack */
+
+  *zoom: 1;
+}
+
+.btn-group-vertical > .btn {
+  display: block;
+  float: none;
+  max-width: 100%;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.btn-group-vertical > .btn + .btn {
+  margin-top: -1px;
+  margin-left: 0;
+}
+
+.btn-group-vertical > .btn:first-child {
+  -webkit-border-radius: 4px 4px 0 0;
+     -moz-border-radius: 4px 4px 0 0;
+          border-radius: 4px 4px 0 0;
+}
+
+.btn-group-vertical > .btn:last-child {
+  -webkit-border-radius: 0 0 4px 4px;
+     -moz-border-radius: 0 0 4px 4px;
+          border-radius: 0 0 4px 4px;
+}
+
+.btn-group-vertical > .btn-large:first-child {
+  -webkit-border-radius: 6px 6px 0 0;
+     -moz-border-radius: 6px 6px 0 0;
+          border-radius: 6px 6px 0 0;
+}
+
+.btn-group-vertical > .btn-large:last-child {
+  -webkit-border-radius: 0 0 6px 6px;
+     -moz-border-radius: 0 0 6px 6px;
+          border-radius: 0 0 6px 6px;
+}
+
+.alert {
+  padding: 8px 35px 8px 14px;
+  margin-bottom: 20px;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  background-color: #fcf8e3;
+  border: 1px solid #fbeed5;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.alert,
+.alert h4 {
+  color: #c09853;
+}
+
+.alert h4 {
+  margin: 0;
+}
+
+.alert .close {
+  position: relative;
+  top: -2px;
+  right: -21px;
+  line-height: 20px;
+}
+
+.alert-success {
+  color: #468847;
+  background-color: #dff0d8;
+  border-color: #d6e9c6;
+}
+
+.alert-success h4 {
+  color: #468847;
+}
+
+.alert-danger,
+.alert-error {
+  color: #b94a48;
+  background-color: #f2dede;
+  border-color: #eed3d7;
+}
+
+.alert-danger h4,
+.alert-error h4 {
+  color: #b94a48;
+}
+
+.alert-info {
+  color: #3a87ad;
+  background-color: #d9edf7;
+  border-color: #bce8f1;
+}
+
+.alert-info h4 {
+  color: #3a87ad;
+}
+
+.alert-block {
+  padding-top: 14px;
+  padding-bottom: 14px;
+}
+
+.alert-block > p,
+.alert-block > ul {
+  margin-bottom: 0;
+}
+
+.alert-block p + p {
+  margin-top: 5px;
+}
+
+.nav {
+  margin-bottom: 20px;
+  margin-left: 0;
+  list-style: none;
+}
+
+.nav > li > a {
+  display: block;
+}
+
+.nav > li > a:hover,
+.nav > li > a:focus {
+  text-decoration: none;
+  background-color: #eeeeee;
+}
+
+.nav > li > a > img {
+  max-width: none;
+}
+
+.nav > .pull-right {
+  float: right;
+}
+
+.nav-header {
+  display: block;
+  padding: 3px 15px;
+  font-size: 11px;
+  font-weight: bold;
+  line-height: 20px;
+  color: #999999;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  text-transform: uppercase;
+}
+
+.nav li + .nav-header {
+  margin-top: 9px;
+}
+
+.nav-list {
+  padding-right: 15px;
+  padding-left: 15px;
+  margin-bottom: 0;
+}
+
+.nav-list > li > a,
+.nav-list .nav-header {
+  margin-right: -15px;
+  margin-left: -15px;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+}
+
+.nav-list > li > a {
+  padding: 3px 15px;
+}
+
+.nav-list > .active > a,
+.nav-list > .active > a:hover,
+.nav-list > .active > a:focus {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
+  background-color: #0088cc;
+}
+
+.nav-list [class^="icon-"],
+.nav-list [class*=" icon-"] {
+  margin-right: 2px;
+}
+
+.nav-list .divider {
+  *width: 100%;
+  height: 1px;
+  margin: 9px 1px;
+  *margin: -5px 0 5px;
+  overflow: hidden;
+  background-color: #e5e5e5;
+  border-bottom: 1px solid #ffffff;
+}
+
+.nav-tabs,
+.nav-pills {
+  *zoom: 1;
+}
+
+.nav-tabs:before,
+.nav-pills:before,
+.nav-tabs:after,
+.nav-pills:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.nav-tabs:after,
+.nav-pills:after {
+  clear: both;
+}
+
+.nav-tabs > li,
+.nav-pills > li {
+  float: left;
+}
+
+.nav-tabs > li > a,
+.nav-pills > li > a {
+  padding-right: 12px;
+  padding-left: 12px;
+  margin-right: 2px;
+  line-height: 14px;
+}
+
+.nav-tabs {
+  border-bottom: 1px solid #ddd;
+}
+
+.nav-tabs > li {
+  margin-bottom: -1px;
+}
+
+.nav-tabs > li > a {
+  padding-top: 8px;
+  padding-bottom: 8px;
+  line-height: 20px;
+  border: 1px solid transparent;
+  -webkit-border-radius: 4px 4px 0 0;
+     -moz-border-radius: 4px 4px 0 0;
+          border-radius: 4px 4px 0 0;
+}
+
+.nav-tabs > li > a:hover,
+.nav-tabs > li > a:focus {
+  border-color: #eeeeee #eeeeee #dddddd;
+}
+
+.nav-tabs > .active > a,
+.nav-tabs > .active > a:hover,
+.nav-tabs > .active > a:focus {
+  color: #555555;
+  cursor: default;
+  background-color: #ffffff;
+  border: 1px solid #ddd;
+  border-bottom-color: transparent;
+}
+
+.nav-pills > li > a {
+  padding-top: 8px;
+  padding-bottom: 8px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+  -webkit-border-radius: 5px;
+     -moz-border-radius: 5px;
+          border-radius: 5px;
+}
+
+.nav-pills > .active > a,
+.nav-pills > .active > a:hover,
+.nav-pills > .active > a:focus {
+  color: #ffffff;
+  background-color: #0088cc;
+}
+
+.nav-stacked > li {
+  float: none;
+}
+
+.nav-stacked > li > a {
+  margin-right: 0;
+}
+
+.nav-tabs.nav-stacked {
+  border-bottom: 0;
+}
+
+.nav-tabs.nav-stacked > li > a {
+  border: 1px solid #ddd;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.nav-tabs.nav-stacked > li:first-child > a {
+  -webkit-border-top-right-radius: 4px;
+          border-top-right-radius: 4px;
+  -webkit-border-top-left-radius: 4px;
+          border-top-left-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  -moz-border-radius-topleft: 4px;
+}
+
+.nav-tabs.nav-stacked > li:last-child > a {
+  -webkit-border-bottom-right-radius: 4px;
+          border-bottom-right-radius: 4px;
+  -webkit-border-bottom-left-radius: 4px;
+          border-bottom-left-radius: 4px;
+  -moz-border-radius-bottomright: 4px;
+  -moz-border-radius-bottomleft: 4px;
+}
+
+.nav-tabs.nav-stacked > li > a:hover,
+.nav-tabs.nav-stacked > li > a:focus {
+  z-index: 2;
+  border-color: #ddd;
+}
+
+.nav-pills.nav-stacked > li > a {
+  margin-bottom: 3px;
+}
+
+.nav-pills.nav-stacked > li:last-child > a {
+  margin-bottom: 1px;
+}
+
+.nav-tabs .dropdown-menu {
+  -webkit-border-radius: 0 0 6px 6px;
+     -moz-border-radius: 0 0 6px 6px;
+          border-radius: 0 0 6px 6px;
+}
+
+.nav-pills .dropdown-menu {
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+}
+
+.nav .dropdown-toggle .caret {
+  margin-top: 6px;
+  border-top-color: #0088cc;
+  border-bottom-color: #0088cc;
+}
+
+.nav .dropdown-toggle:hover .caret,
+.nav .dropdown-toggle:focus .caret {
+  border-top-color: #005580;
+  border-bottom-color: #005580;
+}
+
+/* move down carets for tabs */
+
+.nav-tabs .dropdown-toggle .caret {
+  margin-top: 8px;
+}
+
+.nav .active .dropdown-toggle .caret {
+  border-top-color: #fff;
+  border-bottom-color: #fff;
+}
+
+.nav-tabs .active .dropdown-toggle .caret {
+  border-top-color: #555555;
+  border-bottom-color: #555555;
+}
+
+.nav > .dropdown.active > a:hover,
+.nav > .dropdown.active > a:focus {
+  cursor: pointer;
+}
+
+.nav-tabs .open .dropdown-toggle,
+.nav-pills .open .dropdown-toggle,
+.nav > li.dropdown.open.active > a:hover,
+.nav > li.dropdown.open.active > a:focus {
+  color: #ffffff;
+  background-color: #999999;
+  border-color: #999999;
+}
+
+.nav li.dropdown.open .caret,
+.nav li.dropdown.open.active .caret,
+.nav li.dropdown.open a:hover .caret,
+.nav li.dropdown.open a:focus .caret {
+  border-top-color: #ffffff;
+  border-bottom-color: #ffffff;
+  opacity: 1;
+  filter: alpha(opacity=100);
+}
+
+.tabs-stacked .open > a:hover,
+.tabs-stacked .open > a:focus {
+  border-color: #999999;
+}
+
+.tabbable {
+  *zoom: 1;
+}
+
+.tabbable:before,
+.tabbable:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.tabbable:after {
+  clear: both;
+}
+
+.tab-content {
+  overflow: auto;
+}
+
+.tabs-below > .nav-tabs,
+.tabs-right > .nav-tabs,
+.tabs-left > .nav-tabs {
+  border-bottom: 0;
+}
+
+.tab-content > .tab-pane,
+.pill-content > .pill-pane {
+  display: none;
+}
+
+.tab-content > .active,
+.pill-content > .active {
+  display: block;
+}
+
+.tabs-below > .nav-tabs {
+  border-top: 1px solid #ddd;
+}
+
+.tabs-below > .nav-tabs > li {
+  margin-top: -1px;
+  margin-bottom: 0;
+}
+
+.tabs-below > .nav-tabs > li > a {
+  -webkit-border-radius: 0 0 4px 4px;
+     -moz-border-radius: 0 0 4px 4px;
+          border-radius: 0 0 4px 4px;
+}
+
+.tabs-below > .nav-tabs > li > a:hover,
+.tabs-below > .nav-tabs > li > a:focus {
+  border-top-color: #ddd;
+  border-bottom-color: transparent;
+}
+
+.tabs-below > .nav-tabs > .active > a,
+.tabs-below > .nav-tabs > .active > a:hover,
+.tabs-below > .nav-tabs > .active > a:focus {
+  border-color: transparent #ddd #ddd #ddd;
+}
+
+.tabs-left > .nav-tabs > li,
+.tabs-right > .nav-tabs > li {
+  float: none;
+}
+
+.tabs-left > .nav-tabs > li > a,
+.tabs-right > .nav-tabs > li > a {
+  min-width: 74px;
+  margin-right: 0;
+  margin-bottom: 3px;
+}
+
+.tabs-left > .nav-tabs {
+  float: left;
+  margin-right: 19px;
+  border-right: 1px solid #ddd;
+}
+
+.tabs-left > .nav-tabs > li > a {
+  margin-right: -1px;
+  -webkit-border-radius: 4px 0 0 4px;
+     -moz-border-radius: 4px 0 0 4px;
+          border-radius: 4px 0 0 4px;
+}
+
+.tabs-left > .nav-tabs > li > a:hover,
+.tabs-left > .nav-tabs > li > a:focus {
+  border-color: #eeeeee #dddddd #eeeeee #eeeeee;
+}
+
+.tabs-left > .nav-tabs .active > a,
+.tabs-left > .nav-tabs .active > a:hover,
+.tabs-left > .nav-tabs .active > a:focus {
+  border-color: #ddd transparent #ddd #ddd;
+  *border-right-color: #ffffff;
+}
+
+.tabs-right > .nav-tabs {
+  float: right;
+  margin-left: 19px;
+  border-left: 1px solid #ddd;
+}
+
+.tabs-right > .nav-tabs > li > a {
+  margin-left: -1px;
+  -webkit-border-radius: 0 4px 4px 0;
+     -moz-border-radius: 0 4px 4px 0;
+          border-radius: 0 4px 4px 0;
+}
+
+.tabs-right > .nav-tabs > li > a:hover,
+.tabs-right > .nav-tabs > li > a:focus {
+  border-color: #eeeeee #eeeeee #eeeeee #dddddd;
+}
+
+.tabs-right > .nav-tabs .active > a,
+.tabs-right > .nav-tabs .active > a:hover,
+.tabs-right > .nav-tabs .active > a:focus {
+  border-color: #ddd #ddd #ddd transparent;
+  *border-left-color: #ffffff;
+}
+
+.nav > .disabled > a {
+  color: #999999;
+}
+
+.nav > .disabled > a:hover,
+.nav > .disabled > a:focus {
+  text-decoration: none;
+  cursor: default;
+  background-color: transparent;
+}
+
+.navbar {
+  *position: relative;
+  *z-index: 2;
+  margin-bottom: 20px;
+  overflow: visible;
+}
+
+.navbar-inner {
+  min-height: 40px;
+  padding-right: 20px;
+  padding-left: 20px;
+  background-color: #fafafa;
+  background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2));
+  background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2);
+  background-image: -o-linear-gradient(top, #ffffff, #f2f2f2);
+  background-image: linear-gradient(to bottom, #ffffff, #f2f2f2);
+  background-repeat: repeat-x;
+  border: 1px solid #d4d4d4;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);
+  *zoom: 1;
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
+     -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
+          box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
+}
+
+.navbar-inner:before,
+.navbar-inner:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.navbar-inner:after {
+  clear: both;
+}
+
+.navbar .container {
+  width: auto;
+}
+
+.nav-collapse.collapse {
+  height: auto;
+  overflow: visible;
+}
+
+.navbar .brand {
+  display: block;
+  float: left;
+  padding: 10px 20px 10px;
+  margin-left: -20px;
+  font-size: 20px;
+  font-weight: 200;
+  color: #777777;
+  text-shadow: 0 1px 0 #ffffff;
+}
+
+.navbar .brand:hover,
+.navbar .brand:focus {
+  text-decoration: none;
+}
+
+.navbar-text {
+  margin-bottom: 0;
+  line-height: 40px;
+  color: #777777;
+}
+
+.navbar-link {
+  color: #777777;
+}
+
+.navbar-link:hover,
+.navbar-link:focus {
+  color: #333333;
+}
+
+.navbar .divider-vertical {
+  height: 40px;
+  margin: 0 9px;
+  border-right: 1px solid #ffffff;
+  border-left: 1px solid #f2f2f2;
+}
+
+.navbar .btn,
+.navbar .btn-group {
+  margin-top: 5px;
+}
+
+.navbar .btn-group .btn,
+.navbar .input-prepend .btn,
+.navbar .input-append .btn,
+.navbar .input-prepend .btn-group,
+.navbar .input-append .btn-group {
+  margin-top: 0;
+}
+
+.navbar-form {
+  margin-bottom: 0;
+  *zoom: 1;
+}
+
+.navbar-form:before,
+.navbar-form:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.navbar-form:after {
+  clear: both;
+}
+
+.navbar-form input,
+.navbar-form select,
+.navbar-form .radio,
+.navbar-form .checkbox {
+  margin-top: 5px;
+}
+
+.navbar-form input,
+.navbar-form select,
+.navbar-form .btn {
+  display: inline-block;
+  margin-bottom: 0;
+}
+
+.navbar-form input[type="image"],
+.navbar-form input[type="checkbox"],
+.navbar-form input[type="radio"] {
+  margin-top: 3px;
+}
+
+.navbar-form .input-append,
+.navbar-form .input-prepend {
+  margin-top: 5px;
+  white-space: nowrap;
+}
+
+.navbar-form .input-append input,
+.navbar-form .input-prepend input {
+  margin-top: 0;
+}
+
+.navbar-search {
+  position: relative;
+  float: left;
+  margin-top: 5px;
+  margin-bottom: 0;
+}
+
+.navbar-search .search-query {
+  padding: 4px 14px;
+  margin-bottom: 0;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  font-weight: normal;
+  line-height: 1;
+  -webkit-border-radius: 15px;
+     -moz-border-radius: 15px;
+          border-radius: 15px;
+}
+
+.navbar-static-top {
+  position: static;
+  margin-bottom: 0;
+}
+
+.navbar-static-top .navbar-inner {
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.navbar-fixed-top,
+.navbar-fixed-bottom {
+  position: fixed;
+  right: 0;
+  left: 0;
+  z-index: 1030;
+  margin-bottom: 0;
+}
+
+.navbar-fixed-top .navbar-inner,
+.navbar-static-top .navbar-inner {
+  border-width: 0 0 1px;
+}
+
+.navbar-fixed-bottom .navbar-inner {
+  border-width: 1px 0 0;
+}
+
+.navbar-fixed-top .navbar-inner,
+.navbar-fixed-bottom .navbar-inner {
+  padding-right: 0;
+  padding-left: 0;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+
+.navbar-static-top .container,
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
+  width: 940px;
+}
+
+.navbar-fixed-top {
+  top: 0;
+}
+
+.navbar-fixed-top .navbar-inner,
+.navbar-static-top .navbar-inner {
+  -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
+     -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
+          box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
+}
+
+.navbar-fixed-bottom {
+  bottom: 0;
+}
+
+.navbar-fixed-bottom .navbar-inner {
+  -webkit-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
+     -moz-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
+          box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
+}
+
+.navbar .nav {
+  position: relative;
+  left: 0;
+  display: block;
+  float: left;
+  margin: 0 10px 0 0;
+}
+
+.navbar .nav.pull-right {
+  float: right;
+  margin-right: 0;
+}
+
+.navbar .nav > li {
+  float: left;
+}
+
+.navbar .nav > li > a {
+  float: none;
+  padding: 10px 15px 10px;
+  color: #777777;
+  text-decoration: none;
+  text-shadow: 0 1px 0 #ffffff;
+}
+
+.navbar .nav .dropdown-toggle .caret {
+  margin-top: 8px;
+}
+
+.navbar .nav > li > a:focus,
+.navbar .nav > li > a:hover {
+  color: #333333;
+  text-decoration: none;
+  background-color: transparent;
+}
+
+.navbar .nav > .active > a,
+.navbar .nav > .active > a:hover,
+.navbar .nav > .active > a:focus {
+  color: #555555;
+  text-decoration: none;
+  background-color: #e5e5e5;
+  -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
+     -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
+          box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
+}
+
+.navbar .btn-navbar {
+  display: none;
+  float: right;
+  padding: 7px 10px;
+  margin-right: 5px;
+  margin-left: 5px;
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #ededed;
+  *background-color: #e5e5e5;
+  background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5));
+  background-image: -webkit-linear-gradient(top, #f2f2f2, #e5e5e5);
+  background-image: -o-linear-gradient(top, #f2f2f2, #e5e5e5);
+  background-image: linear-gradient(to bottom, #f2f2f2, #e5e5e5);
+  background-repeat: repeat-x;
+  border-color: #e5e5e5 #e5e5e5 #bfbfbf;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
+     -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
+}
+
+.navbar .btn-navbar:hover,
+.navbar .btn-navbar:focus,
+.navbar .btn-navbar:active,
+.navbar .btn-navbar.active,
+.navbar .btn-navbar.disabled,
+.navbar .btn-navbar[disabled] {
+  color: #ffffff;
+  background-color: #e5e5e5;
+  *background-color: #d9d9d9;
+}
+
+.navbar .btn-navbar:active,
+.navbar .btn-navbar.active {
+  background-color: #cccccc \9;
+}
+
+.navbar .btn-navbar .icon-bar {
+  display: block;
+  width: 18px;
+  height: 2px;
+  background-color: #f5f5f5;
+  -webkit-border-radius: 1px;
+     -moz-border-radius: 1px;
+          border-radius: 1px;
+  -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
+     -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
+          box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
+}
+
+.btn-navbar .icon-bar + .icon-bar {
+  margin-top: 3px;
+}
+
+.navbar .nav > li > .dropdown-menu:before {
+  position: absolute;
+  top: -7px;
+  left: 9px;
+  display: inline-block;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-left: 7px solid transparent;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  content: '';
+}
+
+.navbar .nav > li > .dropdown-menu:after {
+  position: absolute;
+  top: -6px;
+  left: 10px;
+  display: inline-block;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #ffffff;
+  border-left: 6px solid transparent;
+  content: '';
+}
+
+.navbar-fixed-bottom .nav > li > .dropdown-menu:before {
+  top: auto;
+  bottom: -7px;
+  border-top: 7px solid #ccc;
+  border-bottom: 0;
+  border-top-color: rgba(0, 0, 0, 0.2);
+}
+
+.navbar-fixed-bottom .nav > li > .dropdown-menu:after {
+  top: auto;
+  bottom: -6px;
+  border-top: 6px solid #ffffff;
+  border-bottom: 0;
+}
+
+.navbar .nav li.dropdown > a:hover .caret,
+.navbar .nav li.dropdown > a:focus .caret {
+  border-top-color: #333333;
+  border-bottom-color: #333333;
+}
+
+.navbar .nav li.dropdown.open > .dropdown-toggle,
+.navbar .nav li.dropdown.active > .dropdown-toggle,
+.navbar .nav li.dropdown.open.active > .dropdown-toggle {
+  color: #555555;
+  background-color: #e5e5e5;
+}
+
+.navbar .nav li.dropdown > .dropdown-toggle .caret {
+  border-top-color: #777777;
+  border-bottom-color: #777777;
+}
+
+.navbar .nav li.dropdown.open > .dropdown-toggle .caret,
+.navbar .nav li.dropdown.active > .dropdown-toggle .caret,
+.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret {
+  border-top-color: #555555;
+  border-bottom-color: #555555;
+}
+
+.navbar .pull-right > li > .dropdown-menu,
+.navbar .nav > li > .dropdown-menu.pull-right {
+  right: 0;
+  left: auto;
+}
+
+.navbar .pull-right > li > .dropdown-menu:before,
+.navbar .nav > li > .dropdown-menu.pull-right:before {
+  right: 12px;
+  left: auto;
+}
+
+.navbar .pull-right > li > .dropdown-menu:after,
+.navbar .nav > li > .dropdown-menu.pull-right:after {
+  right: 13px;
+  left: auto;
+}
+
+.navbar .pull-right > li > .dropdown-menu .dropdown-menu,
+.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu {
+  right: 100%;
+  left: auto;
+  margin-right: -1px;
+  margin-left: 0;
+  -webkit-border-radius: 6px 0 6px 6px;
+     -moz-border-radius: 6px 0 6px 6px;
+          border-radius: 6px 0 6px 6px;
+}
+
+.navbar-inverse .navbar-inner {
+  background-color: #1b1b1b;
+  background-image: -moz-linear-gradient(top, #222222, #111111);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111));
+  background-image: -webkit-linear-gradient(top, #222222, #111111);
+  background-image: -o-linear-gradient(top, #222222, #111111);
+  background-image: linear-gradient(to bottom, #222222, #111111);
+  background-repeat: repeat-x;
+  border-color: #252525;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0);
+}
+
+.navbar-inverse .brand,
+.navbar-inverse .nav > li > a {
+  color: #999999;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+
+.navbar-inverse .brand:hover,
+.navbar-inverse .nav > li > a:hover,
+.navbar-inverse .brand:focus,
+.navbar-inverse .nav > li > a:focus {
+  color: #ffffff;
+}
+
+.navbar-inverse .brand {
+  color: #999999;
+}
+
+.navbar-inverse .navbar-text {
+  color: #999999;
+}
+
+.navbar-inverse .nav > li > a:focus,
+.navbar-inverse .nav > li > a:hover {
+  color: #ffffff;
+  background-color: transparent;
+}
+
+.navbar-inverse .nav .active > a,
+.navbar-inverse .nav .active > a:hover,
+.navbar-inverse .nav .active > a:focus {
+  color: #ffffff;
+  background-color: #111111;
+}
+
+.navbar-inverse .navbar-link {
+  color: #999999;
+}
+
+.navbar-inverse .navbar-link:hover,
+.navbar-inverse .navbar-link:focus {
+  color: #ffffff;
+}
+
+.navbar-inverse .divider-vertical {
+  border-right-color: #222222;
+  border-left-color: #111111;
+}
+
+.navbar-inverse .nav li.dropdown.open > .dropdown-toggle,
+.navbar-inverse .nav li.dropdown.active > .dropdown-toggle,
+.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle {
+  color: #ffffff;
+  background-color: #111111;
+}
+
+.navbar-inverse .nav li.dropdown > a:hover .caret,
+.navbar-inverse .nav li.dropdown > a:focus .caret {
+  border-top-color: #ffffff;
+  border-bottom-color: #ffffff;
+}
+
+.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret {
+  border-top-color: #999999;
+  border-bottom-color: #999999;
+}
+
+.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret,
+.navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret,
+.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret {
+  border-top-color: #ffffff;
+  border-bottom-color: #ffffff;
+}
+
+.navbar-inverse .navbar-search .search-query {
+  color: #ffffff;
+  background-color: #515151;
+  border-color: #111111;
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
+     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
+          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
+  -webkit-transition: none;
+     -moz-transition: none;
+       -o-transition: none;
+          transition: none;
+}
+
+.navbar-inverse .navbar-search .search-query:-moz-placeholder {
+  color: #cccccc;
+}
+
+.navbar-inverse .navbar-search .search-query:-ms-input-placeholder {
+  color: #cccccc;
+}
+
+.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder {
+  color: #cccccc;
+}
+
+.navbar-inverse .navbar-search .search-query:focus,
+.navbar-inverse .navbar-search .search-query.focused {
+  padding: 5px 15px;
+  color: #333333;
+  text-shadow: 0 1px 0 #ffffff;
+  background-color: #ffffff;
+  border: 0;
+  outline: 0;
+  -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+     -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+          box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+}
+
+.navbar-inverse .btn-navbar {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #0e0e0e;
+  *background-color: #040404;
+  background-image: -moz-linear-gradient(top, #151515, #040404);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404));
+  background-image: -webkit-linear-gradient(top, #151515, #040404);
+  background-image: -o-linear-gradient(top, #151515, #040404);
+  background-image: linear-gradient(to bottom, #151515, #040404);
+  background-repeat: repeat-x;
+  border-color: #040404 #040404 #000000;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.navbar-inverse .btn-navbar:hover,
+.navbar-inverse .btn-navbar:focus,
+.navbar-inverse .btn-navbar:active,
+.navbar-inverse .btn-navbar.active,
+.navbar-inverse .btn-navbar.disabled,
+.navbar-inverse .btn-navbar[disabled] {
+  color: #ffffff;
+  background-color: #040404;
+  *background-color: #000000;
+}
+
+.navbar-inverse .btn-navbar:active,
+.navbar-inverse .btn-navbar.active {
+  background-color: #000000 \9;
+}
+
+.breadcrumb {
+  padding: 8px 15px;
+  margin: 0 0 20px;
+  list-style: none;
+  background-color: #f5f5f5;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.breadcrumb > li {
+  display: inline-block;
+  *display: inline;
+  text-shadow: 0 1px 0 #ffffff;
+  *zoom: 1;
+}
+
+.breadcrumb > li > .divider {
+  padding: 0 5px;
+  color: #ccc;
+}
+
+.breadcrumb > .active {
+  color: #999999;
+}
+
+.pagination {
+  margin: 20px 0;
+}
+
+.pagination ul {
+  display: inline-block;
+  *display: inline;
+  margin-bottom: 0;
+  margin-left: 0;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  *zoom: 1;
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+     -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+          box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.pagination ul > li {
+  display: inline;
+}
+
+.pagination ul > li > a,
+.pagination ul > li > span {
+  float: left;
+  padding: 4px 12px;
+  line-height: 20px;
+  text-decoration: none;
+  background-color: #ffffff;
+  border: 1px solid #dddddd;
+  border-left-width: 0;
+}
+
+.pagination ul > li > a:hover,
+.pagination ul > li > a:focus,
+.pagination ul > .active > a,
+.pagination ul > .active > span {
+  background-color: #f5f5f5;
+}
+
+.pagination ul > .active > a,
+.pagination ul > .active > span {
+  color: #999999;
+  cursor: default;
+}
+
+.pagination ul > .disabled > span,
+.pagination ul > .disabled > a,
+.pagination ul > .disabled > a:hover,
+.pagination ul > .disabled > a:focus {
+  color: #999999;
+  cursor: default;
+  background-color: transparent;
+}
+
+.pagination ul > li:first-child > a,
+.pagination ul > li:first-child > span {
+  border-left-width: 1px;
+  -webkit-border-bottom-left-radius: 4px;
+          border-bottom-left-radius: 4px;
+  -webkit-border-top-left-radius: 4px;
+          border-top-left-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+  -moz-border-radius-topleft: 4px;
+}
+
+.pagination ul > li:last-child > a,
+.pagination ul > li:last-child > span {
+  -webkit-border-top-right-radius: 4px;
+          border-top-right-radius: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+          border-bottom-right-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  -moz-border-radius-bottomright: 4px;
+}
+
+.pagination-centered {
+  text-align: center;
+}
+
+.pagination-right {
+  text-align: right;
+}
+
+.pagination-large ul > li > a,
+.pagination-large ul > li > span {
+  padding: 11px 19px;
+  font-size: 17.5px;
+}
+
+.pagination-large ul > li:first-child > a,
+.pagination-large ul > li:first-child > span {
+  -webkit-border-bottom-left-radius: 6px;
+          border-bottom-left-radius: 6px;
+  -webkit-border-top-left-radius: 6px;
+          border-top-left-radius: 6px;
+  -moz-border-radius-bottomleft: 6px;
+  -moz-border-radius-topleft: 6px;
+}
+
+.pagination-large ul > li:last-child > a,
+.pagination-large ul > li:last-child > span {
+  -webkit-border-top-right-radius: 6px;
+          border-top-right-radius: 6px;
+  -webkit-border-bottom-right-radius: 6px;
+          border-bottom-right-radius: 6px;
+  -moz-border-radius-topright: 6px;
+  -moz-border-radius-bottomright: 6px;
+}
+
+.pagination-mini ul > li:first-child > a,
+.pagination-small ul > li:first-child > a,
+.pagination-mini ul > li:first-child > span,
+.pagination-small ul > li:first-child > span {
+  -webkit-border-bottom-left-radius: 3px;
+          border-bottom-left-radius: 3px;
+  -webkit-border-top-left-radius: 3px;
+          border-top-left-radius: 3px;
+  -moz-border-radius-bottomleft: 3px;
+  -moz-border-radius-topleft: 3px;
+}
+
+.pagination-mini ul > li:last-child > a,
+.pagination-small ul > li:last-child > a,
+.pagination-mini ul > li:last-child > span,
+.pagination-small ul > li:last-child > span {
+  -webkit-border-top-right-radius: 3px;
+          border-top-right-radius: 3px;
+  -webkit-border-bottom-right-radius: 3px;
+          border-bottom-right-radius: 3px;
+  -moz-border-radius-topright: 3px;
+  -moz-border-radius-bottomright: 3px;
+}
+
+.pagination-small ul > li > a,
+.pagination-small ul > li > span {
+  padding: 2px 10px;
+  font-size: 11.9px;
+}
+
+.pagination-mini ul > li > a,
+.pagination-mini ul > li > span {
+  padding: 0 6px;
+  font-size: 10.5px;
+}
+
+.pager {
+  margin: 20px 0;
+  text-align: center;
+  list-style: none;
+  *zoom: 1;
+}
+
+.pager:before,
+.pager:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.pager:after {
+  clear: both;
+}
+
+.pager li {
+  display: inline;
+}
+
+.pager li > a,
+.pager li > span {
+  display: inline-block;
+  padding: 5px 14px;
+  background-color: #fff;
+  border: 1px solid #ddd;
+  -webkit-border-radius: 15px;
+     -moz-border-radius: 15px;
+          border-radius: 15px;
+}
+
+.pager li > a:hover,
+.pager li > a:focus {
+  text-decoration: none;
+  background-color: #f5f5f5;
+}
+
+.pager .next > a,
+.pager .next > span {
+  float: right;
+}
+
+.pager .previous > a,
+.pager .previous > span {
+  float: left;
+}
+
+.pager .disabled > a,
+.pager .disabled > a:hover,
+.pager .disabled > a:focus,
+.pager .disabled > span {
+  color: #999999;
+  cursor: default;
+  background-color: #fff;
+}
+
+.modal-backdrop {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1040;
+  background-color: #000000;
+}
+
+.modal-backdrop.fade {
+  opacity: 0;
+}
+
+.modal-backdrop,
+.modal-backdrop.fade.in {
+  opacity: 0.8;
+  filter: alpha(opacity=80);
+}
+
+.modal {
+  position: fixed;
+  top: 10%;
+  left: 50%;
+  z-index: 1050;
+  width: 560px;
+  margin-left: -280px;
+  background-color: #ffffff;
+  border: 1px solid #999;
+  border: 1px solid rgba(0, 0, 0, 0.3);
+  *border: 1px solid #999;
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+  outline: none;
+  -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+     -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+          box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+  -webkit-background-clip: padding-box;
+     -moz-background-clip: padding-box;
+          background-clip: padding-box;
+}
+
+.modal.fade {
+  top: -25%;
+  -webkit-transition: opacity 0.3s linear, top 0.3s ease-out;
+     -moz-transition: opacity 0.3s linear, top 0.3s ease-out;
+       -o-transition: opacity 0.3s linear, top 0.3s ease-out;
+          transition: opacity 0.3s linear, top 0.3s ease-out;
+}
+
+.modal.fade.in {
+  top: 10%;
+}
+
+.modal-header {
+  padding: 9px 15px;
+  border-bottom: 1px solid #eee;
+}
+
+.modal-header .close {
+  margin-top: 2px;
+}
+
+.modal-header h3 {
+  margin: 0;
+  line-height: 30px;
+}
+
+.modal-body {
+  position: relative;
+  max-height: 400px;
+  padding: 15px;
+  overflow-y: auto;
+}
+
+.modal-form {
+  margin-bottom: 0;
+}
+
+.modal-footer {
+  padding: 14px 15px 15px;
+  margin-bottom: 0;
+  text-align: right;
+  background-color: #f5f5f5;
+  border-top: 1px solid #ddd;
+  -webkit-border-radius: 0 0 6px 6px;
+     -moz-border-radius: 0 0 6px 6px;
+          border-radius: 0 0 6px 6px;
+  *zoom: 1;
+  -webkit-box-shadow: inset 0 1px 0 #ffffff;
+     -moz-box-shadow: inset 0 1px 0 #ffffff;
+          box-shadow: inset 0 1px 0 #ffffff;
+}
+
+.modal-footer:before,
+.modal-footer:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.modal-footer:after {
+  clear: both;
+}
+
+.modal-footer .btn + .btn {
+  margin-bottom: 0;
+  margin-left: 5px;
+}
+
+.modal-footer .btn-group .btn + .btn {
+  margin-left: -1px;
+}
+
+.modal-footer .btn-block + .btn-block {
+  margin-left: 0;
+}
+
+.tooltip {
+  position: absolute;
+  z-index: 1030;
+  display: block;
+  font-size: 11px;
+  line-height: 1.4;
+  opacity: 0;
+  filter: alpha(opacity=0);
+  visibility: visible;
+}
+
+.tooltip.in {
+  opacity: 0.8;
+  filter: alpha(opacity=80);
+}
+
+.tooltip.top {
+  padding: 5px 0;
+  margin-top: -3px;
+}
+
+.tooltip.right {
+  padding: 0 5px;
+  margin-left: 3px;
+}
+
+.tooltip.bottom {
+  padding: 5px 0;
+  margin-top: 3px;
+}
+
+.tooltip.left {
+  padding: 0 5px;
+  margin-left: -3px;
+}
+
+.tooltip-inner {
+  max-width: 200px;
+  padding: 8px;
+  color: #ffffff;
+  text-align: center;
+  text-decoration: none;
+  background-color: #000000;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.tooltip-arrow {
+  position: absolute;
+  width: 0;
+  height: 0;
+  border-color: transparent;
+  border-style: solid;
+}
+
+.tooltip.top .tooltip-arrow {
+  bottom: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-top-color: #000000;
+  border-width: 5px 5px 0;
+}
+
+.tooltip.right .tooltip-arrow {
+  top: 50%;
+  left: 0;
+  margin-top: -5px;
+  border-right-color: #000000;
+  border-width: 5px 5px 5px 0;
+}
+
+.tooltip.left .tooltip-arrow {
+  top: 50%;
+  right: 0;
+  margin-top: -5px;
+  border-left-color: #000000;
+  border-width: 5px 0 5px 5px;
+}
+
+.tooltip.bottom .tooltip-arrow {
+  top: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-bottom-color: #000000;
+  border-width: 0 5px 5px;
+}
+
+.popover {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 1010;
+  display: none;
+  max-width: 276px;
+  padding: 1px;
+  text-align: left;
+  white-space: normal;
+  background-color: #ffffff;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+     -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+          box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -webkit-background-clip: padding-box;
+     -moz-background-clip: padding;
+          background-clip: padding-box;
+}
+
+.popover.top {
+  margin-top: -10px;
+}
+
+.popover.right {
+  margin-left: 10px;
+}
+
+.popover.bottom {
+  margin-top: 10px;
+}
+
+.popover.left {
+  margin-left: -10px;
+}
+
+.popover-title {
+  padding: 8px 14px;
+  margin: 0;
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 18px;
+  background-color: #f7f7f7;
+  border-bottom: 1px solid #ebebeb;
+  -webkit-border-radius: 5px 5px 0 0;
+     -moz-border-radius: 5px 5px 0 0;
+          border-radius: 5px 5px 0 0;
+}
+
+.popover-title:empty {
+  display: none;
+}
+
+.popover-content {
+  padding: 9px 14px;
+}
+
+.popover .arrow,
+.popover .arrow:after {
+  position: absolute;
+  display: block;
+  width: 0;
+  height: 0;
+  border-color: transparent;
+  border-style: solid;
+}
+
+.popover .arrow {
+  border-width: 11px;
+}
+
+.popover .arrow:after {
+  border-width: 10px;
+  content: "";
+}
+
+.popover.top .arrow {
+  bottom: -11px;
+  left: 50%;
+  margin-left: -11px;
+  border-top-color: #999;
+  border-top-color: rgba(0, 0, 0, 0.25);
+  border-bottom-width: 0;
+}
+
+.popover.top .arrow:after {
+  bottom: 1px;
+  margin-left: -10px;
+  border-top-color: #ffffff;
+  border-bottom-width: 0;
+}
+
+.popover.right .arrow {
+  top: 50%;
+  left: -11px;
+  margin-top: -11px;
+  border-right-color: #999;
+  border-right-color: rgba(0, 0, 0, 0.25);
+  border-left-width: 0;
+}
+
+.popover.right .arrow:after {
+  bottom: -10px;
+  left: 1px;
+  border-right-color: #ffffff;
+  border-left-width: 0;
+}
+
+.popover.bottom .arrow {
+  top: -11px;
+  left: 50%;
+  margin-left: -11px;
+  border-bottom-color: #999;
+  border-bottom-color: rgba(0, 0, 0, 0.25);
+  border-top-width: 0;
+}
+
+.popover.bottom .arrow:after {
+  top: 1px;
+  margin-left: -10px;
+  border-bottom-color: #ffffff;
+  border-top-width: 0;
+}
+
+.popover.left .arrow {
+  top: 50%;
+  right: -11px;
+  margin-top: -11px;
+  border-left-color: #999;
+  border-left-color: rgba(0, 0, 0, 0.25);
+  border-right-width: 0;
+}
+
+.popover.left .arrow:after {
+  right: 1px;
+  bottom: -10px;
+  border-left-color: #ffffff;
+  border-right-width: 0;
+}
+
+.thumbnails {
+  margin-left: -20px;
+  list-style: none;
+  *zoom: 1;
+}
+
+.thumbnails:before,
+.thumbnails:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.thumbnails:after {
+  clear: both;
+}
+
+.row-fluid .thumbnails {
+  margin-left: 0;
+}
+
+.thumbnails > li {
+  float: left;
+  margin-bottom: 20px;
+  margin-left: 20px;
+}
+
+.thumbnail {
+  display: block;
+  padding: 4px;
+  line-height: 20px;
+  border: 1px solid #ddd;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
+     -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
+          box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
+  -webkit-transition: all 0.2s ease-in-out;
+     -moz-transition: all 0.2s ease-in-out;
+       -o-transition: all 0.2s ease-in-out;
+          transition: all 0.2s ease-in-out;
+}
+
+a.thumbnail:hover,
+a.thumbnail:focus {
+  border-color: #0088cc;
+  -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+     -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+          box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+}
+
+.thumbnail > img {
+  display: block;
+  max-width: 100%;
+  margin-right: auto;
+  margin-left: auto;
+}
+
+.thumbnail .caption {
+  padding: 9px;
+  color: #555555;
+}
+
+.media,
+.media-body {
+  overflow: hidden;
+  *overflow: visible;
+  zoom: 1;
+}
+
+.media,
+.media .media {
+  margin-top: 15px;
+}
+
+.media:first-child {
+  margin-top: 0;
+}
+
+.media-object {
+  display: block;
+}
+
+.media-heading {
+  margin: 0 0 5px;
+}
+
+.media > .pull-left {
+  margin-right: 10px;
+}
+
+.media > .pull-right {
+  margin-left: 10px;
+}
+
+.media-list {
+  margin-left: 0;
+  list-style: none;
+}
+
+.label,
+.badge {
+  display: inline-block;
+  padding: 2px 4px;
+  font-size: 11.844px;
+  font-weight: bold;
+  line-height: 14px;
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  white-space: nowrap;
+  vertical-align: baseline;
+  background-color: #999999;
+}
+
+.label {
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
+}
+
+.badge {
+  padding-right: 9px;
+  padding-left: 9px;
+  -webkit-border-radius: 9px;
+     -moz-border-radius: 9px;
+          border-radius: 9px;
+}
+
+.label:empty,
+.badge:empty {
+  display: none;
+}
+
+a.label:hover,
+a.label:focus,
+a.badge:hover,
+a.badge:focus {
+  color: #ffffff;
+  text-decoration: none;
+  cursor: pointer;
+}
+
+.label-important,
+.badge-important {
+  background-color: #b94a48;
+}
+
+.label-important[href],
+.badge-important[href] {
+  background-color: #953b39;
+}
+
+.label-warning,
+.badge-warning {
+  background-color: #f89406;
+}
+
+.label-warning[href],
+.badge-warning[href] {
+  background-color: #c67605;
+}
+
+.label-success,
+.badge-success {
+  background-color: #468847;
+}
+
+.label-success[href],
+.badge-success[href] {
+  background-color: #356635;
+}
+
+.label-info,
+.badge-info {
+  background-color: #3a87ad;
+}
+
+.label-info[href],
+.badge-info[href] {
+  background-color: #2d6987;
+}
+
+.label-inverse,
+.badge-inverse {
+  background-color: #333333;
+}
+
+.label-inverse[href],
+.badge-inverse[href] {
+  background-color: #1a1a1a;
+}
+
+.btn .label,
+.btn .badge {
+  position: relative;
+  top: -1px;
+}
+
+.btn-mini .label,
+.btn-mini .badge {
+  top: 0;
+}
+
+@-webkit-keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+
+@-moz-keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+
+@-ms-keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+
+@-o-keyframes progress-bar-stripes {
+  from {
+    background-position: 0 0;
+  }
+  to {
+    background-position: 40px 0;
+  }
+}
+
+@keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+
+.progress {
+  height: 20px;
+  margin-bottom: 20px;
+  overflow: hidden;
+  background-color: #f7f7f7;
+  background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));
+  background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9);
+  background-repeat: repeat-x;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0);
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+}
+
+.progress .bar {
+  float: left;
+  width: 0;
+  height: 100%;
+  font-size: 12px;
+  color: #ffffff;
+  text-align: center;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #0e90d2;
+  background-image: -moz-linear-gradient(top, #149bdf, #0480be);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));
+  background-image: -webkit-linear-gradient(top, #149bdf, #0480be);
+  background-image: -o-linear-gradient(top, #149bdf, #0480be);
+  background-image: linear-gradient(to bottom, #149bdf, #0480be);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0);
+  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+     -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+          box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+  -webkit-transition: width 0.6s ease;
+     -moz-transition: width 0.6s ease;
+       -o-transition: width 0.6s ease;
+          transition: width 0.6s ease;
+}
+
+.progress .bar + .bar {
+  -webkit-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+     -moz-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+          box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+}
+
+.progress-striped .bar {
+  background-color: #149bdf;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  -webkit-background-size: 40px 40px;
+     -moz-background-size: 40px 40px;
+       -o-background-size: 40px 40px;
+          background-size: 40px 40px;
+}
+
+.progress.active .bar {
+  -webkit-animation: progress-bar-stripes 2s linear infinite;
+     -moz-animation: progress-bar-stripes 2s linear infinite;
+      -ms-animation: progress-bar-stripes 2s linear infinite;
+       -o-animation: progress-bar-stripes 2s linear infinite;
+          animation: progress-bar-stripes 2s linear infinite;
+}
+
+.progress-danger .bar,
+.progress .bar-danger {
+  background-color: #dd514c;
+  background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));
+  background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: linear-gradient(to bottom, #ee5f5b, #c43c35);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0);
+}
+
+.progress-danger.progress-striped .bar,
+.progress-striped .bar-danger {
+  background-color: #ee5f5b;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+
+.progress-success .bar,
+.progress .bar-success {
+  background-color: #5eb95e;
+  background-image: -moz-linear-gradient(top, #62c462, #57a957);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));
+  background-image: -webkit-linear-gradient(top, #62c462, #57a957);
+  background-image: -o-linear-gradient(top, #62c462, #57a957);
+  background-image: linear-gradient(to bottom, #62c462, #57a957);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0);
+}
+
+.progress-success.progress-striped .bar,
+.progress-striped .bar-success {
+  background-color: #62c462;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+
+.progress-info .bar,
+.progress .bar-info {
+  background-color: #4bb1cf;
+  background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));
+  background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: linear-gradient(to bottom, #5bc0de, #339bb9);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0);
+}
+
+.progress-info.progress-striped .bar,
+.progress-striped .bar-info {
+  background-color: #5bc0de;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+
+.progress-warning .bar,
+.progress .bar-warning {
+  background-color: #faa732;
+  background-image: -moz-linear-gradient(top, #fbb450, #f89406);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
+  background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
+  background-image: -o-linear-gradient(top, #fbb450, #f89406);
+  background-image: linear-gradient(to bottom, #fbb450, #f89406);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
+}
+
+.progress-warning.progress-striped .bar,
+.progress-striped .bar-warning {
+  background-color: #fbb450;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+
+.accordion {
+  margin-bottom: 20px;
+}
+
+.accordion-group {
+  margin-bottom: 2px;
+  border: 1px solid #e5e5e5;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+
+.accordion-heading {
+  border-bottom: 0;
+}
+
+.accordion-heading .accordion-toggle {
+  display: block;
+  padding: 8px 15px;
+}
+
+.accordion-toggle {
+  cursor: pointer;
+}
+
+.accordion-inner {
+  padding: 9px 15px;
+  border-top: 1px solid #e5e5e5;
+}
+
+.carousel {
+  position: relative;
+  margin-bottom: 20px;
+  line-height: 1;
+}
+
+.carousel-inner {
+  position: relative;
+  width: 100%;
+  overflow: hidden;
+}
+
+.carousel-inner > .item {
+  position: relative;
+  display: none;
+  -webkit-transition: 0.6s ease-in-out left;
+     -moz-transition: 0.6s ease-in-out left;
+       -o-transition: 0.6s ease-in-out left;
+          transition: 0.6s ease-in-out left;
+}
+
+.carousel-inner > .item > img,
+.carousel-inner > .item > a > img {
+  display: block;
+  line-height: 1;
+}
+
+.carousel-inner > .active,
+.carousel-inner > .next,
+.carousel-inner > .prev {
+  display: block;
+}
+
+.carousel-inner > .active {
+  left: 0;
+}
+
+.carousel-inner > .next,
+.carousel-inner > .prev {
+  position: absolute;
+  top: 0;
+  width: 100%;
+}
+
+.carousel-inner > .next {
+  left: 100%;
+}
+
+.carousel-inner > .prev {
+  left: -100%;
+}
+
+.carousel-inner > .next.left,
+.carousel-inner > .prev.right {
+  left: 0;
+}
+
+.carousel-inner > .active.left {
+  left: -100%;
+}
+
+.carousel-inner > .active.right {
+  left: 100%;
+}
+
+.carousel-control {
+  position: absolute;
+  top: 40%;
+  left: 15px;
+  width: 40px;
+  height: 40px;
+  margin-top: -20px;
+  font-size: 60px;
+  font-weight: 100;
+  line-height: 30px;
+  color: #ffffff;
+  text-align: center;
+  background: #222222;
+  border: 3px solid #ffffff;
+  -webkit-border-radius: 23px;
+     -moz-border-radius: 23px;
+          border-radius: 23px;
+  opacity: 0.5;
+  filter: alpha(opacity=50);
+}
+
+.carousel-control.right {
+  right: 15px;
+  left: auto;
+}
+
+.carousel-control:hover,
+.carousel-control:focus {
+  color: #ffffff;
+  text-decoration: none;
+  opacity: 0.9;
+  filter: alpha(opacity=90);
+}
+
+.carousel-indicators {
+  position: absolute;
+  top: 15px;
+  right: 15px;
+  z-index: 5;
+  margin: 0;
+  list-style: none;
+}
+
+.carousel-indicators li {
+  display: block;
+  float: left;
+  width: 10px;
+  height: 10px;
+  margin-left: 5px;
+  text-indent: -999px;
+  background-color: #ccc;
+  background-color: rgba(255, 255, 255, 0.25);
+  border-radius: 5px;
+}
+
+.carousel-indicators .active {
+  background-color: #fff;
+}
+
+.carousel-caption {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  padding: 15px;
+  background: #333333;
+  background: rgba(0, 0, 0, 0.75);
+}
+
+.carousel-caption h4,
+.carousel-caption p {
+  line-height: 20px;
+  color: #ffffff;
+}
+
+.carousel-caption h4 {
+  margin: 0 0 5px;
+}
+
+.carousel-caption p {
+  margin-bottom: 0;
+}
+
+.hero-unit {
+  padding: 60px;
+  margin-bottom: 30px;
+  font-size: 18px;
+  font-weight: 200;
+  line-height: 30px;
+  color: inherit;
+  background-color: #eeeeee;
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+}
+
+.hero-unit h1 {
+  margin-bottom: 0;
+  font-size: 60px;
+  line-height: 1;
+  letter-spacing: -1px;
+  color: inherit;
+}
+
+.hero-unit li {
+  line-height: 30px;
+}
+
+.pull-right {
+  float: right;
+}
+
+.pull-left {
+  float: left;
+}
+
+.hide {
+  display: none;
+}
+
+.show {
+  display: block;
+}
+
+.invisible {
+  visibility: hidden;
+}
+
+.affix {
+  position: fixed;
+}
diff --git a/view/theme/oldtest/css/bootstrap.min.css b/view/theme/oldtest/css/bootstrap.min.css
new file mode 100644
index 000000000..c10c7f417
--- /dev/null
+++ b/view/theme/oldtest/css/bootstrap.min.css
@@ -0,0 +1,9 @@
+/*!
+ * Bootstrap v2.3.1
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;line-height:0;content:""}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}a:hover,a:active{outline:0}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{width:auto\9;height:auto;max-width:100%;vertical-align:middle;border:0;-ms-interpolation-mode:bicubic}#map_canvas img,.google-maps img{max-width:none}button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle}button,input{*overflow:visible;line-height:normal}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}button,html input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button}label,select,button,input[type="button"],input[type="reset"],input[type="submit"],input[type="radio"],input[type="checkbox"]{cursor:pointer}input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}textarea{overflow:auto;vertical-align:top}@media print{*{color:#000!important;text-shadow:none!important;background:transparent!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}.ir a:after,a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}@page{margin:.5cm}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}}body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:20px;color:#333;background-color:#fff}a{color:#08c;text-decoration:none}a:hover,a:focus{color:#005580;text-decoration:underline}.img-rounded{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.img-polaroid{padding:4px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.1);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.1);box-shadow:0 1px 3px rgba(0,0,0,0.1)}.img-circle{-webkit-border-radius:500px;-moz-border-radius:500px;border-radius:500px}.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px}.span12{width:940px}.span11{width:860px}.span10{width:780px}.span9{width:700px}.span8{width:620px}.span7{width:540px}.span6{width:460px}.span5{width:380px}.span4{width:300px}.span3{width:220px}.span2{width:140px}.span1{width:60px}.offset12{margin-left:980px}.offset11{margin-left:900px}.offset10{margin-left:820px}.offset9{margin-left:740px}.offset8{margin-left:660px}.offset7{margin-left:580px}.offset6{margin-left:500px}.offset5{margin-left:420px}.offset4{margin-left:340px}.offset3{margin-left:260px}.offset2{margin-left:180px}.offset1{margin-left:100px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.127659574468085%;*margin-left:2.074468085106383%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.127659574468085%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.48936170212765%;*width:91.43617021276594%}.row-fluid .span10{width:82.97872340425532%;*width:82.92553191489361%}.row-fluid .span9{width:74.46808510638297%;*width:74.41489361702126%}.row-fluid .span8{width:65.95744680851064%;*width:65.90425531914893%}.row-fluid .span7{width:57.44680851063829%;*width:57.39361702127659%}.row-fluid .span6{width:48.93617021276595%;*width:48.88297872340425%}.row-fluid .span5{width:40.42553191489362%;*width:40.37234042553192%}.row-fluid .span4{width:31.914893617021278%;*width:31.861702127659576%}.row-fluid .span3{width:23.404255319148934%;*width:23.351063829787233%}.row-fluid .span2{width:14.893617021276595%;*width:14.840425531914894%}.row-fluid .span1{width:6.382978723404255%;*width:6.329787234042553%}.row-fluid .offset12{margin-left:104.25531914893617%;*margin-left:104.14893617021275%}.row-fluid .offset12:first-child{margin-left:102.12765957446808%;*margin-left:102.02127659574467%}.row-fluid .offset11{margin-left:95.74468085106382%;*margin-left:95.6382978723404%}.row-fluid .offset11:first-child{margin-left:93.61702127659574%;*margin-left:93.51063829787232%}.row-fluid .offset10{margin-left:87.23404255319149%;*margin-left:87.12765957446807%}.row-fluid .offset10:first-child{margin-left:85.1063829787234%;*margin-left:84.99999999999999%}.row-fluid .offset9{margin-left:78.72340425531914%;*margin-left:78.61702127659572%}.row-fluid .offset9:first-child{margin-left:76.59574468085106%;*margin-left:76.48936170212764%}.row-fluid .offset8{margin-left:70.2127659574468%;*margin-left:70.10638297872339%}.row-fluid .offset8:first-child{margin-left:68.08510638297872%;*margin-left:67.9787234042553%}.row-fluid .offset7{margin-left:61.70212765957446%;*margin-left:61.59574468085106%}.row-fluid .offset7:first-child{margin-left:59.574468085106375%;*margin-left:59.46808510638297%}.row-fluid .offset6{margin-left:53.191489361702125%;*margin-left:53.085106382978715%}.row-fluid .offset6:first-child{margin-left:51.063829787234035%;*margin-left:50.95744680851063%}.row-fluid .offset5{margin-left:44.68085106382979%;*margin-left:44.57446808510638%}.row-fluid .offset5:first-child{margin-left:42.5531914893617%;*margin-left:42.4468085106383%}.row-fluid .offset4{margin-left:36.170212765957444%;*margin-left:36.06382978723405%}.row-fluid .offset4:first-child{margin-left:34.04255319148936%;*margin-left:33.93617021276596%}.row-fluid .offset3{margin-left:27.659574468085104%;*margin-left:27.5531914893617%}.row-fluid .offset3:first-child{margin-left:25.53191489361702%;*margin-left:25.425531914893618%}.row-fluid .offset2{margin-left:19.148936170212764%;*margin-left:19.04255319148936%}.row-fluid .offset2:first-child{margin-left:17.02127659574468%;*margin-left:16.914893617021278%}.row-fluid .offset1{margin-left:10.638297872340425%;*margin-left:10.53191489361702%}.row-fluid .offset1:first-child{margin-left:8.51063829787234%;*margin-left:8.404255319148938%}[class*="span"].hide,.row-fluid [class*="span"].hide{display:none}[class*="span"].pull-right,.row-fluid [class*="span"].pull-right{float:right}.container{margin-right:auto;margin-left:auto;*zoom:1}.container:before,.container:after{display:table;line-height:0;content:""}.container:after{clear:both}.container-fluid{padding-right:20px;padding-left:20px;*zoom:1}.container-fluid:before,.container-fluid:after{display:table;line-height:0;content:""}.container-fluid:after{clear:both}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:21px;font-weight:200;line-height:30px}small{font-size:85%}strong{font-weight:bold}em{font-style:italic}cite{font-style:normal}.muted{color:#999}a.muted:hover,a.muted:focus{color:#808080}.text-warning{color:#c09853}a.text-warning:hover,a.text-warning:focus{color:#a47e3c}.text-error{color:#b94a48}a.text-error:hover,a.text-error:focus{color:#953b39}.text-info{color:#3a87ad}a.text-info:hover,a.text-info:focus{color:#2d6987}.text-success{color:#468847}a.text-success:hover,a.text-success:focus{color:#356635}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}h1,h2,h3,h4,h5,h6{margin:10px 0;font-family:inherit;font-weight:bold;line-height:20px;color:inherit;text-rendering:optimizelegibility}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;line-height:1;color:#999}h1,h2,h3{line-height:40px}h1{font-size:38.5px}h2{font-size:31.5px}h3{font-size:24.5px}h4{font-size:17.5px}h5{font-size:14px}h6{font-size:11.9px}h1 small{font-size:24.5px}h2 small{font-size:17.5px}h3 small{font-size:14px}h4 small{font-size:14px}.page-header{padding-bottom:9px;margin:20px 0 30px;border-bottom:1px solid #eee}ul,ol{padding:0;margin:0 0 10px 25px}ul ul,ul ol,ol ol,ol ul{margin-bottom:0}li{line-height:20px}ul.unstyled,ol.unstyled{margin-left:0;list-style:none}ul.inline,ol.inline{margin-left:0;list-style:none}ul.inline>li,ol.inline>li{display:inline-block;*display:inline;padding-right:5px;padding-left:5px;*zoom:1}dl{margin-bottom:20px}dt,dd{line-height:20px}dt{font-weight:bold}dd{margin-left:10px}.dl-horizontal{*zoom:1}.dl-horizontal:before,.dl-horizontal:after{display:table;line-height:0;content:""}.dl-horizontal:after{clear:both}.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}hr{margin:20px 0;border:0;border-top:1px solid #eee;border-bottom:1px solid #fff}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999}abbr.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:0 0 0 15px;margin:0 0 20px;border-left:5px solid #eee}blockquote p{margin-bottom:0;font-size:17.5px;font-weight:300;line-height:1.25}blockquote small{display:block;line-height:20px;color:#999}blockquote small:before{content:'\2014 \00A0'}blockquote.pull-right{float:right;padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0}blockquote.pull-right p,blockquote.pull-right small{text-align:right}blockquote.pull-right small:before{content:''}blockquote.pull-right small:after{content:'\00A0 \2014'}q:before,q:after,blockquote:before,blockquote:after{content:""}address{display:block;margin-bottom:20px;font-style:normal;line-height:20px}code,pre{padding:0 3px 2px;font-family:Monaco,Menlo,Consolas,"Courier New",monospace;font-size:12px;color:#333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}code{padding:2px 4px;color:#d14;white-space:nowrap;background-color:#f7f7f9;border:1px solid #e1e1e8}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:20px;word-break:break-all;word-wrap:break-word;white-space:pre;white-space:pre-wrap;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}pre.prettyprint{margin-bottom:20px}pre code{padding:0;color:inherit;white-space:pre;white-space:pre-wrap;background-color:transparent;border:0}.pre-scrollable{max-height:340px;overflow-y:scroll}form{margin:0 0 20px}fieldset{padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:40px;color:#333;border:0;border-bottom:1px solid #e5e5e5}legend small{font-size:15px;color:#999}label,input,button,select,textarea{font-size:14px;font-weight:normal;line-height:20px}input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif}label{display:block;margin-bottom:5px}select,textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{display:inline-block;height:20px;padding:4px 6px;margin-bottom:10px;font-size:14px;line-height:20px;color:#555;vertical-align:middle;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}input,textarea,.uneditable-input{width:206px}textarea{height:auto}textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{background-color:#fff;border:1px solid #ccc;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border linear .2s,box-shadow linear .2s;-moz-transition:border linear .2s,box-shadow linear .2s;-o-transition:border linear .2s,box-shadow linear .2s;transition:border linear .2s,box-shadow linear .2s}textarea:focus,input[type="text"]:focus,input[type="password"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus,.uneditable-input:focus{border-color:rgba(82,168,236,0.8);outline:0;outline:thin dotted \9;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}input[type="radio"],input[type="checkbox"]{margin:4px 0 0;margin-top:1px \9;*margin-top:0;line-height:normal}input[type="file"],input[type="image"],input[type="submit"],input[type="reset"],input[type="button"],input[type="radio"],input[type="checkbox"]{width:auto}select,input[type="file"]{height:30px;*margin-top:4px;line-height:30px}select{width:220px;background-color:#fff;border:1px solid #ccc}select[multiple],select[size]{height:auto}select:focus,input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.uneditable-input,.uneditable-textarea{color:#999;cursor:not-allowed;background-color:#fcfcfc;border-color:#ccc;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.025);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.025);box-shadow:inset 0 1px 2px rgba(0,0,0,0.025)}.uneditable-input{overflow:hidden;white-space:nowrap}.uneditable-textarea{width:auto;height:auto}input:-moz-placeholder,textarea:-moz-placeholder{color:#999}input:-ms-input-placeholder,textarea:-ms-input-placeholder{color:#999}input::-webkit-input-placeholder,textarea::-webkit-input-placeholder{color:#999}.radio,.checkbox{min-height:20px;padding-left:20px}.radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-20px}.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px}.radio.inline,.checkbox.inline{display:inline-block;padding-top:5px;margin-bottom:0;vertical-align:middle}.radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px}.input-mini{width:60px}.input-small{width:90px}.input-medium{width:150px}.input-large{width:210px}.input-xlarge{width:270px}.input-xxlarge{width:530px}input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"]{float:none;margin-left:0}.input-append input[class*="span"],.input-append .uneditable-input[class*="span"],.input-prepend input[class*="span"],.input-prepend .uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"],.row-fluid .input-prepend [class*="span"],.row-fluid .input-append [class*="span"]{display:inline-block}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:20px}input.span12,textarea.span12,.uneditable-input.span12{width:926px}input.span11,textarea.span11,.uneditable-input.span11{width:846px}input.span10,textarea.span10,.uneditable-input.span10{width:766px}input.span9,textarea.span9,.uneditable-input.span9{width:686px}input.span8,textarea.span8,.uneditable-input.span8{width:606px}input.span7,textarea.span7,.uneditable-input.span7{width:526px}input.span6,textarea.span6,.uneditable-input.span6{width:446px}input.span5,textarea.span5,.uneditable-input.span5{width:366px}input.span4,textarea.span4,.uneditable-input.span4{width:286px}input.span3,textarea.span3,.uneditable-input.span3{width:206px}input.span2,textarea.span2,.uneditable-input.span2{width:126px}input.span1,textarea.span1,.uneditable-input.span1{width:46px}.controls-row{*zoom:1}.controls-row:before,.controls-row:after{display:table;line-height:0;content:""}.controls-row:after{clear:both}.controls-row [class*="span"],.row-fluid .controls-row [class*="span"]{float:left}.controls-row .checkbox[class*="span"],.controls-row .radio[class*="span"]{padding-top:5px}input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{cursor:not-allowed;background-color:#eee}input[type="radio"][disabled],input[type="checkbox"][disabled],input[type="radio"][readonly],input[type="checkbox"][readonly]{background-color:transparent}.control-group.warning .control-label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853}.control-group.warning .checkbox,.control-group.warning .radio,.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853}.control-group.warning input,.control-group.warning select,.control-group.warning textarea{border-color:#c09853;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e}.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853}.control-group.error .control-label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48}.control-group.error .checkbox,.control-group.error .radio,.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48}.control-group.error input,.control-group.error select,.control-group.error textarea{border-color:#b94a48;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392}.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48}.control-group.success .control-label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847}.control-group.success .checkbox,.control-group.success .radio,.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847}.control-group.success input,.control-group.success select,.control-group.success textarea{border-color:#468847;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b}.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847}.control-group.info .control-label,.control-group.info .help-block,.control-group.info .help-inline{color:#3a87ad}.control-group.info .checkbox,.control-group.info .radio,.control-group.info input,.control-group.info select,.control-group.info textarea{color:#3a87ad}.control-group.info input,.control-group.info select,.control-group.info textarea{border-color:#3a87ad;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.info input:focus,.control-group.info select:focus,.control-group.info textarea:focus{border-color:#2d6987;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3}.control-group.info .input-prepend .add-on,.control-group.info .input-append .add-on{color:#3a87ad;background-color:#d9edf7;border-color:#3a87ad}input:focus:invalid,textarea:focus:invalid,select:focus:invalid{color:#b94a48;border-color:#ee5f5b}input:focus:invalid:focus,textarea:focus:invalid:focus,select:focus:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7}.form-actions{padding:19px 20px 20px;margin-top:20px;margin-bottom:20px;background-color:#f5f5f5;border-top:1px solid #e5e5e5;*zoom:1}.form-actions:before,.form-actions:after{display:table;line-height:0;content:""}.form-actions:after{clear:both}.help-block,.help-inline{color:#595959}.help-block{display:block;margin-bottom:10px}.help-inline{display:inline-block;*display:inline;padding-left:5px;vertical-align:middle;*zoom:1}.input-append,.input-prepend{display:inline-block;margin-bottom:10px;font-size:0;white-space:nowrap;vertical-align:middle}.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input,.input-append .dropdown-menu,.input-prepend .dropdown-menu,.input-append .popover,.input-prepend .popover{font-size:14px}.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input{position:relative;margin-bottom:0;*margin-left:0;vertical-align:top;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-append input:focus,.input-prepend input:focus,.input-append select:focus,.input-prepend select:focus,.input-append .uneditable-input:focus,.input-prepend .uneditable-input:focus{z-index:2}.input-append .add-on,.input-prepend .add-on{display:inline-block;width:auto;height:20px;min-width:16px;padding:4px 5px;font-size:14px;font-weight:normal;line-height:20px;text-align:center;text-shadow:0 1px 0 #fff;background-color:#eee;border:1px solid #ccc}.input-append .add-on,.input-prepend .add-on,.input-append .btn,.input-prepend .btn,.input-append .btn-group>.dropdown-toggle,.input-prepend .btn-group>.dropdown-toggle{vertical-align:top;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.input-append .active,.input-prepend .active{background-color:#a9dba9;border-color:#46a546}.input-prepend .add-on,.input-prepend .btn{margin-right:-1px}.input-prepend .add-on:first-child,.input-prepend .btn:first-child{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.input-append input,.input-append select,.input-append .uneditable-input{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.input-append input+.btn-group .btn:last-child,.input-append select+.btn-group .btn:last-child,.input-append .uneditable-input+.btn-group .btn:last-child{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-append .add-on,.input-append .btn,.input-append .btn-group{margin-left:-1px}.input-append .add-on:last-child,.input-append .btn:last-child,.input-append .btn-group:last-child>.dropdown-toggle{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-prepend.input-append input,.input-prepend.input-append select,.input-prepend.input-append .uneditable-input{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.input-prepend.input-append input+.btn-group .btn,.input-prepend.input-append select+.btn-group .btn,.input-prepend.input-append .uneditable-input+.btn-group .btn{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-prepend.input-append .add-on:first-child,.input-prepend.input-append .btn:first-child{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.input-prepend.input-append .add-on:last-child,.input-prepend.input-append .btn:last-child{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-prepend.input-append .btn-group:first-child{margin-left:0}input.search-query{padding-right:14px;padding-right:4px \9;padding-left:14px;padding-left:4px \9;margin-bottom:0;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.form-search .input-append .search-query,.form-search .input-prepend .search-query{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.form-search .input-append .search-query{-webkit-border-radius:14px 0 0 14px;-moz-border-radius:14px 0 0 14px;border-radius:14px 0 0 14px}.form-search .input-append .btn{-webkit-border-radius:0 14px 14px 0;-moz-border-radius:0 14px 14px 0;border-radius:0 14px 14px 0}.form-search .input-prepend .search-query{-webkit-border-radius:0 14px 14px 0;-moz-border-radius:0 14px 14px 0;border-radius:0 14px 14px 0}.form-search .input-prepend .btn{-webkit-border-radius:14px 0 0 14px;-moz-border-radius:14px 0 0 14px;border-radius:14px 0 0 14px}.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input,.form-search .input-prepend,.form-inline .input-prepend,.form-horizontal .input-prepend,.form-search .input-append,.form-inline .input-append,.form-horizontal .input-append{display:inline-block;*display:inline;margin-bottom:0;vertical-align:middle;*zoom:1}.form-search .hide,.form-inline .hide,.form-horizontal .hide{display:none}.form-search label,.form-inline label,.form-search .btn-group,.form-inline .btn-group{display:inline-block}.form-search .input-append,.form-inline .input-append,.form-search .input-prepend,.form-inline .input-prepend{margin-bottom:0}.form-search .radio,.form-search .checkbox,.form-inline .radio,.form-inline .checkbox{padding-left:0;margin-bottom:0;vertical-align:middle}.form-search .radio input[type="radio"],.form-search .checkbox input[type="checkbox"],.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:left;margin-right:3px;margin-left:0}.control-group{margin-bottom:10px}legend+.control-group{margin-top:20px;-webkit-margin-top-collapse:separate}.form-horizontal .control-group{margin-bottom:20px;*zoom:1}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;line-height:0;content:""}.form-horizontal .control-group:after{clear:both}.form-horizontal .control-label{float:left;width:160px;padding-top:5px;text-align:right}.form-horizontal .controls{*display:inline-block;*padding-left:20px;margin-left:180px;*margin-left:0}.form-horizontal .controls:first-child{*padding-left:180px}.form-horizontal .help-block{margin-bottom:0}.form-horizontal input+.help-block,.form-horizontal select+.help-block,.form-horizontal textarea+.help-block,.form-horizontal .uneditable-input+.help-block,.form-horizontal .input-prepend+.help-block,.form-horizontal .input-append+.help-block{margin-top:10px}.form-horizontal .form-actions{padding-left:180px}table{max-width:100%;background-color:transparent;border-collapse:collapse;border-spacing:0}.table{width:100%;margin-bottom:20px}.table th,.table td{padding:8px;line-height:20px;text-align:left;vertical-align:top;border-top:1px solid #ddd}.table th{font-weight:bold}.table thead th{vertical-align:bottom}.table caption+thead tr:first-child th,.table caption+thead tr:first-child td,.table colgroup+thead tr:first-child th,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child th,.table thead:first-child tr:first-child td{border-top:0}.table tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed th,.table-condensed td{padding:4px 5px}.table-bordered{border:1px solid #ddd;border-collapse:separate;*border-collapse:collapse;border-left:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.table-bordered th,.table-bordered td{border-left:1px solid #ddd}.table-bordered caption+thead tr:first-child th,.table-bordered caption+tbody tr:first-child th,.table-bordered caption+tbody tr:first-child td,.table-bordered colgroup+thead tr:first-child th,.table-bordered colgroup+tbody tr:first-child th,.table-bordered colgroup+tbody tr:first-child td,.table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0}.table-bordered thead:first-child tr:first-child>th:first-child,.table-bordered tbody:first-child tr:first-child>td:first-child,.table-bordered tbody:first-child tr:first-child>th:first-child{-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topleft:4px}.table-bordered thead:first-child tr:first-child>th:last-child,.table-bordered tbody:first-child tr:first-child>td:last-child,.table-bordered tbody:first-child tr:first-child>th:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-topright:4px}.table-bordered thead:last-child tr:last-child>th:first-child,.table-bordered tbody:last-child tr:last-child>td:first-child,.table-bordered tbody:last-child tr:last-child>th:first-child,.table-bordered tfoot:last-child tr:last-child>td:first-child,.table-bordered tfoot:last-child tr:last-child>th:first-child{-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px}.table-bordered thead:last-child tr:last-child>th:last-child,.table-bordered tbody:last-child tr:last-child>td:last-child,.table-bordered tbody:last-child tr:last-child>th:last-child,.table-bordered tfoot:last-child tr:last-child>td:last-child,.table-bordered tfoot:last-child tr:last-child>th:last-child{-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px}.table-bordered tfoot+tbody:last-child tr:last-child td:first-child{-webkit-border-bottom-left-radius:0;border-bottom-left-radius:0;-moz-border-radius-bottomleft:0}.table-bordered tfoot+tbody:last-child tr:last-child td:last-child{-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0;-moz-border-radius-bottomright:0}.table-bordered caption+thead tr:first-child th:first-child,.table-bordered caption+tbody tr:first-child td:first-child,.table-bordered colgroup+thead tr:first-child th:first-child,.table-bordered colgroup+tbody tr:first-child td:first-child{-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topleft:4px}.table-bordered caption+thead tr:first-child th:last-child,.table-bordered caption+tbody tr:first-child td:last-child,.table-bordered colgroup+thead tr:first-child th:last-child,.table-bordered colgroup+tbody tr:first-child td:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-topright:4px}.table-striped tbody>tr:nth-child(odd)>td,.table-striped tbody>tr:nth-child(odd)>th{background-color:#f9f9f9}.table-hover tbody tr:hover>td,.table-hover tbody tr:hover>th{background-color:#f5f5f5}table td[class*="span"],table th[class*="span"],.row-fluid table td[class*="span"],.row-fluid table th[class*="span"]{display:table-cell;float:none;margin-left:0}.table td.span1,.table th.span1{float:none;width:44px;margin-left:0}.table td.span2,.table th.span2{float:none;width:124px;margin-left:0}.table td.span3,.table th.span3{float:none;width:204px;margin-left:0}.table td.span4,.table th.span4{float:none;width:284px;margin-left:0}.table td.span5,.table th.span5{float:none;width:364px;margin-left:0}.table td.span6,.table th.span6{float:none;width:444px;margin-left:0}.table td.span7,.table th.span7{float:none;width:524px;margin-left:0}.table td.span8,.table th.span8{float:none;width:604px;margin-left:0}.table td.span9,.table th.span9{float:none;width:684px;margin-left:0}.table td.span10,.table th.span10{float:none;width:764px;margin-left:0}.table td.span11,.table th.span11{float:none;width:844px;margin-left:0}.table td.span12,.table th.span12{float:none;width:924px;margin-left:0}.table tbody tr.success>td{background-color:#dff0d8}.table tbody tr.error>td{background-color:#f2dede}.table tbody tr.warning>td{background-color:#fcf8e3}.table tbody tr.info>td{background-color:#d9edf7}.table-hover tbody tr.success:hover>td{background-color:#d0e9c6}.table-hover tbody tr.error:hover>td{background-color:#ebcccc}.table-hover tbody tr.warning:hover>td{background-color:#faf2cc}.table-hover tbody tr.info:hover>td{background-color:#c4e3f3}[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;margin-top:1px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat}.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:focus>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>li>a:focus>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:focus>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"],.dropdown-submenu:focus>a>[class*=" icon-"]{background-image:url("../img/glyphicons-halflings-white.png")}.icon-glass{background-position:0 0}.icon-music{background-position:-24px 0}.icon-search{background-position:-48px 0}.icon-envelope{background-position:-72px 0}.icon-heart{background-position:-96px 0}.icon-star{background-position:-120px 0}.icon-star-empty{background-position:-144px 0}.icon-user{background-position:-168px 0}.icon-film{background-position:-192px 0}.icon-th-large{background-position:-216px 0}.icon-th{background-position:-240px 0}.icon-th-list{background-position:-264px 0}.icon-ok{background-position:-288px 0}.icon-remove{background-position:-312px 0}.icon-zoom-in{background-position:-336px 0}.icon-zoom-out{background-position:-360px 0}.icon-off{background-position:-384px 0}.icon-signal{background-position:-408px 0}.icon-cog{background-position:-432px 0}.icon-trash{background-position:-456px 0}.icon-home{background-position:0 -24px}.icon-file{background-position:-24px -24px}.icon-time{background-position:-48px -24px}.icon-road{background-position:-72px -24px}.icon-download-alt{background-position:-96px -24px}.icon-download{background-position:-120px -24px}.icon-upload{background-position:-144px -24px}.icon-inbox{background-position:-168px -24px}.icon-play-circle{background-position:-192px -24px}.icon-repeat{background-position:-216px -24px}.icon-refresh{background-position:-240px -24px}.icon-list-alt{background-position:-264px -24px}.icon-lock{background-position:-287px -24px}.icon-flag{background-position:-312px -24px}.icon-headphones{background-position:-336px -24px}.icon-volume-off{background-position:-360px -24px}.icon-volume-down{background-position:-384px -24px}.icon-volume-up{background-position:-408px -24px}.icon-qrcode{background-position:-432px -24px}.icon-barcode{background-position:-456px -24px}.icon-tag{background-position:0 -48px}.icon-tags{background-position:-25px -48px}.icon-book{background-position:-48px -48px}.icon-bookmark{background-position:-72px -48px}.icon-print{background-position:-96px -48px}.icon-camera{background-position:-120px -48px}.icon-font{background-position:-144px -48px}.icon-bold{background-position:-167px -48px}.icon-italic{background-position:-192px -48px}.icon-text-height{background-position:-216px -48px}.icon-text-width{background-position:-240px -48px}.icon-align-left{background-position:-264px -48px}.icon-align-center{background-position:-288px -48px}.icon-align-right{background-position:-312px -48px}.icon-align-justify{background-position:-336px -48px}.icon-list{background-position:-360px -48px}.icon-indent-left{background-position:-384px -48px}.icon-indent-right{background-position:-408px -48px}.icon-facetime-video{background-position:-432px -48px}.icon-picture{background-position:-456px -48px}.icon-pencil{background-position:0 -72px}.icon-map-marker{background-position:-24px -72px}.icon-adjust{background-position:-48px -72px}.icon-tint{background-position:-72px -72px}.icon-edit{background-position:-96px -72px}.icon-share{background-position:-120px -72px}.icon-check{background-position:-144px -72px}.icon-move{background-position:-168px -72px}.icon-step-backward{background-position:-192px -72px}.icon-fast-backward{background-position:-216px -72px}.icon-backward{background-position:-240px -72px}.icon-play{background-position:-264px -72px}.icon-pause{background-position:-288px -72px}.icon-stop{background-position:-312px -72px}.icon-forward{background-position:-336px -72px}.icon-fast-forward{background-position:-360px -72px}.icon-step-forward{background-position:-384px -72px}.icon-eject{background-position:-408px -72px}.icon-chevron-left{background-position:-432px -72px}.icon-chevron-right{background-position:-456px -72px}.icon-plus-sign{background-position:0 -96px}.icon-minus-sign{background-position:-24px -96px}.icon-remove-sign{background-position:-48px -96px}.icon-ok-sign{background-position:-72px -96px}.icon-question-sign{background-position:-96px -96px}.icon-info-sign{background-position:-120px -96px}.icon-screenshot{background-position:-144px -96px}.icon-remove-circle{background-position:-168px -96px}.icon-ok-circle{background-position:-192px -96px}.icon-ban-circle{background-position:-216px -96px}.icon-arrow-left{background-position:-240px -96px}.icon-arrow-right{background-position:-264px -96px}.icon-arrow-up{background-position:-289px -96px}.icon-arrow-down{background-position:-312px -96px}.icon-share-alt{background-position:-336px -96px}.icon-resize-full{background-position:-360px -96px}.icon-resize-small{background-position:-384px -96px}.icon-plus{background-position:-408px -96px}.icon-minus{background-position:-433px -96px}.icon-asterisk{background-position:-456px -96px}.icon-exclamation-sign{background-position:0 -120px}.icon-gift{background-position:-24px -120px}.icon-leaf{background-position:-48px -120px}.icon-fire{background-position:-72px -120px}.icon-eye-open{background-position:-96px -120px}.icon-eye-close{background-position:-120px -120px}.icon-warning-sign{background-position:-144px -120px}.icon-plane{background-position:-168px -120px}.icon-calendar{background-position:-192px -120px}.icon-random{width:16px;background-position:-216px -120px}.icon-comment{background-position:-240px -120px}.icon-magnet{background-position:-264px -120px}.icon-chevron-up{background-position:-288px -120px}.icon-chevron-down{background-position:-313px -119px}.icon-retweet{background-position:-336px -120px}.icon-shopping-cart{background-position:-360px -120px}.icon-folder-close{width:16px;background-position:-384px -120px}.icon-folder-open{width:16px;background-position:-408px -120px}.icon-resize-vertical{background-position:-432px -119px}.icon-resize-horizontal{background-position:-456px -118px}.icon-hdd{background-position:0 -144px}.icon-bullhorn{background-position:-24px -144px}.icon-bell{background-position:-48px -144px}.icon-certificate{background-position:-72px -144px}.icon-thumbs-up{background-position:-96px -144px}.icon-thumbs-down{background-position:-120px -144px}.icon-hand-right{background-position:-144px -144px}.icon-hand-left{background-position:-168px -144px}.icon-hand-up{background-position:-192px -144px}.icon-hand-down{background-position:-216px -144px}.icon-circle-arrow-right{background-position:-240px -144px}.icon-circle-arrow-left{background-position:-264px -144px}.icon-circle-arrow-up{background-position:-288px -144px}.icon-circle-arrow-down{background-position:-312px -144px}.icon-globe{background-position:-336px -144px}.icon-wrench{background-position:-360px -144px}.icon-tasks{background-position:-384px -144px}.icon-filter{background-position:-408px -144px}.icon-briefcase{background-position:-432px -144px}.icon-fullscreen{background-position:-456px -144px}.dropup,.dropdown{position:relative}.dropdown-toggle{*margin-bottom:-3px}.dropdown-toggle:active,.open .dropdown-toggle{outline:0}.caret{display:inline-block;width:0;height:0;vertical-align:top;border-top:4px solid #000;border-right:4px solid transparent;border-left:4px solid transparent;content:""}.dropdown .caret{margin-top:8px;margin-left:2px}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);*border-right-width:2px;*border-bottom-width:2px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #fff}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:20px;color:#333;white-space:nowrap}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus,.dropdown-submenu:hover>a,.dropdown-submenu:focus>a{color:#fff;text-decoration:none;background-color:#0081c2;background-image:-moz-linear-gradient(top,#08c,#0077b3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));background-image:-webkit-linear-gradient(top,#08c,#0077b3);background-image:-o-linear-gradient(top,#08c,#0077b3);background-image:linear-gradient(to bottom,#08c,#0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0077b3',GradientType=0)}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;background-color:#0081c2;background-image:-moz-linear-gradient(top,#08c,#0077b3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));background-image:-webkit-linear-gradient(top,#08c,#0077b3);background-image:-o-linear-gradient(top,#08c,#0077b3);background-image:linear-gradient(to bottom,#08c,#0077b3);background-repeat:repeat-x;outline:0;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0077b3',GradientType=0)}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#999}.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{text-decoration:none;cursor:default;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open{*z-index:1000}.open>.dropdown-menu{display:block}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid #000;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}.dropdown-submenu{position:relative}.dropdown-submenu>.dropdown-menu{top:0;left:100%;margin-top:-6px;margin-left:-1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px}.dropdown-submenu:hover>.dropdown-menu{display:block}.dropup .dropdown-submenu>.dropdown-menu{top:auto;bottom:0;margin-top:0;margin-bottom:-2px;-webkit-border-radius:5px 5px 5px 0;-moz-border-radius:5px 5px 5px 0;border-radius:5px 5px 5px 0}.dropdown-submenu>a:after{display:block;float:right;width:0;height:0;margin-top:5px;margin-right:-10px;border-color:transparent;border-left-color:#ccc;border-style:solid;border-width:5px 0 5px 5px;content:" "}.dropdown-submenu:hover>a:after{border-left-color:#fff}.dropdown-submenu.pull-left{float:none}.dropdown-submenu.pull-left>.dropdown-menu{left:-100%;margin-left:10px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px}.dropdown .dropdown-menu .nav-header{padding-right:20px;padding-left:20px}.typeahead{z-index:1051;margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,0.15)}.well-large{padding:24px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.well-small{padding:9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.fade{opacity:0;-webkit-transition:opacity .15s linear;-moz-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;-moz-transition:height .35s ease;-o-transition:height .35s ease;transition:height .35s ease}.collapse.in{height:auto}.close{float:right;font-size:20px;font-weight:bold;line-height:20px;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover,.close:focus{color:#000;text-decoration:none;cursor:pointer;opacity:.4;filter:alpha(opacity=40)}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}.btn{display:inline-block;*display:inline;padding:4px 12px;margin-bottom:0;*margin-left:.3em;font-size:14px;line-height:20px;color:#333;text-align:center;text-shadow:0 1px 1px rgba(255,255,255,0.75);vertical-align:middle;cursor:pointer;background-color:#f5f5f5;*background-color:#e6e6e6;background-image:-moz-linear-gradient(top,#fff,#e6e6e6);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));background-image:-webkit-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);background-image:linear-gradient(to bottom,#fff,#e6e6e6);background-repeat:repeat-x;border:1px solid #ccc;*border:0;border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);border-bottom-color:#b3b3b3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffe6e6e6',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);*zoom:1;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.btn:hover,.btn:focus,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#333;background-color:#e6e6e6;*background-color:#d9d9d9}.btn:active,.btn.active{background-color:#ccc \9}.btn:first-child{*margin-left:0}.btn:hover,.btn:focus{color:#333;text-decoration:none;background-position:0 -15px;-webkit-transition:background-position .1s linear;-moz-transition:background-position .1s linear;-o-transition:background-position .1s linear;transition:background-position .1s linear}.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.btn.disabled,.btn[disabled]{cursor:default;background-image:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-large{padding:11px 19px;font-size:17.5px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.btn-large [class^="icon-"],.btn-large [class*=" icon-"]{margin-top:4px}.btn-small{padding:2px 10px;font-size:11.9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.btn-small [class^="icon-"],.btn-small [class*=" icon-"]{margin-top:0}.btn-mini [class^="icon-"],.btn-mini [class*=" icon-"]{margin-top:-1px}.btn-mini{padding:0 6px;font-size:10.5px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.btn-block{display:block;width:100%;padding-right:0;padding-left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.btn-block+.btn-block{margin-top:5px}input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%}.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active,.btn-inverse.active{color:rgba(255,255,255,0.75)}.btn-primary{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#006dcc;*background-color:#04c;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(to bottom,#08c,#04c);background-repeat:repeat-x;border-color:#04c #04c #002a80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0044cc',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#fff;background-color:#04c;*background-color:#003bb3}.btn-primary:active,.btn-primary.active{background-color:#039 \9}.btn-warning{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#faa732;*background-color:#f89406;background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(to bottom,#fbb450,#f89406);background-repeat:repeat-x;border-color:#f89406 #f89406 #ad6704;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450',endColorstr='#fff89406',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{color:#fff;background-color:#f89406;*background-color:#df8505}.btn-warning:active,.btn-warning.active{background-color:#c67605 \9}.btn-danger{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#da4f49;*background-color:#bd362f;background-image:-moz-linear-gradient(top,#ee5f5b,#bd362f);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#bd362f));background-image:-webkit-linear-gradient(top,#ee5f5b,#bd362f);background-image:-o-linear-gradient(top,#ee5f5b,#bd362f);background-image:linear-gradient(to bottom,#ee5f5b,#bd362f);background-repeat:repeat-x;border-color:#bd362f #bd362f #802420;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b',endColorstr='#ffbd362f',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{color:#fff;background-color:#bd362f;*background-color:#a9302a}.btn-danger:active,.btn-danger.active{background-color:#942a25 \9}.btn-success{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#5bb75b;*background-color:#51a351;background-image:-moz-linear-gradient(top,#62c462,#51a351);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#51a351));background-image:-webkit-linear-gradient(top,#62c462,#51a351);background-image:-o-linear-gradient(top,#62c462,#51a351);background-image:linear-gradient(to bottom,#62c462,#51a351);background-repeat:repeat-x;border-color:#51a351 #51a351 #387038;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462',endColorstr='#ff51a351',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{color:#fff;background-color:#51a351;*background-color:#499249}.btn-success:active,.btn-success.active{background-color:#408140 \9}.btn-info{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#49afcd;*background-color:#2f96b4;background-image:-moz-linear-gradient(top,#5bc0de,#2f96b4);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#2f96b4));background-image:-webkit-linear-gradient(top,#5bc0de,#2f96b4);background-image:-o-linear-gradient(top,#5bc0de,#2f96b4);background-image:linear-gradient(to bottom,#5bc0de,#2f96b4);background-repeat:repeat-x;border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff2f96b4',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{color:#fff;background-color:#2f96b4;*background-color:#2a85a0}.btn-info:active,.btn-info.active{background-color:#24748c \9}.btn-inverse{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#363636;*background-color:#222;background-image:-moz-linear-gradient(top,#444,#222);background-image:-webkit-gradient(linear,0 0,0 100%,from(#444),to(#222));background-image:-webkit-linear-gradient(top,#444,#222);background-image:-o-linear-gradient(top,#444,#222);background-image:linear-gradient(to bottom,#444,#222);background-repeat:repeat-x;border-color:#222 #222 #000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444',endColorstr='#ff222222',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-inverse:hover,.btn-inverse:focus,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{color:#fff;background-color:#222;*background-color:#151515}.btn-inverse:active,.btn-inverse.active{background-color:#080808 \9}button.btn,input[type="submit"].btn{*padding-top:3px;*padding-bottom:3px}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0}button.btn.btn-large,input[type="submit"].btn.btn-large{*padding-top:7px;*padding-bottom:7px}button.btn.btn-small,input[type="submit"].btn.btn-small{*padding-top:3px;*padding-bottom:3px}button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-bottom:1px}.btn-link,.btn-link:active,.btn-link[disabled]{background-color:transparent;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-link{color:#08c;cursor:pointer;border-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-link:hover,.btn-link:focus{color:#005580;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover,.btn-link[disabled]:focus{color:#333;text-decoration:none}.btn-group{position:relative;display:inline-block;*display:inline;*margin-left:.3em;font-size:0;white-space:nowrap;vertical-align:middle;*zoom:1}.btn-group:first-child{*margin-left:0}.btn-group+.btn-group{margin-left:5px}.btn-toolbar{margin-top:10px;margin-bottom:10px;font-size:0}.btn-toolbar>.btn+.btn,.btn-toolbar>.btn-group+.btn,.btn-toolbar>.btn+.btn-group{margin-left:5px}.btn-group>.btn{position:relative;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-group>.btn+.btn{margin-left:-1px}.btn-group>.btn,.btn-group>.dropdown-menu,.btn-group>.popover{font-size:14px}.btn-group>.btn-mini{font-size:10.5px}.btn-group>.btn-small{font-size:11.9px}.btn-group>.btn-large{font-size:17.5px}.btn-group>.btn:first-child{margin-left:0;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-bottomleft:4px;-moz-border-radius-topleft:4px}.btn-group>.btn:last-child,.btn-group>.dropdown-toggle{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-bottomright:4px}.btn-group>.btn.large:first-child{margin-left:0;-webkit-border-bottom-left-radius:6px;border-bottom-left-radius:6px;-webkit-border-top-left-radius:6px;border-top-left-radius:6px;-moz-border-radius-bottomleft:6px;-moz-border-radius-topleft:6px}.btn-group>.btn.large:last-child,.btn-group>.large.dropdown-toggle{-webkit-border-top-right-radius:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;border-bottom-right-radius:6px;-moz-border-radius-topright:6px;-moz-border-radius-bottomright:6px}.btn-group>.btn:hover,.btn-group>.btn:focus,.btn-group>.btn:active,.btn-group>.btn.active{z-index:2}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{*padding-top:5px;padding-right:8px;*padding-bottom:5px;padding-left:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.btn-group>.btn-mini+.dropdown-toggle{*padding-top:2px;padding-right:5px;*padding-bottom:2px;padding-left:5px}.btn-group>.btn-small+.dropdown-toggle{*padding-top:5px;*padding-bottom:4px}.btn-group>.btn-large+.dropdown-toggle{*padding-top:7px;padding-right:12px;*padding-bottom:7px;padding-left:12px}.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.btn-group.open .btn.dropdown-toggle{background-color:#e6e6e6}.btn-group.open .btn-primary.dropdown-toggle{background-color:#04c}.btn-group.open .btn-warning.dropdown-toggle{background-color:#f89406}.btn-group.open .btn-danger.dropdown-toggle{background-color:#bd362f}.btn-group.open .btn-success.dropdown-toggle{background-color:#51a351}.btn-group.open .btn-info.dropdown-toggle{background-color:#2f96b4}.btn-group.open .btn-inverse.dropdown-toggle{background-color:#222}.btn .caret{margin-top:8px;margin-left:0}.btn-large .caret{margin-top:6px}.btn-large .caret{border-top-width:5px;border-right-width:5px;border-left-width:5px}.btn-mini .caret,.btn-small .caret{margin-top:8px}.dropup .btn-large .caret{border-bottom-width:5px}.btn-primary .caret,.btn-warning .caret,.btn-danger .caret,.btn-info .caret,.btn-success .caret,.btn-inverse .caret{border-top-color:#fff;border-bottom-color:#fff}.btn-group-vertical{display:inline-block;*display:inline;*zoom:1}.btn-group-vertical>.btn{display:block;float:none;max-width:100%;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-group-vertical>.btn+.btn{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:first-child{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.btn-group-vertical>.btn:last-child{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px}.btn-group-vertical>.btn-large:first-child{-webkit-border-radius:6px 6px 0 0;-moz-border-radius:6px 6px 0 0;border-radius:6px 6px 0 0}.btn-group-vertical>.btn-large:last-child{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}.alert{padding:8px 35px 8px 14px;margin-bottom:20px;text-shadow:0 1px 0 rgba(255,255,255,0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.alert,.alert h4{color:#c09853}.alert h4{margin:0}.alert .close{position:relative;top:-2px;right:-21px;line-height:20px}.alert-success{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}.alert-success h4{color:#468847}.alert-danger,.alert-error{color:#b94a48;background-color:#f2dede;border-color:#eed3d7}.alert-danger h4,.alert-error h4{color:#b94a48}.alert-info{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}.alert-info h4{color:#3a87ad}.alert-block{padding-top:14px;padding-bottom:14px}.alert-block>p,.alert-block>ul{margin-bottom:0}.alert-block p+p{margin-top:5px}.nav{margin-bottom:20px;margin-left:0;list-style:none}.nav>li>a{display:block}.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:#eee}.nav>li>a>img{max-width:none}.nav>.pull-right{float:right}.nav-header{display:block;padding:3px 15px;font-size:11px;font-weight:bold;line-height:20px;color:#999;text-shadow:0 1px 0 rgba(255,255,255,0.5);text-transform:uppercase}.nav li+.nav-header{margin-top:9px}.nav-list{padding-right:15px;padding-left:15px;margin-bottom:0}.nav-list>li>a,.nav-list .nav-header{margin-right:-15px;margin-left:-15px;text-shadow:0 1px 0 rgba(255,255,255,0.5)}.nav-list>li>a{padding:3px 15px}.nav-list>.active>a,.nav-list>.active>a:hover,.nav-list>.active>a:focus{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.2);background-color:#08c}.nav-list [class^="icon-"],.nav-list [class*=" icon-"]{margin-right:2px}.nav-list .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #fff}.nav-tabs,.nav-pills{*zoom:1}.nav-tabs:before,.nav-pills:before,.nav-tabs:after,.nav-pills:after{display:table;line-height:0;content:""}.nav-tabs:after,.nav-pills:after{clear:both}.nav-tabs>li,.nav-pills>li{float:left}.nav-tabs>li>a,.nav-pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{margin-bottom:-1px}.nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:20px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover,.nav-tabs>li>a:focus{border-color:#eee #eee #ddd}.nav-tabs>.active>a,.nav-tabs>.active>a:hover,.nav-tabs>.active>a:focus{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.nav-pills>.active>a,.nav-pills>.active>a:hover,.nav-pills>.active>a:focus{color:#fff;background-color:#08c}.nav-stacked>li{float:none}.nav-stacked>li>a{margin-right:0}.nav-tabs.nav-stacked{border-bottom:0}.nav-tabs.nav-stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.nav-tabs.nav-stacked>li:first-child>a{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-topleft:4px}.nav-tabs.nav-stacked>li:last-child>a{-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomright:4px;-moz-border-radius-bottomleft:4px}.nav-tabs.nav-stacked>li>a:hover,.nav-tabs.nav-stacked>li>a:focus{z-index:2;border-color:#ddd}.nav-pills.nav-stacked>li>a{margin-bottom:3px}.nav-pills.nav-stacked>li:last-child>a{margin-bottom:1px}.nav-tabs .dropdown-menu{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}.nav-pills .dropdown-menu{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.nav .dropdown-toggle .caret{margin-top:6px;border-top-color:#08c;border-bottom-color:#08c}.nav .dropdown-toggle:hover .caret,.nav .dropdown-toggle:focus .caret{border-top-color:#005580;border-bottom-color:#005580}.nav-tabs .dropdown-toggle .caret{margin-top:8px}.nav .active .dropdown-toggle .caret{border-top-color:#fff;border-bottom-color:#fff}.nav-tabs .active .dropdown-toggle .caret{border-top-color:#555;border-bottom-color:#555}.nav>.dropdown.active>a:hover,.nav>.dropdown.active>a:focus{cursor:pointer}.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover,.nav>li.dropdown.open.active>a:focus{color:#fff;background-color:#999;border-color:#999}.nav li.dropdown.open .caret,.nav li.dropdown.open.active .caret,.nav li.dropdown.open a:hover .caret,.nav li.dropdown.open a:focus .caret{border-top-color:#fff;border-bottom-color:#fff;opacity:1;filter:alpha(opacity=100)}.tabs-stacked .open>a:hover,.tabs-stacked .open>a:focus{border-color:#999}.tabbable{*zoom:1}.tabbable:before,.tabbable:after{display:table;line-height:0;content:""}.tabbable:after{clear:both}.tab-content{overflow:auto}.tabs-below>.nav-tabs,.tabs-right>.nav-tabs,.tabs-left>.nav-tabs{border-bottom:0}.tab-content>.tab-pane,.pill-content>.pill-pane{display:none}.tab-content>.active,.pill-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:hover,.tabs-below>.nav-tabs>li>a:focus{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:hover,.tabs-below>.nav-tabs>.active>a:focus{border-color:transparent #ddd #ddd #ddd}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px}.tabs-left>.nav-tabs{float:left;margin-right:19px;border-right:1px solid #ddd}.tabs-left>.nav-tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:hover,.tabs-left>.nav-tabs>li>a:focus{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs .active>a,.tabs-left>.nav-tabs .active>a:hover,.tabs-left>.nav-tabs .active>a:focus{border-color:#ddd transparent #ddd #ddd;*border-right-color:#fff}.tabs-right>.nav-tabs{float:right;margin-left:19px;border-left:1px solid #ddd}.tabs-right>.nav-tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:hover,.tabs-right>.nav-tabs>li>a:focus{border-color:#eee #eee #eee #ddd}.tabs-right>.nav-tabs .active>a,.tabs-right>.nav-tabs .active>a:hover,.tabs-right>.nav-tabs .active>a:focus{border-color:#ddd #ddd #ddd transparent;*border-left-color:#fff}.nav>.disabled>a{color:#999}.nav>.disabled>a:hover,.nav>.disabled>a:focus{text-decoration:none;cursor:default;background-color:transparent}.navbar{*position:relative;*z-index:2;margin-bottom:20px;overflow:visible}.navbar-inner{min-height:40px;padding-right:20px;padding-left:20px;background-color:#fafafa;background-image:-moz-linear-gradient(top,#fff,#f2f2f2);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#f2f2f2));background-image:-webkit-linear-gradient(top,#fff,#f2f2f2);background-image:-o-linear-gradient(top,#fff,#f2f2f2);background-image:linear-gradient(to bottom,#fff,#f2f2f2);background-repeat:repeat-x;border:1px solid #d4d4d4;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#fff2f2f2',GradientType=0);*zoom:1;-webkit-box-shadow:0 1px 4px rgba(0,0,0,0.065);-moz-box-shadow:0 1px 4px rgba(0,0,0,0.065);box-shadow:0 1px 4px rgba(0,0,0,0.065)}.navbar-inner:before,.navbar-inner:after{display:table;line-height:0;content:""}.navbar-inner:after{clear:both}.navbar .container{width:auto}.nav-collapse.collapse{height:auto;overflow:visible}.navbar .brand{display:block;float:left;padding:10px 20px 10px;margin-left:-20px;font-size:20px;font-weight:200;color:#777;text-shadow:0 1px 0 #fff}.navbar .brand:hover,.navbar .brand:focus{text-decoration:none}.navbar-text{margin-bottom:0;line-height:40px;color:#777}.navbar-link{color:#777}.navbar-link:hover,.navbar-link:focus{color:#333}.navbar .divider-vertical{height:40px;margin:0 9px;border-right:1px solid #fff;border-left:1px solid #f2f2f2}.navbar .btn,.navbar .btn-group{margin-top:5px}.navbar .btn-group .btn,.navbar .input-prepend .btn,.navbar .input-append .btn,.navbar .input-prepend .btn-group,.navbar .input-append .btn-group{margin-top:0}.navbar-form{margin-bottom:0;*zoom:1}.navbar-form:before,.navbar-form:after{display:table;line-height:0;content:""}.navbar-form:after{clear:both}.navbar-form input,.navbar-form select,.navbar-form .radio,.navbar-form .checkbox{margin-top:5px}.navbar-form input,.navbar-form select,.navbar-form .btn{display:inline-block;margin-bottom:0}.navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px}.navbar-form .input-append,.navbar-form .input-prepend{margin-top:5px;white-space:nowrap}.navbar-form .input-append input,.navbar-form .input-prepend input{margin-top:0}.navbar-search{position:relative;float:left;margin-top:5px;margin-bottom:0}.navbar-search .search-query{padding:4px 14px;margin-bottom:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.navbar-static-top{position:static;margin-bottom:0}.navbar-static-top .navbar-inner{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030;margin-bottom:0}.navbar-fixed-top .navbar-inner,.navbar-static-top .navbar-inner{border-width:0 0 1px}.navbar-fixed-bottom .navbar-inner{border-width:1px 0 0}.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding-right:0;padding-left:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px}.navbar-fixed-top{top:0}.navbar-fixed-top .navbar-inner,.navbar-static-top .navbar-inner{-webkit-box-shadow:0 1px 10px rgba(0,0,0,0.1);-moz-box-shadow:0 1px 10px rgba(0,0,0,0.1);box-shadow:0 1px 10px rgba(0,0,0,0.1)}.navbar-fixed-bottom{bottom:0}.navbar-fixed-bottom .navbar-inner{-webkit-box-shadow:0 -1px 10px rgba(0,0,0,0.1);-moz-box-shadow:0 -1px 10px rgba(0,0,0,0.1);box-shadow:0 -1px 10px rgba(0,0,0,0.1)}.navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0}.navbar .nav.pull-right{float:right;margin-right:0}.navbar .nav>li{float:left}.navbar .nav>li>a{float:none;padding:10px 15px 10px;color:#777;text-decoration:none;text-shadow:0 1px 0 #fff}.navbar .nav .dropdown-toggle .caret{margin-top:8px}.navbar .nav>li>a:focus,.navbar .nav>li>a:hover{color:#333;text-decoration:none;background-color:transparent}.navbar .nav>.active>a,.navbar .nav>.active>a:hover,.navbar .nav>.active>a:focus{color:#555;text-decoration:none;background-color:#e5e5e5;-webkit-box-shadow:inset 0 3px 8px rgba(0,0,0,0.125);-moz-box-shadow:inset 0 3px 8px rgba(0,0,0,0.125);box-shadow:inset 0 3px 8px rgba(0,0,0,0.125)}.navbar .btn-navbar{display:none;float:right;padding:7px 10px;margin-right:5px;margin-left:5px;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#ededed;*background-color:#e5e5e5;background-image:-moz-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f2f2f2),to(#e5e5e5));background-image:-webkit-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:-o-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:linear-gradient(to bottom,#f2f2f2,#e5e5e5);background-repeat:repeat-x;border-color:#e5e5e5 #e5e5e5 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2',endColorstr='#ffe5e5e5',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075)}.navbar .btn-navbar:hover,.navbar .btn-navbar:focus,.navbar .btn-navbar:active,.navbar .btn-navbar.active,.navbar .btn-navbar.disabled,.navbar .btn-navbar[disabled]{color:#fff;background-color:#e5e5e5;*background-color:#d9d9d9}.navbar .btn-navbar:active,.navbar .btn-navbar.active{background-color:#ccc \9}.navbar .btn-navbar .icon-bar{display:block;width:18px;height:2px;background-color:#f5f5f5;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-shadow:0 1px 0 rgba(0,0,0,0.25);-moz-box-shadow:0 1px 0 rgba(0,0,0,0.25);box-shadow:0 1px 0 rgba(0,0,0,0.25)}.btn-navbar .icon-bar+.icon-bar{margin-top:3px}.navbar .nav>li>.dropdown-menu:before{position:absolute;top:-7px;left:9px;display:inline-block;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-left:7px solid transparent;border-bottom-color:rgba(0,0,0,0.2);content:''}.navbar .nav>li>.dropdown-menu:after{position:absolute;top:-6px;left:10px;display:inline-block;border-right:6px solid transparent;border-bottom:6px solid #fff;border-left:6px solid transparent;content:''}.navbar-fixed-bottom .nav>li>.dropdown-menu:before{top:auto;bottom:-7px;border-top:7px solid #ccc;border-bottom:0;border-top-color:rgba(0,0,0,0.2)}.navbar-fixed-bottom .nav>li>.dropdown-menu:after{top:auto;bottom:-6px;border-top:6px solid #fff;border-bottom:0}.navbar .nav li.dropdown>a:hover .caret,.navbar .nav li.dropdown>a:focus .caret{border-top-color:#333;border-bottom-color:#333}.navbar .nav li.dropdown.open>.dropdown-toggle,.navbar .nav li.dropdown.active>.dropdown-toggle,.navbar .nav li.dropdown.open.active>.dropdown-toggle{color:#555;background-color:#e5e5e5}.navbar .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#777;border-bottom-color:#777}.navbar .nav li.dropdown.open>.dropdown-toggle .caret,.navbar .nav li.dropdown.active>.dropdown-toggle .caret,.navbar .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#555;border-bottom-color:#555}.navbar .pull-right>li>.dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right{right:0;left:auto}.navbar .pull-right>li>.dropdown-menu:before,.navbar .nav>li>.dropdown-menu.pull-right:before{right:12px;left:auto}.navbar .pull-right>li>.dropdown-menu:after,.navbar .nav>li>.dropdown-menu.pull-right:after{right:13px;left:auto}.navbar .pull-right>li>.dropdown-menu .dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right .dropdown-menu{right:100%;left:auto;margin-right:-1px;margin-left:0;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px}.navbar-inverse .navbar-inner{background-color:#1b1b1b;background-image:-moz-linear-gradient(top,#222,#111);background-image:-webkit-gradient(linear,0 0,0 100%,from(#222),to(#111));background-image:-webkit-linear-gradient(top,#222,#111);background-image:-o-linear-gradient(top,#222,#111);background-image:linear-gradient(to bottom,#222,#111);background-repeat:repeat-x;border-color:#252525;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222',endColorstr='#ff111111',GradientType=0)}.navbar-inverse .brand,.navbar-inverse .nav>li>a{color:#999;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.navbar-inverse .brand:hover,.navbar-inverse .nav>li>a:hover,.navbar-inverse .brand:focus,.navbar-inverse .nav>li>a:focus{color:#fff}.navbar-inverse .brand{color:#999}.navbar-inverse .navbar-text{color:#999}.navbar-inverse .nav>li>a:focus,.navbar-inverse .nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .nav .active>a,.navbar-inverse .nav .active>a:hover,.navbar-inverse .nav .active>a:focus{color:#fff;background-color:#111}.navbar-inverse .navbar-link{color:#999}.navbar-inverse .navbar-link:hover,.navbar-inverse .navbar-link:focus{color:#fff}.navbar-inverse .divider-vertical{border-right-color:#222;border-left-color:#111}.navbar-inverse .nav li.dropdown.open>.dropdown-toggle,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle{color:#fff;background-color:#111}.navbar-inverse .nav li.dropdown>a:hover .caret,.navbar-inverse .nav li.dropdown>a:focus .caret{border-top-color:#fff;border-bottom-color:#fff}.navbar-inverse .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#999;border-bottom-color:#999}.navbar-inverse .nav li.dropdown.open>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#fff;border-bottom-color:#fff}.navbar-inverse .navbar-search .search-query{color:#fff;background-color:#515151;border-color:#111;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);-webkit-transition:none;-moz-transition:none;-o-transition:none;transition:none}.navbar-inverse .navbar-search .search-query:-moz-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query:-ms-input-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query:focus,.navbar-inverse .navbar-search .search-query.focused{padding:5px 15px;color:#333;text-shadow:0 1px 0 #fff;background-color:#fff;border:0;outline:0;-webkit-box-shadow:0 0 3px rgba(0,0,0,0.15);-moz-box-shadow:0 0 3px rgba(0,0,0,0.15);box-shadow:0 0 3px rgba(0,0,0,0.15)}.navbar-inverse .btn-navbar{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#0e0e0e;*background-color:#040404;background-image:-moz-linear-gradient(top,#151515,#040404);background-image:-webkit-gradient(linear,0 0,0 100%,from(#151515),to(#040404));background-image:-webkit-linear-gradient(top,#151515,#040404);background-image:-o-linear-gradient(top,#151515,#040404);background-image:linear-gradient(to bottom,#151515,#040404);background-repeat:repeat-x;border-color:#040404 #040404 #000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515',endColorstr='#ff040404',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.navbar-inverse .btn-navbar:hover,.navbar-inverse .btn-navbar:focus,.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active,.navbar-inverse .btn-navbar.disabled,.navbar-inverse .btn-navbar[disabled]{color:#fff;background-color:#040404;*background-color:#000}.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active{background-color:#000 \9}.breadcrumb{padding:8px 15px;margin:0 0 20px;list-style:none;background-color:#f5f5f5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.breadcrumb>li{display:inline-block;*display:inline;text-shadow:0 1px 0 #fff;*zoom:1}.breadcrumb>li>.divider{padding:0 5px;color:#ccc}.breadcrumb>.active{color:#999}.pagination{margin:20px 0}.pagination ul{display:inline-block;*display:inline;margin-bottom:0;margin-left:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;*zoom:1;-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:0 1px 2px rgba(0,0,0,0.05);box-shadow:0 1px 2px rgba(0,0,0,0.05)}.pagination ul>li{display:inline}.pagination ul>li>a,.pagination ul>li>span{float:left;padding:4px 12px;line-height:20px;text-decoration:none;background-color:#fff;border:1px solid #ddd;border-left-width:0}.pagination ul>li>a:hover,.pagination ul>li>a:focus,.pagination ul>.active>a,.pagination ul>.active>span{background-color:#f5f5f5}.pagination ul>.active>a,.pagination ul>.active>span{color:#999;cursor:default}.pagination ul>.disabled>span,.pagination ul>.disabled>a,.pagination ul>.disabled>a:hover,.pagination ul>.disabled>a:focus{color:#999;cursor:default;background-color:transparent}.pagination ul>li:first-child>a,.pagination ul>li:first-child>span{border-left-width:1px;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-bottomleft:4px;-moz-border-radius-topleft:4px}.pagination ul>li:last-child>a,.pagination ul>li:last-child>span{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-bottomright:4px}.pagination-centered{text-align:center}.pagination-right{text-align:right}.pagination-large ul>li>a,.pagination-large ul>li>span{padding:11px 19px;font-size:17.5px}.pagination-large ul>li:first-child>a,.pagination-large ul>li:first-child>span{-webkit-border-bottom-left-radius:6px;border-bottom-left-radius:6px;-webkit-border-top-left-radius:6px;border-top-left-radius:6px;-moz-border-radius-bottomleft:6px;-moz-border-radius-topleft:6px}.pagination-large ul>li:last-child>a,.pagination-large ul>li:last-child>span{-webkit-border-top-right-radius:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;border-bottom-right-radius:6px;-moz-border-radius-topright:6px;-moz-border-radius-bottomright:6px}.pagination-mini ul>li:first-child>a,.pagination-small ul>li:first-child>a,.pagination-mini ul>li:first-child>span,.pagination-small ul>li:first-child>span{-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;-webkit-border-top-left-radius:3px;border-top-left-radius:3px;-moz-border-radius-bottomleft:3px;-moz-border-radius-topleft:3px}.pagination-mini ul>li:last-child>a,.pagination-small ul>li:last-child>a,.pagination-mini ul>li:last-child>span,.pagination-small ul>li:last-child>span{-webkit-border-top-right-radius:3px;border-top-right-radius:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px;-moz-border-radius-topright:3px;-moz-border-radius-bottomright:3px}.pagination-small ul>li>a,.pagination-small ul>li>span{padding:2px 10px;font-size:11.9px}.pagination-mini ul>li>a,.pagination-mini ul>li>span{padding:0 6px;font-size:10.5px}.pager{margin:20px 0;text-align:center;list-style:none;*zoom:1}.pager:before,.pager:after{display:table;line-height:0;content:""}.pager:after{clear:both}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.pager li>a:hover,.pager li>a:focus{text-decoration:none;background-color:#f5f5f5}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>a:focus,.pager .disabled>span{color:#999;cursor:default;background-color:#fff}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{opacity:0}.modal-backdrop,.modal-backdrop.fade.in{opacity:.8;filter:alpha(opacity=80)}.modal{position:fixed;top:10%;left:50%;z-index:1050;width:560px;margin-left:-280px;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;outline:0;-webkit-box-shadow:0 3px 7px rgba(0,0,0,0.3);-moz-box-shadow:0 3px 7px rgba(0,0,0,0.3);box-shadow:0 3px 7px rgba(0,0,0,0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box}.modal.fade{top:-25%;-webkit-transition:opacity .3s linear,top .3s ease-out;-moz-transition:opacity .3s linear,top .3s ease-out;-o-transition:opacity .3s linear,top .3s ease-out;transition:opacity .3s linear,top .3s ease-out}.modal.fade.in{top:10%}.modal-header{padding:9px 15px;border-bottom:1px solid #eee}.modal-header .close{margin-top:2px}.modal-header h3{margin:0;line-height:30px}.modal-body{position:relative;max-height:400px;padding:15px;overflow-y:auto}.modal-form{margin-bottom:0}.modal-footer{padding:14px 15px 15px;margin-bottom:0;text-align:right;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;*zoom:1;-webkit-box-shadow:inset 0 1px 0 #fff;-moz-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff}.modal-footer:before,.modal-footer:after{display:table;line-height:0;content:""}.modal-footer:after{clear:both}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.tooltip{position:absolute;z-index:1030;display:block;font-size:11px;line-height:1.4;opacity:0;filter:alpha(opacity=0);visibility:visible}.tooltip.in{opacity:.8;filter:alpha(opacity=80)}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-color:#000;border-width:5px 5px 0}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-right-color:#000;border-width:5px 5px 5px 0}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-left-color:#000;border-width:5px 0 5px 5px}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-color:#000;border-width:0 5px 5px}.popover{position:absolute;top:0;left:0;z-index:1010;display:none;max-width:276px;padding:1px;text-align:left;white-space:normal;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;font-weight:normal;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0}.popover-title:empty{display:none}.popover-content{padding:9px 14px}.popover .arrow,.popover .arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover .arrow{border-width:11px}.popover .arrow:after{border-width:10px;content:""}.popover.top .arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,0.25);border-bottom-width:0}.popover.top .arrow:after{bottom:1px;margin-left:-10px;border-top-color:#fff;border-bottom-width:0}.popover.right .arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,0.25);border-left-width:0}.popover.right .arrow:after{bottom:-10px;left:1px;border-right-color:#fff;border-left-width:0}.popover.bottom .arrow{top:-11px;left:50%;margin-left:-11px;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,0.25);border-top-width:0}.popover.bottom .arrow:after{top:1px;margin-left:-10px;border-bottom-color:#fff;border-top-width:0}.popover.left .arrow{top:50%;right:-11px;margin-top:-11px;border-left-color:#999;border-left-color:rgba(0,0,0,0.25);border-right-width:0}.popover.left .arrow:after{right:1px;bottom:-10px;border-left-color:#fff;border-right-width:0}.thumbnails{margin-left:-20px;list-style:none;*zoom:1}.thumbnails:before,.thumbnails:after{display:table;line-height:0;content:""}.thumbnails:after{clear:both}.row-fluid .thumbnails{margin-left:0}.thumbnails>li{float:left;margin-bottom:20px;margin-left:20px}.thumbnail{display:block;padding:4px;line-height:20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.055);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.055);box-shadow:0 1px 3px rgba(0,0,0,0.055);-webkit-transition:all .2s ease-in-out;-moz-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}a.thumbnail:hover,a.thumbnail:focus{border-color:#08c;-webkit-box-shadow:0 1px 4px rgba(0,105,214,0.25);-moz-box-shadow:0 1px 4px rgba(0,105,214,0.25);box-shadow:0 1px 4px rgba(0,105,214,0.25)}.thumbnail>img{display:block;max-width:100%;margin-right:auto;margin-left:auto}.thumbnail .caption{padding:9px;color:#555}.media,.media-body{overflow:hidden;*overflow:visible;zoom:1}.media,.media .media{margin-top:15px}.media:first-child{margin-top:0}.media-object{display:block}.media-heading{margin:0 0 5px}.media>.pull-left{margin-right:10px}.media>.pull-right{margin-left:10px}.media-list{margin-left:0;list-style:none}.label,.badge{display:inline-block;padding:2px 4px;font-size:11.844px;font-weight:bold;line-height:14px;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);white-space:nowrap;vertical-align:baseline;background-color:#999}.label{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.badge{padding-right:9px;padding-left:9px;-webkit-border-radius:9px;-moz-border-radius:9px;border-radius:9px}.label:empty,.badge:empty{display:none}a.label:hover,a.label:focus,a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer}.label-important,.badge-important{background-color:#b94a48}.label-important[href],.badge-important[href]{background-color:#953b39}.label-warning,.badge-warning{background-color:#f89406}.label-warning[href],.badge-warning[href]{background-color:#c67605}.label-success,.badge-success{background-color:#468847}.label-success[href],.badge-success[href]{background-color:#356635}.label-info,.badge-info{background-color:#3a87ad}.label-info[href],.badge-info[href]{background-color:#2d6987}.label-inverse,.badge-inverse{background-color:#333}.label-inverse[href],.badge-inverse[href]{background-color:#1a1a1a}.btn .label,.btn .badge{position:relative;top:-1px}.btn-mini .label,.btn-mini .badge{top:0}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-moz-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-ms-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:0 0}to{background-position:40px 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f7f7f7;background-image:-moz-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f5f5f5),to(#f9f9f9));background-image:-webkit-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:-o-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:linear-gradient(to bottom,#f5f5f5,#f9f9f9);background-repeat:repeat-x;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5',endColorstr='#fff9f9f9',GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1)}.progress .bar{float:left;width:0;height:100%;font-size:12px;color:#fff;text-align:center;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top,#149bdf,#0480be);background-image:-webkit-gradient(linear,0 0,0 100%,from(#149bdf),to(#0480be));background-image:-webkit-linear-gradient(top,#149bdf,#0480be);background-image:-o-linear-gradient(top,#149bdf,#0480be);background-image:linear-gradient(to bottom,#149bdf,#0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf',endColorstr='#ff0480be',GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width .6s ease;-moz-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress .bar+.bar{-webkit-box-shadow:inset 1px 0 0 rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15);-moz-box-shadow:inset 1px 0 0 rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 1px 0 0 rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15)}.progress-striped .bar{background-color:#149bdf;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px}.progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;-ms-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-danger .bar,.progress .bar-danger{background-color:#dd514c;background-image:-moz-linear-gradient(top,#ee5f5b,#c43c35);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#c43c35));background-image:-webkit-linear-gradient(top,#ee5f5b,#c43c35);background-image:-o-linear-gradient(top,#ee5f5b,#c43c35);background-image:linear-gradient(to bottom,#ee5f5b,#c43c35);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b',endColorstr='#ffc43c35',GradientType=0)}.progress-danger.progress-striped .bar,.progress-striped .bar-danger{background-color:#ee5f5b;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-success .bar,.progress .bar-success{background-color:#5eb95e;background-image:-moz-linear-gradient(top,#62c462,#57a957);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#57a957));background-image:-webkit-linear-gradient(top,#62c462,#57a957);background-image:-o-linear-gradient(top,#62c462,#57a957);background-image:linear-gradient(to bottom,#62c462,#57a957);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462',endColorstr='#ff57a957',GradientType=0)}.progress-success.progress-striped .bar,.progress-striped .bar-success{background-color:#62c462;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-info .bar,.progress .bar-info{background-color:#4bb1cf;background-image:-moz-linear-gradient(top,#5bc0de,#339bb9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#339bb9));background-image:-webkit-linear-gradient(top,#5bc0de,#339bb9);background-image:-o-linear-gradient(top,#5bc0de,#339bb9);background-image:linear-gradient(to bottom,#5bc0de,#339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff339bb9',GradientType=0)}.progress-info.progress-striped .bar,.progress-striped .bar-info{background-color:#5bc0de;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-warning .bar,.progress .bar-warning{background-color:#faa732;background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(to bottom,#fbb450,#f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450',endColorstr='#fff89406',GradientType=0)}.progress-warning.progress-striped .bar,.progress-striped .bar-warning{background-color:#fbb450;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.accordion{margin-bottom:20px}.accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.accordion-heading{border-bottom:0}.accordion-heading .accordion-toggle{display:block;padding:8px 15px}.accordion-toggle{cursor:pointer}.accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5}.carousel{position:relative;margin-bottom:20px;line-height:1}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-moz-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>img,.carousel-inner>.item>a>img{display:block;line-height:1}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#fff;text-align:center;background:#222;border:3px solid #fff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;opacity:.5;filter:alpha(opacity=50)}.carousel-control.right{right:15px;left:auto}.carousel-control:hover,.carousel-control:focus{color:#fff;text-decoration:none;opacity:.9;filter:alpha(opacity=90)}.carousel-indicators{position:absolute;top:15px;right:15px;z-index:5;margin:0;list-style:none}.carousel-indicators li{display:block;float:left;width:10px;height:10px;margin-left:5px;text-indent:-999px;background-color:#ccc;background-color:rgba(255,255,255,0.25);border-radius:5px}.carousel-indicators .active{background-color:#fff}.carousel-caption{position:absolute;right:0;bottom:0;left:0;padding:15px;background:#333;background:rgba(0,0,0,0.75)}.carousel-caption h4,.carousel-caption p{line-height:20px;color:#fff}.carousel-caption h4{margin:0 0 5px}.carousel-caption p{margin-bottom:0}.hero-unit{padding:60px;margin-bottom:30px;font-size:18px;font-weight:200;line-height:30px;color:inherit;background-color:#eee;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;color:inherit}.hero-unit li{line-height:30px}.pull-right{float:right}.pull-left{float:left}.hide{display:none}.show{display:block}.invisible{visibility:hidden}.affix{position:fixed}
diff --git a/view/theme/oldtest/default.php b/view/theme/oldtest/default.php
new file mode 100644
index 000000000..1fc070df1
--- /dev/null
+++ b/view/theme/oldtest/default.php
@@ -0,0 +1,52 @@
+<?php
+	if (is_ajax()) {
+	 	$t = $a->template_engine('jsonificator');
+		//echo "<hr><pre>"; var_dump($t->data); killme();
+		echo json_encode($t->data);
+		killme();
+	} 
+?>
+<!DOCTYPE html>
+<html>
+  <head>
+    <title><?php if(x($page,'title')) echo $page['title'] ?></title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <!-- Bootstrap -->
+    <link href="<?php echo  $a->get_baseurl() ?>/view/theme/test/css/bootstrap.min.css" rel="stylesheet" media="screen">
+    <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
+  </head>
+  <body>
+    
+    	
+		<div class="navbar navbar-fixed-top">
+		  <div class="navbar-inner">
+		    <div class="container">
+		 
+		      <!-- .btn-navbar is used as the toggle for collapsed navbar content -->
+		      <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+		        <span class="icon-bar"></span>
+		        <span class="icon-bar"></span>
+		        <span class="icon-bar"></span>
+		      </a>
+		 
+		      <!-- Be sure to leave the brand out there if you want it shown -->
+		      <a class="brand" href="#"><span data-bind="text: nav()"></span></a>
+		 
+		      <!-- Everything you want hidden at 940px or less, place within here -->
+		      <div class="nav-collapse navbar-responsive-collapse collapse">
+		        <ul class="nav"  data-bind="foreach: nav().nav">
+		        	<li><a data-bind="href: url, text: text"></a></li>
+		        </ul>
+		      </div>
+		 
+		    </div>
+		  </div>
+		</div>    	
+    	
+    
+    <script src="http://code.jquery.com/jquery.js"></script>
+    <script src="<?php echo  $a->get_baseurl() ?>/view/theme/test/js/bootstrap.min.js"></script>
+    <script src="<?php echo  $a->get_baseurl() ?>/view/theme/test/js/knockout-2.2.1.js"></script>
+    <script src="<?php echo  $a->get_baseurl() ?>/view/theme/test/app/app.js"></script>
+  </body>
+</html>
\ No newline at end of file
diff --git a/view/theme/oldtest/img/glyphicons-halflings-white.png b/view/theme/oldtest/img/glyphicons-halflings-white.png
new file mode 100644
index 000000000..3bf6484a2
Binary files /dev/null and b/view/theme/oldtest/img/glyphicons-halflings-white.png differ
diff --git a/view/theme/oldtest/img/glyphicons-halflings.png b/view/theme/oldtest/img/glyphicons-halflings.png
new file mode 100644
index 000000000..a99699932
Binary files /dev/null and b/view/theme/oldtest/img/glyphicons-halflings.png differ
diff --git a/view/theme/oldtest/js/bootstrap.js b/view/theme/oldtest/js/bootstrap.js
new file mode 100644
index 000000000..c298ee42e
--- /dev/null
+++ b/view/theme/oldtest/js/bootstrap.js
@@ -0,0 +1,2276 @@
+/* ===================================================
+ * bootstrap-transition.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#transitions
+ * ===================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+  /* CSS TRANSITION SUPPORT (http://www.modernizr.com/)
+   * ======================================================= */
+
+  $(function () {
+
+    $.support.transition = (function () {
+
+      var transitionEnd = (function () {
+
+        var el = document.createElement('bootstrap')
+          , transEndEventNames = {
+               'WebkitTransition' : 'webkitTransitionEnd'
+            ,  'MozTransition'    : 'transitionend'
+            ,  'OTransition'      : 'oTransitionEnd otransitionend'
+            ,  'transition'       : 'transitionend'
+            }
+          , name
+
+        for (name in transEndEventNames){
+          if (el.style[name] !== undefined) {
+            return transEndEventNames[name]
+          }
+        }
+
+      }())
+
+      return transitionEnd && {
+        end: transitionEnd
+      }
+
+    })()
+
+  })
+
+}(window.jQuery);/* ==========================================================
+ * bootstrap-alert.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#alerts
+ * ==========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* ALERT CLASS DEFINITION
+  * ====================== */
+
+  var dismiss = '[data-dismiss="alert"]'
+    , Alert = function (el) {
+        $(el).on('click', dismiss, this.close)
+      }
+
+  Alert.prototype.close = function (e) {
+    var $this = $(this)
+      , selector = $this.attr('data-target')
+      , $parent
+
+    if (!selector) {
+      selector = $this.attr('href')
+      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+    }
+
+    $parent = $(selector)
+
+    e && e.preventDefault()
+
+    $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
+
+    $parent.trigger(e = $.Event('close'))
+
+    if (e.isDefaultPrevented()) return
+
+    $parent.removeClass('in')
+
+    function removeElement() {
+      $parent
+        .trigger('closed')
+        .remove()
+    }
+
+    $.support.transition && $parent.hasClass('fade') ?
+      $parent.on($.support.transition.end, removeElement) :
+      removeElement()
+  }
+
+
+ /* ALERT PLUGIN DEFINITION
+  * ======================= */
+
+  var old = $.fn.alert
+
+  $.fn.alert = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('alert')
+      if (!data) $this.data('alert', (data = new Alert(this)))
+      if (typeof option == 'string') data[option].call($this)
+    })
+  }
+
+  $.fn.alert.Constructor = Alert
+
+
+ /* ALERT NO CONFLICT
+  * ================= */
+
+  $.fn.alert.noConflict = function () {
+    $.fn.alert = old
+    return this
+  }
+
+
+ /* ALERT DATA-API
+  * ============== */
+
+  $(document).on('click.alert.data-api', dismiss, Alert.prototype.close)
+
+}(window.jQuery);/* ============================================================
+ * bootstrap-button.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#buttons
+ * ============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* BUTTON PUBLIC CLASS DEFINITION
+  * ============================== */
+
+  var Button = function (element, options) {
+    this.$element = $(element)
+    this.options = $.extend({}, $.fn.button.defaults, options)
+  }
+
+  Button.prototype.setState = function (state) {
+    var d = 'disabled'
+      , $el = this.$element
+      , data = $el.data()
+      , val = $el.is('input') ? 'val' : 'html'
+
+    state = state + 'Text'
+    data.resetText || $el.data('resetText', $el[val]())
+
+    $el[val](data[state] || this.options[state])
+
+    // push to event loop to allow forms to submit
+    setTimeout(function () {
+      state == 'loadingText' ?
+        $el.addClass(d).attr(d, d) :
+        $el.removeClass(d).removeAttr(d)
+    }, 0)
+  }
+
+  Button.prototype.toggle = function () {
+    var $parent = this.$element.closest('[data-toggle="buttons-radio"]')
+
+    $parent && $parent
+      .find('.active')
+      .removeClass('active')
+
+    this.$element.toggleClass('active')
+  }
+
+
+ /* BUTTON PLUGIN DEFINITION
+  * ======================== */
+
+  var old = $.fn.button
+
+  $.fn.button = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('button')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('button', (data = new Button(this, options)))
+      if (option == 'toggle') data.toggle()
+      else if (option) data.setState(option)
+    })
+  }
+
+  $.fn.button.defaults = {
+    loadingText: 'loading...'
+  }
+
+  $.fn.button.Constructor = Button
+
+
+ /* BUTTON NO CONFLICT
+  * ================== */
+
+  $.fn.button.noConflict = function () {
+    $.fn.button = old
+    return this
+  }
+
+
+ /* BUTTON DATA-API
+  * =============== */
+
+  $(document).on('click.button.data-api', '[data-toggle^=button]', function (e) {
+    var $btn = $(e.target)
+    if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
+    $btn.button('toggle')
+  })
+
+}(window.jQuery);/* ==========================================================
+ * bootstrap-carousel.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#carousel
+ * ==========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* CAROUSEL CLASS DEFINITION
+  * ========================= */
+
+  var Carousel = function (element, options) {
+    this.$element = $(element)
+    this.$indicators = this.$element.find('.carousel-indicators')
+    this.options = options
+    this.options.pause == 'hover' && this.$element
+      .on('mouseenter', $.proxy(this.pause, this))
+      .on('mouseleave', $.proxy(this.cycle, this))
+  }
+
+  Carousel.prototype = {
+
+    cycle: function (e) {
+      if (!e) this.paused = false
+      if (this.interval) clearInterval(this.interval);
+      this.options.interval
+        && !this.paused
+        && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
+      return this
+    }
+
+  , getActiveIndex: function () {
+      this.$active = this.$element.find('.item.active')
+      this.$items = this.$active.parent().children()
+      return this.$items.index(this.$active)
+    }
+
+  , to: function (pos) {
+      var activeIndex = this.getActiveIndex()
+        , that = this
+
+      if (pos > (this.$items.length - 1) || pos < 0) return
+
+      if (this.sliding) {
+        return this.$element.one('slid', function () {
+          that.to(pos)
+        })
+      }
+
+      if (activeIndex == pos) {
+        return this.pause().cycle()
+      }
+
+      return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos]))
+    }
+
+  , pause: function (e) {
+      if (!e) this.paused = true
+      if (this.$element.find('.next, .prev').length && $.support.transition.end) {
+        this.$element.trigger($.support.transition.end)
+        this.cycle(true)
+      }
+      clearInterval(this.interval)
+      this.interval = null
+      return this
+    }
+
+  , next: function () {
+      if (this.sliding) return
+      return this.slide('next')
+    }
+
+  , prev: function () {
+      if (this.sliding) return
+      return this.slide('prev')
+    }
+
+  , slide: function (type, next) {
+      var $active = this.$element.find('.item.active')
+        , $next = next || $active[type]()
+        , isCycling = this.interval
+        , direction = type == 'next' ? 'left' : 'right'
+        , fallback  = type == 'next' ? 'first' : 'last'
+        , that = this
+        , e
+
+      this.sliding = true
+
+      isCycling && this.pause()
+
+      $next = $next.length ? $next : this.$element.find('.item')[fallback]()
+
+      e = $.Event('slide', {
+        relatedTarget: $next[0]
+      , direction: direction
+      })
+
+      if ($next.hasClass('active')) return
+
+      if (this.$indicators.length) {
+        this.$indicators.find('.active').removeClass('active')
+        this.$element.one('slid', function () {
+          var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()])
+          $nextIndicator && $nextIndicator.addClass('active')
+        })
+      }
+
+      if ($.support.transition && this.$element.hasClass('slide')) {
+        this.$element.trigger(e)
+        if (e.isDefaultPrevented()) return
+        $next.addClass(type)
+        $next[0].offsetWidth // force reflow
+        $active.addClass(direction)
+        $next.addClass(direction)
+        this.$element.one($.support.transition.end, function () {
+          $next.removeClass([type, direction].join(' ')).addClass('active')
+          $active.removeClass(['active', direction].join(' '))
+          that.sliding = false
+          setTimeout(function () { that.$element.trigger('slid') }, 0)
+        })
+      } else {
+        this.$element.trigger(e)
+        if (e.isDefaultPrevented()) return
+        $active.removeClass('active')
+        $next.addClass('active')
+        this.sliding = false
+        this.$element.trigger('slid')
+      }
+
+      isCycling && this.cycle()
+
+      return this
+    }
+
+  }
+
+
+ /* CAROUSEL PLUGIN DEFINITION
+  * ========================== */
+
+  var old = $.fn.carousel
+
+  $.fn.carousel = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('carousel')
+        , options = $.extend({}, $.fn.carousel.defaults, typeof option == 'object' && option)
+        , action = typeof option == 'string' ? option : options.slide
+      if (!data) $this.data('carousel', (data = new Carousel(this, options)))
+      if (typeof option == 'number') data.to(option)
+      else if (action) data[action]()
+      else if (options.interval) data.pause().cycle()
+    })
+  }
+
+  $.fn.carousel.defaults = {
+    interval: 5000
+  , pause: 'hover'
+  }
+
+  $.fn.carousel.Constructor = Carousel
+
+
+ /* CAROUSEL NO CONFLICT
+  * ==================== */
+
+  $.fn.carousel.noConflict = function () {
+    $.fn.carousel = old
+    return this
+  }
+
+ /* CAROUSEL DATA-API
+  * ================= */
+
+  $(document).on('click.carousel.data-api', '[data-slide], [data-slide-to]', function (e) {
+    var $this = $(this), href
+      , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
+      , options = $.extend({}, $target.data(), $this.data())
+      , slideIndex
+
+    $target.carousel(options)
+
+    if (slideIndex = $this.attr('data-slide-to')) {
+      $target.data('carousel').pause().to(slideIndex).cycle()
+    }
+
+    e.preventDefault()
+  })
+
+}(window.jQuery);/* =============================================================
+ * bootstrap-collapse.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#collapse
+ * =============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* COLLAPSE PUBLIC CLASS DEFINITION
+  * ================================ */
+
+  var Collapse = function (element, options) {
+    this.$element = $(element)
+    this.options = $.extend({}, $.fn.collapse.defaults, options)
+
+    if (this.options.parent) {
+      this.$parent = $(this.options.parent)
+    }
+
+    this.options.toggle && this.toggle()
+  }
+
+  Collapse.prototype = {
+
+    constructor: Collapse
+
+  , dimension: function () {
+      var hasWidth = this.$element.hasClass('width')
+      return hasWidth ? 'width' : 'height'
+    }
+
+  , show: function () {
+      var dimension
+        , scroll
+        , actives
+        , hasData
+
+      if (this.transitioning || this.$element.hasClass('in')) return
+
+      dimension = this.dimension()
+      scroll = $.camelCase(['scroll', dimension].join('-'))
+      actives = this.$parent && this.$parent.find('> .accordion-group > .in')
+
+      if (actives && actives.length) {
+        hasData = actives.data('collapse')
+        if (hasData && hasData.transitioning) return
+        actives.collapse('hide')
+        hasData || actives.data('collapse', null)
+      }
+
+      this.$element[dimension](0)
+      this.transition('addClass', $.Event('show'), 'shown')
+      $.support.transition && this.$element[dimension](this.$element[0][scroll])
+    }
+
+  , hide: function () {
+      var dimension
+      if (this.transitioning || !this.$element.hasClass('in')) return
+      dimension = this.dimension()
+      this.reset(this.$element[dimension]())
+      this.transition('removeClass', $.Event('hide'), 'hidden')
+      this.$element[dimension](0)
+    }
+
+  , reset: function (size) {
+      var dimension = this.dimension()
+
+      this.$element
+        .removeClass('collapse')
+        [dimension](size || 'auto')
+        [0].offsetWidth
+
+      this.$element[size !== null ? 'addClass' : 'removeClass']('collapse')
+
+      return this
+    }
+
+  , transition: function (method, startEvent, completeEvent) {
+      var that = this
+        , complete = function () {
+            if (startEvent.type == 'show') that.reset()
+            that.transitioning = 0
+            that.$element.trigger(completeEvent)
+          }
+
+      this.$element.trigger(startEvent)
+
+      if (startEvent.isDefaultPrevented()) return
+
+      this.transitioning = 1
+
+      this.$element[method]('in')
+
+      $.support.transition && this.$element.hasClass('collapse') ?
+        this.$element.one($.support.transition.end, complete) :
+        complete()
+    }
+
+  , toggle: function () {
+      this[this.$element.hasClass('in') ? 'hide' : 'show']()
+    }
+
+  }
+
+
+ /* COLLAPSE PLUGIN DEFINITION
+  * ========================== */
+
+  var old = $.fn.collapse
+
+  $.fn.collapse = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('collapse')
+        , options = $.extend({}, $.fn.collapse.defaults, $this.data(), typeof option == 'object' && option)
+      if (!data) $this.data('collapse', (data = new Collapse(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.collapse.defaults = {
+    toggle: true
+  }
+
+  $.fn.collapse.Constructor = Collapse
+
+
+ /* COLLAPSE NO CONFLICT
+  * ==================== */
+
+  $.fn.collapse.noConflict = function () {
+    $.fn.collapse = old
+    return this
+  }
+
+
+ /* COLLAPSE DATA-API
+  * ================= */
+
+  $(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) {
+    var $this = $(this), href
+      , target = $this.attr('data-target')
+        || e.preventDefault()
+        || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
+      , option = $(target).data('collapse') ? 'toggle' : $this.data()
+    $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
+    $(target).collapse(option)
+  })
+
+}(window.jQuery);/* ============================================================
+ * bootstrap-dropdown.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#dropdowns
+ * ============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* DROPDOWN CLASS DEFINITION
+  * ========================= */
+
+  var toggle = '[data-toggle=dropdown]'
+    , Dropdown = function (element) {
+        var $el = $(element).on('click.dropdown.data-api', this.toggle)
+        $('html').on('click.dropdown.data-api', function () {
+          $el.parent().removeClass('open')
+        })
+      }
+
+  Dropdown.prototype = {
+
+    constructor: Dropdown
+
+  , toggle: function (e) {
+      var $this = $(this)
+        , $parent
+        , isActive
+
+      if ($this.is('.disabled, :disabled')) return
+
+      $parent = getParent($this)
+
+      isActive = $parent.hasClass('open')
+
+      clearMenus()
+
+      if (!isActive) {
+        $parent.toggleClass('open')
+      }
+
+      $this.focus()
+
+      return false
+    }
+
+  , keydown: function (e) {
+      var $this
+        , $items
+        , $active
+        , $parent
+        , isActive
+        , index
+
+      if (!/(38|40|27)/.test(e.keyCode)) return
+
+      $this = $(this)
+
+      e.preventDefault()
+      e.stopPropagation()
+
+      if ($this.is('.disabled, :disabled')) return
+
+      $parent = getParent($this)
+
+      isActive = $parent.hasClass('open')
+
+      if (!isActive || (isActive && e.keyCode == 27)) {
+        if (e.which == 27) $parent.find(toggle).focus()
+        return $this.click()
+      }
+
+      $items = $('[role=menu] li:not(.divider):visible a', $parent)
+
+      if (!$items.length) return
+
+      index = $items.index($items.filter(':focus'))
+
+      if (e.keyCode == 38 && index > 0) index--                                        // up
+      if (e.keyCode == 40 && index < $items.length - 1) index++                        // down
+      if (!~index) index = 0
+
+      $items
+        .eq(index)
+        .focus()
+    }
+
+  }
+
+  function clearMenus() {
+    $(toggle).each(function () {
+      getParent($(this)).removeClass('open')
+    })
+  }
+
+  function getParent($this) {
+    var selector = $this.attr('data-target')
+      , $parent
+
+    if (!selector) {
+      selector = $this.attr('href')
+      selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+    }
+
+    $parent = selector && $(selector)
+
+    if (!$parent || !$parent.length) $parent = $this.parent()
+
+    return $parent
+  }
+
+
+  /* DROPDOWN PLUGIN DEFINITION
+   * ========================== */
+
+  var old = $.fn.dropdown
+
+  $.fn.dropdown = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('dropdown')
+      if (!data) $this.data('dropdown', (data = new Dropdown(this)))
+      if (typeof option == 'string') data[option].call($this)
+    })
+  }
+
+  $.fn.dropdown.Constructor = Dropdown
+
+
+ /* DROPDOWN NO CONFLICT
+  * ==================== */
+
+  $.fn.dropdown.noConflict = function () {
+    $.fn.dropdown = old
+    return this
+  }
+
+
+  /* APPLY TO STANDARD DROPDOWN ELEMENTS
+   * =================================== */
+
+  $(document)
+    .on('click.dropdown.data-api', clearMenus)
+    .on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
+    .on('click.dropdown-menu', function (e) { e.stopPropagation() })
+    .on('click.dropdown.data-api'  , toggle, Dropdown.prototype.toggle)
+    .on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
+
+}(window.jQuery);
+/* =========================================================
+ * bootstrap-modal.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#modals
+ * =========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================= */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* MODAL CLASS DEFINITION
+  * ====================== */
+
+  var Modal = function (element, options) {
+    this.options = options
+    this.$element = $(element)
+      .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
+    this.options.remote && this.$element.find('.modal-body').load(this.options.remote)
+  }
+
+  Modal.prototype = {
+
+      constructor: Modal
+
+    , toggle: function () {
+        return this[!this.isShown ? 'show' : 'hide']()
+      }
+
+    , show: function () {
+        var that = this
+          , e = $.Event('show')
+
+        this.$element.trigger(e)
+
+        if (this.isShown || e.isDefaultPrevented()) return
+
+        this.isShown = true
+
+        this.escape()
+
+        this.backdrop(function () {
+          var transition = $.support.transition && that.$element.hasClass('fade')
+
+          if (!that.$element.parent().length) {
+            that.$element.appendTo(document.body) //don't move modals dom position
+          }
+
+          that.$element.show()
+
+          if (transition) {
+            that.$element[0].offsetWidth // force reflow
+          }
+
+          that.$element
+            .addClass('in')
+            .attr('aria-hidden', false)
+
+          that.enforceFocus()
+
+          transition ?
+            that.$element.one($.support.transition.end, function () { that.$element.focus().trigger('shown') }) :
+            that.$element.focus().trigger('shown')
+
+        })
+      }
+
+    , hide: function (e) {
+        e && e.preventDefault()
+
+        var that = this
+
+        e = $.Event('hide')
+
+        this.$element.trigger(e)
+
+        if (!this.isShown || e.isDefaultPrevented()) return
+
+        this.isShown = false
+
+        this.escape()
+
+        $(document).off('focusin.modal')
+
+        this.$element
+          .removeClass('in')
+          .attr('aria-hidden', true)
+
+        $.support.transition && this.$element.hasClass('fade') ?
+          this.hideWithTransition() :
+          this.hideModal()
+      }
+
+    , enforceFocus: function () {
+        var that = this
+        $(document).on('focusin.modal', function (e) {
+          if (that.$element[0] !== e.target && !that.$element.has(e.target).length) {
+            that.$element.focus()
+          }
+        })
+      }
+
+    , escape: function () {
+        var that = this
+        if (this.isShown && this.options.keyboard) {
+          this.$element.on('keyup.dismiss.modal', function ( e ) {
+            e.which == 27 && that.hide()
+          })
+        } else if (!this.isShown) {
+          this.$element.off('keyup.dismiss.modal')
+        }
+      }
+
+    , hideWithTransition: function () {
+        var that = this
+          , timeout = setTimeout(function () {
+              that.$element.off($.support.transition.end)
+              that.hideModal()
+            }, 500)
+
+        this.$element.one($.support.transition.end, function () {
+          clearTimeout(timeout)
+          that.hideModal()
+        })
+      }
+
+    , hideModal: function () {
+        var that = this
+        this.$element.hide()
+        this.backdrop(function () {
+          that.removeBackdrop()
+          that.$element.trigger('hidden')
+        })
+      }
+
+    , removeBackdrop: function () {
+        this.$backdrop && this.$backdrop.remove()
+        this.$backdrop = null
+      }
+
+    , backdrop: function (callback) {
+        var that = this
+          , animate = this.$element.hasClass('fade') ? 'fade' : ''
+
+        if (this.isShown && this.options.backdrop) {
+          var doAnimate = $.support.transition && animate
+
+          this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
+            .appendTo(document.body)
+
+          this.$backdrop.click(
+            this.options.backdrop == 'static' ?
+              $.proxy(this.$element[0].focus, this.$element[0])
+            : $.proxy(this.hide, this)
+          )
+
+          if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
+
+          this.$backdrop.addClass('in')
+
+          if (!callback) return
+
+          doAnimate ?
+            this.$backdrop.one($.support.transition.end, callback) :
+            callback()
+
+        } else if (!this.isShown && this.$backdrop) {
+          this.$backdrop.removeClass('in')
+
+          $.support.transition && this.$element.hasClass('fade')?
+            this.$backdrop.one($.support.transition.end, callback) :
+            callback()
+
+        } else if (callback) {
+          callback()
+        }
+      }
+  }
+
+
+ /* MODAL PLUGIN DEFINITION
+  * ======================= */
+
+  var old = $.fn.modal
+
+  $.fn.modal = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('modal')
+        , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option)
+      if (!data) $this.data('modal', (data = new Modal(this, options)))
+      if (typeof option == 'string') data[option]()
+      else if (options.show) data.show()
+    })
+  }
+
+  $.fn.modal.defaults = {
+      backdrop: true
+    , keyboard: true
+    , show: true
+  }
+
+  $.fn.modal.Constructor = Modal
+
+
+ /* MODAL NO CONFLICT
+  * ================= */
+
+  $.fn.modal.noConflict = function () {
+    $.fn.modal = old
+    return this
+  }
+
+
+ /* MODAL DATA-API
+  * ============== */
+
+  $(document).on('click.modal.data-api', '[data-toggle="modal"]', function (e) {
+    var $this = $(this)
+      , href = $this.attr('href')
+      , $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
+      , option = $target.data('modal') ? 'toggle' : $.extend({ remote:!/#/.test(href) && href }, $target.data(), $this.data())
+
+    e.preventDefault()
+
+    $target
+      .modal(option)
+      .one('hide', function () {
+        $this.focus()
+      })
+  })
+
+}(window.jQuery);
+/* ===========================================================
+ * bootstrap-tooltip.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#tooltips
+ * Inspired by the original jQuery.tipsy by Jason Frame
+ * ===========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* TOOLTIP PUBLIC CLASS DEFINITION
+  * =============================== */
+
+  var Tooltip = function (element, options) {
+    this.init('tooltip', element, options)
+  }
+
+  Tooltip.prototype = {
+
+    constructor: Tooltip
+
+  , init: function (type, element, options) {
+      var eventIn
+        , eventOut
+        , triggers
+        , trigger
+        , i
+
+      this.type = type
+      this.$element = $(element)
+      this.options = this.getOptions(options)
+      this.enabled = true
+
+      triggers = this.options.trigger.split(' ')
+
+      for (i = triggers.length; i--;) {
+        trigger = triggers[i]
+        if (trigger == 'click') {
+          this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
+        } else if (trigger != 'manual') {
+          eventIn = trigger == 'hover' ? 'mouseenter' : 'focus'
+          eventOut = trigger == 'hover' ? 'mouseleave' : 'blur'
+          this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
+          this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
+        }
+      }
+
+      this.options.selector ?
+        (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
+        this.fixTitle()
+    }
+
+  , getOptions: function (options) {
+      options = $.extend({}, $.fn[this.type].defaults, this.$element.data(), options)
+
+      if (options.delay && typeof options.delay == 'number') {
+        options.delay = {
+          show: options.delay
+        , hide: options.delay
+        }
+      }
+
+      return options
+    }
+
+  , enter: function (e) {
+      var defaults = $.fn[this.type].defaults
+        , options = {}
+        , self
+
+      this._options && $.each(this._options, function (key, value) {
+        if (defaults[key] != value) options[key] = value
+      }, this)
+
+      self = $(e.currentTarget)[this.type](options).data(this.type)
+
+      if (!self.options.delay || !self.options.delay.show) return self.show()
+
+      clearTimeout(this.timeout)
+      self.hoverState = 'in'
+      this.timeout = setTimeout(function() {
+        if (self.hoverState == 'in') self.show()
+      }, self.options.delay.show)
+    }
+
+  , leave: function (e) {
+      var self = $(e.currentTarget)[this.type](this._options).data(this.type)
+
+      if (this.timeout) clearTimeout(this.timeout)
+      if (!self.options.delay || !self.options.delay.hide) return self.hide()
+
+      self.hoverState = 'out'
+      this.timeout = setTimeout(function() {
+        if (self.hoverState == 'out') self.hide()
+      }, self.options.delay.hide)
+    }
+
+  , show: function () {
+      var $tip
+        , pos
+        , actualWidth
+        , actualHeight
+        , placement
+        , tp
+        , e = $.Event('show')
+
+      if (this.hasContent() && this.enabled) {
+        this.$element.trigger(e)
+        if (e.isDefaultPrevented()) return
+        $tip = this.tip()
+        this.setContent()
+
+        if (this.options.animation) {
+          $tip.addClass('fade')
+        }
+
+        placement = typeof this.options.placement == 'function' ?
+          this.options.placement.call(this, $tip[0], this.$element[0]) :
+          this.options.placement
+
+        $tip
+          .detach()
+          .css({ top: 0, left: 0, display: 'block' })
+
+        this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
+
+        pos = this.getPosition()
+
+        actualWidth = $tip[0].offsetWidth
+        actualHeight = $tip[0].offsetHeight
+
+        switch (placement) {
+          case 'bottom':
+            tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2}
+            break
+          case 'top':
+            tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2}
+            break
+          case 'left':
+            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth}
+            break
+          case 'right':
+            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width}
+            break
+        }
+
+        this.applyPlacement(tp, placement)
+        this.$element.trigger('shown')
+      }
+    }
+
+  , applyPlacement: function(offset, placement){
+      var $tip = this.tip()
+        , width = $tip[0].offsetWidth
+        , height = $tip[0].offsetHeight
+        , actualWidth
+        , actualHeight
+        , delta
+        , replace
+
+      $tip
+        .offset(offset)
+        .addClass(placement)
+        .addClass('in')
+
+      actualWidth = $tip[0].offsetWidth
+      actualHeight = $tip[0].offsetHeight
+
+      if (placement == 'top' && actualHeight != height) {
+        offset.top = offset.top + height - actualHeight
+        replace = true
+      }
+
+      if (placement == 'bottom' || placement == 'top') {
+        delta = 0
+
+        if (offset.left < 0){
+          delta = offset.left * -2
+          offset.left = 0
+          $tip.offset(offset)
+          actualWidth = $tip[0].offsetWidth
+          actualHeight = $tip[0].offsetHeight
+        }
+
+        this.replaceArrow(delta - width + actualWidth, actualWidth, 'left')
+      } else {
+        this.replaceArrow(actualHeight - height, actualHeight, 'top')
+      }
+
+      if (replace) $tip.offset(offset)
+    }
+
+  , replaceArrow: function(delta, dimension, position){
+      this
+        .arrow()
+        .css(position, delta ? (50 * (1 - delta / dimension) + "%") : '')
+    }
+
+  , setContent: function () {
+      var $tip = this.tip()
+        , title = this.getTitle()
+
+      $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title)
+      $tip.removeClass('fade in top bottom left right')
+    }
+
+  , hide: function () {
+      var that = this
+        , $tip = this.tip()
+        , e = $.Event('hide')
+
+      this.$element.trigger(e)
+      if (e.isDefaultPrevented()) return
+
+      $tip.removeClass('in')
+
+      function removeWithAnimation() {
+        var timeout = setTimeout(function () {
+          $tip.off($.support.transition.end).detach()
+        }, 500)
+
+        $tip.one($.support.transition.end, function () {
+          clearTimeout(timeout)
+          $tip.detach()
+        })
+      }
+
+      $.support.transition && this.$tip.hasClass('fade') ?
+        removeWithAnimation() :
+        $tip.detach()
+
+      this.$element.trigger('hidden')
+
+      return this
+    }
+
+  , fixTitle: function () {
+      var $e = this.$element
+      if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') {
+        $e.attr('data-original-title', $e.attr('title') || '').attr('title', '')
+      }
+    }
+
+  , hasContent: function () {
+      return this.getTitle()
+    }
+
+  , getPosition: function () {
+      var el = this.$element[0]
+      return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : {
+        width: el.offsetWidth
+      , height: el.offsetHeight
+      }, this.$element.offset())
+    }
+
+  , getTitle: function () {
+      var title
+        , $e = this.$element
+        , o = this.options
+
+      title = $e.attr('data-original-title')
+        || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
+
+      return title
+    }
+
+  , tip: function () {
+      return this.$tip = this.$tip || $(this.options.template)
+    }
+
+  , arrow: function(){
+      return this.$arrow = this.$arrow || this.tip().find(".tooltip-arrow")
+    }
+
+  , validate: function () {
+      if (!this.$element[0].parentNode) {
+        this.hide()
+        this.$element = null
+        this.options = null
+      }
+    }
+
+  , enable: function () {
+      this.enabled = true
+    }
+
+  , disable: function () {
+      this.enabled = false
+    }
+
+  , toggleEnabled: function () {
+      this.enabled = !this.enabled
+    }
+
+  , toggle: function (e) {
+      var self = e ? $(e.currentTarget)[this.type](this._options).data(this.type) : this
+      self.tip().hasClass('in') ? self.hide() : self.show()
+    }
+
+  , destroy: function () {
+      this.hide().$element.off('.' + this.type).removeData(this.type)
+    }
+
+  }
+
+
+ /* TOOLTIP PLUGIN DEFINITION
+  * ========================= */
+
+  var old = $.fn.tooltip
+
+  $.fn.tooltip = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('tooltip')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('tooltip', (data = new Tooltip(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.tooltip.Constructor = Tooltip
+
+  $.fn.tooltip.defaults = {
+    animation: true
+  , placement: 'top'
+  , selector: false
+  , template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
+  , trigger: 'hover focus'
+  , title: ''
+  , delay: 0
+  , html: false
+  , container: false
+  }
+
+
+ /* TOOLTIP NO CONFLICT
+  * =================== */
+
+  $.fn.tooltip.noConflict = function () {
+    $.fn.tooltip = old
+    return this
+  }
+
+}(window.jQuery);
+/* ===========================================================
+ * bootstrap-popover.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#popovers
+ * ===========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * =========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* POPOVER PUBLIC CLASS DEFINITION
+  * =============================== */
+
+  var Popover = function (element, options) {
+    this.init('popover', element, options)
+  }
+
+
+  /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js
+     ========================================== */
+
+  Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, {
+
+    constructor: Popover
+
+  , setContent: function () {
+      var $tip = this.tip()
+        , title = this.getTitle()
+        , content = this.getContent()
+
+      $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
+      $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content)
+
+      $tip.removeClass('fade top bottom left right in')
+    }
+
+  , hasContent: function () {
+      return this.getTitle() || this.getContent()
+    }
+
+  , getContent: function () {
+      var content
+        , $e = this.$element
+        , o = this.options
+
+      content = (typeof o.content == 'function' ? o.content.call($e[0]) :  o.content)
+        || $e.attr('data-content')
+
+      return content
+    }
+
+  , tip: function () {
+      if (!this.$tip) {
+        this.$tip = $(this.options.template)
+      }
+      return this.$tip
+    }
+
+  , destroy: function () {
+      this.hide().$element.off('.' + this.type).removeData(this.type)
+    }
+
+  })
+
+
+ /* POPOVER PLUGIN DEFINITION
+  * ======================= */
+
+  var old = $.fn.popover
+
+  $.fn.popover = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('popover')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('popover', (data = new Popover(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.popover.Constructor = Popover
+
+  $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, {
+    placement: 'right'
+  , trigger: 'click'
+  , content: ''
+  , template: '<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
+  })
+
+
+ /* POPOVER NO CONFLICT
+  * =================== */
+
+  $.fn.popover.noConflict = function () {
+    $.fn.popover = old
+    return this
+  }
+
+}(window.jQuery);
+/* =============================================================
+ * bootstrap-scrollspy.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#scrollspy
+ * =============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* SCROLLSPY CLASS DEFINITION
+  * ========================== */
+
+  function ScrollSpy(element, options) {
+    var process = $.proxy(this.process, this)
+      , $element = $(element).is('body') ? $(window) : $(element)
+      , href
+    this.options = $.extend({}, $.fn.scrollspy.defaults, options)
+    this.$scrollElement = $element.on('scroll.scroll-spy.data-api', process)
+    this.selector = (this.options.target
+      || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
+      || '') + ' .nav li > a'
+    this.$body = $('body')
+    this.refresh()
+    this.process()
+  }
+
+  ScrollSpy.prototype = {
+
+      constructor: ScrollSpy
+
+    , refresh: function () {
+        var self = this
+          , $targets
+
+        this.offsets = $([])
+        this.targets = $([])
+
+        $targets = this.$body
+          .find(this.selector)
+          .map(function () {
+            var $el = $(this)
+              , href = $el.data('target') || $el.attr('href')
+              , $href = /^#\w/.test(href) && $(href)
+            return ( $href
+              && $href.length
+              && [[ $href.position().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]] ) || null
+          })
+          .sort(function (a, b) { return a[0] - b[0] })
+          .each(function () {
+            self.offsets.push(this[0])
+            self.targets.push(this[1])
+          })
+      }
+
+    , process: function () {
+        var scrollTop = this.$scrollElement.scrollTop() + this.options.offset
+          , scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight
+          , maxScroll = scrollHeight - this.$scrollElement.height()
+          , offsets = this.offsets
+          , targets = this.targets
+          , activeTarget = this.activeTarget
+          , i
+
+        if (scrollTop >= maxScroll) {
+          return activeTarget != (i = targets.last()[0])
+            && this.activate ( i )
+        }
+
+        for (i = offsets.length; i--;) {
+          activeTarget != targets[i]
+            && scrollTop >= offsets[i]
+            && (!offsets[i + 1] || scrollTop <= offsets[i + 1])
+            && this.activate( targets[i] )
+        }
+      }
+
+    , activate: function (target) {
+        var active
+          , selector
+
+        this.activeTarget = target
+
+        $(this.selector)
+          .parent('.active')
+          .removeClass('active')
+
+        selector = this.selector
+          + '[data-target="' + target + '"],'
+          + this.selector + '[href="' + target + '"]'
+
+        active = $(selector)
+          .parent('li')
+          .addClass('active')
+
+        if (active.parent('.dropdown-menu').length)  {
+          active = active.closest('li.dropdown').addClass('active')
+        }
+
+        active.trigger('activate')
+      }
+
+  }
+
+
+ /* SCROLLSPY PLUGIN DEFINITION
+  * =========================== */
+
+  var old = $.fn.scrollspy
+
+  $.fn.scrollspy = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('scrollspy')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.scrollspy.Constructor = ScrollSpy
+
+  $.fn.scrollspy.defaults = {
+    offset: 10
+  }
+
+
+ /* SCROLLSPY NO CONFLICT
+  * ===================== */
+
+  $.fn.scrollspy.noConflict = function () {
+    $.fn.scrollspy = old
+    return this
+  }
+
+
+ /* SCROLLSPY DATA-API
+  * ================== */
+
+  $(window).on('load', function () {
+    $('[data-spy="scroll"]').each(function () {
+      var $spy = $(this)
+      $spy.scrollspy($spy.data())
+    })
+  })
+
+}(window.jQuery);/* ========================================================
+ * bootstrap-tab.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#tabs
+ * ========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ======================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* TAB CLASS DEFINITION
+  * ==================== */
+
+  var Tab = function (element) {
+    this.element = $(element)
+  }
+
+  Tab.prototype = {
+
+    constructor: Tab
+
+  , show: function () {
+      var $this = this.element
+        , $ul = $this.closest('ul:not(.dropdown-menu)')
+        , selector = $this.attr('data-target')
+        , previous
+        , $target
+        , e
+
+      if (!selector) {
+        selector = $this.attr('href')
+        selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+      }
+
+      if ( $this.parent('li').hasClass('active') ) return
+
+      previous = $ul.find('.active:last a')[0]
+
+      e = $.Event('show', {
+        relatedTarget: previous
+      })
+
+      $this.trigger(e)
+
+      if (e.isDefaultPrevented()) return
+
+      $target = $(selector)
+
+      this.activate($this.parent('li'), $ul)
+      this.activate($target, $target.parent(), function () {
+        $this.trigger({
+          type: 'shown'
+        , relatedTarget: previous
+        })
+      })
+    }
+
+  , activate: function ( element, container, callback) {
+      var $active = container.find('> .active')
+        , transition = callback
+            && $.support.transition
+            && $active.hasClass('fade')
+
+      function next() {
+        $active
+          .removeClass('active')
+          .find('> .dropdown-menu > .active')
+          .removeClass('active')
+
+        element.addClass('active')
+
+        if (transition) {
+          element[0].offsetWidth // reflow for transition
+          element.addClass('in')
+        } else {
+          element.removeClass('fade')
+        }
+
+        if ( element.parent('.dropdown-menu') ) {
+          element.closest('li.dropdown').addClass('active')
+        }
+
+        callback && callback()
+      }
+
+      transition ?
+        $active.one($.support.transition.end, next) :
+        next()
+
+      $active.removeClass('in')
+    }
+  }
+
+
+ /* TAB PLUGIN DEFINITION
+  * ===================== */
+
+  var old = $.fn.tab
+
+  $.fn.tab = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('tab')
+      if (!data) $this.data('tab', (data = new Tab(this)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.tab.Constructor = Tab
+
+
+ /* TAB NO CONFLICT
+  * =============== */
+
+  $.fn.tab.noConflict = function () {
+    $.fn.tab = old
+    return this
+  }
+
+
+ /* TAB DATA-API
+  * ============ */
+
+  $(document).on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
+    e.preventDefault()
+    $(this).tab('show')
+  })
+
+}(window.jQuery);/* =============================================================
+ * bootstrap-typeahead.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#typeahead
+ * =============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function($){
+
+  "use strict"; // jshint ;_;
+
+
+ /* TYPEAHEAD PUBLIC CLASS DEFINITION
+  * ================================= */
+
+  var Typeahead = function (element, options) {
+    this.$element = $(element)
+    this.options = $.extend({}, $.fn.typeahead.defaults, options)
+    this.matcher = this.options.matcher || this.matcher
+    this.sorter = this.options.sorter || this.sorter
+    this.highlighter = this.options.highlighter || this.highlighter
+    this.updater = this.options.updater || this.updater
+    this.source = this.options.source
+    this.$menu = $(this.options.menu)
+    this.shown = false
+    this.listen()
+  }
+
+  Typeahead.prototype = {
+
+    constructor: Typeahead
+
+  , select: function () {
+      var val = this.$menu.find('.active').attr('data-value')
+      this.$element
+        .val(this.updater(val))
+        .change()
+      return this.hide()
+    }
+
+  , updater: function (item) {
+      return item
+    }
+
+  , show: function () {
+      var pos = $.extend({}, this.$element.position(), {
+        height: this.$element[0].offsetHeight
+      })
+
+      this.$menu
+        .insertAfter(this.$element)
+        .css({
+          top: pos.top + pos.height
+        , left: pos.left
+        })
+        .show()
+
+      this.shown = true
+      return this
+    }
+
+  , hide: function () {
+      this.$menu.hide()
+      this.shown = false
+      return this
+    }
+
+  , lookup: function (event) {
+      var items
+
+      this.query = this.$element.val()
+
+      if (!this.query || this.query.length < this.options.minLength) {
+        return this.shown ? this.hide() : this
+      }
+
+      items = $.isFunction(this.source) ? this.source(this.query, $.proxy(this.process, this)) : this.source
+
+      return items ? this.process(items) : this
+    }
+
+  , process: function (items) {
+      var that = this
+
+      items = $.grep(items, function (item) {
+        return that.matcher(item)
+      })
+
+      items = this.sorter(items)
+
+      if (!items.length) {
+        return this.shown ? this.hide() : this
+      }
+
+      return this.render(items.slice(0, this.options.items)).show()
+    }
+
+  , matcher: function (item) {
+      return ~item.toLowerCase().indexOf(this.query.toLowerCase())
+    }
+
+  , sorter: function (items) {
+      var beginswith = []
+        , caseSensitive = []
+        , caseInsensitive = []
+        , item
+
+      while (item = items.shift()) {
+        if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item)
+        else if (~item.indexOf(this.query)) caseSensitive.push(item)
+        else caseInsensitive.push(item)
+      }
+
+      return beginswith.concat(caseSensitive, caseInsensitive)
+    }
+
+  , highlighter: function (item) {
+      var query = this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, '\\$&')
+      return item.replace(new RegExp('(' + query + ')', 'ig'), function ($1, match) {
+        return '<strong>' + match + '</strong>'
+      })
+    }
+
+  , render: function (items) {
+      var that = this
+
+      items = $(items).map(function (i, item) {
+        i = $(that.options.item).attr('data-value', item)
+        i.find('a').html(that.highlighter(item))
+        return i[0]
+      })
+
+      items.first().addClass('active')
+      this.$menu.html(items)
+      return this
+    }
+
+  , next: function (event) {
+      var active = this.$menu.find('.active').removeClass('active')
+        , next = active.next()
+
+      if (!next.length) {
+        next = $(this.$menu.find('li')[0])
+      }
+
+      next.addClass('active')
+    }
+
+  , prev: function (event) {
+      var active = this.$menu.find('.active').removeClass('active')
+        , prev = active.prev()
+
+      if (!prev.length) {
+        prev = this.$menu.find('li').last()
+      }
+
+      prev.addClass('active')
+    }
+
+  , listen: function () {
+      this.$element
+        .on('focus',    $.proxy(this.focus, this))
+        .on('blur',     $.proxy(this.blur, this))
+        .on('keypress', $.proxy(this.keypress, this))
+        .on('keyup',    $.proxy(this.keyup, this))
+
+      if (this.eventSupported('keydown')) {
+        this.$element.on('keydown', $.proxy(this.keydown, this))
+      }
+
+      this.$menu
+        .on('click', $.proxy(this.click, this))
+        .on('mouseenter', 'li', $.proxy(this.mouseenter, this))
+        .on('mouseleave', 'li', $.proxy(this.mouseleave, this))
+    }
+
+  , eventSupported: function(eventName) {
+      var isSupported = eventName in this.$element
+      if (!isSupported) {
+        this.$element.setAttribute(eventName, 'return;')
+        isSupported = typeof this.$element[eventName] === 'function'
+      }
+      return isSupported
+    }
+
+  , move: function (e) {
+      if (!this.shown) return
+
+      switch(e.keyCode) {
+        case 9: // tab
+        case 13: // enter
+        case 27: // escape
+          e.preventDefault()
+          break
+
+        case 38: // up arrow
+          e.preventDefault()
+          this.prev()
+          break
+
+        case 40: // down arrow
+          e.preventDefault()
+          this.next()
+          break
+      }
+
+      e.stopPropagation()
+    }
+
+  , keydown: function (e) {
+      this.suppressKeyPressRepeat = ~$.inArray(e.keyCode, [40,38,9,13,27])
+      this.move(e)
+    }
+
+  , keypress: function (e) {
+      if (this.suppressKeyPressRepeat) return
+      this.move(e)
+    }
+
+  , keyup: function (e) {
+      switch(e.keyCode) {
+        case 40: // down arrow
+        case 38: // up arrow
+        case 16: // shift
+        case 17: // ctrl
+        case 18: // alt
+          break
+
+        case 9: // tab
+        case 13: // enter
+          if (!this.shown) return
+          this.select()
+          break
+
+        case 27: // escape
+          if (!this.shown) return
+          this.hide()
+          break
+
+        default:
+          this.lookup()
+      }
+
+      e.stopPropagation()
+      e.preventDefault()
+  }
+
+  , focus: function (e) {
+      this.focused = true
+    }
+
+  , blur: function (e) {
+      this.focused = false
+      if (!this.mousedover && this.shown) this.hide()
+    }
+
+  , click: function (e) {
+      e.stopPropagation()
+      e.preventDefault()
+      this.select()
+      this.$element.focus()
+    }
+
+  , mouseenter: function (e) {
+      this.mousedover = true
+      this.$menu.find('.active').removeClass('active')
+      $(e.currentTarget).addClass('active')
+    }
+
+  , mouseleave: function (e) {
+      this.mousedover = false
+      if (!this.focused && this.shown) this.hide()
+    }
+
+  }
+
+
+  /* TYPEAHEAD PLUGIN DEFINITION
+   * =========================== */
+
+  var old = $.fn.typeahead
+
+  $.fn.typeahead = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('typeahead')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('typeahead', (data = new Typeahead(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.typeahead.defaults = {
+    source: []
+  , items: 8
+  , menu: '<ul class="typeahead dropdown-menu"></ul>'
+  , item: '<li><a href="#"></a></li>'
+  , minLength: 1
+  }
+
+  $.fn.typeahead.Constructor = Typeahead
+
+
+ /* TYPEAHEAD NO CONFLICT
+  * =================== */
+
+  $.fn.typeahead.noConflict = function () {
+    $.fn.typeahead = old
+    return this
+  }
+
+
+ /* TYPEAHEAD DATA-API
+  * ================== */
+
+  $(document).on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) {
+    var $this = $(this)
+    if ($this.data('typeahead')) return
+    $this.typeahead($this.data())
+  })
+
+}(window.jQuery);
+/* ==========================================================
+ * bootstrap-affix.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#affix
+ * ==========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* AFFIX CLASS DEFINITION
+  * ====================== */
+
+  var Affix = function (element, options) {
+    this.options = $.extend({}, $.fn.affix.defaults, options)
+    this.$window = $(window)
+      .on('scroll.affix.data-api', $.proxy(this.checkPosition, this))
+      .on('click.affix.data-api',  $.proxy(function () { setTimeout($.proxy(this.checkPosition, this), 1) }, this))
+    this.$element = $(element)
+    this.checkPosition()
+  }
+
+  Affix.prototype.checkPosition = function () {
+    if (!this.$element.is(':visible')) return
+
+    var scrollHeight = $(document).height()
+      , scrollTop = this.$window.scrollTop()
+      , position = this.$element.offset()
+      , offset = this.options.offset
+      , offsetBottom = offset.bottom
+      , offsetTop = offset.top
+      , reset = 'affix affix-top affix-bottom'
+      , affix
+
+    if (typeof offset != 'object') offsetBottom = offsetTop = offset
+    if (typeof offsetTop == 'function') offsetTop = offset.top()
+    if (typeof offsetBottom == 'function') offsetBottom = offset.bottom()
+
+    affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ?
+      false    : offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ?
+      'bottom' : offsetTop != null && scrollTop <= offsetTop ?
+      'top'    : false
+
+    if (this.affixed === affix) return
+
+    this.affixed = affix
+    this.unpin = affix == 'bottom' ? position.top - scrollTop : null
+
+    this.$element.removeClass(reset).addClass('affix' + (affix ? '-' + affix : ''))
+  }
+
+
+ /* AFFIX PLUGIN DEFINITION
+  * ======================= */
+
+  var old = $.fn.affix
+
+  $.fn.affix = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('affix')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('affix', (data = new Affix(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.affix.Constructor = Affix
+
+  $.fn.affix.defaults = {
+    offset: 0
+  }
+
+
+ /* AFFIX NO CONFLICT
+  * ================= */
+
+  $.fn.affix.noConflict = function () {
+    $.fn.affix = old
+    return this
+  }
+
+
+ /* AFFIX DATA-API
+  * ============== */
+
+  $(window).on('load', function () {
+    $('[data-spy="affix"]').each(function () {
+      var $spy = $(this)
+        , data = $spy.data()
+
+      data.offset = data.offset || {}
+
+      data.offsetBottom && (data.offset.bottom = data.offsetBottom)
+      data.offsetTop && (data.offset.top = data.offsetTop)
+
+      $spy.affix(data)
+    })
+  })
+
+
+}(window.jQuery);
\ No newline at end of file
diff --git a/view/theme/oldtest/js/bootstrap.min.js b/view/theme/oldtest/js/bootstrap.min.js
new file mode 100644
index 000000000..95c5ac5ee
--- /dev/null
+++ b/view/theme/oldtest/js/bootstrap.min.js
@@ -0,0 +1,6 @@
+/*!
+* Bootstrap.js by @fat & @mdo
+* Copyright 2012 Twitter, Inc.
+* http://www.apache.org/licenses/LICENSE-2.0.txt
+*/
+!function(e){"use strict";e(function(){e.support.transition=function(){var e=function(){var e=document.createElement("bootstrap"),t={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},n;for(n in t)if(e.style[n]!==undefined)return t[n]}();return e&&{end:e}}()})}(window.jQuery),!function(e){"use strict";var t='[data-dismiss="alert"]',n=function(n){e(n).on("click",t,this.close)};n.prototype.close=function(t){function s(){i.trigger("closed").remove()}var n=e(this),r=n.attr("data-target"),i;r||(r=n.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,"")),i=e(r),t&&t.preventDefault(),i.length||(i=n.hasClass("alert")?n:n.parent()),i.trigger(t=e.Event("close"));if(t.isDefaultPrevented())return;i.removeClass("in"),e.support.transition&&i.hasClass("fade")?i.on(e.support.transition.end,s):s()};var r=e.fn.alert;e.fn.alert=function(t){return this.each(function(){var r=e(this),i=r.data("alert");i||r.data("alert",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.alert.Constructor=n,e.fn.alert.noConflict=function(){return e.fn.alert=r,this},e(document).on("click.alert.data-api",t,n.prototype.close)}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.button.defaults,n)};t.prototype.setState=function(e){var t="disabled",n=this.$element,r=n.data(),i=n.is("input")?"val":"html";e+="Text",r.resetText||n.data("resetText",n[i]()),n[i](r[e]||this.options[e]),setTimeout(function(){e=="loadingText"?n.addClass(t).attr(t,t):n.removeClass(t).removeAttr(t)},0)},t.prototype.toggle=function(){var e=this.$element.closest('[data-toggle="buttons-radio"]');e&&e.find(".active").removeClass("active"),this.$element.toggleClass("active")};var n=e.fn.button;e.fn.button=function(n){return this.each(function(){var r=e(this),i=r.data("button"),s=typeof n=="object"&&n;i||r.data("button",i=new t(this,s)),n=="toggle"?i.toggle():n&&i.setState(n)})},e.fn.button.defaults={loadingText:"loading..."},e.fn.button.Constructor=t,e.fn.button.noConflict=function(){return e.fn.button=n,this},e(document).on("click.button.data-api","[data-toggle^=button]",function(t){var n=e(t.target);n.hasClass("btn")||(n=n.closest(".btn")),n.button("toggle")})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.$indicators=this.$element.find(".carousel-indicators"),this.options=n,this.options.pause=="hover"&&this.$element.on("mouseenter",e.proxy(this.pause,this)).on("mouseleave",e.proxy(this.cycle,this))};t.prototype={cycle:function(t){return t||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(e.proxy(this.next,this),this.options.interval)),this},getActiveIndex:function(){return this.$active=this.$element.find(".item.active"),this.$items=this.$active.parent().children(),this.$items.index(this.$active)},to:function(t){var n=this.getActiveIndex(),r=this;if(t>this.$items.length-1||t<0)return;return this.sliding?this.$element.one("slid",function(){r.to(t)}):n==t?this.pause().cycle():this.slide(t>n?"next":"prev",e(this.$items[t]))},pause:function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&e.support.transition.end&&(this.$element.trigger(e.support.transition.end),this.cycle(!0)),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(t,n){var r=this.$element.find(".item.active"),i=n||r[t](),s=this.interval,o=t=="next"?"left":"right",u=t=="next"?"first":"last",a=this,f;this.sliding=!0,s&&this.pause(),i=i.length?i:this.$element.find(".item")[u](),f=e.Event("slide",{relatedTarget:i[0],direction:o});if(i.hasClass("active"))return;this.$indicators.length&&(this.$indicators.find(".active").removeClass("active"),this.$element.one("slid",function(){var t=e(a.$indicators.children()[a.getActiveIndex()]);t&&t.addClass("active")}));if(e.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(f);if(f.isDefaultPrevented())return;i.addClass(t),i[0].offsetWidth,r.addClass(o),i.addClass(o),this.$element.one(e.support.transition.end,function(){i.removeClass([t,o].join(" ")).addClass("active"),r.removeClass(["active",o].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger("slid")},0)})}else{this.$element.trigger(f);if(f.isDefaultPrevented())return;r.removeClass("active"),i.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return s&&this.cycle(),this}};var n=e.fn.carousel;e.fn.carousel=function(n){return this.each(function(){var r=e(this),i=r.data("carousel"),s=e.extend({},e.fn.carousel.defaults,typeof n=="object"&&n),o=typeof n=="string"?n:s.slide;i||r.data("carousel",i=new t(this,s)),typeof n=="number"?i.to(n):o?i[o]():s.interval&&i.pause().cycle()})},e.fn.carousel.defaults={interval:5e3,pause:"hover"},e.fn.carousel.Constructor=t,e.fn.carousel.noConflict=function(){return e.fn.carousel=n,this},e(document).on("click.carousel.data-api","[data-slide], [data-slide-to]",function(t){var n=e(this),r,i=e(n.attr("data-target")||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,"")),s=e.extend({},i.data(),n.data()),o;i.carousel(s),(o=n.attr("data-slide-to"))&&i.data("carousel").pause().to(o).cycle(),t.preventDefault()})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.collapse.defaults,n),this.options.parent&&(this.$parent=e(this.options.parent)),this.options.toggle&&this.toggle()};t.prototype={constructor:t,dimension:function(){var e=this.$element.hasClass("width");return e?"width":"height"},show:function(){var t,n,r,i;if(this.transitioning||this.$element.hasClass("in"))return;t=this.dimension(),n=e.camelCase(["scroll",t].join("-")),r=this.$parent&&this.$parent.find("> .accordion-group > .in");if(r&&r.length){i=r.data("collapse");if(i&&i.transitioning)return;r.collapse("hide"),i||r.data("collapse",null)}this.$element[t](0),this.transition("addClass",e.Event("show"),"shown"),e.support.transition&&this.$element[t](this.$element[0][n])},hide:function(){var t;if(this.transitioning||!this.$element.hasClass("in"))return;t=this.dimension(),this.reset(this.$element[t]()),this.transition("removeClass",e.Event("hide"),"hidden"),this.$element[t](0)},reset:function(e){var t=this.dimension();return this.$element.removeClass("collapse")[t](e||"auto")[0].offsetWidth,this.$element[e!==null?"addClass":"removeClass"]("collapse"),this},transition:function(t,n,r){var i=this,s=function(){n.type=="show"&&i.reset(),i.transitioning=0,i.$element.trigger(r)};this.$element.trigger(n);if(n.isDefaultPrevented())return;this.transitioning=1,this.$element[t]("in"),e.support.transition&&this.$element.hasClass("collapse")?this.$element.one(e.support.transition.end,s):s()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}};var n=e.fn.collapse;e.fn.collapse=function(n){return this.each(function(){var r=e(this),i=r.data("collapse"),s=e.extend({},e.fn.collapse.defaults,r.data(),typeof n=="object"&&n);i||r.data("collapse",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.collapse.defaults={toggle:!0},e.fn.collapse.Constructor=t,e.fn.collapse.noConflict=function(){return e.fn.collapse=n,this},e(document).on("click.collapse.data-api","[data-toggle=collapse]",function(t){var n=e(this),r,i=n.attr("data-target")||t.preventDefault()||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,""),s=e(i).data("collapse")?"toggle":n.data();n[e(i).hasClass("in")?"addClass":"removeClass"]("collapsed"),e(i).collapse(s)})}(window.jQuery),!function(e){"use strict";function r(){e(t).each(function(){i(e(this)).removeClass("open")})}function i(t){var n=t.attr("data-target"),r;n||(n=t.attr("href"),n=n&&/#/.test(n)&&n.replace(/.*(?=#[^\s]*$)/,"")),r=n&&e(n);if(!r||!r.length)r=t.parent();return r}var t="[data-toggle=dropdown]",n=function(t){var n=e(t).on("click.dropdown.data-api",this.toggle);e("html").on("click.dropdown.data-api",function(){n.parent().removeClass("open")})};n.prototype={constructor:n,toggle:function(t){var n=e(this),s,o;if(n.is(".disabled, :disabled"))return;return s=i(n),o=s.hasClass("open"),r(),o||s.toggleClass("open"),n.focus(),!1},keydown:function(n){var r,s,o,u,a,f;if(!/(38|40|27)/.test(n.keyCode))return;r=e(this),n.preventDefault(),n.stopPropagation();if(r.is(".disabled, :disabled"))return;u=i(r),a=u.hasClass("open");if(!a||a&&n.keyCode==27)return n.which==27&&u.find(t).focus(),r.click();s=e("[role=menu] li:not(.divider):visible a",u);if(!s.length)return;f=s.index(s.filter(":focus")),n.keyCode==38&&f>0&&f--,n.keyCode==40&&f<s.length-1&&f++,~f||(f=0),s.eq(f).focus()}};var s=e.fn.dropdown;e.fn.dropdown=function(t){return this.each(function(){var r=e(this),i=r.data("dropdown");i||r.data("dropdown",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.dropdown.Constructor=n,e.fn.dropdown.noConflict=function(){return e.fn.dropdown=s,this},e(document).on("click.dropdown.data-api",r).on("click.dropdown.data-api",".dropdown form",function(e){e.stopPropagation()}).on("click.dropdown-menu",function(e){e.stopPropagation()}).on("click.dropdown.data-api",t,n.prototype.toggle).on("keydown.dropdown.data-api",t+", [role=menu]",n.prototype.keydown)}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=n,this.$element=e(t).delegate('[data-dismiss="modal"]',"click.dismiss.modal",e.proxy(this.hide,this)),this.options.remote&&this.$element.find(".modal-body").load(this.options.remote)};t.prototype={constructor:t,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var t=this,n=e.Event("show");this.$element.trigger(n);if(this.isShown||n.isDefaultPrevented())return;this.isShown=!0,this.escape(),this.backdrop(function(){var n=e.support.transition&&t.$element.hasClass("fade");t.$element.parent().length||t.$element.appendTo(document.body),t.$element.show(),n&&t.$element[0].offsetWidth,t.$element.addClass("in").attr("aria-hidden",!1),t.enforceFocus(),n?t.$element.one(e.support.transition.end,function(){t.$element.focus().trigger("shown")}):t.$element.focus().trigger("shown")})},hide:function(t){t&&t.preventDefault();var n=this;t=e.Event("hide"),this.$element.trigger(t);if(!this.isShown||t.isDefaultPrevented())return;this.isShown=!1,this.escape(),e(document).off("focusin.modal"),this.$element.removeClass("in").attr("aria-hidden",!0),e.support.transition&&this.$element.hasClass("fade")?this.hideWithTransition():this.hideModal()},enforceFocus:function(){var t=this;e(document).on("focusin.modal",function(e){t.$element[0]!==e.target&&!t.$element.has(e.target).length&&t.$element.focus()})},escape:function(){var e=this;this.isShown&&this.options.keyboard?this.$element.on("keyup.dismiss.modal",function(t){t.which==27&&e.hide()}):this.isShown||this.$element.off("keyup.dismiss.modal")},hideWithTransition:function(){var t=this,n=setTimeout(function(){t.$element.off(e.support.transition.end),t.hideModal()},500);this.$element.one(e.support.transition.end,function(){clearTimeout(n),t.hideModal()})},hideModal:function(){var e=this;this.$element.hide(),this.backdrop(function(){e.removeBackdrop(),e.$element.trigger("hidden")})},removeBackdrop:function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},backdrop:function(t){var n=this,r=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var i=e.support.transition&&r;this.$backdrop=e('<div class="modal-backdrop '+r+'" />').appendTo(document.body),this.$backdrop.click(this.options.backdrop=="static"?e.proxy(this.$element[0].focus,this.$element[0]):e.proxy(this.hide,this)),i&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in");if(!t)return;i?this.$backdrop.one(e.support.transition.end,t):t()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),e.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(e.support.transition.end,t):t()):t&&t()}};var n=e.fn.modal;e.fn.modal=function(n){return this.each(function(){var r=e(this),i=r.data("modal"),s=e.extend({},e.fn.modal.defaults,r.data(),typeof n=="object"&&n);i||r.data("modal",i=new t(this,s)),typeof n=="string"?i[n]():s.show&&i.show()})},e.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},e.fn.modal.Constructor=t,e.fn.modal.noConflict=function(){return e.fn.modal=n,this},e(document).on("click.modal.data-api",'[data-toggle="modal"]',function(t){var n=e(this),r=n.attr("href"),i=e(n.attr("data-target")||r&&r.replace(/.*(?=#[^\s]+$)/,"")),s=i.data("modal")?"toggle":e.extend({remote:!/#/.test(r)&&r},i.data(),n.data());t.preventDefault(),i.modal(s).one("hide",function(){n.focus()})})}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("tooltip",e,t)};t.prototype={constructor:t,init:function(t,n,r){var i,s,o,u,a;this.type=t,this.$element=e(n),this.options=this.getOptions(r),this.enabled=!0,o=this.options.trigger.split(" ");for(a=o.length;a--;)u=o[a],u=="click"?this.$element.on("click."+this.type,this.options.selector,e.proxy(this.toggle,this)):u!="manual"&&(i=u=="hover"?"mouseenter":"focus",s=u=="hover"?"mouseleave":"blur",this.$element.on(i+"."+this.type,this.options.selector,e.proxy(this.enter,this)),this.$element.on(s+"."+this.type,this.options.selector,e.proxy(this.leave,this)));this.options.selector?this._options=e.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(t){return t=e.extend({},e.fn[this.type].defaults,this.$element.data(),t),t.delay&&typeof t.delay=="number"&&(t.delay={show:t.delay,hide:t.delay}),t},enter:function(t){var n=e.fn[this.type].defaults,r={},i;this._options&&e.each(this._options,function(e,t){n[e]!=t&&(r[e]=t)},this),i=e(t.currentTarget)[this.type](r).data(this.type);if(!i.options.delay||!i.options.delay.show)return i.show();clearTimeout(this.timeout),i.hoverState="in",this.timeout=setTimeout(function(){i.hoverState=="in"&&i.show()},i.options.delay.show)},leave:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);this.timeout&&clearTimeout(this.timeout);if(!n.options.delay||!n.options.delay.hide)return n.hide();n.hoverState="out",this.timeout=setTimeout(function(){n.hoverState=="out"&&n.hide()},n.options.delay.hide)},show:function(){var t,n,r,i,s,o,u=e.Event("show");if(this.hasContent()&&this.enabled){this.$element.trigger(u);if(u.isDefaultPrevented())return;t=this.tip(),this.setContent(),this.options.animation&&t.addClass("fade"),s=typeof this.options.placement=="function"?this.options.placement.call(this,t[0],this.$element[0]):this.options.placement,t.detach().css({top:0,left:0,display:"block"}),this.options.container?t.appendTo(this.options.container):t.insertAfter(this.$element),n=this.getPosition(),r=t[0].offsetWidth,i=t[0].offsetHeight;switch(s){case"bottom":o={top:n.top+n.height,left:n.left+n.width/2-r/2};break;case"top":o={top:n.top-i,left:n.left+n.width/2-r/2};break;case"left":o={top:n.top+n.height/2-i/2,left:n.left-r};break;case"right":o={top:n.top+n.height/2-i/2,left:n.left+n.width}}this.applyPlacement(o,s),this.$element.trigger("shown")}},applyPlacement:function(e,t){var n=this.tip(),r=n[0].offsetWidth,i=n[0].offsetHeight,s,o,u,a;n.offset(e).addClass(t).addClass("in"),s=n[0].offsetWidth,o=n[0].offsetHeight,t=="top"&&o!=i&&(e.top=e.top+i-o,a=!0),t=="bottom"||t=="top"?(u=0,e.left<0&&(u=e.left*-2,e.left=0,n.offset(e),s=n[0].offsetWidth,o=n[0].offsetHeight),this.replaceArrow(u-r+s,s,"left")):this.replaceArrow(o-i,o,"top"),a&&n.offset(e)},replaceArrow:function(e,t,n){this.arrow().css(n,e?50*(1-e/t)+"%":"")},setContent:function(){var e=this.tip(),t=this.getTitle();e.find(".tooltip-inner")[this.options.html?"html":"text"](t),e.removeClass("fade in top bottom left right")},hide:function(){function i(){var t=setTimeout(function(){n.off(e.support.transition.end).detach()},500);n.one(e.support.transition.end,function(){clearTimeout(t),n.detach()})}var t=this,n=this.tip(),r=e.Event("hide");this.$element.trigger(r);if(r.isDefaultPrevented())return;return n.removeClass("in"),e.support.transition&&this.$tip.hasClass("fade")?i():n.detach(),this.$element.trigger("hidden"),this},fixTitle:function(){var e=this.$element;(e.attr("title")||typeof e.attr("data-original-title")!="string")&&e.attr("data-original-title",e.attr("title")||"").attr("title","")},hasContent:function(){return this.getTitle()},getPosition:function(){var t=this.$element[0];return e.extend({},typeof t.getBoundingClientRect=="function"?t.getBoundingClientRect():{width:t.offsetWidth,height:t.offsetHeight},this.$element.offset())},getTitle:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-original-title")||(typeof n.title=="function"?n.title.call(t[0]):n.title),e},tip:function(){return this.$tip=this.$tip||e(this.options.template)},arrow:function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(t){var n=t?e(t.currentTarget)[this.type](this._options).data(this.type):this;n.tip().hasClass("in")?n.hide():n.show()},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}};var n=e.fn.tooltip;e.fn.tooltip=function(n){return this.each(function(){var r=e(this),i=r.data("tooltip"),s=typeof n=="object"&&n;i||r.data("tooltip",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.tooltip.Constructor=t,e.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1},e.fn.tooltip.noConflict=function(){return e.fn.tooltip=n,this}}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("popover",e,t)};t.prototype=e.extend({},e.fn.tooltip.Constructor.prototype,{constructor:t,setContent:function(){var e=this.tip(),t=this.getTitle(),n=this.getContent();e.find(".popover-title")[this.options.html?"html":"text"](t),e.find(".popover-content")[this.options.html?"html":"text"](n),e.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var e,t=this.$element,n=this.options;return e=(typeof n.content=="function"?n.content.call(t[0]):n.content)||t.attr("data-content"),e},tip:function(){return this.$tip||(this.$tip=e(this.options.template)),this.$tip},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}});var n=e.fn.popover;e.fn.popover=function(n){return this.each(function(){var r=e(this),i=r.data("popover"),s=typeof n=="object"&&n;i||r.data("popover",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.popover.Constructor=t,e.fn.popover.defaults=e.extend({},e.fn.tooltip.defaults,{placement:"right",trigger:"click",content:"",template:'<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),e.fn.popover.noConflict=function(){return e.fn.popover=n,this}}(window.jQuery),!function(e){"use strict";function t(t,n){var r=e.proxy(this.process,this),i=e(t).is("body")?e(window):e(t),s;this.options=e.extend({},e.fn.scrollspy.defaults,n),this.$scrollElement=i.on("scroll.scroll-spy.data-api",r),this.selector=(this.options.target||(s=e(t).attr("href"))&&s.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=e("body"),this.refresh(),this.process()}t.prototype={constructor:t,refresh:function(){var t=this,n;this.offsets=e([]),this.targets=e([]),n=this.$body.find(this.selector).map(function(){var n=e(this),r=n.data("target")||n.attr("href"),i=/^#\w/.test(r)&&e(r);return i&&i.length&&[[i.position().top+(!e.isWindow(t.$scrollElement.get(0))&&t.$scrollElement.scrollTop()),r]]||null}).sort(function(e,t){return e[0]-t[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},process:function(){var e=this.$scrollElement.scrollTop()+this.options.offset,t=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,n=t-this.$scrollElement.height(),r=this.offsets,i=this.targets,s=this.activeTarget,o;if(e>=n)return s!=(o=i.last()[0])&&this.activate(o);for(o=r.length;o--;)s!=i[o]&&e>=r[o]&&(!r[o+1]||e<=r[o+1])&&this.activate(i[o])},activate:function(t){var n,r;this.activeTarget=t,e(this.selector).parent(".active").removeClass("active"),r=this.selector+'[data-target="'+t+'"],'+this.selector+'[href="'+t+'"]',n=e(r).parent("li").addClass("active"),n.parent(".dropdown-menu").length&&(n=n.closest("li.dropdown").addClass("active")),n.trigger("activate")}};var n=e.fn.scrollspy;e.fn.scrollspy=function(n){return this.each(function(){var r=e(this),i=r.data("scrollspy"),s=typeof n=="object"&&n;i||r.data("scrollspy",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.scrollspy.Constructor=t,e.fn.scrollspy.defaults={offset:10},e.fn.scrollspy.noConflict=function(){return e.fn.scrollspy=n,this},e(window).on("load",function(){e('[data-spy="scroll"]').each(function(){var t=e(this);t.scrollspy(t.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t){this.element=e(t)};t.prototype={constructor:t,show:function(){var t=this.element,n=t.closest("ul:not(.dropdown-menu)"),r=t.attr("data-target"),i,s,o;r||(r=t.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,""));if(t.parent("li").hasClass("active"))return;i=n.find(".active:last a")[0],o=e.Event("show",{relatedTarget:i}),t.trigger(o);if(o.isDefaultPrevented())return;s=e(r),this.activate(t.parent("li"),n),this.activate(s,s.parent(),function(){t.trigger({type:"shown",relatedTarget:i})})},activate:function(t,n,r){function o(){i.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),t.addClass("active"),s?(t[0].offsetWidth,t.addClass("in")):t.removeClass("fade"),t.parent(".dropdown-menu")&&t.closest("li.dropdown").addClass("active"),r&&r()}var i=n.find("> .active"),s=r&&e.support.transition&&i.hasClass("fade");s?i.one(e.support.transition.end,o):o(),i.removeClass("in")}};var n=e.fn.tab;e.fn.tab=function(n){return this.each(function(){var r=e(this),i=r.data("tab");i||r.data("tab",i=new t(this)),typeof n=="string"&&i[n]()})},e.fn.tab.Constructor=t,e.fn.tab.noConflict=function(){return e.fn.tab=n,this},e(document).on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(t){t.preventDefault(),e(this).tab("show")})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.typeahead.defaults,n),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.source=this.options.source,this.$menu=e(this.options.menu),this.shown=!1,this.listen()};t.prototype={constructor:t,select:function(){var e=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(e)).change(),this.hide()},updater:function(e){return e},show:function(){var t=e.extend({},this.$element.position(),{height:this.$element[0].offsetHeight});return this.$menu.insertAfter(this.$element).css({top:t.top+t.height,left:t.left}).show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(t){var n;return this.query=this.$element.val(),!this.query||this.query.length<this.options.minLength?this.shown?this.hide():this:(n=e.isFunction(this.source)?this.source(this.query,e.proxy(this.process,this)):this.source,n?this.process(n):this)},process:function(t){var n=this;return t=e.grep(t,function(e){return n.matcher(e)}),t=this.sorter(t),t.length?this.render(t.slice(0,this.options.items)).show():this.shown?this.hide():this},matcher:function(e){return~e.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(e){var t=[],n=[],r=[],i;while(i=e.shift())i.toLowerCase().indexOf(this.query.toLowerCase())?~i.indexOf(this.query)?n.push(i):r.push(i):t.push(i);return t.concat(n,r)},highlighter:function(e){var t=this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&");return e.replace(new RegExp("("+t+")","ig"),function(e,t){return"<strong>"+t+"</strong>"})},render:function(t){var n=this;return t=e(t).map(function(t,r){return t=e(n.options.item).attr("data-value",r),t.find("a").html(n.highlighter(r)),t[0]}),t.first().addClass("active"),this.$menu.html(t),this},next:function(t){var n=this.$menu.find(".active").removeClass("active"),r=n.next();r.length||(r=e(this.$menu.find("li")[0])),r.addClass("active")},prev:function(e){var t=this.$menu.find(".active").removeClass("active"),n=t.prev();n.length||(n=this.$menu.find("li").last()),n.addClass("active")},listen:function(){this.$element.on("focus",e.proxy(this.focus,this)).on("blur",e.proxy(this.blur,this)).on("keypress",e.proxy(this.keypress,this)).on("keyup",e.proxy(this.keyup,this)),this.eventSupported("keydown")&&this.$element.on("keydown",e.proxy(this.keydown,this)),this.$menu.on("click",e.proxy(this.click,this)).on("mouseenter","li",e.proxy(this.mouseenter,this)).on("mouseleave","li",e.proxy(this.mouseleave,this))},eventSupported:function(e){var t=e in this.$element;return t||(this.$element.setAttribute(e,"return;"),t=typeof this.$element[e]=="function"),t},move:function(e){if(!this.shown)return;switch(e.keyCode){case 9:case 13:case 27:e.preventDefault();break;case 38:e.preventDefault(),this.prev();break;case 40:e.preventDefault(),this.next()}e.stopPropagation()},keydown:function(t){this.suppressKeyPressRepeat=~e.inArray(t.keyCode,[40,38,9,13,27]),this.move(t)},keypress:function(e){if(this.suppressKeyPressRepeat)return;this.move(e)},keyup:function(e){switch(e.keyCode){case 40:case 38:case 16:case 17:case 18:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}e.stopPropagation(),e.preventDefault()},focus:function(e){this.focused=!0},blur:function(e){this.focused=!1,!this.mousedover&&this.shown&&this.hide()},click:function(e){e.stopPropagation(),e.preventDefault(),this.select(),this.$element.focus()},mouseenter:function(t){this.mousedover=!0,this.$menu.find(".active").removeClass("active"),e(t.currentTarget).addClass("active")},mouseleave:function(e){this.mousedover=!1,!this.focused&&this.shown&&this.hide()}};var n=e.fn.typeahead;e.fn.typeahead=function(n){return this.each(function(){var r=e(this),i=r.data("typeahead"),s=typeof n=="object"&&n;i||r.data("typeahead",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.typeahead.defaults={source:[],items:8,menu:'<ul class="typeahead dropdown-menu"></ul>',item:'<li><a href="#"></a></li>',minLength:1},e.fn.typeahead.Constructor=t,e.fn.typeahead.noConflict=function(){return e.fn.typeahead=n,this},e(document).on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(t){var n=e(this);if(n.data("typeahead"))return;n.typeahead(n.data())})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=e.extend({},e.fn.affix.defaults,n),this.$window=e(window).on("scroll.affix.data-api",e.proxy(this.checkPosition,this)).on("click.affix.data-api",e.proxy(function(){setTimeout(e.proxy(this.checkPosition,this),1)},this)),this.$element=e(t),this.checkPosition()};t.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var t=e(document).height(),n=this.$window.scrollTop(),r=this.$element.offset(),i=this.options.offset,s=i.bottom,o=i.top,u="affix affix-top affix-bottom",a;typeof i!="object"&&(s=o=i),typeof o=="function"&&(o=i.top()),typeof s=="function"&&(s=i.bottom()),a=this.unpin!=null&&n+this.unpin<=r.top?!1:s!=null&&r.top+this.$element.height()>=t-s?"bottom":o!=null&&n<=o?"top":!1;if(this.affixed===a)return;this.affixed=a,this.unpin=a=="bottom"?r.top-n:null,this.$element.removeClass(u).addClass("affix"+(a?"-"+a:""))};var n=e.fn.affix;e.fn.affix=function(n){return this.each(function(){var r=e(this),i=r.data("affix"),s=typeof n=="object"&&n;i||r.data("affix",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.affix.Constructor=t,e.fn.affix.defaults={offset:0},e.fn.affix.noConflict=function(){return e.fn.affix=n,this},e(window).on("load",function(){e('[data-spy="affix"]').each(function(){var t=e(this),n=t.data();n.offset=n.offset||{},n.offsetBottom&&(n.offset.bottom=n.offsetBottom),n.offsetTop&&(n.offset.top=n.offsetTop),t.affix(n)})})}(window.jQuery);
\ No newline at end of file
diff --git a/view/theme/oldtest/js/knockout-2.2.1.js b/view/theme/oldtest/js/knockout-2.2.1.js
new file mode 100644
index 000000000..d93e4977c
--- /dev/null
+++ b/view/theme/oldtest/js/knockout-2.2.1.js
@@ -0,0 +1,85 @@
+// Knockout JavaScript library v2.2.1
+// (c) Steven Sanderson - http://knockoutjs.com/
+// License: MIT (http://www.opensource.org/licenses/mit-license.php)
+
+(function() {function j(w){throw w;}var m=!0,p=null,r=!1;function u(w){return function(){return w}};var x=window,y=document,ga=navigator,F=window.jQuery,I=void 0;
+function L(w){function ha(a,d,c,e,f){var g=[];a=b.j(function(){var a=d(c,f)||[];0<g.length&&(b.a.Ya(M(g),a),e&&b.r.K(e,p,[c,a,f]));g.splice(0,g.length);b.a.P(g,a)},p,{W:a,Ka:function(){return 0==g.length||!b.a.X(g[0])}});return{M:g,j:a.pa()?a:I}}function M(a){for(;a.length&&!b.a.X(a[0]);)a.splice(0,1);if(1<a.length){for(var d=a[0],c=a[a.length-1],e=[d];d!==c;){d=d.nextSibling;if(!d)return;e.push(d)}Array.prototype.splice.apply(a,[0,a.length].concat(e))}return a}function S(a,b,c,e,f){var g=Math.min,
+h=Math.max,k=[],l,n=a.length,q,s=b.length,v=s-n||1,G=n+s+1,J,A,z;for(l=0;l<=n;l++){A=J;k.push(J=[]);z=g(s,l+v);for(q=h(0,l-1);q<=z;q++)J[q]=q?l?a[l-1]===b[q-1]?A[q-1]:g(A[q]||G,J[q-1]||G)+1:q+1:l+1}g=[];h=[];v=[];l=n;for(q=s;l||q;)s=k[l][q]-1,q&&s===k[l][q-1]?h.push(g[g.length]={status:c,value:b[--q],index:q}):l&&s===k[l-1][q]?v.push(g[g.length]={status:e,value:a[--l],index:l}):(g.push({status:"retained",value:b[--q]}),--l);if(h.length&&v.length){a=10*n;var t;for(b=c=0;(f||b<a)&&(t=h[c]);c++){for(e=
+0;k=v[e];e++)if(t.value===k.value){t.moved=k.index;k.moved=t.index;v.splice(e,1);b=e=0;break}b+=e}}return g.reverse()}function T(a,d,c,e,f){f=f||{};var g=a&&N(a),g=g&&g.ownerDocument,h=f.templateEngine||O;b.za.vb(c,h,g);c=h.renderTemplate(c,e,f,g);("number"!=typeof c.length||0<c.length&&"number"!=typeof c[0].nodeType)&&j(Error("Template engine must return an array of DOM nodes"));g=r;switch(d){case "replaceChildren":b.e.N(a,c);g=m;break;case "replaceNode":b.a.Ya(a,c);g=m;break;case "ignoreTargetNode":break;
+default:j(Error("Unknown renderMode: "+d))}g&&(U(c,e),f.afterRender&&b.r.K(f.afterRender,p,[c,e.$data]));return c}function N(a){return a.nodeType?a:0<a.length?a[0]:p}function U(a,d){if(a.length){var c=a[0],e=a[a.length-1];V(c,e,function(a){b.Da(d,a)});V(c,e,function(a){b.s.ib(a,[d])})}}function V(a,d,c){var e;for(d=b.e.nextSibling(d);a&&(e=a)!==d;)a=b.e.nextSibling(e),(1===e.nodeType||8===e.nodeType)&&c(e)}function W(a,d,c){a=b.g.aa(a);for(var e=b.g.Q,f=0;f<a.length;f++){var g=a[f].key;if(e.hasOwnProperty(g)){var h=
+e[g];"function"===typeof h?(g=h(a[f].value))&&j(Error(g)):h||j(Error("This template engine does not support the '"+g+"' binding within its templates"))}}a="ko.__tr_ambtns(function($context,$element){return(function(){return{ "+b.g.ba(a)+" } })()})";return c.createJavaScriptEvaluatorBlock(a)+d}function X(a,d,c,e){function f(a){return function(){return k[a]}}function g(){return k}var h=0,k,l;b.j(function(){var n=c&&c instanceof b.z?c:new b.z(b.a.d(c)),q=n.$data;e&&b.eb(a,n);if(k=("function"==typeof d?
+d(n,a):d)||b.J.instance.getBindings(a,n)){if(0===h){h=1;for(var s in k){var v=b.c[s];v&&8===a.nodeType&&!b.e.I[s]&&j(Error("The binding '"+s+"' cannot be used with virtual elements"));if(v&&"function"==typeof v.init&&(v=(0,v.init)(a,f(s),g,q,n))&&v.controlsDescendantBindings)l!==I&&j(Error("Multiple bindings ("+l+" and "+s+") are trying to control descendant bindings of the same element. You cannot use these bindings together on the same element.")),l=s}h=2}if(2===h)for(s in k)(v=b.c[s])&&"function"==
+typeof v.update&&(0,v.update)(a,f(s),g,q,n)}},p,{W:a});return{Nb:l===I}}function Y(a,d,c){var e=m,f=1===d.nodeType;f&&b.e.Ta(d);if(f&&c||b.J.instance.nodeHasBindings(d))e=X(d,p,a,c).Nb;e&&Z(a,d,!f)}function Z(a,d,c){for(var e=b.e.firstChild(d);d=e;)e=b.e.nextSibling(d),Y(a,d,c)}function $(a,b){var c=aa(a,b);return c?0<c.length?c[c.length-1].nextSibling:a.nextSibling:p}function aa(a,b){for(var c=a,e=1,f=[];c=c.nextSibling;){if(H(c)&&(e--,0===e))return f;f.push(c);B(c)&&e++}b||j(Error("Cannot find closing comment tag to match: "+
+a.nodeValue));return p}function H(a){return 8==a.nodeType&&(K?a.text:a.nodeValue).match(ia)}function B(a){return 8==a.nodeType&&(K?a.text:a.nodeValue).match(ja)}function P(a,b){for(var c=p;a!=c;)c=a,a=a.replace(ka,function(a,c){return b[c]});return a}function la(){var a=[],d=[];this.save=function(c,e){var f=b.a.i(a,c);0<=f?d[f]=e:(a.push(c),d.push(e))};this.get=function(c){c=b.a.i(a,c);return 0<=c?d[c]:I}}function ba(a,b,c){function e(e){var g=b(a[e]);switch(typeof g){case "boolean":case "number":case "string":case "function":f[e]=
+g;break;case "object":case "undefined":var h=c.get(g);f[e]=h!==I?h:ba(g,b,c)}}c=c||new la;a=b(a);if(!("object"==typeof a&&a!==p&&a!==I&&!(a instanceof Date)))return a;var f=a instanceof Array?[]:{};c.save(a,f);var g=a;if(g instanceof Array){for(var h=0;h<g.length;h++)e(h);"function"==typeof g.toJSON&&e("toJSON")}else for(h in g)e(h);return f}function ca(a,d){if(a)if(8==a.nodeType){var c=b.s.Ua(a.nodeValue);c!=p&&d.push({sb:a,Fb:c})}else if(1==a.nodeType)for(var c=0,e=a.childNodes,f=e.length;c<f;c++)ca(e[c],
+d)}function Q(a,d,c,e){b.c[a]={init:function(a){b.a.f.set(a,da,{});return{controlsDescendantBindings:m}},update:function(a,g,h,k,l){h=b.a.f.get(a,da);g=b.a.d(g());k=!c!==!g;var n=!h.Za;if(n||d||k!==h.qb)n&&(h.Za=b.a.Ia(b.e.childNodes(a),m)),k?(n||b.e.N(a,b.a.Ia(h.Za)),b.Ea(e?e(l,g):l,a)):b.e.Y(a),h.qb=k}};b.g.Q[a]=r;b.e.I[a]=m}function ea(a,d,c){c&&d!==b.k.q(a)&&b.k.T(a,d);d!==b.k.q(a)&&b.r.K(b.a.Ba,p,[a,"change"])}var b="undefined"!==typeof w?w:{};b.b=function(a,d){for(var c=a.split("."),e=b,f=0;f<
+c.length-1;f++)e=e[c[f]];e[c[c.length-1]]=d};b.p=function(a,b,c){a[b]=c};b.version="2.2.1";b.b("version",b.version);b.a=new function(){function a(a,d){if("input"!==b.a.u(a)||!a.type||"click"!=d.toLowerCase())return r;var c=a.type;return"checkbox"==c||"radio"==c}var d=/^(\s|\u00A0)+|(\s|\u00A0)+$/g,c={},e={};c[/Firefox\/2/i.test(ga.userAgent)?"KeyboardEvent":"UIEvents"]=["keyup","keydown","keypress"];c.MouseEvents="click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave".split(" ");
+for(var f in c){var g=c[f];if(g.length)for(var h=0,k=g.length;h<k;h++)e[g[h]]=f}var l={propertychange:m},n,c=3;f=y.createElement("div");for(g=f.getElementsByTagName("i");f.innerHTML="\x3c!--[if gt IE "+ ++c+"]><i></i><![endif]--\x3e",g[0];);n=4<c?c:I;return{Na:["authenticity_token",/^__RequestVerificationToken(_.*)?$/],o:function(a,b){for(var d=0,c=a.length;d<c;d++)b(a[d])},i:function(a,b){if("function"==typeof Array.prototype.indexOf)return Array.prototype.indexOf.call(a,b);for(var d=0,c=a.length;d<
+c;d++)if(a[d]===b)return d;return-1},lb:function(a,b,d){for(var c=0,e=a.length;c<e;c++)if(b.call(d,a[c]))return a[c];return p},ga:function(a,d){var c=b.a.i(a,d);0<=c&&a.splice(c,1)},Ga:function(a){a=a||[];for(var d=[],c=0,e=a.length;c<e;c++)0>b.a.i(d,a[c])&&d.push(a[c]);return d},V:function(a,b){a=a||[];for(var d=[],c=0,e=a.length;c<e;c++)d.push(b(a[c]));return d},fa:function(a,b){a=a||[];for(var d=[],c=0,e=a.length;c<e;c++)b(a[c])&&d.push(a[c]);return d},P:function(a,b){if(b instanceof Array)a.push.apply(a,
+b);else for(var d=0,c=b.length;d<c;d++)a.push(b[d]);return a},extend:function(a,b){if(b)for(var d in b)b.hasOwnProperty(d)&&(a[d]=b[d]);return a},ka:function(a){for(;a.firstChild;)b.removeNode(a.firstChild)},Hb:function(a){a=b.a.L(a);for(var d=y.createElement("div"),c=0,e=a.length;c<e;c++)d.appendChild(b.A(a[c]));return d},Ia:function(a,d){for(var c=0,e=a.length,g=[];c<e;c++){var f=a[c].cloneNode(m);g.push(d?b.A(f):f)}return g},N:function(a,d){b.a.ka(a);if(d)for(var c=0,e=d.length;c<e;c++)a.appendChild(d[c])},
+Ya:function(a,d){var c=a.nodeType?[a]:a;if(0<c.length){for(var e=c[0],g=e.parentNode,f=0,h=d.length;f<h;f++)g.insertBefore(d[f],e);f=0;for(h=c.length;f<h;f++)b.removeNode(c[f])}},bb:function(a,b){7>n?a.setAttribute("selected",b):a.selected=b},D:function(a){return(a||"").replace(d,"")},Rb:function(a,d){for(var c=[],e=(a||"").split(d),f=0,g=e.length;f<g;f++){var h=b.a.D(e[f]);""!==h&&c.push(h)}return c},Ob:function(a,b){a=a||"";return b.length>a.length?r:a.substring(0,b.length)===b},tb:function(a,b){if(b.compareDocumentPosition)return 16==
+(b.compareDocumentPosition(a)&16);for(;a!=p;){if(a==b)return m;a=a.parentNode}return r},X:function(a){return b.a.tb(a,a.ownerDocument)},u:function(a){return a&&a.tagName&&a.tagName.toLowerCase()},n:function(b,d,c){var e=n&&l[d];if(!e&&"undefined"!=typeof F){if(a(b,d)){var f=c;c=function(a,b){var d=this.checked;b&&(this.checked=b.nb!==m);f.call(this,a);this.checked=d}}F(b).bind(d,c)}else!e&&"function"==typeof b.addEventListener?b.addEventListener(d,c,r):"undefined"!=typeof b.attachEvent?b.attachEvent("on"+
+d,function(a){c.call(b,a)}):j(Error("Browser doesn't support addEventListener or attachEvent"))},Ba:function(b,d){(!b||!b.nodeType)&&j(Error("element must be a DOM node when calling triggerEvent"));if("undefined"!=typeof F){var c=[];a(b,d)&&c.push({nb:b.checked});F(b).trigger(d,c)}else"function"==typeof y.createEvent?"function"==typeof b.dispatchEvent?(c=y.createEvent(e[d]||"HTMLEvents"),c.initEvent(d,m,m,x,0,0,0,0,0,r,r,r,r,0,b),b.dispatchEvent(c)):j(Error("The supplied element doesn't support dispatchEvent")):
+"undefined"!=typeof b.fireEvent?(a(b,d)&&(b.checked=b.checked!==m),b.fireEvent("on"+d)):j(Error("Browser doesn't support triggering events"))},d:function(a){return b.$(a)?a():a},ua:function(a){return b.$(a)?a.t():a},da:function(a,d,c){if(d){var e=/[\w-]+/g,f=a.className.match(e)||[];b.a.o(d.match(e),function(a){var d=b.a.i(f,a);0<=d?c||f.splice(d,1):c&&f.push(a)});a.className=f.join(" ")}},cb:function(a,d){var c=b.a.d(d);if(c===p||c===I)c="";if(3===a.nodeType)a.data=c;else{var e=b.e.firstChild(a);
+!e||3!=e.nodeType||b.e.nextSibling(e)?b.e.N(a,[y.createTextNode(c)]):e.data=c;b.a.wb(a)}},ab:function(a,b){a.name=b;if(7>=n)try{a.mergeAttributes(y.createElement("<input name='"+a.name+"'/>"),r)}catch(d){}},wb:function(a){9<=n&&(a=1==a.nodeType?a:a.parentNode,a.style&&(a.style.zoom=a.style.zoom))},ub:function(a){if(9<=n){var b=a.style.width;a.style.width=0;a.style.width=b}},Lb:function(a,d){a=b.a.d(a);d=b.a.d(d);for(var c=[],e=a;e<=d;e++)c.push(e);return c},L:function(a){for(var b=[],d=0,c=a.length;d<
+c;d++)b.push(a[d]);return b},Pb:6===n,Qb:7===n,Z:n,Oa:function(a,d){for(var c=b.a.L(a.getElementsByTagName("input")).concat(b.a.L(a.getElementsByTagName("textarea"))),e="string"==typeof d?function(a){return a.name===d}:function(a){return d.test(a.name)},f=[],g=c.length-1;0<=g;g--)e(c[g])&&f.push(c[g]);return f},Ib:function(a){return"string"==typeof a&&(a=b.a.D(a))?x.JSON&&x.JSON.parse?x.JSON.parse(a):(new Function("return "+a))():p},xa:function(a,d,c){("undefined"==typeof JSON||"undefined"==typeof JSON.stringify)&&
+j(Error("Cannot find JSON.stringify(). Some browsers (e.g., IE < 8) don't support it natively, but you can overcome this by adding a script reference to json2.js, downloadable from http://www.json.org/json2.js"));return JSON.stringify(b.a.d(a),d,c)},Jb:function(a,d,c){c=c||{};var e=c.params||{},f=c.includeFields||this.Na,g=a;if("object"==typeof a&&"form"===b.a.u(a))for(var g=a.action,h=f.length-1;0<=h;h--)for(var k=b.a.Oa(a,f[h]),l=k.length-1;0<=l;l--)e[k[l].name]=k[l].value;d=b.a.d(d);var n=y.createElement("form");
+n.style.display="none";n.action=g;n.method="post";for(var w in d)a=y.createElement("input"),a.name=w,a.value=b.a.xa(b.a.d(d[w])),n.appendChild(a);for(w in e)a=y.createElement("input"),a.name=w,a.value=e[w],n.appendChild(a);y.body.appendChild(n);c.submitter?c.submitter(n):n.submit();setTimeout(function(){n.parentNode.removeChild(n)},0)}}};b.b("utils",b.a);b.b("utils.arrayForEach",b.a.o);b.b("utils.arrayFirst",b.a.lb);b.b("utils.arrayFilter",b.a.fa);b.b("utils.arrayGetDistinctValues",b.a.Ga);b.b("utils.arrayIndexOf",
+b.a.i);b.b("utils.arrayMap",b.a.V);b.b("utils.arrayPushAll",b.a.P);b.b("utils.arrayRemoveItem",b.a.ga);b.b("utils.extend",b.a.extend);b.b("utils.fieldsIncludedWithJsonPost",b.a.Na);b.b("utils.getFormFields",b.a.Oa);b.b("utils.peekObservable",b.a.ua);b.b("utils.postJson",b.a.Jb);b.b("utils.parseJson",b.a.Ib);b.b("utils.registerEventHandler",b.a.n);b.b("utils.stringifyJson",b.a.xa);b.b("utils.range",b.a.Lb);b.b("utils.toggleDomNodeCssClass",b.a.da);b.b("utils.triggerEvent",b.a.Ba);b.b("utils.unwrapObservable",
+b.a.d);Function.prototype.bind||(Function.prototype.bind=function(a){var b=this,c=Array.prototype.slice.call(arguments);a=c.shift();return function(){return b.apply(a,c.concat(Array.prototype.slice.call(arguments)))}});b.a.f=new function(){var a=0,d="__ko__"+(new Date).getTime(),c={};return{get:function(a,d){var c=b.a.f.la(a,r);return c===I?I:c[d]},set:function(a,d,c){c===I&&b.a.f.la(a,r)===I||(b.a.f.la(a,m)[d]=c)},la:function(b,f){var g=b[d];if(!g||!("null"!==g&&c[g])){if(!f)return I;g=b[d]="ko"+
+a++;c[g]={}}return c[g]},clear:function(a){var b=a[d];return b?(delete c[b],a[d]=p,m):r}}};b.b("utils.domData",b.a.f);b.b("utils.domData.clear",b.a.f.clear);b.a.F=new function(){function a(a,d){var e=b.a.f.get(a,c);e===I&&d&&(e=[],b.a.f.set(a,c,e));return e}function d(c){var e=a(c,r);if(e)for(var e=e.slice(0),k=0;k<e.length;k++)e[k](c);b.a.f.clear(c);"function"==typeof F&&"function"==typeof F.cleanData&&F.cleanData([c]);if(f[c.nodeType])for(e=c.firstChild;c=e;)e=c.nextSibling,8===c.nodeType&&d(c)}
+var c="__ko_domNodeDisposal__"+(new Date).getTime(),e={1:m,8:m,9:m},f={1:m,9:m};return{Ca:function(b,d){"function"!=typeof d&&j(Error("Callback must be a function"));a(b,m).push(d)},Xa:function(d,e){var f=a(d,r);f&&(b.a.ga(f,e),0==f.length&&b.a.f.set(d,c,I))},A:function(a){if(e[a.nodeType]&&(d(a),f[a.nodeType])){var c=[];b.a.P(c,a.getElementsByTagName("*"));for(var k=0,l=c.length;k<l;k++)d(c[k])}return a},removeNode:function(a){b.A(a);a.parentNode&&a.parentNode.removeChild(a)}}};b.A=b.a.F.A;b.removeNode=
+b.a.F.removeNode;b.b("cleanNode",b.A);b.b("removeNode",b.removeNode);b.b("utils.domNodeDisposal",b.a.F);b.b("utils.domNodeDisposal.addDisposeCallback",b.a.F.Ca);b.b("utils.domNodeDisposal.removeDisposeCallback",b.a.F.Xa);b.a.ta=function(a){var d;if("undefined"!=typeof F)if(F.parseHTML)d=F.parseHTML(a);else{if((d=F.clean([a]))&&d[0]){for(a=d[0];a.parentNode&&11!==a.parentNode.nodeType;)a=a.parentNode;a.parentNode&&a.parentNode.removeChild(a)}}else{var c=b.a.D(a).toLowerCase();d=y.createElement("div");
+c=c.match(/^<(thead|tbody|tfoot)/)&&[1,"<table>","</table>"]||!c.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!c.indexOf("<td")||!c.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||[0,"",""];a="ignored<div>"+c[1]+a+c[2]+"</div>";for("function"==typeof x.innerShiv?d.appendChild(x.innerShiv(a)):d.innerHTML=a;c[0]--;)d=d.lastChild;d=b.a.L(d.lastChild.childNodes)}return d};b.a.ca=function(a,d){b.a.ka(a);d=b.a.d(d);if(d!==p&&d!==I)if("string"!=typeof d&&(d=d.toString()),
+"undefined"!=typeof F)F(a).html(d);else for(var c=b.a.ta(d),e=0;e<c.length;e++)a.appendChild(c[e])};b.b("utils.parseHtmlFragment",b.a.ta);b.b("utils.setHtml",b.a.ca);var R={};b.s={ra:function(a){"function"!=typeof a&&j(Error("You can only pass a function to ko.memoization.memoize()"));var b=(4294967296*(1+Math.random())|0).toString(16).substring(1)+(4294967296*(1+Math.random())|0).toString(16).substring(1);R[b]=a;return"\x3c!--[ko_memo:"+b+"]--\x3e"},hb:function(a,b){var c=R[a];c===I&&j(Error("Couldn't find any memo with ID "+
+a+". Perhaps it's already been unmemoized."));try{return c.apply(p,b||[]),m}finally{delete R[a]}},ib:function(a,d){var c=[];ca(a,c);for(var e=0,f=c.length;e<f;e++){var g=c[e].sb,h=[g];d&&b.a.P(h,d);b.s.hb(c[e].Fb,h);g.nodeValue="";g.parentNode&&g.parentNode.removeChild(g)}},Ua:function(a){return(a=a.match(/^\[ko_memo\:(.*?)\]$/))?a[1]:p}};b.b("memoization",b.s);b.b("memoization.memoize",b.s.ra);b.b("memoization.unmemoize",b.s.hb);b.b("memoization.parseMemoText",b.s.Ua);b.b("memoization.unmemoizeDomNodeAndDescendants",
+b.s.ib);b.Ma={throttle:function(a,d){a.throttleEvaluation=d;var c=p;return b.j({read:a,write:function(b){clearTimeout(c);c=setTimeout(function(){a(b)},d)}})},notify:function(a,d){a.equalityComparer="always"==d?u(r):b.m.fn.equalityComparer;return a}};b.b("extenders",b.Ma);b.fb=function(a,d,c){this.target=a;this.ha=d;this.rb=c;b.p(this,"dispose",this.B)};b.fb.prototype.B=function(){this.Cb=m;this.rb()};b.S=function(){this.w={};b.a.extend(this,b.S.fn);b.p(this,"subscribe",this.ya);b.p(this,"extend",
+this.extend);b.p(this,"getSubscriptionsCount",this.yb)};b.S.fn={ya:function(a,d,c){c=c||"change";var e=new b.fb(this,d?a.bind(d):a,function(){b.a.ga(this.w[c],e)}.bind(this));this.w[c]||(this.w[c]=[]);this.w[c].push(e);return e},notifySubscribers:function(a,d){d=d||"change";this.w[d]&&b.r.K(function(){b.a.o(this.w[d].slice(0),function(b){b&&b.Cb!==m&&b.ha(a)})},this)},yb:function(){var a=0,b;for(b in this.w)this.w.hasOwnProperty(b)&&(a+=this.w[b].length);return a},extend:function(a){var d=this;if(a)for(var c in a){var e=
+b.Ma[c];"function"==typeof e&&(d=e(d,a[c]))}return d}};b.Qa=function(a){return"function"==typeof a.ya&&"function"==typeof a.notifySubscribers};b.b("subscribable",b.S);b.b("isSubscribable",b.Qa);var C=[];b.r={mb:function(a){C.push({ha:a,La:[]})},end:function(){C.pop()},Wa:function(a){b.Qa(a)||j(Error("Only subscribable things can act as dependencies"));if(0<C.length){var d=C[C.length-1];d&&!(0<=b.a.i(d.La,a))&&(d.La.push(a),d.ha(a))}},K:function(a,b,c){try{return C.push(p),a.apply(b,c||[])}finally{C.pop()}}};
+var ma={undefined:m,"boolean":m,number:m,string:m};b.m=function(a){function d(){if(0<arguments.length){if(!d.equalityComparer||!d.equalityComparer(c,arguments[0]))d.H(),c=arguments[0],d.G();return this}b.r.Wa(d);return c}var c=a;b.S.call(d);d.t=function(){return c};d.G=function(){d.notifySubscribers(c)};d.H=function(){d.notifySubscribers(c,"beforeChange")};b.a.extend(d,b.m.fn);b.p(d,"peek",d.t);b.p(d,"valueHasMutated",d.G);b.p(d,"valueWillMutate",d.H);return d};b.m.fn={equalityComparer:function(a,
+b){return a===p||typeof a in ma?a===b:r}};var E=b.m.Kb="__ko_proto__";b.m.fn[E]=b.m;b.ma=function(a,d){return a===p||a===I||a[E]===I?r:a[E]===d?m:b.ma(a[E],d)};b.$=function(a){return b.ma(a,b.m)};b.Ra=function(a){return"function"==typeof a&&a[E]===b.m||"function"==typeof a&&a[E]===b.j&&a.zb?m:r};b.b("observable",b.m);b.b("isObservable",b.$);b.b("isWriteableObservable",b.Ra);b.R=function(a){0==arguments.length&&(a=[]);a!==p&&(a!==I&&!("length"in a))&&j(Error("The argument passed when initializing an observable array must be an array, or null, or undefined."));
+var d=b.m(a);b.a.extend(d,b.R.fn);return d};b.R.fn={remove:function(a){for(var b=this.t(),c=[],e="function"==typeof a?a:function(b){return b===a},f=0;f<b.length;f++){var g=b[f];e(g)&&(0===c.length&&this.H(),c.push(g),b.splice(f,1),f--)}c.length&&this.G();return c},removeAll:function(a){if(a===I){var d=this.t(),c=d.slice(0);this.H();d.splice(0,d.length);this.G();return c}return!a?[]:this.remove(function(d){return 0<=b.a.i(a,d)})},destroy:function(a){var b=this.t(),c="function"==typeof a?a:function(b){return b===
+a};this.H();for(var e=b.length-1;0<=e;e--)c(b[e])&&(b[e]._destroy=m);this.G()},destroyAll:function(a){return a===I?this.destroy(u(m)):!a?[]:this.destroy(function(d){return 0<=b.a.i(a,d)})},indexOf:function(a){var d=this();return b.a.i(d,a)},replace:function(a,b){var c=this.indexOf(a);0<=c&&(this.H(),this.t()[c]=b,this.G())}};b.a.o("pop push reverse shift sort splice unshift".split(" "),function(a){b.R.fn[a]=function(){var b=this.t();this.H();b=b[a].apply(b,arguments);this.G();return b}});b.a.o(["slice"],
+function(a){b.R.fn[a]=function(){var b=this();return b[a].apply(b,arguments)}});b.b("observableArray",b.R);b.j=function(a,d,c){function e(){b.a.o(z,function(a){a.B()});z=[]}function f(){var a=h.throttleEvaluation;a&&0<=a?(clearTimeout(t),t=setTimeout(g,a)):g()}function g(){if(!q)if(n&&w())A();else{q=m;try{var a=b.a.V(z,function(a){return a.target});b.r.mb(function(c){var d;0<=(d=b.a.i(a,c))?a[d]=I:z.push(c.ya(f))});for(var c=s.call(d),e=a.length-1;0<=e;e--)a[e]&&z.splice(e,1)[0].B();n=m;h.notifySubscribers(l,
+"beforeChange");l=c}finally{b.r.end()}h.notifySubscribers(l);q=r;z.length||A()}}function h(){if(0<arguments.length)return"function"===typeof v?v.apply(d,arguments):j(Error("Cannot write a value to a ko.computed unless you specify a 'write' option. If you wish to read the current value, don't pass any parameters.")),this;n||g();b.r.Wa(h);return l}function k(){return!n||0<z.length}var l,n=r,q=r,s=a;s&&"object"==typeof s?(c=s,s=c.read):(c=c||{},s||(s=c.read));"function"!=typeof s&&j(Error("Pass a function that returns the value of the ko.computed"));
+var v=c.write,G=c.disposeWhenNodeIsRemoved||c.W||p,w=c.disposeWhen||c.Ka||u(r),A=e,z=[],t=p;d||(d=c.owner);h.t=function(){n||g();return l};h.xb=function(){return z.length};h.zb="function"===typeof c.write;h.B=function(){A()};h.pa=k;b.S.call(h);b.a.extend(h,b.j.fn);b.p(h,"peek",h.t);b.p(h,"dispose",h.B);b.p(h,"isActive",h.pa);b.p(h,"getDependenciesCount",h.xb);c.deferEvaluation!==m&&g();if(G&&k()){A=function(){b.a.F.Xa(G,arguments.callee);e()};b.a.F.Ca(G,A);var D=w,w=function(){return!b.a.X(G)||D()}}return h};
+b.Bb=function(a){return b.ma(a,b.j)};w=b.m.Kb;b.j[w]=b.m;b.j.fn={};b.j.fn[w]=b.j;b.b("dependentObservable",b.j);b.b("computed",b.j);b.b("isComputed",b.Bb);b.gb=function(a){0==arguments.length&&j(Error("When calling ko.toJS, pass the object you want to convert."));return ba(a,function(a){for(var c=0;b.$(a)&&10>c;c++)a=a();return a})};b.toJSON=function(a,d,c){a=b.gb(a);return b.a.xa(a,d,c)};b.b("toJS",b.gb);b.b("toJSON",b.toJSON);b.k={q:function(a){switch(b.a.u(a)){case "option":return a.__ko__hasDomDataOptionValue__===
+m?b.a.f.get(a,b.c.options.sa):7>=b.a.Z?a.getAttributeNode("value").specified?a.value:a.text:a.value;case "select":return 0<=a.selectedIndex?b.k.q(a.options[a.selectedIndex]):I;default:return a.value}},T:function(a,d){switch(b.a.u(a)){case "option":switch(typeof d){case "string":b.a.f.set(a,b.c.options.sa,I);"__ko__hasDomDataOptionValue__"in a&&delete a.__ko__hasDomDataOptionValue__;a.value=d;break;default:b.a.f.set(a,b.c.options.sa,d),a.__ko__hasDomDataOptionValue__=m,a.value="number"===typeof d?
+d:""}break;case "select":for(var c=a.options.length-1;0<=c;c--)if(b.k.q(a.options[c])==d){a.selectedIndex=c;break}break;default:if(d===p||d===I)d="";a.value=d}}};b.b("selectExtensions",b.k);b.b("selectExtensions.readValue",b.k.q);b.b("selectExtensions.writeValue",b.k.T);var ka=/\@ko_token_(\d+)\@/g,na=["true","false"],oa=/^(?:[$_a-z][$\w]*|(.+)(\.\s*[$_a-z][$\w]*|\[.+\]))$/i;b.g={Q:[],aa:function(a){var d=b.a.D(a);if(3>d.length)return[];"{"===d.charAt(0)&&(d=d.substring(1,d.length-1));a=[];for(var c=
+p,e,f=0;f<d.length;f++){var g=d.charAt(f);if(c===p)switch(g){case '"':case "'":case "/":c=f,e=g}else if(g==e&&"\\"!==d.charAt(f-1)){g=d.substring(c,f+1);a.push(g);var h="@ko_token_"+(a.length-1)+"@",d=d.substring(0,c)+h+d.substring(f+1),f=f-(g.length-h.length),c=p}}e=c=p;for(var k=0,l=p,f=0;f<d.length;f++){g=d.charAt(f);if(c===p)switch(g){case "{":c=f;l=g;e="}";break;case "(":c=f;l=g;e=")";break;case "[":c=f,l=g,e="]"}g===l?k++:g===e&&(k--,0===k&&(g=d.substring(c,f+1),a.push(g),h="@ko_token_"+(a.length-
+1)+"@",d=d.substring(0,c)+h+d.substring(f+1),f-=g.length-h.length,c=p))}e=[];d=d.split(",");c=0;for(f=d.length;c<f;c++)k=d[c],l=k.indexOf(":"),0<l&&l<k.length-1?(g=k.substring(l+1),e.push({key:P(k.substring(0,l),a),value:P(g,a)})):e.push({unknown:P(k,a)});return e},ba:function(a){var d="string"===typeof a?b.g.aa(a):a,c=[];a=[];for(var e,f=0;e=d[f];f++)if(0<c.length&&c.push(","),e.key){var g;a:{g=e.key;var h=b.a.D(g);switch(h.length&&h.charAt(0)){case "'":case '"':break a;default:g="'"+h+"'"}}e=e.value;
+c.push(g);c.push(":");c.push(e);e=b.a.D(e);0<=b.a.i(na,b.a.D(e).toLowerCase())?e=r:(h=e.match(oa),e=h===p?r:h[1]?"Object("+h[1]+")"+h[2]:e);e&&(0<a.length&&a.push(", "),a.push(g+" : function(__ko_value) { "+e+" = __ko_value; }"))}else e.unknown&&c.push(e.unknown);d=c.join("");0<a.length&&(d=d+", '_ko_property_writers' : { "+a.join("")+" } ");return d},Eb:function(a,d){for(var c=0;c<a.length;c++)if(b.a.D(a[c].key)==d)return m;return r},ea:function(a,d,c,e,f){if(!a||!b.Ra(a)){if((a=d()._ko_property_writers)&&
+a[c])a[c](e)}else(!f||a.t()!==e)&&a(e)}};b.b("expressionRewriting",b.g);b.b("expressionRewriting.bindingRewriteValidators",b.g.Q);b.b("expressionRewriting.parseObjectLiteral",b.g.aa);b.b("expressionRewriting.preProcessBindings",b.g.ba);b.b("jsonExpressionRewriting",b.g);b.b("jsonExpressionRewriting.insertPropertyAccessorsIntoJson",b.g.ba);var K="\x3c!--test--\x3e"===y.createComment("test").text,ja=K?/^\x3c!--\s*ko(?:\s+(.+\s*\:[\s\S]*))?\s*--\x3e$/:/^\s*ko(?:\s+(.+\s*\:[\s\S]*))?\s*$/,ia=K?/^\x3c!--\s*\/ko\s*--\x3e$/:
+/^\s*\/ko\s*$/,pa={ul:m,ol:m};b.e={I:{},childNodes:function(a){return B(a)?aa(a):a.childNodes},Y:function(a){if(B(a)){a=b.e.childNodes(a);for(var d=0,c=a.length;d<c;d++)b.removeNode(a[d])}else b.a.ka(a)},N:function(a,d){if(B(a)){b.e.Y(a);for(var c=a.nextSibling,e=0,f=d.length;e<f;e++)c.parentNode.insertBefore(d[e],c)}else b.a.N(a,d)},Va:function(a,b){B(a)?a.parentNode.insertBefore(b,a.nextSibling):a.firstChild?a.insertBefore(b,a.firstChild):a.appendChild(b)},Pa:function(a,d,c){c?B(a)?a.parentNode.insertBefore(d,
+c.nextSibling):c.nextSibling?a.insertBefore(d,c.nextSibling):a.appendChild(d):b.e.Va(a,d)},firstChild:function(a){return!B(a)?a.firstChild:!a.nextSibling||H(a.nextSibling)?p:a.nextSibling},nextSibling:function(a){B(a)&&(a=$(a));return a.nextSibling&&H(a.nextSibling)?p:a.nextSibling},jb:function(a){return(a=B(a))?a[1]:p},Ta:function(a){if(pa[b.a.u(a)]){var d=a.firstChild;if(d){do if(1===d.nodeType){var c;c=d.firstChild;var e=p;if(c){do if(e)e.push(c);else if(B(c)){var f=$(c,m);f?c=f:e=[c]}else H(c)&&
+(e=[c]);while(c=c.nextSibling)}if(c=e){e=d.nextSibling;for(f=0;f<c.length;f++)e?a.insertBefore(c[f],e):a.appendChild(c[f])}}while(d=d.nextSibling)}}}};b.b("virtualElements",b.e);b.b("virtualElements.allowedBindings",b.e.I);b.b("virtualElements.emptyNode",b.e.Y);b.b("virtualElements.insertAfter",b.e.Pa);b.b("virtualElements.prepend",b.e.Va);b.b("virtualElements.setDomNodeChildren",b.e.N);b.J=function(){this.Ha={}};b.a.extend(b.J.prototype,{nodeHasBindings:function(a){switch(a.nodeType){case 1:return a.getAttribute("data-bind")!=
+p;case 8:return b.e.jb(a)!=p;default:return r}},getBindings:function(a,b){var c=this.getBindingsString(a,b);return c?this.parseBindingsString(c,b,a):p},getBindingsString:function(a){switch(a.nodeType){case 1:return a.getAttribute("data-bind");case 8:return b.e.jb(a);default:return p}},parseBindingsString:function(a,d,c){try{var e;if(!(e=this.Ha[a])){var f=this.Ha,g,h="with($context){with($data||{}){return{"+b.g.ba(a)+"}}}";g=new Function("$context","$element",h);e=f[a]=g}return e(d,c)}catch(k){j(Error("Unable to parse bindings.\nMessage: "+
+k+";\nBindings value: "+a))}}});b.J.instance=new b.J;b.b("bindingProvider",b.J);b.c={};b.z=function(a,d,c){d?(b.a.extend(this,d),this.$parentContext=d,this.$parent=d.$data,this.$parents=(d.$parents||[]).slice(0),this.$parents.unshift(this.$parent)):(this.$parents=[],this.$root=a,this.ko=b);this.$data=a;c&&(this[c]=a)};b.z.prototype.createChildContext=function(a,d){return new b.z(a,this,d)};b.z.prototype.extend=function(a){var d=b.a.extend(new b.z,this);return b.a.extend(d,a)};b.eb=function(a,d){if(2==
+arguments.length)b.a.f.set(a,"__ko_bindingContext__",d);else return b.a.f.get(a,"__ko_bindingContext__")};b.Fa=function(a,d,c){1===a.nodeType&&b.e.Ta(a);return X(a,d,c,m)};b.Ea=function(a,b){(1===b.nodeType||8===b.nodeType)&&Z(a,b,m)};b.Da=function(a,b){b&&(1!==b.nodeType&&8!==b.nodeType)&&j(Error("ko.applyBindings: first parameter should be your view model; second parameter should be a DOM node"));b=b||x.document.body;Y(a,b,m)};b.ja=function(a){switch(a.nodeType){case 1:case 8:var d=b.eb(a);if(d)return d;
+if(a.parentNode)return b.ja(a.parentNode)}return I};b.pb=function(a){return(a=b.ja(a))?a.$data:I};b.b("bindingHandlers",b.c);b.b("applyBindings",b.Da);b.b("applyBindingsToDescendants",b.Ea);b.b("applyBindingsToNode",b.Fa);b.b("contextFor",b.ja);b.b("dataFor",b.pb);var fa={"class":"className","for":"htmlFor"};b.c.attr={update:function(a,d){var c=b.a.d(d())||{},e;for(e in c)if("string"==typeof e){var f=b.a.d(c[e]),g=f===r||f===p||f===I;g&&a.removeAttribute(e);8>=b.a.Z&&e in fa?(e=fa[e],g?a.removeAttribute(e):
+a[e]=f):g||a.setAttribute(e,f.toString());"name"===e&&b.a.ab(a,g?"":f.toString())}}};b.c.checked={init:function(a,d,c){b.a.n(a,"click",function(){var e;if("checkbox"==a.type)e=a.checked;else if("radio"==a.type&&a.checked)e=a.value;else return;var f=d(),g=b.a.d(f);"checkbox"==a.type&&g instanceof Array?(e=b.a.i(g,a.value),a.checked&&0>e?f.push(a.value):!a.checked&&0<=e&&f.splice(e,1)):b.g.ea(f,c,"checked",e,m)});"radio"==a.type&&!a.name&&b.c.uniqueName.init(a,u(m))},update:function(a,d){var c=b.a.d(d());
+"checkbox"==a.type?a.checked=c instanceof Array?0<=b.a.i(c,a.value):c:"radio"==a.type&&(a.checked=a.value==c)}};b.c.css={update:function(a,d){var c=b.a.d(d());if("object"==typeof c)for(var e in c){var f=b.a.d(c[e]);b.a.da(a,e,f)}else c=String(c||""),b.a.da(a,a.__ko__cssValue,r),a.__ko__cssValue=c,b.a.da(a,c,m)}};b.c.enable={update:function(a,d){var c=b.a.d(d());c&&a.disabled?a.removeAttribute("disabled"):!c&&!a.disabled&&(a.disabled=m)}};b.c.disable={update:function(a,d){b.c.enable.update(a,function(){return!b.a.d(d())})}};
+b.c.event={init:function(a,d,c,e){var f=d()||{},g;for(g in f)(function(){var f=g;"string"==typeof f&&b.a.n(a,f,function(a){var g,n=d()[f];if(n){var q=c();try{var s=b.a.L(arguments);s.unshift(e);g=n.apply(e,s)}finally{g!==m&&(a.preventDefault?a.preventDefault():a.returnValue=r)}q[f+"Bubble"]===r&&(a.cancelBubble=m,a.stopPropagation&&a.stopPropagation())}})})()}};b.c.foreach={Sa:function(a){return function(){var d=a(),c=b.a.ua(d);if(!c||"number"==typeof c.length)return{foreach:d,templateEngine:b.C.oa};
+b.a.d(d);return{foreach:c.data,as:c.as,includeDestroyed:c.includeDestroyed,afterAdd:c.afterAdd,beforeRemove:c.beforeRemove,afterRender:c.afterRender,beforeMove:c.beforeMove,afterMove:c.afterMove,templateEngine:b.C.oa}}},init:function(a,d){return b.c.template.init(a,b.c.foreach.Sa(d))},update:function(a,d,c,e,f){return b.c.template.update(a,b.c.foreach.Sa(d),c,e,f)}};b.g.Q.foreach=r;b.e.I.foreach=m;b.c.hasfocus={init:function(a,d,c){function e(e){a.__ko_hasfocusUpdating=m;var f=a.ownerDocument;"activeElement"in
+f&&(e=f.activeElement===a);f=d();b.g.ea(f,c,"hasfocus",e,m);a.__ko_hasfocusUpdating=r}var f=e.bind(p,m),g=e.bind(p,r);b.a.n(a,"focus",f);b.a.n(a,"focusin",f);b.a.n(a,"blur",g);b.a.n(a,"focusout",g)},update:function(a,d){var c=b.a.d(d());a.__ko_hasfocusUpdating||(c?a.focus():a.blur(),b.r.K(b.a.Ba,p,[a,c?"focusin":"focusout"]))}};b.c.html={init:function(){return{controlsDescendantBindings:m}},update:function(a,d){b.a.ca(a,d())}};var da="__ko_withIfBindingData";Q("if");Q("ifnot",r,m);Q("with",m,r,function(a,
+b){return a.createChildContext(b)});b.c.options={update:function(a,d,c){"select"!==b.a.u(a)&&j(Error("options binding applies only to SELECT elements"));for(var e=0==a.length,f=b.a.V(b.a.fa(a.childNodes,function(a){return a.tagName&&"option"===b.a.u(a)&&a.selected}),function(a){return b.k.q(a)||a.innerText||a.textContent}),g=a.scrollTop,h=b.a.d(d());0<a.length;)b.A(a.options[0]),a.remove(0);if(h){c=c();var k=c.optionsIncludeDestroyed;"number"!=typeof h.length&&(h=[h]);if(c.optionsCaption){var l=y.createElement("option");
+b.a.ca(l,c.optionsCaption);b.k.T(l,I);a.appendChild(l)}d=0;for(var n=h.length;d<n;d++){var q=h[d];if(!q||!q._destroy||k){var l=y.createElement("option"),s=function(a,b,c){var d=typeof b;return"function"==d?b(a):"string"==d?a[b]:c},v=s(q,c.optionsValue,q);b.k.T(l,b.a.d(v));q=s(q,c.optionsText,v);b.a.cb(l,q);a.appendChild(l)}}h=a.getElementsByTagName("option");d=k=0;for(n=h.length;d<n;d++)0<=b.a.i(f,b.k.q(h[d]))&&(b.a.bb(h[d],m),k++);a.scrollTop=g;e&&"value"in c&&ea(a,b.a.ua(c.value),m);b.a.ub(a)}}};
+b.c.options.sa="__ko.optionValueDomData__";b.c.selectedOptions={init:function(a,d,c){b.a.n(a,"change",function(){var e=d(),f=[];b.a.o(a.getElementsByTagName("option"),function(a){a.selected&&f.push(b.k.q(a))});b.g.ea(e,c,"value",f)})},update:function(a,d){"select"!=b.a.u(a)&&j(Error("values binding applies only to SELECT elements"));var c=b.a.d(d());c&&"number"==typeof c.length&&b.a.o(a.getElementsByTagName("option"),function(a){var d=0<=b.a.i(c,b.k.q(a));b.a.bb(a,d)})}};b.c.style={update:function(a,
+d){var c=b.a.d(d()||{}),e;for(e in c)if("string"==typeof e){var f=b.a.d(c[e]);a.style[e]=f||""}}};b.c.submit={init:function(a,d,c,e){"function"!=typeof d()&&j(Error("The value for a submit binding must be a function"));b.a.n(a,"submit",function(b){var c,h=d();try{c=h.call(e,a)}finally{c!==m&&(b.preventDefault?b.preventDefault():b.returnValue=r)}})}};b.c.text={update:function(a,d){b.a.cb(a,d())}};b.e.I.text=m;b.c.uniqueName={init:function(a,d){if(d()){var c="ko_unique_"+ ++b.c.uniqueName.ob;b.a.ab(a,
+c)}}};b.c.uniqueName.ob=0;b.c.value={init:function(a,d,c){function e(){h=r;var e=d(),f=b.k.q(a);b.g.ea(e,c,"value",f)}var f=["change"],g=c().valueUpdate,h=r;g&&("string"==typeof g&&(g=[g]),b.a.P(f,g),f=b.a.Ga(f));if(b.a.Z&&("input"==a.tagName.toLowerCase()&&"text"==a.type&&"off"!=a.autocomplete&&(!a.form||"off"!=a.form.autocomplete))&&-1==b.a.i(f,"propertychange"))b.a.n(a,"propertychange",function(){h=m}),b.a.n(a,"blur",function(){h&&e()});b.a.o(f,function(c){var d=e;b.a.Ob(c,"after")&&(d=function(){setTimeout(e,
+0)},c=c.substring(5));b.a.n(a,c,d)})},update:function(a,d){var c="select"===b.a.u(a),e=b.a.d(d()),f=b.k.q(a),g=e!=f;0===e&&(0!==f&&"0"!==f)&&(g=m);g&&(f=function(){b.k.T(a,e)},f(),c&&setTimeout(f,0));c&&0<a.length&&ea(a,e,r)}};b.c.visible={update:function(a,d){var c=b.a.d(d()),e="none"!=a.style.display;c&&!e?a.style.display="":!c&&e&&(a.style.display="none")}};b.c.click={init:function(a,d,c,e){return b.c.event.init.call(this,a,function(){var a={};a.click=d();return a},c,e)}};b.v=function(){};b.v.prototype.renderTemplateSource=
+function(){j(Error("Override renderTemplateSource"))};b.v.prototype.createJavaScriptEvaluatorBlock=function(){j(Error("Override createJavaScriptEvaluatorBlock"))};b.v.prototype.makeTemplateSource=function(a,d){if("string"==typeof a){d=d||y;var c=d.getElementById(a);c||j(Error("Cannot find template with ID "+a));return new b.l.h(c)}if(1==a.nodeType||8==a.nodeType)return new b.l.O(a);j(Error("Unknown template type: "+a))};b.v.prototype.renderTemplate=function(a,b,c,e){a=this.makeTemplateSource(a,e);
+return this.renderTemplateSource(a,b,c)};b.v.prototype.isTemplateRewritten=function(a,b){return this.allowTemplateRewriting===r?m:this.makeTemplateSource(a,b).data("isRewritten")};b.v.prototype.rewriteTemplate=function(a,b,c){a=this.makeTemplateSource(a,c);b=b(a.text());a.text(b);a.data("isRewritten",m)};b.b("templateEngine",b.v);var qa=/(<[a-z]+\d*(\s+(?!data-bind=)[a-z0-9\-]+(=(\"[^\"]*\"|\'[^\']*\'))?)*\s+)data-bind=(["'])([\s\S]*?)\5/gi,ra=/\x3c!--\s*ko\b\s*([\s\S]*?)\s*--\x3e/g;b.za={vb:function(a,
+d,c){d.isTemplateRewritten(a,c)||d.rewriteTemplate(a,function(a){return b.za.Gb(a,d)},c)},Gb:function(a,b){return a.replace(qa,function(a,e,f,g,h,k,l){return W(l,e,b)}).replace(ra,function(a,e){return W(e,"\x3c!-- ko --\x3e",b)})},kb:function(a){return b.s.ra(function(d,c){d.nextSibling&&b.Fa(d.nextSibling,a,c)})}};b.b("__tr_ambtns",b.za.kb);b.l={};b.l.h=function(a){this.h=a};b.l.h.prototype.text=function(){var a=b.a.u(this.h),a="script"===a?"text":"textarea"===a?"value":"innerHTML";if(0==arguments.length)return this.h[a];
+var d=arguments[0];"innerHTML"===a?b.a.ca(this.h,d):this.h[a]=d};b.l.h.prototype.data=function(a){if(1===arguments.length)return b.a.f.get(this.h,"templateSourceData_"+a);b.a.f.set(this.h,"templateSourceData_"+a,arguments[1])};b.l.O=function(a){this.h=a};b.l.O.prototype=new b.l.h;b.l.O.prototype.text=function(){if(0==arguments.length){var a=b.a.f.get(this.h,"__ko_anon_template__")||{};a.Aa===I&&a.ia&&(a.Aa=a.ia.innerHTML);return a.Aa}b.a.f.set(this.h,"__ko_anon_template__",{Aa:arguments[0]})};b.l.h.prototype.nodes=
+function(){if(0==arguments.length)return(b.a.f.get(this.h,"__ko_anon_template__")||{}).ia;b.a.f.set(this.h,"__ko_anon_template__",{ia:arguments[0]})};b.b("templateSources",b.l);b.b("templateSources.domElement",b.l.h);b.b("templateSources.anonymousTemplate",b.l.O);var O;b.wa=function(a){a!=I&&!(a instanceof b.v)&&j(Error("templateEngine must inherit from ko.templateEngine"));O=a};b.va=function(a,d,c,e,f){c=c||{};(c.templateEngine||O)==I&&j(Error("Set a template engine before calling renderTemplate"));
+f=f||"replaceChildren";if(e){var g=N(e);return b.j(function(){var h=d&&d instanceof b.z?d:new b.z(b.a.d(d)),k="function"==typeof a?a(h.$data,h):a,h=T(e,f,k,h,c);"replaceNode"==f&&(e=h,g=N(e))},p,{Ka:function(){return!g||!b.a.X(g)},W:g&&"replaceNode"==f?g.parentNode:g})}return b.s.ra(function(e){b.va(a,d,c,e,"replaceNode")})};b.Mb=function(a,d,c,e,f){function g(a,b){U(b,k);c.afterRender&&c.afterRender(b,a)}function h(d,e){k=f.createChildContext(b.a.d(d),c.as);k.$index=e;var g="function"==typeof a?
+a(d,k):a;return T(p,"ignoreTargetNode",g,k,c)}var k;return b.j(function(){var a=b.a.d(d)||[];"undefined"==typeof a.length&&(a=[a]);a=b.a.fa(a,function(a){return c.includeDestroyed||a===I||a===p||!b.a.d(a._destroy)});b.r.K(b.a.$a,p,[e,a,h,c,g])},p,{W:e})};b.c.template={init:function(a,d){var c=b.a.d(d());if("string"!=typeof c&&!c.name&&(1==a.nodeType||8==a.nodeType))c=1==a.nodeType?a.childNodes:b.e.childNodes(a),c=b.a.Hb(c),(new b.l.O(a)).nodes(c);return{controlsDescendantBindings:m}},update:function(a,
+d,c,e,f){d=b.a.d(d());c={};e=m;var g,h=p;"string"!=typeof d&&(c=d,d=c.name,"if"in c&&(e=b.a.d(c["if"])),e&&"ifnot"in c&&(e=!b.a.d(c.ifnot)),g=b.a.d(c.data));"foreach"in c?h=b.Mb(d||a,e&&c.foreach||[],c,a,f):e?(f="data"in c?f.createChildContext(g,c.as):f,h=b.va(d||a,f,c,a)):b.e.Y(a);f=h;(g=b.a.f.get(a,"__ko__templateComputedDomDataKey__"))&&"function"==typeof g.B&&g.B();b.a.f.set(a,"__ko__templateComputedDomDataKey__",f&&f.pa()?f:I)}};b.g.Q.template=function(a){a=b.g.aa(a);return 1==a.length&&a[0].unknown||
+b.g.Eb(a,"name")?p:"This template engine does not support anonymous templates nested within its templates"};b.e.I.template=m;b.b("setTemplateEngine",b.wa);b.b("renderTemplate",b.va);b.a.Ja=function(a,b,c){a=a||[];b=b||[];return a.length<=b.length?S(a,b,"added","deleted",c):S(b,a,"deleted","added",c)};b.b("utils.compareArrays",b.a.Ja);b.a.$a=function(a,d,c,e,f){function g(a,b){t=l[b];w!==b&&(z[a]=t);t.na(w++);M(t.M);s.push(t);A.push(t)}function h(a,c){if(a)for(var d=0,e=c.length;d<e;d++)c[d]&&b.a.o(c[d].M,
+function(b){a(b,d,c[d].U)})}d=d||[];e=e||{};var k=b.a.f.get(a,"setDomNodeChildrenFromArrayMapping_lastMappingResult")===I,l=b.a.f.get(a,"setDomNodeChildrenFromArrayMapping_lastMappingResult")||[],n=b.a.V(l,function(a){return a.U}),q=b.a.Ja(n,d),s=[],v=0,w=0,B=[],A=[];d=[];for(var z=[],n=[],t,D=0,C,E;C=q[D];D++)switch(E=C.moved,C.status){case "deleted":E===I&&(t=l[v],t.j&&t.j.B(),B.push.apply(B,M(t.M)),e.beforeRemove&&(d[D]=t,A.push(t)));v++;break;case "retained":g(D,v++);break;case "added":E!==I?
+g(D,E):(t={U:C.value,na:b.m(w++)},s.push(t),A.push(t),k||(n[D]=t))}h(e.beforeMove,z);b.a.o(B,e.beforeRemove?b.A:b.removeNode);for(var D=0,k=b.e.firstChild(a),H;t=A[D];D++){t.M||b.a.extend(t,ha(a,c,t.U,f,t.na));for(v=0;q=t.M[v];k=q.nextSibling,H=q,v++)q!==k&&b.e.Pa(a,q,H);!t.Ab&&f&&(f(t.U,t.M,t.na),t.Ab=m)}h(e.beforeRemove,d);h(e.afterMove,z);h(e.afterAdd,n);b.a.f.set(a,"setDomNodeChildrenFromArrayMapping_lastMappingResult",s)};b.b("utils.setDomNodeChildrenFromArrayMapping",b.a.$a);b.C=function(){this.allowTemplateRewriting=
+r};b.C.prototype=new b.v;b.C.prototype.renderTemplateSource=function(a){var d=!(9>b.a.Z)&&a.nodes?a.nodes():p;if(d)return b.a.L(d.cloneNode(m).childNodes);a=a.text();return b.a.ta(a)};b.C.oa=new b.C;b.wa(b.C.oa);b.b("nativeTemplateEngine",b.C);b.qa=function(){var a=this.Db=function(){if("undefined"==typeof F||!F.tmpl)return 0;try{if(0<=F.tmpl.tag.tmpl.open.toString().indexOf("__"))return 2}catch(a){}return 1}();this.renderTemplateSource=function(b,c,e){e=e||{};2>a&&j(Error("Your version of jQuery.tmpl is too old. Please upgrade to jQuery.tmpl 1.0.0pre or later."));
+var f=b.data("precompiled");f||(f=b.text()||"",f=F.template(p,"{{ko_with $item.koBindingContext}}"+f+"{{/ko_with}}"),b.data("precompiled",f));b=[c.$data];c=F.extend({koBindingContext:c},e.templateOptions);c=F.tmpl(f,b,c);c.appendTo(y.createElement("div"));F.fragments={};return c};this.createJavaScriptEvaluatorBlock=function(a){return"{{ko_code ((function() { return "+a+" })()) }}"};this.addTemplate=function(a,b){y.write("<script type='text/html' id='"+a+"'>"+b+"\x3c/script>")};0<a&&(F.tmpl.tag.ko_code=
+{open:"__.push($1 || '');"},F.tmpl.tag.ko_with={open:"with($1) {",close:"} "})};b.qa.prototype=new b.v;w=new b.qa;0<w.Db&&b.wa(w);b.b("jqueryTmplTemplateEngine",b.qa)}"function"===typeof require&&"object"===typeof exports&&"object"===typeof module?L(module.exports||exports):"function"===typeof define&&define.amd?define(["exports"],L):L(x.ko={});m;
+})();
diff --git a/view/theme/oldtest/style.css b/view/theme/oldtest/style.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/view/theme/oldtest/theme.php b/view/theme/oldtest/theme.php
new file mode 100644
index 000000000..1f1beab62
--- /dev/null
+++ b/view/theme/oldtest/theme.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Name: Test
+ * Description: Test theme
+ * 
+ */
+ 
+ require_once 'object/TemplateEngine.php';
+ 
+ 
+ function test_init(&$a){
+ 	#$a->theme_info = array();
+	$a->register_template_engine("JSONIficator");
+	$a->set_template_engine('jsonificator');
+ }
+
+
+ 
+ class JSONIficator implements ITemplateEngine {
+ 	static $name = 'jsonificator';
+	
+	public $data = array();
+	private $last_template;
+	
+	public function replace_macros($s,$v){
+		$dbg = debug_backtrace();
+		$cntx = $dbg[2]['function'];
+		if ($cntx=="") {
+			$cntx=basename($dbg[1]['file']);
+		}
+		if (!isset($this->data[$cntx])) {
+			$this->data[$cntx] = array();
+		}
+		$nv = array();
+		foreach ($v as $key => $value) {
+			$nkey = $key;
+			if ($key[0]==="$") $nkey = substr($key, 1);
+			$nv[$nkey] = $value;
+		}
+		$this->data[$cntx][] = $nv;
+	}
+	public function get_template_file($file, $root=''){
+		return  "";
+	}
+	
+ }
diff --git a/view/theme/quattro/templates/birthdays_reminder.tpl b/view/theme/quattro/templates/birthdays_reminder.tpl
new file mode 100644
index 000000000..f951fc97a
--- /dev/null
+++ b/view/theme/quattro/templates/birthdays_reminder.tpl
@@ -0,0 +1,6 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
diff --git a/view/theme/quattro/templates/comment_item.tpl b/view/theme/quattro/templates/comment_item.tpl
new file mode 100644
index 000000000..eca1f14f4
--- /dev/null
+++ b/view/theme/quattro/templates/comment_item.tpl
@@ -0,0 +1,68 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
+			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
+				<input type="hidden" name="type" value="{{$type}}" />
+				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+				<input type="hidden" name="parent" value="{{$parent}}" />
+				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
+				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
+				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
+					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+				</div>
+				<ul id="comment-edit-bb-{{$id}}"
+					class="comment-edit-bb">
+					<li><a class="editicon boldbb shadow"
+						style="cursor: pointer;" title="{{$edbold}}"
+						onclick="insertFormatting('{{$comment}}','b', {{$id}});"></a></li>
+					<li><a class="editicon italicbb shadow"
+						style="cursor: pointer;" title="{{$editalic}}"
+						onclick="insertFormatting('{{$comment}}','i', {{$id}});"></a></li>
+					<li><a class="editicon underlinebb shadow"
+						style="cursor: pointer;" title="{{$eduline}}"
+						onclick="insertFormatting('{{$comment}}','u', {{$id}});"></a></li>
+					<li><a class="editicon quotebb shadow"
+						style="cursor: pointer;" title="{{$edquote}}"
+						onclick="insertFormatting('{{$comment}}','quote', {{$id}});"></a></li>
+					<li><a class="editicon codebb shadow"
+						style="cursor: pointer;" title="{{$edcode}}"
+						onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
+					<li><a class="editicon imagebb shadow"
+						style="cursor: pointer;" title="{{$edimg}}"
+						onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
+					<li><a class="editicon urlbb shadow"
+						style="cursor: pointer;" title="{{$edurl}}"
+						onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
+					<li><a class="editicon videobb shadow"
+						style="cursor: pointer;" title="{{$edvideo}}"
+						onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
+				</ul>	
+				<textarea id="comment-edit-text-{{$id}}" 
+					class="comment-edit-text-empty" 
+					name="body" 
+					onFocus="commentOpen(this,{{$id}}) && cmtBbOpen({{$id}});" 
+					onBlur="commentClose(this,{{$id}}) && cmtBbClose({{$id}});" >{{$comment}}</textarea>
+				{{if $qcomment}}
+					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
+					<option value=""></option>
+				{{foreach $qcomment as $qc}}
+					<option value="{{$qc}}">{{$qc}}</option>				
+				{{/foreach}}
+					</select>
+				{{/if}}
+
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
+					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
+					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
+					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+			</form>
+
+		</div>
diff --git a/view/theme/quattro/templates/contact_template.tpl b/view/theme/quattro/templates/contact_template.tpl
new file mode 100644
index 000000000..c74a513b8
--- /dev/null
+++ b/view/theme/quattro/templates/contact_template.tpl
@@ -0,0 +1,37 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div class="contact-wrapper" id="contact-entry-wrapper-{{$id}}" >
+	<div class="contact-photo-wrapper" >
+		<div class="contact-photo mframe" id="contact-entry-photo-{{$contact.id}}"
+		onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}}); openMenu('contact-photo-menu-button-{{$contact.id}}')" 
+		onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$contact.id}}\'); closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)" >
+
+			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>
+
+			{{if $contact.photo_menu}}
+			<a href="#" rel="#contact-photo-menu-{{$contact.id}}" class="contact-photo-menu-button icon s16 menu" id="contact-photo-menu-button-{{$contact.id}}">menu</a>
+			<ul class="contact-photo-menu menu-popup" id="contact-photo-menu-{{$contact.id}}">
+				{{foreach $contact.photo_menu as $c}}
+				{{if $c.2}}
+				<li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+				{{else}}
+				<li><a href="{{$c.1}}">{{$c.0}}</a></li>
+				{{/if}}
+				{{/foreach}}
+			</ul>
+			{{/if}}
+		</div>
+			
+	</div>
+	<div class="contact-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div>
+	{{if $contact.alt_text}}<div class="contact-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
+	<div class="contact-details" id="contact-entry-url-{{$contact.id}}" >{{$contact.itemurl}}</div>
+	<div class="contact-details" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>
+
+
+</div>
+
diff --git a/view/theme/quattro/templates/conversation.tpl b/view/theme/quattro/templates/conversation.tpl
new file mode 100644
index 000000000..4e3553894
--- /dev/null
+++ b/view/theme/quattro/templates/conversation.tpl
@@ -0,0 +1,54 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$live_update}}
+
+{{foreach $threads as $thread}}
+<div id="tread-wrapper-{{$thread.id}}" class="tread-wrapper">
+	{{foreach $thread.items as $item}}
+        {{if $mode == display}}
+        {{else}}
+		{{if $item.comment_firstcollapsed}}
+			<div class="hide-comments-outer">
+			<span id="hide-comments-total-{{$thread.id}}" class="hide-comments-total">{{$thread.num_comments}}</span> <span id="hide-comments-{{$thread.id}}" class="hide-comments fakelink" onclick="showHideComments({{$thread.id}});">{{$thread.hide_text}}</span>
+			</div>
+			<div id="collapsed-comments-{{$thread.id}}" class="collapsed-comments" style="display: none;">
+		{{/if}}
+		{{if $item.comment_lastcollapsed}}</div>{{/if}}
+        {{/if}}
+        
+		{{if $item.type == tag}}
+			{{include file="wall_item_tag.tpl"}}
+		{{else}}
+			{{include file="{{$item.template}}"}}
+		{{/if}}
+		
+	{{/foreach}}
+</div>
+{{/foreach}}
+
+<div id="conversation-end"></div>
+
+{{if $dropping}}
+<a href="#" onclick="deleteCheckedItems();return false;">
+	<span class="icon s22 delete text">{{$dropping}}</span>
+</a>
+{{/if}}
+
+<script>
+// jquery color plugin from https://raw.github.com/gist/1891361/17747b50ad87f7a59a14b4e0f38d8f3fb6a18b27/gistfile1.js
+    (function(d){d.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor","borderTopColor","color","outlineColor"],function(f,e){d.fx.step[e]=function(g){if(!g.colorInit){g.start=c(g.elem,e);g.end=b(g.end);g.colorInit=true}g.elem.style[e]="rgb("+[Math.max(Math.min(parseInt((g.pos*(g.end[0]-g.start[0]))+g.start[0]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[1]-g.start[1]))+g.start[1]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[2]-g.start[2]))+g.start[2]),255),0)].join(",")+")"}});function b(f){var e;if(f&&f.constructor==Array&&f.length==3){return f}if(e=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(f)){return[parseInt(e[1]),parseInt(e[2]),parseInt(e[3])]}if(e=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(f)){return[parseFloat(e[1])*2.55,parseFloat(e[2])*2.55,parseFloat(e[3])*2.55]}if(e=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(f)){return[parseInt(e[1],16),parseInt(e[2],16),parseInt(e[3],16)]}if(e=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(f)){return[parseInt(e[1]+e[1],16),parseInt(e[2]+e[2],16),parseInt(e[3]+e[3],16)]}if(e=/rgba\(0, 0, 0, 0\)/.exec(f)){return a.transparent}return a[d.trim(f).toLowerCase()]}function c(g,e){var f;do{f=d.curCSS(g,e);if(f!=""&&f!="transparent"||d.nodeName(g,"body")){break}e="backgroundColor"}while(g=g.parentNode);return b(f)}var a={transparent:[255,255,255]}})(jQuery);
+    var colWhite = {backgroundColor:'#EFF0F1'};
+    var colShiny = {backgroundColor:'#FCE94F'};
+</script>
+
+{{if $mode == display}}
+<script>
+    var id = window.location.pathname.split("/").pop();
+    $(window).scrollTop($('#item-'+id).position().top);
+    $('#item-'+id).animate(colWhite, 1000).animate(colShiny).animate(colWhite, 2000);   
+</script>
+{{/if}}
+
diff --git a/view/theme/quattro/templates/events_reminder.tpl b/view/theme/quattro/templates/events_reminder.tpl
new file mode 100644
index 000000000..b188bd4a3
--- /dev/null
+++ b/view/theme/quattro/templates/events_reminder.tpl
@@ -0,0 +1,44 @@
+{{*
+ *	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>
+	// start calendar from yesterday
+	var yesterday= new Date()
+	yesterday.setDate(yesterday.getDate()-1)
+	
+	function showEvent(eventid) {
+		$.get(
+			'{{$baseurl}}/events/?id='+eventid,
+			function(data){
+				$.colorbox({html:data});
+			}
+		);			
+	}
+	$(document).ready(function() {
+		$('#events-reminder').fullCalendar({
+			firstDay: yesterday.getDay(),
+			year: yesterday.getFullYear(),
+			month: yesterday.getMonth(),
+			date: yesterday.getDate(),
+			events: '{{$baseurl}}/events/json/',
+			header: {
+				left: '',
+				center: '',
+				right: ''
+			},			
+			timeFormat: 'H(:mm)',
+			defaultView: 'basicWeek',
+			height: 50,
+			eventClick: function(calEvent, jsEvent, view) {
+				showEvent(calEvent.id);
+			}
+		});
+	});
+</script>
+<div id="events-reminder"></div>
+<br>
diff --git a/view/theme/quattro/templates/fileas_widget.tpl b/view/theme/quattro/templates/fileas_widget.tpl
new file mode 100644
index 000000000..555ac5feb
--- /dev/null
+++ b/view/theme/quattro/templates/fileas_widget.tpl
@@ -0,0 +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>
+	
+	<ul class="fileas-ul">
+		<li class="tool {{if $sel_all}}selected{{/if}}"><a href="{{$base}}" class="fileas-link fileas-all">{{$all}}</a></li>
+		{{foreach $terms as $term}}
+			<li class="tool {{if $term.selected}}selected{{/if}}"><a href="{{$base}}?f=&file={{$term.name}}" class="fileas-link">{{$term.name}}</a></li>
+		{{/foreach}}
+	</ul>
+	
+</div>
diff --git a/view/theme/quattro/templates/generic_links_widget.tpl b/view/theme/quattro/templates/generic_links_widget.tpl
new file mode 100644
index 000000000..802563255
--- /dev/null
+++ b/view/theme/quattro/templates/generic_links_widget.tpl
@@ -0,0 +1,16 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="widget">
+	{{if $title}}<h3>{{$title}}</h3>{{/if}}
+	{{if $desc}}<div class="desc">{{$desc}}</div>{{/if}}
+	
+	<ul>
+		{{foreach $items as $item}}
+			<li class="tool {{if $item.selected}}selected{{/if}}"><a href="{{$item.url}}" class="link">{{$item.label}}</a></li>
+		{{/foreach}}
+	</ul>
+	
+</div>
diff --git a/view/theme/quattro/templates/group_side.tpl b/view/theme/quattro/templates/group_side.tpl
new file mode 100644
index 000000000..b71f1f1e2
--- /dev/null
+++ b/view/theme/quattro/templates/group_side.tpl
@@ -0,0 +1,34 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id="group-sidebar" class="widget">
+	<div class="title tool">
+		<h3 class="label">{{$title}}</h3>
+		<a href="group/new" title="{{$createtext}}" class="action"><span class="icon text s16 add"> {{$add}}</span></a>
+	</div>
+
+	<div id="sidebar-group-list">
+		<ul>
+			{{foreach $groups as $group}}
+			<li class="tool  {{if $group.selected}}selected{{/if}}">
+				<a href="{{$group.href}}" class="label">
+					{{$group.text}}
+				</a>
+				{{if $group.edit}}
+					<a href="{{$group.edit.href}}" class="action"><span class="icon text s10 edit">{{$group.edit.title}}</span></a>
+				{{/if}}
+				{{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}}
+			</li>
+			{{/foreach}}
+		</ul>
+	</div>
+</div>	
+
diff --git a/view/theme/quattro/templates/jot.tpl b/view/theme/quattro/templates/jot.tpl
new file mode 100644
index 000000000..f9f36a37d
--- /dev/null
+++ b/view/theme/quattro/templates/jot.tpl
@@ -0,0 +1,61 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<form id="profile-jot-form" action="{{$action}}" method="post">
+	<div id="jot">
+		<div id="profile-jot-desc" class="jothidden">&nbsp;</div>
+		<input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" title="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none" />
+		{{if $placeholdercategory}}
+		<input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" title="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" />
+		{{/if}}
+		<div id="character-counter" class="grey jothidden"></div>
+		
+
+
+		<input type="hidden" name="type" value="{{$ptyp}}" />
+		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+		<input type="hidden" name="return" value="{{$return_path}}" />
+		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
+		<input type="hidden" name="coord" id="jot-coord" value="" />
+		<input type="hidden" name="post_id" value="{{$post_id}}" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+
+		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}</textarea>
+
+		<ul id="jot-tools" class="jothidden" style="display:none">
+			<li><a href="#" onclick="return false;" id="wall-image-upload" title="{{$upload}}">{{$shortupload}}</a></a></li>
+			<li><a href="#" onclick="return false;" id="wall-file-upload"  title="{{$attach}}">{{$shortattach}}</a></li>
+			<li><a id="profile-link"  ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="{{$weblink}}">{{$shortweblink}}</a></li>
+			<li><a id="profile-video" onclick="jotVideoURL();return false;" title="{{$video}}">{{$shortvideo}}</a></li>
+			<li><a id="profile-audio" onclick="jotAudioURL();return false;" title="{{$audio}}">{{$shortaudio}}</a></li>
+			<!-- TODO: waiting for a better placement 
+			<li><a id="profile-location" onclick="jotGetLocation();return false;" title="{{$setloc}}">{{$shortsetloc}}</a></li>
+			<li><a id="profile-nolocation" onclick="jotClearLocation();return false;" title="{{$noloc}}">{{$shortnoloc}}</a></li>
+			-->
+			<li><a id="jot-preview-link" onclick="preview_post(); return false;" title="{{$preview}}">{{$preview}}</a></li>
+			{{$jotplugins}}
+
+			<li class="perms"><a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon s22 {{$lockstate}} {{$bang}}"  title="{{$permset}}" ></a></li>
+			<li class="submit"><input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" /></li>
+			<li id="profile-rotator" class="loading" style="display: none"><img src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}"  /></li>
+		</ul>
+	</div>
+	
+	<div id="jot-preview-content" style="display:none;"></div>
+
+	<div style="display: none;">
+		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+			{{$acl}}
+			<hr style="clear:both"/>
+			<div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
+			<div id="profile-jot-email-end"></div>
+			{{$jotnets}}
+		</div>
+	</div>
+
+</form>
+
+{{if $content}}<script>initEditor();</script>{{/if}}
diff --git a/view/theme/quattro/templates/mail_conv.tpl b/view/theme/quattro/templates/mail_conv.tpl
new file mode 100644
index 000000000..3ddc8e99f
--- /dev/null
+++ b/view/theme/quattro/templates/mail_conv.tpl
@@ -0,0 +1,68 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="wall-item-container {{$item.indent}}">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper"
+				<a href="{{$mail.profile_url}}" target="redir" title="{{$mail.from_name}}" class="contact-photo-link" id="wall-item-photo-link-{{$mail.id}}">
+					<img src="{{$mail.from_photo}}" class="contact-photo{{$mail.sparkle}}" id="wall-item-photo-{{$mail.id}}" alt="{{$mail.from_name}}" />
+				</a>
+			</div>
+		</div>
+		<div class="wall-item-content">
+			{{$mail.body}}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="">
+		</div>
+		<div class="wall-item-actions">
+			<div class="wall-item-actions-author">
+				<a href="{{$mail.from_url}}" target="redir"
+                                class="wall-item-name-link"><span
+                                class="wall-item-name{{$mail.sparkle}}">{{$mail.from_name}}</span></a>
+                                <span class="wall-item-ago" title="{{$mail.date}}">{{$mail.ago}}</span>
+			</div>
+			
+			<div class="wall-item-actions-social">
+			</div>
+			
+			<div class="wall-item-actions-tools">
+				<a href="message/drop/{{$mail.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$mail.delete}}">{{$mail.delete}}</a>
+			</div>
+			
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+	</div>
+</div>
+
+
+{{*
+
+
+<div class="mail-conv-outside-wrapper">
+	<div class="mail-conv-sender" >
+		<a href="{{$mail.from_url}}" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo{{$mail.sparkle}}" src="{{$mail.from_photo}}" heigth="80" width="80" alt="{{$mail.from_name}}" /></a>
+	</div>
+	<div class="mail-conv-detail" >
+		<div class="mail-conv-sender-name" >{{$mail.from_name}}</div>
+		<div class="mail-conv-date">{{$mail.date}}</div>
+		<div class="mail-conv-subject">{{$mail.subject}}</div>
+		<div class="mail-conv-body">{{$mail.body}}</div>
+	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
+	<div class="mail-conv-outside-wrapper-end"></div>
+</div>
+</div>
+<hr class="mail-conv-break" />
+
+*}}
diff --git a/view/theme/quattro/templates/mail_display.tpl b/view/theme/quattro/templates/mail_display.tpl
new file mode 100644
index 000000000..dc1fbbc6f
--- /dev/null
+++ b/view/theme/quattro/templates/mail_display.tpl
@@ -0,0 +1,17 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id="mail-display-subject">
+	<span class="{{if $thread_seen}}seen{{else}}unseen{{/if}}">{{$thread_subject}}</span>
+	<a href="message/dropconv/{{$thread_id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="mail-delete icon s22 delete"></a>
+</div>
+
+{{foreach $mails as $mail}}
+	<div id="tread-wrapper-{{$mail_item.id}}" class="tread-wrapper">
+		{{include file="mail_conv.tpl"}}
+	</div>
+{{/foreach}}
+
+{{include file="prv_message.tpl"}}
diff --git a/view/theme/quattro/templates/mail_list.tpl b/view/theme/quattro/templates/mail_list.tpl
new file mode 100644
index 000000000..009066874
--- /dev/null
+++ b/view/theme/quattro/templates/mail_list.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="mail-list-wrapper">
+	<span class="mail-subject {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span>
+	<span class="mail-from">{{$from_name}}</span>
+	<span class="mail-date" title="{{$date}}">{{$ago}}</span>
+	<span class="mail-count">{{$count}}</span>
+	
+	<a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="mail-delete icon s22 delete"></a>
+</div>
diff --git a/view/theme/quattro/templates/message_side.tpl b/view/theme/quattro/templates/message_side.tpl
new file mode 100644
index 000000000..723b0b710
--- /dev/null
+++ b/view/theme/quattro/templates/message_side.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id="message-sidebar" class="widget">
+	<div id="message-new" class="{{if $new.sel}}selected{{/if}}"><a href="{{$new.url}}">{{$new.label}}</a> </div>
+	
+	<ul class="message-ul">
+		{{foreach $tabs as $t}}
+			<li class="tool {{if $t.sel}}selected{{/if}}"><a href="{{$t.url}}" class="message-link">{{$t.label}}</a></li>
+		{{/foreach}}
+	</ul>
+	
+</div>
diff --git a/view/theme/quattro/templates/nav.tpl b/view/theme/quattro/templates/nav.tpl
new file mode 100644
index 000000000..2118c1e34
--- /dev/null
+++ b/view/theme/quattro/templates/nav.tpl
@@ -0,0 +1,100 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<header>
+	{{* {{$langselector}} *}}
+
+	<div id="site-location">{{$sitelocation}}</div>
+	<div id="banner">{{$banner}}</div>
+</header>
+<nav>
+	<ul>
+		{{if $userinfo}}
+			<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="{{$sitelocation}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"></a>
+				<ul id="nav-user-menu" class="menu-popup">
+					{{foreach $nav.usermenu as $usermenu}}
+						<li><a class="{{$usermenu.2}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}">{{$usermenu.1}}</a></li>
+					{{/foreach}}
+					
+					{{if $nav.notifications}}<li><a class="{{$nav.notifications.2}}" href="{{$nav.notifications.0}}" title="{{$nav.notifications.3}}" >{{$nav.notifications.1}}</a></li>{{/if}}
+					{{if $nav.messages}}<li><a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.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}}	
+				</ul>
+			</li>
+		{{/if}}
+		
+		{{if $nav.community}}
+			<li id="nav-community-link" class="nav-menu {{$sel.community}}">
+				<a class="{{$nav.community.2}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
+			</li>
+		{{/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"></span>
+			</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"></span>
+			</li>
+		{{/if}}
+		
+		{{if $nav.notifications}}
+			<li  id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}"><span class="icon s22 notify">{{$nav.notifications.1}}</span></a>
+				<span id="notify-update" class="nav-notify"></span>
+				<ul id="nav-notifications-menu" class="menu-popup">
+					<!-- TODO: better icons! -->
+					<li id="nav-notifications-mark-all" class="toolbar"><a href="#" onclick="notifyMarkAll(); return false;" title="{{$nav.notifications.mark.1}}"><span class="icon s10 edit"></span></a></a><a href="{{$nav.notifications.all.0}}" title="{{$nav.notifications.all.1}}"><span class="icon s10 plugin"></span></a></li>
+					<li class="empty">{{$emptynotifications}}</li>
+				</ul>
+			</li>		
+		{{/if}}		
+		
+		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
+			<ul id="nav-site-menu" class="menu-popup">
+				{{if $nav.manage}}<li><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a></li>{{/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}}
+				{{if $nav.login}}<li><a class="{{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><li>{{/if}}
+			</ul>		
+		</li>
+		
+		{{if $nav.help}} 
+		<li id="nav-help-link" class="nav-menu {{$sel.help}}">
+			<a class="{{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a>
+		</li>
+		{{/if}}
+
+		<li id="nav-search-link" class="nav-menu {{$sel.search}}">
+			<a class="{{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a>
+		</li>
+		<li id="nav-directory-link" class="nav-menu {{$sel.directory}}">
+			<a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a>
+		</li>
+		
+		{{if $nav.apps}}
+			<li id="nav-apps-link" class="nav-menu {{$sel.apps}}">
+				<a class=" {{$nav.apps.2}}" href="#" rel="#nav-apps-menu" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a>
+				<ul id="nav-apps-menu" class="menu-popup">
+					{{foreach $apps as $ap}}
+					<li>{{$ap}}</li>
+					{{/foreach}}
+				</ul>
+			</li>
+		{{/if}}
+	</ul>
+
+</nav>
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li><a href="{0}"><img data-src="{1}">{2} <span class="notif-when">{3}</span></a></li>
+</ul>
+
+<div style="position: fixed; top: 3px; left: 5px; z-index:9999">{{$langselector}}</div>
diff --git a/view/theme/quattro/templates/nets.tpl b/view/theme/quattro/templates/nets.tpl
new file mode 100644
index 000000000..dfe133251
--- /dev/null
+++ b/view/theme/quattro/templates/nets.tpl
@@ -0,0 +1,17 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id="nets-sidebar" class="widget">
+	<h3>{{$title}}</h3>
+	<div id="nets-desc">{{$desc}}</div>
+	
+	<ul class="nets-ul">
+		<li class="tool {{if $sel_all}}selected{{/if}}"><a href="{{$base}}?nets=all" class="nets-link nets-all">{{$all}}</a>
+		{{foreach $nets as $net}}
+			<li class="tool {{if $net.selected}}selected{{/if}}"><a href="{{$base}}?f=&nets={{$net.ref}}" class="nets-link">{{$net.name}}</a></li>
+		{{/foreach}}
+	</ul>
+	
+</div>
diff --git a/view/theme/quattro/templates/photo_view.tpl b/view/theme/quattro/templates/photo_view.tpl
new file mode 100644
index 000000000..38b3b5216
--- /dev/null
+++ b/view/theme/quattro/templates/photo_view.tpl
@@ -0,0 +1,42 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id="live-display"></div>
+<h3 id="photo-album-title"><a href="{{$album.0}}">{{$album.1}}</a></h3>
+
+<div id="photo-edit-link-wrap">
+{{if $tools}}
+<a id="photo-edit-link" href="{{$tools.edit.0}}">{{$tools.edit.1}}</a>
+|
+<a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a>
+{{/if}}
+{{if $lock}} | <img src="images/lock_icon.gif" class="lockview" alt="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');" /> {{/if}}
+</div>
+
+<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}"><img src="{{$photo.src}}" /></a></div>
+{{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}">{{$prevlink.1}}</a></div>{{/if}}
+{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}">{{$nextlink.1}}</a></div>{{/if}}
+<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}}
+<div class="wall-item-comment-wrapper">
+    {{$comments}}
+</div>
+
+{{$paginate}}
+
diff --git a/view/theme/quattro/templates/profile_vcard.tpl b/view/theme/quattro/templates/profile_vcard.tpl
new file mode 100644
index 000000000..4b1ddb6e6
--- /dev/null
+++ b/view/theme/quattro/templates/profile_vcard.tpl
@@ -0,0 +1,73 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="vcard">
+
+	<div class="tool">
+		<div class="fn label">{{$profile.name}}</div>
+		{{if $profile.edit}}
+			<div class="action">
+			<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
+			<ul id="profiles-menu" class="menu-popup">
+				{{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>
+
+
+	{{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 $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/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}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
+
+	{{include file="diaspora_vcard.tpl"}}
+	
+	<div id="profile-extra-links">
+		<ul>
+			{{if $connect}}
+				<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
+			{{/if}}
+			{{if $wallmessage}}
+				<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
+			{{/if}}
+		</ul>
+	</div>
+</div>
+
+{{$contact_block}}
+
+
diff --git a/view/theme/quattro/templates/prv_message.tpl b/view/theme/quattro/templates/prv_message.tpl
new file mode 100644
index 000000000..26b14d6e0
--- /dev/null
+++ b/view/theme/quattro/templates/prv_message.tpl
@@ -0,0 +1,43 @@
+{{*
+ *	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="20" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
+
+
+<div id="prvmail-submit-wrapper" >
+	<input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" />
+	<div id="prvmail-upload-wrapper" >
+		<div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
+	</div> 
+	<div id="prvmail-link-wrapper" >
+		<div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
+	</div> 
+	<div id="prvmail-rotator-wrapper" >
+		<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+	</div> 
+</div>
+<div id="prvmail-end"></div>
+</form>
+</div>
diff --git a/view/theme/quattro/templates/saved_searches_aside.tpl b/view/theme/quattro/templates/saved_searches_aside.tpl
new file mode 100644
index 000000000..6ff59afae
--- /dev/null
+++ b/view/theme/quattro/templates/saved_searches_aside.tpl
@@ -0,0 +1,20 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div id="saved-search-list" class="widget">
+	<h3 class="title">{{$title}}</h3>
+
+	<ul id="saved-search-ul">
+		{{foreach $saved as $search}}
+			<li class="tool {{if $search.selected}}selected{{/if}}">
+					<a href="network/?f=&search={{$search.encodedterm}}" class="label" >{{$search.term}}</a>
+					<a href="network/?f=&remove=1&search={{$search.encodedterm}}" class="action icon s10 delete" title="{{$search.delete}}" onclick="return confirmDelete();"></a>
+			</li>
+		{{/foreach}}
+	</ul>
+	
+	{{$searchbox}}
+	
+</div>
diff --git a/view/theme/quattro/templates/search_item.tpl b/view/theme/quattro/templates/search_item.tpl
new file mode 100644
index 000000000..a5dafa643
--- /dev/null
+++ b/view/theme/quattro/templates/search_item.tpl
@@ -0,0 +1,98 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div class="wall-item-decor">
+	<span class="icon s22 star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred}}">{{$item.star.starred}}</span>
+	{{if $item.lock}}<span class="icon s22 lock fakelink" onclick="lockview(event,{{$item.id}});" title="{{$item.lock}}">{{$item.lock}}</span>{{/if}}	
+	<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+</div>
+
+<div class="wall-item-container {{$item.indent}}">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper"
+				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
+				onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+					<img src="{{$item.thumb}}" class="contact-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
+				</a>
+				<a href="#" rel="#wall-item-photo-menu-{{$item.id}}" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-{{$item.id}}">menu</a>
+				<ul class="wall-item-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
+				{{$item.item_photo_menu}}
+				</ul>
+				
+			</div>
+			<div class="wall-item-location">{{$item.location}}</div>	
+		</div>
+		<div class="wall-item-content">
+			{{if $item.title}}<h2><a href="{{$item.plink.href}}">{{$item.title}}</a></h2>{{/if}}
+			{{$item.body}}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+			{{foreach $item.tags as $tag}}
+				<span class='tag'>{{$tag}}</span>
+			{{/foreach}}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="">
+			{{if $item.plink}}<a class="icon s16 link" title="{{$item.plink.title}}" href="{{$item.plink.href}}">{{$item.plink.title}}</a>{{/if}}
+		</div>
+		<div class="wall-item-actions">
+			<div class="wall-item-actions-author">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a> <span class="wall-item-ago" title="{{$item.localtime}}">{{$item.ago}}</span>
+			</div>
+			
+			<div class="wall-item-actions-social">
+			{{if $item.star}}
+				<a href="#" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classdo}}"  title="{{$item.star.do}}">{{$item.star.do}}</a>
+				<a href="#" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classundo}}"  title="{{$item.star.undo}}">{{$item.star.undo}}</a>
+				<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="{{$item.star.classtagger}}" title="{{$item.star.tagger}}">{{$item.star.tagger}}</a>
+			{{/if}}
+			
+			{{if $item.vote}}
+				<a href="#" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false">{{$item.vote.like.1}}</a>
+				<a href="#" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false">{{$item.vote.dislike.1}}</a>
+			{{/if}}
+						
+			{{if $item.vote.share}}
+				<a href="#" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false">{{$item.vote.share.1}}</a>
+			{{/if}}			
+			</div>
+			
+			<div class="wall-item-actions-tools">
+
+				{{if $item.drop.pagedrop}}
+					<input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
+				{{/if}}
+				{{if $item.drop.dropping}}
+					<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$item.drop.delete}}">{{$item.drop.delete}}</a>
+				{{/if}}
+				{{if $item.edpost}}
+					<a class="icon edit s16" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
+				{{/if}}
+			</div>
+			
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links"></div>
+		<div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
+		<div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
+		{{if $item.conv}}
+		<div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
+			<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
+		{{/if}}
+		</div>
+	</div>
+	
+	
+</div>
+
diff --git a/view/theme/quattro/templates/theme_settings.tpl b/view/theme/quattro/templates/theme_settings.tpl
new file mode 100644
index 000000000..5df1e99ed
--- /dev/null
+++ b/view/theme/quattro/templates/theme_settings.tpl
@@ -0,0 +1,37 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+ <script src="{{$baseurl}}/view/theme/quattro/jquery.tools.min.js"></script>
+ 
+{{include file="field_select.tpl" field=$color}}
+
+{{include file="field_select.tpl" field=$align}}
+
+
+<div class="field">
+    <label for="id_{{$pfs.0}}">{{$pfs.1}}</label>
+    <input type="range" class="inputRange" id="id_{{$pfs.0}}" name="{{$pfs.0}}" value="{{$pfs.2}}" min="10" max="22" step="1"  />
+    <span class="field_help"></span>
+</div>
+
+
+<div class="field">
+    <label for="id_{{$tfs.0}}">{{$tfs.1}}</label>
+    <input type="range" class="inputRange" id="id_{{$tfs.0}}" name="{{$tfs.0}}" value="{{$tfs.2}}" min="10" max="22" step="1"  />
+    <span class="field_help"></span>
+</div>
+
+
+
+
+
+<div class="settings-submit-wrapper">
+	<input type="submit" value="{{$submit}}" class="settings-submit" name="quattro-settings-submit" />
+</div>
+
+<script>
+    
+    $(".inputRange").rangeinput();
+</script>
diff --git a/view/theme/quattro/templates/threaded_conversation.tpl b/view/theme/quattro/templates/threaded_conversation.tpl
new file mode 100644
index 000000000..dc3e918f6
--- /dev/null
+++ b/view/theme/quattro/templates/threaded_conversation.tpl
@@ -0,0 +1,45 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$live_update}}
+
+{{foreach $threads as $thread}}
+
+<div id="tread-wrapper-{{$thread.id}}" class="tread-wrapper {{if $thread.threaded}}threaded{{/if}}  {{$thread.toplevel}}">
+       
+       
+		{{if $thread.type == tag}}
+			{{include file="wall_item_tag.tpl" item=$thread}}
+		{{else}}
+			{{include file="{{$thread.template}}" item=$thread}}
+		{{/if}}
+		
+</div>
+{{/foreach}}
+
+<div id="conversation-end"></div>
+
+{{if $dropping}}
+<a id="item-delete-selected" href="#" onclick="deleteCheckedItems();return false;">
+	<span class="icon s22 delete text">{{$dropping}}</span>
+</a>
+<img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
+{{/if}}
+
+<script>
+// jquery color plugin from https://raw.github.com/gist/1891361/17747b50ad87f7a59a14b4e0f38d8f3fb6a18b27/gistfile1.js
+    (function(d){d.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor","borderTopColor","color","outlineColor"],function(f,e){d.fx.step[e]=function(g){if(!g.colorInit){g.start=c(g.elem,e);g.end=b(g.end);g.colorInit=true}g.elem.style[e]="rgb("+[Math.max(Math.min(parseInt((g.pos*(g.end[0]-g.start[0]))+g.start[0]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[1]-g.start[1]))+g.start[1]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[2]-g.start[2]))+g.start[2]),255),0)].join(",")+")"}});function b(f){var e;if(f&&f.constructor==Array&&f.length==3){return f}if(e=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(f)){return[parseInt(e[1]),parseInt(e[2]),parseInt(e[3])]}if(e=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(f)){return[parseFloat(e[1])*2.55,parseFloat(e[2])*2.55,parseFloat(e[3])*2.55]}if(e=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(f)){return[parseInt(e[1],16),parseInt(e[2],16),parseInt(e[3],16)]}if(e=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(f)){return[parseInt(e[1]+e[1],16),parseInt(e[2]+e[2],16),parseInt(e[3]+e[3],16)]}if(e=/rgba\(0, 0, 0, 0\)/.exec(f)){return a.transparent}return a[d.trim(f).toLowerCase()]}function c(g,e){var f;do{f=d.curCSS(g,e);if(f!=""&&f!="transparent"||d.nodeName(g,"body")){break}e="backgroundColor"}while(g=g.parentNode);return b(f)}var a={transparent:[255,255,255]}})(jQuery);
+    var colWhite = {backgroundColor:'#EFF0F1'};
+    var colShiny = {backgroundColor:'#FCE94F'};
+</script>
+
+{{if $mode == display}}
+<script>
+    var id = window.location.pathname.split("/").pop();
+    $(window).scrollTop($('#item-'+id).position().top);
+    $('#item-'+id).animate(colWhite, 1000).animate(colShiny).animate(colWhite, 2000);   
+</script>
+{{/if}}
+
diff --git a/view/theme/quattro/templates/wall_item_tag.tpl b/view/theme/quattro/templates/wall_item_tag.tpl
new file mode 100644
index 000000000..1e658883c
--- /dev/null
+++ b/view/theme/quattro/templates/wall_item_tag.tpl
@@ -0,0 +1,72 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{if $mode == display}}
+{{else}}
+{{if $item.comment_firstcollapsed}}
+	<div class="hide-comments-outer">
+		<span id="hide-comments-total-{{$item.id}}" 
+			class="hide-comments-total">{{$item.num_comments}}</span>
+			<span id="hide-comments-{{$item.id}}" 
+				class="hide-comments fakelink" 
+				onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
+			{{if $item.thread_level==3}} - 
+			<span id="hide-thread-{{$item}}-id"
+				class="fakelink"
+				onclick="showThread({{$item.id}});">expand</span> /
+			<span id="hide-thread-{{$item}}-id"
+				class="fakelink"
+				onclick="hideThread({{$item.id}});">collapse</span> thread{{/if}}
+	</div>
+	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
+{{/if}}
+{{/if}}
+
+{{if $item.thread_level!=1}}<div class="children">{{/if}}
+
+
+<div class="wall-item-container item-tag {{$item.indent}} {{$item.shiny}}">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="contact-photo-link" id="wall-item-photo-link-{{$item.id}}">
+					<img src="{{$item.thumb}}" class="contact-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
+				</a>
+				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
+				{{$item.item_photo_menu}}
+				</ul>
+				
+			</div>
+			<div class="wall-item-location">{{$item.location}}</div>	
+		</div>
+		<div class="wall-item-content">
+			{{$item.ago}} {{$item.body}} 
+		</div>
+			<div class="wall-item-tools">
+				{{if $item.drop.pagedrop}}
+					<input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
+				{{/if}}
+				{{if $item.drop.dropping}}
+					<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$item.drop.delete}}">{{$item.drop.delete}}</a>
+				{{/if}}
+			</div>
+	</div>
+</div>
+
+{{if $item.thread_level!=1}}</div>{{/if}}
+
+{{if $mode == display}}
+{{else}}
+{{if $item.comment_lastcollapsed}}</div>{{/if}}
+{{/if}}
+
+{{* top thread comment box *}}
+{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
+<div class="wall-item-comment-wrapper" >{{$item.comment}}</div>
+{{/if}}{{/if}}{{/if}}
+
+{{if $item.flatten}}
+<div class="wall-item-comment-wrapper" >{{$item.comment}}</div>
+{{/if}}
diff --git a/view/theme/quattro/templates/wall_thread.tpl b/view/theme/quattro/templates/wall_thread.tpl
new file mode 100644
index 000000000..805ddfaaa
--- /dev/null
+++ b/view/theme/quattro/templates/wall_thread.tpl
@@ -0,0 +1,177 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{if $mode == display}}
+{{else}}
+{{if $item.comment_firstcollapsed}}
+	<div class="hide-comments-outer">
+		<span id="hide-comments-total-{{$item.id}}" 
+			class="hide-comments-total">{{$item.num_comments}}</span>
+			<span id="hide-comments-{{$item.id}}" 
+				class="hide-comments fakelink" 
+				onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
+			{{if $item.thread_level==3}} - 
+			<span id="hide-thread-{{$item}}-id"
+				class="fakelink"
+				onclick="showThread({{$item.id}});">expand</span> /
+			<span id="hide-thread-{{$item}}-id"
+				class="fakelink"
+				onclick="hideThread({{$item.id}});">collapse</span> thread{{/if}}
+	</div>
+	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
+{{/if}}
+{{/if}}
+
+{{if $item.thread_level!=1}}<div class="children">{{/if}}
+
+<div class="wall-item-decor">
+	<span class="icon s22 star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred}}">{{$item.star.starred}}</span>
+	{{if $item.lock}}<span class="icon s22 lock fakelink" onclick="lockview(event,{{$item.id}});" title="{{$item.lock}}">{{$item.lock}}</span>{{/if}}	
+	<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+</div>
+
+<div class="wall-item-container {{$item.indent}} {{$item.shiny}}" id="item-{{$item.id}}">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}"
+				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
+				onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="contact-photo-link" id="wall-item-photo-link-{{$item.id}}">
+					<img src="{{$item.thumb}}" class="contact-photo {{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
+				</a>
+				<a href="#" rel="#wall-item-photo-menu-{{$item.id}}" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-{{$item.id}}">menu</a>
+				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
+				{{$item.item_photo_menu}}
+				</ul>
+				
+			</div>	
+			{{if $item.owner_url}}
+			<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
+				<a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="contact-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
+					<img src="{{$item.owner_photo}}" class="contact-photo {{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" alt="{{$item.owner_name}}" />
+				</a>
+			</div>
+			{{/if}}			
+			<div class="wall-item-location">{{$item.location}}</div>	
+		</div>
+		<div class="wall-item-content">
+			{{if $item.title}}<h2><a href="{{$item.plink.href}}" class="{{$item.sparkle}}">{{$item.title}}</a></h2>{{/if}}
+			{{$item.body}}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+			{{foreach $item.hashtags as $tag}}
+				<span class='tag'>{{$tag}}</span>
+			{{/foreach}}
+  			{{foreach $item.mentions as $tag}}
+				<span class='mention'>{{$tag}}</span>
+			{{/foreach}}
+               {{foreach $item.folders as $cat}}
+                    <span class='folder'>{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
+               {{/foreach}}
+                {{foreach $item.categories as $cat}}
+                    <span class='category'>{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
+                {{/foreach}}
+		</div>
+	</div>	
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+			{{if $item.plink}}<a class="icon s16 link{{$item.sparkle}}" title="{{$item.plink.title}}" href="{{$item.plink.href}}">{{$item.plink.title}}</a>{{/if}}
+		</div>
+		<div class="wall-item-actions">
+			<div class="wall-item-actions-author">
+				<a href="{{$item.profile_url}}" target="redir"
+                                title="{{$item.linktitle}}"
+                                class="wall-item-name-link"><span
+                                class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a>
+                                <span class="wall-item-ago" title="{{$item.localtime}}">{{$item.ago}}</span>
+				 {{if $item.owner_url}}<br/>{{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}
+				 {{/if}}
+			</div>
+			
+			<div class="wall-item-actions-social">
+			{{if $item.star}}
+				<a href="#" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classdo}}"  title="{{$item.star.do}}">{{$item.star.do}}</a>
+				<a href="#" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classundo}}"  title="{{$item.star.undo}}">{{$item.star.undo}}</a>
+			{{/if}}
+			{{if $item.tagger}}
+				<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="{{$item.tagger.class}}" title="{{$item.tagger.add}}">{{$item.tagger.add}}</a>
+			{{/if}}
+			{{if $item.filer}}
+                                <a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}">{{$item.filer}}</a>
+			{{/if}}			
+			
+			{{if $item.vote}}
+				<a href="#" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false">{{$item.vote.like.1}}</a>
+				{{if $item.vote.dislike}}
+				<a href="#" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false">{{$item.vote.dislike.1}}</a>
+				{{/if}}
+			{{/if}}
+						
+			{{if $item.vote.share}}
+				<a href="#" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false">{{$item.vote.share.1}}</a>
+			{{/if}}			
+			</div>
+			
+			<div class="wall-item-actions-tools">
+
+				{{if $item.drop.pagedrop}}
+					<input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
+				{{/if}}
+				{{if $item.drop.dropping}}
+					<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$item.drop.delete}}">{{$item.drop.delete}}</a>
+				{{/if}}
+				{{if $item.edpost}}
+					<a class="icon edit s16" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
+				{{/if}}
+			</div>
+			
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links"></div>
+		<div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
+		<div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>	
+	</div>
+	
+	{{if $item.threaded}}{{if $item.comment}}{{if $item.indent==comment}}
+	<div class="wall-item-bottom commentbox">
+		<div class="wall-item-links"></div>
+		<div class="wall-item-comment-wrapper">
+					{{$item.comment}}
+		</div>
+	</div>
+	{{/if}}{{/if}}{{/if}}
+</div>
+
+
+{{foreach $item.children as $child}}
+	{{if $child.type == tag}}
+		{{include file="wall_item_tag.tpl" item=$child}}
+	{{else}}
+		{{include file="{{$item.template}}" item=$child}}
+	{{/if}}
+{{/foreach}}
+
+{{if $item.thread_level!=1}}</div>{{/if}}
+
+
+{{if $mode == display}}
+{{else}}
+{{if $item.comment_lastcollapsed}}</div>{{/if}}
+{{/if}}
+
+{{* top thread comment box *}}
+{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
+<div class="wall-item-comment-wrapper" >{{$item.comment}}</div>
+{{/if}}{{/if}}{{/if}}
+
+
+{{if $item.flatten}}
+<div class="wall-item-comment-wrapper" >{{$item.comment}}</div>
+{{/if}}
diff --git a/view/theme/slackr/templates/birthdays_reminder.tpl b/view/theme/slackr/templates/birthdays_reminder.tpl
new file mode 100644
index 000000000..8af03b33a
--- /dev/null
+++ b/view/theme/slackr/templates/birthdays_reminder.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{if $classtoday}}
+<script>
+	$(document).ready(function() {{$lbr}}
+		$('#events-reminder').addClass($.trim('{{$classtoday}}'));
+	{{$rbr}});
+</script>
+{{/if}}
+
diff --git a/view/theme/slackr/templates/events_reminder.tpl b/view/theme/slackr/templates/events_reminder.tpl
new file mode 100644
index 000000000..0f699a302
--- /dev/null
+++ b/view/theme/slackr/templates/events_reminder.tpl
@@ -0,0 +1,44 @@
+{{*
+ *	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>
+	// start calendar from yesterday
+	var yesterday= new Date()
+	yesterday.setDate(yesterday.getDate()-1)
+	
+	function showEvent(eventid) {
+		$.get(
+			'{{$baseurl}}/events/?id='+eventid,
+			function(data){
+				$.colorbox({html:data});
+			}
+		);			
+	}
+	$(document).ready(function() {
+		$('#events-reminder').fullCalendar({
+			firstDay: yesterday.getDay(),
+			year: yesterday.getFullYear(),
+			month: yesterday.getMonth(),
+			date: yesterday.getDate(),
+			events: '{{$baseurl}}/events/json/',
+			header: {
+				left: '',
+				center: '',
+				right: ''
+			},			
+			timeFormat: 'HH(:mm)',
+			defaultView: 'basicWeek',
+			height: 50,
+			eventClick: function(calEvent, jsEvent, view) {
+				showEvent(calEvent.id);
+			}
+		});
+	});
+</script>
+<div id="events-reminder" class="{{$classtoday}}"></div>
+<br>
diff --git a/view/theme/smoothly/templates/bottom.tpl b/view/theme/smoothly/templates/bottom.tpl
new file mode 100644
index 000000000..0c6aa2904
--- /dev/null
+++ b/view/theme/smoothly/templates/bottom.tpl
@@ -0,0 +1,57 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<script type="text/javascript" src="{{$baseurl}}/view/theme/smoothly/js/jquery.autogrow.textarea.js"></script>
+<script type="text/javascript">
+$(document).ready(function() {
+
+});
+function tautogrow(id) {
+$("textarea#comment-edit-text-" + id).autogrow();
+};
+
+function insertFormatting(comment, BBcode, id) {
+var tmpStr = $("#comment-edit-text-" + id).val();
+if(tmpStr == comment) {
+tmpStr = "";
+$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+openMenu("comment-edit-submit-wrapper-" + id);
+}
+textarea = document.getElementById("comment-edit-text-" + id);
+if (document.selection) {
+textarea.focus();
+selected = document.selection.createRange();
+if (BBcode == "url") {
+selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]";
+} else {
+selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+}
+} else if (textarea.selectionStart || textarea.selectionStart == "0") {
+var start = textarea.selectionStart;
+var end = textarea.selectionEnd;
+if (BBcode == "url") {
+textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]"
++ "http://" + textarea.value.substring(start, end)
++ "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+} else {
+textarea.value = textarea.value.substring(0, start)
++ "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]"
++ textarea.value.substring(end, textarea.value.length);
+}
+}
+return true;
+}
+
+function cmtBbOpen(id) {
+$(".comment-edit-bb-" + id).show();
+}
+function cmtBbClose(id) {
+    $(".comment-edit-bb-" + id).hide();
+}
+
+
+
+</script>
diff --git a/view/theme/smoothly/templates/follow.tpl b/view/theme/smoothly/templates/follow.tpl
new file mode 100644
index 000000000..4d9e2a62b
--- /dev/null
+++ b/view/theme/smoothly/templates/follow.tpl
@@ -0,0 +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>
+	<form action="follow" method="post" >
+		<input id="side-follow-url" type="text-sidebar" name="url" size="24" title="{{$hint}}" /><input id="side-follow-submit" type="submit" name="submit" value="{{$follow}}" />
+	</form>
+</div>
+
diff --git a/view/theme/smoothly/templates/jot-header.tpl b/view/theme/smoothly/templates/jot-header.tpl
new file mode 100644
index 000000000..0560969a6
--- /dev/null
+++ b/view/theme/smoothly/templates/jot-header.tpl
@@ -0,0 +1,379 @@
+{{*
+ *	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");
+            		$(".jothidden").show();
+            		editor = true;
+            		$("a#jot-perms-icon").colorbox({
+						'inline' : true,
+						'transition' : 'elastic'
+            		});
+	                            $("#profile-jot-submit-wrapper").show();
+								{{if $newpost}}
+    	                            $("#profile-upload-wrapper").show();
+        	                        $("#profile-attach-wrapper").show();
+            	                    $("#profile-link-wrapper").show();
+                	                $("#profile-video-wrapper").show();
+                    	            $("#profile-audio-wrapper").show();
+                        	        $("#profile-location-wrapper").show();
+                            	    $("#profile-nolocation-wrapper").show();
+                                	$("#profile-title-wrapper").show();
+	                                $("#profile-jot-plugin-wrapper").show();
+	                                $("#jot-preview-link").show();
+								{{/if}}   
+
+
+			if (typeof cb!="undefined") cb();
+			return;
+        }
+        tinyMCE.init({
+                theme : "advanced",
+                mode : "specific_textareas",
+                editor_selector: /(profile-jot-text|prvmail-text)/,
+                plugins : "bbcode,paste,fullscreen,autoresize",
+                theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen",
+                theme_advanced_buttons2 : "",
+                theme_advanced_buttons3 : "",
+                theme_advanced_toolbar_location : "top",
+                theme_advanced_toolbar_align : "center",
+                theme_advanced_blockformats : "blockquote,code",
+                //theme_advanced_resizing : true,
+                //theme_advanced_statusbar_location : "bottom",
+                paste_text_sticky : true,
+                entity_encoding : "raw",
+                add_unload_trigger : false,
+                remove_linebreaks : false,
+                //force_p_newlines : false,
+                //force_br_newlines : true,
+                forced_root_block : 'div',
+                convert_urls: false,
+                content_css: "{{$baseurl}}/view/custom_tinymce.css",
+                theme_advanced_path : false,
+                setup : function(ed) {
+					cPopup = null;
+					ed.onKeyDown.add(function(ed,e) {
+						if(cPopup !== null)
+							cPopup.onkey(e);
+					});
+
+
+
+					ed.onKeyUp.add(function(ed, e) {
+						var txt = tinyMCE.activeEditor.getContent();
+						match = txt.match(/@([^ \n]+)$/);
+						if(match!==null) {
+							if(cPopup === null) {
+								cPopup = new ACPopup(this,baseurl+"/acl");
+							}
+							if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
+							if(! cPopup.ready) cPopup = null;
+						}
+						else {
+							if(cPopup !== null) { cPopup.close(); cPopup = null; }
+						}
+
+						textlen = txt.length;
+						if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
+							$('#profile-jot-desc').html(ispublic);
+						}
+                        else {
+                            $('#profile-jot-desc').html('&nbsp;');
+                        }
+
+				//Character count
+
+                                if(textlen <= 140) {
+                                        $('#character-counter').removeClass('red');
+                                        $('#character-counter').removeClass('orange');
+                                        $('#character-counter').addClass('grey');
+                                }
+                                if((textlen > 140) && (textlen <= 420)) {
+                                        $('#character-counter').removeClass('grey');
+                                        $('#character-counter').removeClass('red');
+                                        $('#character-counter').addClass('orange');
+                                }
+                                if(textlen > 420) {
+                                        $('#character-counter').removeClass('grey');
+                                        $('#character-counter').removeClass('orange');
+                                        $('#character-counter').addClass('red');
+                                }
+                                $('#character-counter').text(textlen);
+                        });
+                        ed.onInit.add(function(ed) {
+                                ed.pasteAsPlainText = true;
+								$("#profile-jot-text-loading").hide();
+								$(".jothidden").show();
+	                            $("#profile-jot-submit-wrapper").show();
+								{{if $newpost}}
+    	                            $("#profile-upload-wrapper").show();
+        	                        $("#profile-attach-wrapper").show();
+            	                    $("#profile-link-wrapper").show();
+                	                $("#profile-video-wrapper").show();
+                    	            $("#profile-audio-wrapper").show();
+                        	        $("#profile-location-wrapper").show();
+                            	    $("#profile-nolocation-wrapper").show();
+                                	$("#profile-title-wrapper").show();
+	                                $("#profile-jot-plugin-wrapper").show();
+	                                $("#jot-preview-link").show();
+								{{/if}}   
+                             $("#character-counter").show();
+                                if (typeof cb!="undefined") cb();
+                        });
+                }
+        });
+        editor = true;
+        // setup acl popup
+        $("a#jot-perms-icon").colorbox({
+			'inline' : true,
+			'transition' : 'elastic'
+        }); 
+    } else {
+        if (typeof cb!="undefined") cb();
+    }
+} // initEditor
+
+function enableOnUser(){
+	if (editor) return;
+	$(this).val("");
+	initEditor();
+}
+
+</script>
+
+<script type="text/javascript" src="js/ajaxupload.js" >
+</script>
+
+<script>
+	var ispublic = '{{$ispublic}}';
+
+	$(document).ready(function() {
+		
+		/* enable tinymce on focus and click */
+		$("#profile-jot-text").focus(enableOnUser);
+		$("#profile-jot-text").click(enableOnUser);
+
+		var uploader = new window.AjaxUpload(
+			'wall-image-upload',
+			{ action: 'wall_upload/{{$nickname}}',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					addeditortext(response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);
+
+		var file_uploader = new window.AjaxUpload(
+			'wall-file-upload',
+			{ action: 'wall_attach/{{$nickname}}',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					addeditortext(response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);		
+		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
+			var selstr;
+			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
+				selstr = $(this).text();
+				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
+				$('#jot-public').hide();
+				$('.profile-jot-net input').attr('disabled', 'disabled');
+			});
+			if(selstr == null) { 
+				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
+				$('#jot-public').show();
+				$('.profile-jot-net input').attr('disabled', false);
+			}
+
+		}).trigger('change');
+
+	});
+
+	function deleteCheckedItems() {
+		if(confirm('{{$delitems}}')) {
+			var checkedstr = '';
+
+			$("#item-delete-selected").hide();
+			$('#item-delete-selected-rotator').show();
+
+			$('.item-select').each( function() {
+				if($(this).is(':checked')) {
+					if(checkedstr.length != 0) {
+						checkedstr = checkedstr + ',' + $(this).val();
+					}
+					else {
+						checkedstr = $(this).val();
+					}
+				}	
+			});
+			$.post('item', { dropitems: checkedstr }, function(data) {
+				window.location.reload();
+			});
+		}
+	}
+
+	function jotGetLink() {
+		reply = prompt("{{$linkurl}}");
+		if(reply && reply.length) {
+			reply = bin2hex(reply);
+			$('#profile-rotator').show();
+			$.get('parse_url?binurl=' + reply, function(data) {
+				addeditortext(data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+	function jotVideoURL() {
+		reply = prompt("{{$vidurl}}");
+		if(reply && reply.length) {
+			addeditortext('[video]' + reply + '[/video]');
+		}
+	}
+
+	function jotAudioURL() {
+		reply = prompt("{{$audurl}}");
+		if(reply && reply.length) {
+			addeditortext('[audio]' + reply + '[/audio]');
+		}
+	}
+
+
+	function jotGetLocation() {
+		reply = prompt("{{$whereareu}}", $('#jot-location').val());
+		if(reply && reply.length) {
+			$('#jot-location').val(reply);
+		}
+	}
+
+	function jotTitle() {
+		reply = prompt("{{$title}}", $('#jot-title').val());
+		if(reply && reply.length) {
+			$('#jot-title').val(reply);
+		}
+	}
+
+	function jotShare(id) {
+		$('#like-rotator-' + id).show();
+		$.get('share/' + id, function(data) {
+				if (!editor) $("#profile-jot-text").val("");
+				initEditor(function(){
+					addeditortext(data);
+					$('#like-rotator-' + id).hide();
+					$(window).scrollTop(0);
+				});
+		});
+	}
+
+	function linkdropper(event) {
+		var linkFound = event.dataTransfer.types.contains("text/uri-list");
+		if(linkFound)
+			event.preventDefault();
+	}
+
+	function linkdrop(event) {
+		var reply = event.dataTransfer.getData("text/uri-list");
+		event.target.textContent = reply;
+		event.preventDefault();
+		if(reply && reply.length) {
+			reply = bin2hex(reply);
+			$('#profile-rotator').show();
+			$.get('parse_url?binurl=' + reply, function(data) {
+				if (!editor) $("#profile-jot-text").val("");
+				initEditor(function(){
+					addeditortext(data);
+					$('#profile-rotator').hide();
+				});
+			});
+		}
+	}
+
+	function itemTag(id) {
+		reply = prompt("{{$term}}");
+		if(reply && reply.length) {
+			reply = reply.replace('#','');
+			if(reply.length) {
+
+				commentBusy = true;
+				$('body').css('cursor', 'wait');
+
+				$.get('tagger/' + id + '?term=' + reply);
+				if(timer) clearTimeout(timer);
+				timer = setTimeout(NavUpdate,3000);
+				liking = 1;
+			}
+		}
+	}
+	
+	function itemFiler(id) {
+		
+		var bordercolor = $("input").css("border-color");
+		
+		$.get('filer/', function(data){
+			$.colorbox({html:data});
+			$("#id_term").keypress(function(){
+				$(this).css("border-color",bordercolor);
+			})
+			$("#select_term").change(function(){
+				$("#id_term").css("border-color",bordercolor);
+			})
+			
+			$("#filer_save").click(function(e){
+				e.preventDefault();
+				reply = $("#id_term").val();
+				if(reply && reply.length) {
+					commentBusy = true;
+					$('body').css('cursor', 'wait');
+					$.get('filer/' + id + '?term=' + reply, NavUpdate);
+//					if(timer) clearTimeout(timer);
+//					timer = setTimeout(NavUpdate,3000);
+					liking = 1;
+					$.colorbox.close();
+				} else {
+					$("#id_term").css("border-color","#FF0000");
+				}
+				return false;
+			});
+		});
+		
+	}
+
+	
+
+	function jotClearLocation() {
+		$('#jot-coord').val('');
+		$('#profile-nolocation-wrapper').hide();
+	}
+
+  function addeditortext(data) {
+        if(plaintext == 'none') {
+            var currentText = $("#profile-jot-text").val();
+            $("#profile-jot-text").val(currentText + data);
+        }
+        else
+            tinyMCE.execCommand('mceInsertRawHTML',false,data);
+    }
+
+
+	{{$geotag}}
+
+</script>
diff --git a/view/theme/smoothly/templates/jot.tpl b/view/theme/smoothly/templates/jot.tpl
new file mode 100644
index 000000000..0fd09c196
--- /dev/null
+++ b/view/theme/smoothly/templates/jot.tpl
@@ -0,0 +1,89 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div id="profile-jot-wrapper" > 
+	<div id="profile-jot-banner-wrapper">
+		<div id="profile-jot-desc" >&nbsp;</div>
+		<div id="character-counter" class="grey" style="display: none;">0</div>
+	</div>
+	<div id="profile-jot-banner-end"></div>
+
+	<form id="profile-jot-form" action="{{$action}}" method="post" >
+		<input type="hidden" name="type" value="{{$ptyp}}" />
+		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+		<input type="hidden" name="return" value="{{$return_path}}" />
+		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
+		<input type="hidden" name="coord" id="jot-coord" value="" />
+		<input type="hidden" name="post_id" value="{{$post_id}}" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+		<div id="jot-title-wrap">
+			<input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none">
+		</div>
+		{{if $placeholdercategory}}
+		<div id="jot-category-wrap">
+			<input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" />
+		</div>
+		{{/if}}
+		<div id="jot-text-wrap">
+                	<img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" /><br>
+                	<textarea rows="5" cols="80" class="profile-jot-text" id="profile-jot-text" name="body" >
+			{{if $content}}{{$content}}{{else}}{{$share}}
+			{{/if}}
+			</textarea>
+		</div>
+
+	<div id="profile-upload-wrapper" class="jot-tool" style="display: none;" >
+		<div id="wall-image-upload-div" ><a onclick="return false;" id="wall-image-upload" class="icon border camera" title="{{$upload}}"></a></div>
+	</div>
+	<div id="profile-attach-wrapper" class="jot-tool" style="display: none;" >
+		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon border attach" title="{{$attach}}"></a></div>
+	</div>  
+	<div id="profile-link-wrapper" class="jot-tool" style="display: none;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
+		<a href="#" id="profile-link" class="icon border  link" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
+	</div> 
+	<div id="profile-video-wrapper" class="jot-tool" style="display: none;" >
+		<a href="#" id="profile-video" class="icon border  video" title="{{$video}}" onclick="jotVideoURL(); return false;"></a>
+	</div> 
+	<div id="profile-audio-wrapper" class="jot-tool" style="display: none;" >
+		<a href="#" id="profile-audio" class="icon border  audio" title="{{$audio}}" onclick="jotAudioURL(); return false;"></a>
+	</div> 
+	<div id="profile-location-wrapper" class="jot-tool" style="display: none;" >
+		<a href="#" id="profile-location" class="icon border  globe" title="{{$setloc}}" onclick="jotGetLocation(); return false;"></a>
+	</div> 
+	<div id="profile-nolocation-wrapper" class="jot-tool" style="display: none;" >
+		<a href="#" id="profile-nolocation" class="icon border  noglobe" title="{{$noloc}}" onclick="jotClearLocation(); return false;"></a>
+	</div> 
+
+	<span onclick="preview_post();" id="jot-preview-link" class="fakelink" style="display: none;" >{{$preview}}</span>
+
+	<div id="profile-jot-submit-wrapper" style="display:none;padding-left: 400px;">
+		<input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" />
+		<div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" >
+            <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}} sharePerms" title="{{$permset}}"></a>{{$bang}}</div>
+	</div>
+
+	<div id="profile-jot-plugin-wrapper" style="display: none;">
+  	{{$jotplugins}}
+	</div>
+	<div id="profile-jot-tools-end"></div>
+	
+	<div id="jot-preview-content" style="display:none;"></div>
+
+        <div style="display: none;">
+            <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+                {{$acl}}
+                <hr style="clear:both"/>
+                <div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
+                <div id="profile-jot-email-end"></div>
+                {{$jotnets}}
+            </div>
+        </div>
+
+<div id="profile-jot-end"></div>
+</form>
+</div>
+                {{if $content}}<script>initEditor();</script>{{/if}}
diff --git a/view/theme/smoothly/templates/lang_selector.tpl b/view/theme/smoothly/templates/lang_selector.tpl
new file mode 100644
index 000000000..a1aee8277
--- /dev/null
+++ b/view/theme/smoothly/templates/lang_selector.tpl
@@ -0,0 +1,15 @@
+{{*
+ *	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/theme/smoothly/templates/nav.tpl b/view/theme/smoothly/templates/nav.tpl
new file mode 100644
index 000000000..0bbca7e69
--- /dev/null
+++ b/view/theme/smoothly/templates/nav.tpl
@@ -0,0 +1,86 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<nav>
+	<span id="banner">{{$banner}}</span>
+
+	<div id="notifications">	
+		{{if $nav.network}}<a id="net-update" class="nav-ajax-update" href="{{$nav.network.0}}" title="{{$nav.network.1}}"></a>{{/if}}
+		{{if $nav.home}}<a id="home-update" class="nav-ajax-update" href="{{$nav.home.0}}" title="{{$nav.home.1}}"></a>{{/if}}
+<!--		{{if $nav.notifications}}<a id="intro-update" class="nav-ajax-update" href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"></a>{{/if}} -->
+		{{if $nav.introductions}}<a id="intro-update" class="nav-ajax-update" href="{{$nav.introductions.0}}" title="{{$nav.introductions.1}}"></a>{{/if}}
+		{{if $nav.messages}}<a id="mail-update" class="nav-ajax-update" href="{{$nav.messages.0}}" title="{{$nav.messages.1}}"></a>{{/if}}
+		{{if $nav.notifications}}<a rel="#nav-notifications-menu" id="notify-update" class="nav-ajax-update" href="{{$nav.notifications.0}}"  title="{{$nav.notifications.1}}"></a>{{/if}}
+
+		<ul id="nav-notifications-menu" class="menu-popup">
+			<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
+			<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
+			<li class="empty">{{$emptynotifications}}</li>
+		</ul>
+	</div>
+	
+	<div id="user-menu" >
+		<a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="{{$nav.home.0}}">{{$sitelocation}}</a>
+		
+		<ul id="user-menu-popup" 
+			 onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')" 
+			 onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
+
+			{{if $nav.register}}<li><a id="nav-register-link" class="nav-commlink {{$nav.register.2}}" href="{{$nav.register.0}}">{{$nav.register.1}}</a></li>{{/if}}
+			
+			{{if $nav.home}}<li><a id="nav-home-link" class="nav-commlink {{$nav.home.2}}" href="{{$nav.home.0}}">{{$nav.home.1}}</a></li>{{/if}}
+		
+			{{if $nav.network}}<li><a id="nav-network-link" class="nav-commlink {{$nav.network.2}}" href="{{$nav.network.0}}">{{$nav.network.1}}</a></li>{{/if}}
+		
+				{{if $nav.community}}
+				<li><a id="nav-community-link" class="nav-commlink {{$nav.community.2}}" href="{{$nav.community.0}}">{{$nav.community.1}}</a></li>
+				{{/if}}
+
+			<li><a id="nav-search-link" class="nav-link {{$nav.search.2}}" href="{{$nav.search.0}}">{{$nav.search.1}}</a></li>
+			<li><a id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}">{{$nav.directory.1}}</a></li>
+			{{if $nav.apps}}<li><a id="nav-apps-link" class="nav-link {{$nav.apps.2}}" href="{{$nav.apps.0}}">{{$nav.apps.1}}</a></li>{{/if}}
+			
+			{{if $nav.notifications}}<li><a id="nav-notify-link" class="nav-commlink nav-sep {{$nav.notifications.2}}" href="{{$nav.notifications.0}}">{{$nav.notifications.1}}</a></li>{{/if}}
+			{{if $nav.messages}}<li><a id="nav-messages-link" class="nav-commlink {{$nav.messages.2}}" href="{{$nav.messages.0}}">{{$nav.messages.1}}</a></li>{{/if}}
+			{{if $nav.contacts}}<li><a id="nav-contacts-link" class="nav-commlink {{$nav.contacts.2}}" href="{{$nav.contacts.0}}">{{$nav.contacts.1}}</a></li>{{/if}}
+		
+			{{if $nav.profiles}}<li><a id="nav-profiles-link" class="nav-commlink nav-sep {{$nav.profiles.2}}" href="{{$nav.profiles.0}}">{{$nav.profiles.1}}</a></li>{{/if}}
+			{{if $nav.settings}}<li><a id="nav-settings-link" class="nav-commlink {{$nav.settings.2}}" href="{{$nav.settings.0}}">{{$nav.settings.1}}</a></li>{{/if}}
+			
+			{{if $nav.manage}}<li><a id="nav-manage-link" class="nav-commlink {{$nav.manage.2}}" href="{{$nav.manage.0}}">{{$nav.manage.1}}</a></li>{{/if}}
+		
+			{{if $nav.admin}}<li><a id="nav-admin-link" class="nav-commlink {{$nav.admin.2}}" href="{{$nav.admin.0}}">{{$nav.admin.1}}</a></li>{{/if}}
+			
+			{{if $nav.help}}<li><a id="nav-help-link" class="nav-link {{$nav.help.2}}" href="{{$nav.help.0}}">{{$nav.help.1}}</a></li>{{/if}}
+
+			{{if $nav.login}}<li><a id="nav-login-link" class="nav-link {{$nav.login.2}}" href="{{$nav.login.0}}">{{$nav.login.1}}</a></li> {{/if}}
+			{{if $nav.logout}}<li><a id="nav-logout-link" class="nav-commlink nav-sep {{$nav.logout.2}}" href="{{$nav.logout.0}}">{{$nav.logout.1}}</a></li> {{/if}}
+		</ul>
+	</div>
+</nav>
+
+<div id="scrollup" >
+<a href="javascript:scrollTo(0,0)"><img src="view/theme/smoothly/images/totop.png" alt="to top" title="to top" /></a><br />
+<a href="javascript:ScrollToBottom()"><img src="view/theme/smoothly/images/tobottom.png" alt="to bottom" title="to bottom" /></a>
+</div>
+
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
+</ul>
+
+<div style="position: fixed; top: 3px; left: 5px; z-index:9999">{{$langselector}}</div>
+
+<script>
+var pagetitle = null;
+$("nav").bind('nav-update', function(e,data){
+if (pagetitle==null) pagetitle = document.title;
+var count = $(data).find('notif').attr('count');
+if (count>0) {
+document.title = "("+count+") "+pagetitle;
+} else {
+document.title = pagetitle;
+}
+});
+</script>
diff --git a/view/theme/smoothly/templates/search_item.tpl b/view/theme/smoothly/templates/search_item.tpl
new file mode 100644
index 000000000..0d77d544a
--- /dev/null
+++ b/view/theme/smoothly/templates/search_item.tpl
@@ -0,0 +1,58 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="wall-item-outside-wrapper {{$item.indent}} {{$item.shiny}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
+	<div class="wall-item-content-wrapper {{$item.indent}} {{$item.shiny}}" id="wall-item-content-wrapper-{{$item.id}}" >
+		<div class="wall-item-info" id="wall-item-info-{{$item.id}}">
+			<div class="wall-item-photo-wrapper mframe" id="wall-item-photo-wrapper-{{$item.id}}" 
+				 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
+				 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
+				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+				<div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+					<ul>
+						{{$item.item_photo_menu}}
+					</ul>
+				</div>
+			</div>
+			<div class="wall-item-photo-end"></div>	
+			<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{if $item.location}}<span class="icon globe"></span>{{$item.location}} {{/if}}</div>
+		</div>
+		<div class="wall-item-lock-wrapper">
+				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
+				{{else}}<div class="wall-item-lock"></div>{{/if}}			
+		</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.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 class="wall-item-content" id="wall-item-content-{{$item.id}}" >
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			<div class="wall-item-title-end"></div>
+			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
+		</div>
+		<div class="wall-item-author">
+				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>
+				
+		</div>			
+		
+	</div>
+	<div class="wall-item-wrapper-end"></div>
+
+
+	<div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
+	{{if $item.conv}}
+			<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
+	{{/if}}
+	</div>
+	<div class="wall-item-wrapper-end"></div>
+</div>
+
+<div class="wall-item-outside-wrapper-end {{$item.indent}} {{$item.shiny}}" ></div>
diff --git a/view/theme/smoothly/templates/wall_thread.tpl b/view/theme/smoothly/templates/wall_thread.tpl
new file mode 100644
index 000000000..f652de90b
--- /dev/null
+++ b/view/theme/smoothly/templates/wall_thread.tpl
@@ -0,0 +1,165 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{if $item.comment_firstcollapsed}}
+	<div class="hide-comments-outer">
+		<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> 
+		<span id="hide-comments-{{$item.id}}" class="hide-comments fakelink" onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
+	</div>
+	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
+{{/if}}
+
+<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
+<div class="wall-item-outside-wrapper {{$item.indent}} {{$item.shiny}} wallwall" id="wall-item-outside-wrapper-{{$item.id}}" >
+<div class="wall-item-content-wrapper {{$item.indent}} {{$item.shiny}}" id="wall-item-content-wrapper-{{$item.id}}" >
+
+		<div class="wall-item-info{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}">
+			{{if $item.owner_url}}
+			<div class="wall-item-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
+				<a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
+				<img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" /></a>
+			</div>
+			<div class="wall-item-arrowphoto-wrapper" ><img src="view/theme/smoothly/images/larrow.gif" alt="{{$item.wall}}" /></div>
+			{{/if}}
+			<div class="wall-item-photo-wrapper mframe{{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-location" id="wall-item-location-{{$item.id}}">{{if $item.location}}<span class="icon globe"></span>{{$item.location}} {{/if}}</div>
+		</div>
+		<div class="wall-item-lock-wrapper">
+			{{if $item.lock}}
+			<div class="wall-item-lock">
+			<img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" />
+			</div>
+			{{else}}
+			<div class="wall-item-lock"></div>
+			{{/if}}
+		</div>
+		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
+		<div class="wall-item-author">
+			<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link">
+			<span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span>
+			</a>
+			<div class="wall-item-ago">&bull;</div>
+			<div class="wall-item-ago" id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}">{{$item.ago}}</div>
+		</div>	
+
+		<div>
+		<hr class="line-dots">
+		</div>
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			<div class="wall-item-title-end"></div>
+			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}
+				<div class="body-tag">
+					{{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-social" id="wall-item-social-{{$item.id}}">
+
+			{{if $item.vote}}
+			<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$item.id}}">
+				<a href="#" class="icon like" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></a>
+				{{if $item.vote.dislike}}
+				<a href="#" class="icon dislike" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>
+				{{/if}}
+				{{if $item.vote.share}}
+				<a href="#" class="icon recycle wall-item-share-buttons" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>				{{/if}}
+				<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+			</div>
+			{{/if}}
+
+			{{if $item.plink}}
+			<div class="wall-item-links-wrapper">
+				<a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="icon remote-link"></a>
+			</div>
+			{{/if}}
+		 
+			{{if $item.star}}
+			<a href="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}"></a>
+			{{/if}}
+			{{if $item.tagger}}
+			<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon tagged" title="{{$item.tagger.add}}"></a>
+			{{/if}}
+
+			{{if $item.filer}}
+			<a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"></a>
+			{{/if}}
+	
+		</div>
+
+		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
+			{{if $item.edpost}}
+			<a class="editpost icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
+			{{/if}}
+
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
+				{{if $item.drop.dropping}}
+				<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
+				{{/if}}
+			</div>
+
+			{{if $item.drop.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" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
+	<div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
+
+	{{if $item.threaded}}
+	{{if $item.comment}}
+        <div class="wall-item-comment-wrapper {{$item.indent}} {{$item.shiny}}" >
+		{{$item.comment}}
+	</div>
+	{{/if}}
+	{{/if}}
+</div>
+
+<div class="wall-item-outside-wrapper-end {{$item.indent}} {{$item.shiny}}" ></div>
+
+{{foreach $item.children as $child}}
+	{{include file="{{$child.template}}" item=$child}}
+{{/foreach}}
+
+{{if $item.flatten}}
+<div class="wall-item-comment-wrapper" >
+	{{$item.comment}}
+</div>
+{{/if}}
+</div>
+{{if $item.comment_lastcollapsed}}</div>{{/if}}
diff --git a/view/theme/testbubble/templates/comment_item.tpl b/view/theme/testbubble/templates/comment_item.tpl
new file mode 100644
index 000000000..ef993e8f5
--- /dev/null
+++ b/view/theme/testbubble/templates/comment_item.tpl
@@ -0,0 +1,38 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
+			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
+				<input type="hidden" name="type" value="{{$type}}" />
+				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+				<input type="hidden" name="parent" value="{{$parent}}" />
+				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
+				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
+				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
+				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
+					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});" >{{$comment}}</textarea>
+				{{if $qcomment}}
+				{{foreach $qcomment as $qc}}				
+					<span class="fakelink qcomment" onclick="commentInsert(this,{{$id}}); return false;" >{{$qc}}</span>
+					&nbsp;
+				{{/foreach}}
+				{{/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}}" />
+					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
+		<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
diff --git a/view/theme/testbubble/templates/group_drop.tpl b/view/theme/testbubble/templates/group_drop.tpl
new file mode 100644
index 000000000..f5039fd8f
--- /dev/null
+++ b/view/theme/testbubble/templates/group_drop.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="group-delete-wrapper" id="group-delete-wrapper-{{$id}}" >
+	<a href="group/drop/{{$id}}" 
+		onclick="return confirmDelete();" 
+		title="{{$delete}}" 
+		id="group-delete-icon-{{$id}}" 
+		class="drophide group-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" >Delete Group</a>
+</div>
+<div class="group-delete-end"></div>
diff --git a/view/theme/testbubble/templates/group_edit.tpl b/view/theme/testbubble/templates/group_edit.tpl
new file mode 100644
index 000000000..aaa0d5670
--- /dev/null
+++ b/view/theme/testbubble/templates/group_edit.tpl
@@ -0,0 +1,21 @@
+{{*
+ *	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" >
+		<div id="group-edit-name-wrapper" >
+			<label id="group-edit-name-label" for="group-edit-name" >{{$gname}}</label>
+			<input type="text" id="group-edit-name" name="groupname" value="{{$name}}" />
+			<input type="submit" name="submit" value="{{$submit}}">
+			{{$drop}}
+		</div>
+		<div id="group-edit-name-end"></div>
+		<div id="group-edit-desc">{{$desc}}</div>
+		<div id="group-edit-select-end" ></div>
+	</form>
+</div>
diff --git a/view/theme/testbubble/templates/group_side.tpl b/view/theme/testbubble/templates/group_side.tpl
new file mode 100644
index 000000000..db246b6de
--- /dev/null
+++ b/view/theme/testbubble/templates/group_side.tpl
@@ -0,0 +1,33 @@
+{{*
+ *	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}}"><span class="icon small-pencil"></span></a>
+				{{/if}}
+				<a 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>
+</div>
+
+
diff --git a/view/theme/testbubble/templates/jot-header.tpl b/view/theme/testbubble/templates/jot-header.tpl
new file mode 100644
index 000000000..6b082738d
--- /dev/null
+++ b/view/theme/testbubble/templates/jot-header.tpl
@@ -0,0 +1,371 @@
+{{*
+ *	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 editor=false;
+var textlen = 0;
+var plaintext = '{{$editselect}}';
+
+function initEditor(cb) {
+    if (editor==false) {
+        $("#profile-jot-text-loading").show();
+ if(plaintext == 'none') {
+            $("#profile-jot-text-loading").hide();
+            $("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
+            $(".jothidden").show();
+            editor = true;
+            $("a#jot-perms-icon").colorbox({
+				'inline' : true,
+				'transition' : 'elastic'
+            });
+	                            $("#profile-jot-submit-wrapper").show();
+								{{if $newpost}}
+    	                            $("#profile-upload-wrapper").show();
+        	                        $("#profile-attach-wrapper").show();
+            	                    $("#profile-link-wrapper").show();
+                	                $("#profile-video-wrapper").show();
+                    	            $("#profile-audio-wrapper").show();
+                        	        $("#profile-location-wrapper").show();
+                            	    $("#profile-nolocation-wrapper").show();
+                                	$("#profile-title-wrapper").show();
+	                                $("#profile-jot-plugin-wrapper").show();
+	                                $("#jot-preview-link").show();
+								{{/if}}   
+
+
+            if (typeof cb!="undefined") cb();
+            return;
+        }
+        tinyMCE.init({
+                theme : "advanced",
+                mode : "specific_textareas",
+                editor_selector: /(profile-jot-text|prvmail-text)/,
+                plugins : "bbcode,paste,fullscreen,autoresize",
+                theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen",
+                theme_advanced_buttons2 : "",
+                theme_advanced_buttons3 : "",
+                theme_advanced_toolbar_location : "top",
+                theme_advanced_toolbar_align : "center",
+                theme_advanced_blockformats : "blockquote,code",
+                //theme_advanced_resizing : true,
+                //theme_advanced_statusbar_location : "bottom",
+                paste_text_sticky : true,
+                entity_encoding : "raw",
+                add_unload_trigger : false,
+                remove_linebreaks : false,
+                //force_p_newlines : false,
+                //force_br_newlines : true,
+                forced_root_block : 'div',
+                convert_urls: false,
+                content_css: "{{$baseurl}}/view/custom_tinymce.css",
+                theme_advanced_path : false,
+                setup : function(ed) {
+					cPopup = null;
+					ed.onKeyDown.add(function(ed,e) {
+						if(cPopup !== null)
+							cPopup.onkey(e);
+					});
+
+
+
+					ed.onKeyUp.add(function(ed, e) {
+						var txt = tinyMCE.activeEditor.getContent();
+						match = txt.match(/@([^ \n]+)$/);
+						if(match!==null) {
+							if(cPopup === null) {
+								cPopup = new ACPopup(this,baseurl+"/acl");
+							}
+							if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]);
+							if(! cPopup.ready) cPopup = null;
+						}
+						else {
+							if(cPopup !== null) { cPopup.close(); cPopup = null; }
+						}
+
+						textlen = txt.length;
+						if(textlen != 0 && $('#jot-perms-icon').is('.unlock')) {
+							$('#profile-jot-desc').html(ispublic);
+						}
+                        else {
+                            $('#profile-jot-desc').html('&nbsp;');
+                        }
+
+								//Character count
+
+                                if(textlen <= 140) {
+                                        $('#character-counter').removeClass('red');
+                                        $('#character-counter').removeClass('orange');
+                                        $('#character-counter').addClass('grey');
+                                }
+                                if((textlen > 140) && (textlen <= 420)) {
+                                        $('#character-counter').removeClass('grey');
+                                        $('#character-counter').removeClass('red');
+                                        $('#character-counter').addClass('orange');
+                                }
+                                if(textlen > 420) {
+                                        $('#character-counter').removeClass('grey');
+                                        $('#character-counter').removeClass('orange');
+                                        $('#character-counter').addClass('red');
+                                }
+                                $('#character-counter').text(textlen);
+                        });
+                        ed.onInit.add(function(ed) {
+                                ed.pasteAsPlainText = true;
+								$("#profile-jot-text-loading").hide();
+								$(".jothidden").show();
+	                            $("#profile-jot-submit-wrapper").show();
+								{{if $newpost}}
+    	                            $("#profile-upload-wrapper").show();
+        	                        $("#profile-attach-wrapper").show();
+            	                    $("#profile-link-wrapper").show();
+                	                $("#profile-video-wrapper").show();
+                    	            $("#profile-audio-wrapper").show();
+                        	        $("#profile-location-wrapper").show();
+                            	    $("#profile-nolocation-wrapper").show();
+                                	$("#profile-title-wrapper").show();
+	                                $("#profile-jot-plugin-wrapper").show();
+	                                $("#jot-preview-link").show();
+								{{/if}}   
+                             $("#character-counter").show();
+                                if (typeof cb!="undefined") cb();
+                        });
+                }
+        });
+        editor = true;
+        // setup acl popup
+        $("a#jot-perms-icon").colorbox({
+			'inline' : true,
+			'transition' : 'elastic'
+        }); 
+    } else {
+        if (typeof cb!="undefined") cb();
+    }
+} // initEditor
+</script>
+<script type="text/javascript" src="js/ajaxupload.js" ></script>
+<script>
+    var ispublic = '{{$ispublic}}';
+	$(document).ready(function() {
+                /* enable tinymce on focus */
+                $("#profile-jot-text").focus(function(){
+                    if (editor) return;
+                    $(this).val("");
+                    initEditor();
+                }); 
+
+
+		var uploader = new window.AjaxUpload(
+			'wall-image-upload',
+			{ action: 'wall_upload/{{$nickname}}',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					addeditortext(response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);
+		var file_uploader = new window.AjaxUpload(
+			'wall-file-upload',
+			{ action: 'wall_attach/{{$nickname}}',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					addeditortext(response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);		
+		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
+			var selstr;
+			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
+				selstr = $(this).text();
+				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
+				$('#jot-public').hide();
+				$('.profile-jot-net input').attr('disabled', 'disabled');
+			});
+			if(selstr == null) { 
+				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
+				$('#jot-public').show();
+				$('.profile-jot-net input').attr('disabled', false);
+			}
+
+		}).trigger('change');
+
+	});
+
+	function deleteCheckedItems() {
+		if(confirm('{{$delitems}}')) {
+			var checkedstr = '';
+
+			$("#item-delete-selected").hide();
+			$('#item-delete-selected-rotator').show();
+
+			$('.item-select').each( function() {
+				if($(this).is(':checked')) {
+					if(checkedstr.length != 0) {
+						checkedstr = checkedstr + ',' + $(this).val();
+					}
+					else {
+						checkedstr = $(this).val();
+					}
+				}	
+			});
+			$.post('item', { dropitems: checkedstr }, function(data) {
+				window.location.reload();
+			});
+		}
+	}
+
+	function jotGetLink() {
+		reply = prompt("{{$linkurl}}");
+		if(reply && reply.length) {
+			reply = bin2hex(reply);
+			$('#profile-rotator').show();
+			$.get('parse_url?binurl=' + reply, function(data) {
+				addeditortext(data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+	function jotVideoURL() {
+		reply = prompt("{{$vidurl}}");
+		if(reply && reply.length) {
+			addeditortext('[video]' + reply + '[/video]');
+		}
+	}
+
+	function jotAudioURL() {
+		reply = prompt("{{$audurl}}");
+		if(reply && reply.length) {
+			addeditortext('[audio]' + reply + '[/audio]');
+		}
+	}
+
+
+	function jotGetLocation() {
+		reply = prompt("{{$whereareu}}", $('#jot-location').val());
+		if(reply && reply.length) {
+			$('#jot-location').val(reply);
+		}
+	}
+
+	function jotTitle() {
+		reply = prompt("{{$title}}", $('#jot-title').val());
+		if(reply && reply.length) {
+			$('#jot-title').val(reply);
+		}
+	}
+
+	function jotShare(id) {
+		$('#like-rotator-' + id).show();
+		$.get('share/' + id, function(data) {
+				if (!editor) $("#profile-jot-text").val("");
+				initEditor(function(){
+					addeditortext(data);
+					$('#like-rotator-' + id).hide();
+					$(window).scrollTop(0);
+				});
+		});
+	}
+
+	function linkdropper(event) {
+		var linkFound = event.dataTransfer.types.contains("text/uri-list");
+		if(linkFound)
+			event.preventDefault();
+	}
+
+	function linkdrop(event) {
+		var reply = event.dataTransfer.getData("text/uri-list");
+		event.target.textContent = reply;
+		event.preventDefault();
+		if(reply && reply.length) {
+			reply = bin2hex(reply);
+			$('#profile-rotator').show();
+			$.get('parse_url?binurl=' + reply, function(data) {
+				if (!editor) $("#profile-jot-text").val("");
+				initEditor(function(){
+					addeditortext(data);
+					$('#profile-rotator').hide();
+				});
+			});
+		}
+	}
+
+	function itemTag(id) {
+		reply = prompt("{{$term}}");
+		if(reply && reply.length) {
+			reply = reply.replace('#','');
+			if(reply.length) {
+
+				commentBusy = true;
+				$('body').css('cursor', 'wait');
+
+				$.get('tagger/' + id + '?term=' + reply);
+				if(timer) clearTimeout(timer);
+				timer = setTimeout(NavUpdate,3000);
+				liking = 1;
+			}
+		}
+	}
+	
+	function itemFiler(id) {
+		
+		var bordercolor = $("input").css("border-color");
+		
+		$.get('filer/', function(data){
+			$.colorbox({html:data});
+			$("#id_term").keypress(function(){
+				$(this).css("border-color",bordercolor);
+			})
+			$("#select_term").change(function(){
+				$("#id_term").css("border-color",bordercolor);
+			})
+			
+			$("#filer_save").click(function(e){
+				e.preventDefault();
+				reply = $("#id_term").val();
+				if(reply && reply.length) {
+					commentBusy = true;
+					$('body').css('cursor', 'wait');
+					$.get('filer/' + id + '?term=' + reply);
+					if(timer) clearTimeout(timer);
+					timer = setTimeout(NavUpdate,3000);
+					liking = 1;
+					$.colorbox.close();
+				} else {
+					$("#id_term").css("border-color","#FF0000");
+				}
+				return false;
+			});
+		});
+		
+	}
+
+	
+
+	function jotClearLocation() {
+		$('#jot-coord').val('');
+		$('#profile-nolocation-wrapper').hide();
+	}
+
+  function addeditortext(data) {
+        if(plaintext == 'none') {
+            var currentText = $("#profile-jot-text").val();
+            $("#profile-jot-text").val(currentText + data);
+        }
+        else
+            tinyMCE.execCommand('mceInsertRawHTML',false,data);
+    }
+
+
+	{{$geotag}}
+
+</script>
+
diff --git a/view/theme/testbubble/templates/jot.tpl b/view/theme/testbubble/templates/jot.tpl
new file mode 100644
index 000000000..8d281dbaa
--- /dev/null
+++ b/view/theme/testbubble/templates/jot.tpl
@@ -0,0 +1,80 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div id="profile-jot-wrapper" > 
+	<div id="profile-jot-banner-wrapper">
+		<div id="profile-jot-desc" >&nbsp;</div>
+		<div id="character-counter" class="grey" style="display: none;">0</div>
+		<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
+			<img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display:none;"  />
+		</div> 		
+	</div>
+
+	<form id="profile-jot-form" action="{{$action}}" method="post" >
+		<input type="hidden" name="type" value="{{$ptyp}}" />
+		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
+		<input type="hidden" name="return" value="{{$return_path}}" />
+		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
+		<input type="hidden" name="coord" id="jot-coord" value="" />
+		<input type="hidden" name="post_id" value="{{$post_id}}" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none"></div>
+		<div id="jot-text-wrap">
+                <img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+                <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}</textarea>
+		</div>
+	<div id="profile-upload-wrapper" class="jot-tool" style="display: none;" >
+		<div id="wall-image-upload-div" ><a onclick="return false;" id="wall-image-upload" class="icon border camera" title="{{$upload}}"></a></div>
+	</div>
+	<div id="profile-attach-wrapper" class="jot-tool" style="display: none;" >
+		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon border attach" title="{{$attach}}"></a></div>
+	</div>  
+	<div id="profile-link-wrapper" class="jot-tool" style="display: none;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
+		<a id="profile-link" class="icon border  link" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
+	</div> 
+	<div id="profile-video-wrapper" class="jot-tool" style="display: none;" >
+		<a id="profile-video" class="icon border  video" title="{{$video}}" onclick="jotVideoURL(); return false;"></a>
+	</div> 
+	<div id="profile-audio-wrapper" class="jot-tool" style="display: none;" >
+		<a id="profile-audio" class="icon border  audio" title="{{$audio}}" onclick="jotAudioURL(); return false;"></a>
+	</div> 
+	<div id="profile-location-wrapper" class="jot-tool" style="display: none;" >
+		<a id="profile-location" class="icon border  globe" title="{{$setloc}}" onclick="jotGetLocation(); return false;"></a>
+	</div> 
+	<div id="profile-nolocation-wrapper" class="jot-tool" style="display: none;" >
+		<a id="profile-nolocation" class="icon border  noglobe" title="{{$noloc}}" onclick="jotClearLocation(); return false;"></a>
+	</div> 
+
+	<span onclick="preview_post();" id="jot-preview-link" class="fakelink" style="display: none;" >{{$preview}}</span>
+
+	<div id="profile-jot-submit-wrapper" style="display:none;padding-left: 400px;">
+		<input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" />
+		<div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" >
+            <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}} sharePerms" title="{{$permset}}"></a>{{$bang}}</div>
+	</div>
+
+	<div id="profile-jot-plugin-wrapper" style="display: none;">
+  	{{$jotplugins}}
+	</div>
+	<div id="profile-jot-tools-end"></div>
+	
+	<div id="jot-preview-content" style="display:none;"></div>
+
+        <div style="display: none;">
+            <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+                {{$acl}}
+                <hr style="clear:both"/>
+                <div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
+                <div id="profile-jot-email-end"></div>
+                {{$jotnets}}
+            </div>
+        </div>
+
+<div id="profile-jot-end"></div>
+</form>
+</div>
+                {{if $content}}<script>initEditor();</script>{{/if}}
diff --git a/view/theme/testbubble/templates/match.tpl b/view/theme/testbubble/templates/match.tpl
new file mode 100644
index 000000000..61a861c1c
--- /dev/null
+++ b/view/theme/testbubble/templates/match.tpl
@@ -0,0 +1,18 @@
+{{*
+ *	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}}" />
+		</a>
+	</div>
+	<span><a href="{{$url}}">{{$name}}</a>{{$inttxt}}<br />{{$tags}}</span>
+	<div class="profile-match-break"></div>
+	{{if $connlnk}}
+	<div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}">{{$conntxt}}</a></div>
+	{{/if}}
+	<div class="profile-match-end"></div>
+</div>
\ No newline at end of file
diff --git a/view/theme/testbubble/templates/nav.tpl b/view/theme/testbubble/templates/nav.tpl
new file mode 100644
index 000000000..be7c2e7b6
--- /dev/null
+++ b/view/theme/testbubble/templates/nav.tpl
@@ -0,0 +1,71 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<nav>
+	{{$langselector}}
+
+	<span id="banner">{{$banner}}</span>
+
+	<div id="notifications">	
+		{{if $nav.network}}<a id="net-update" class="nav-ajax-update" href="{{$nav.network.0}}" title="{{$nav.network.1}}"></a>{{/if}}
+		{{if $nav.home}}<a id="home-update" class="nav-ajax-update" href="{{$nav.home.0}}" title="{{$nav.home.1}}"></a>{{/if}}
+<!--		{{if $nav.notifications}}<a id="intro-update" class="nav-ajax-update" href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"></a>{{/if}} -->
+		{{if $nav.introductions}}<a id="intro-update" class="nav-ajax-update" href="{{$nav.introductions.0}}" title="{{$nav.introductions.1}}"></a>{{/if}}
+		{{if $nav.messages}}<a id="mail-update" class="nav-ajax-update" href="{{$nav.messages.0}}" title="{{$nav.messages.1}}"></a>{{/if}}
+		{{if $nav.notifications}}<a rel="#nav-notifications-menu" id="notify-update" class="nav-ajax-update" href="{{$nav.notifications.0}}"  title="{{$nav.notifications.1}}"></a>{{/if}}
+
+		<ul id="nav-notifications-menu" class="menu-popup">
+			<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
+			<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
+			<li class="empty">{{$emptynotifications}}</li>
+		</ul>
+	</div>
+	
+	<div id="user-menu" >
+		<a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="{{$nav.home.0}}">{{$sitelocation}}</a>
+		
+		<ul id="user-menu-popup" 
+			 onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')" 
+			 onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
+
+			{{if $nav.register}}<li><a id="nav-register-link" class="nav-commlink {{$nav.register.2}}" href="{{$nav.register.0}}">{{$nav.register.1}}</a></li>{{/if}}
+			
+			{{if $nav.home}}<li><a id="nav-home-link" class="nav-commlink {{$nav.home.2}}" href="{{$nav.home.0}}">{{$nav.home.1}}</a></li>{{/if}}
+		
+			{{if $nav.network}}<li><a id="nav-network-link" class="nav-commlink {{$nav.network.2}}" href="{{$nav.network.0}}">{{$nav.network.1}}</a></li>{{/if}}
+		
+				{{if $nav.community}}
+				<li><a id="nav-community-link" class="nav-commlink {{$nav.community.2}}" href="{{$nav.community.0}}">{{$nav.community.1}}</a></li>
+				{{/if}}
+
+			<li><a id="nav-search-link" class="nav-link {{$nav.search.2}}" href="{{$nav.search.0}}">{{$nav.search.1}}</a></li>
+			<li><a id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}">{{$nav.directory.1}}</a></li>
+			{{if $nav.apps}}<li><a id="nav-apps-link" class="nav-link {{$nav.apps.2}}" href="{{$nav.apps.0}}">{{$nav.apps.1}}</a></li>{{/if}}
+			
+			{{if $nav.notifications}}<li><a id="nav-notify-link" class="nav-commlink nav-sep {{$nav.notifications.2}}" href="{{$nav.notifications.0}}">{{$nav.notifications.1}}</a></li>{{/if}}
+			{{if $nav.messages}}<li><a id="nav-messages-link" class="nav-commlink {{$nav.messages.2}}" href="{{$nav.messages.0}}">{{$nav.messages.1}}</a></li>{{/if}}
+			{{if $nav.contacts}}<li><a id="nav-contacts-link" class="nav-commlink {{$nav.contacts.2}}" href="{{$nav.contacts.0}}">{{$nav.contacts.1}}</a></li>{{/if}}
+		
+			{{if $nav.profiles}}<li><a id="nav-profiles-link" class="nav-commlink nav-sep {{$nav.profiles.2}}" href="{{$nav.profiles.0}}">{{$nav.profiles.1}}</a></li>{{/if}}
+			{{if $nav.settings}}<li><a id="nav-settings-link" class="nav-commlink {{$nav.settings.2}}" href="{{$nav.settings.0}}">{{$nav.settings.1}}</a></li>{{/if}}
+			
+			{{if $nav.manage}}<li><a id="nav-manage-link" class="nav-commlink {{$nav.manage.2}}" href="{{$nav.manage.0}}">{{$nav.manage.1}}</a></li>{{/if}}
+		
+			{{if $nav.admin}}<li><a id="nav-admin-link" class="nav-commlink {{$nav.admin.2}}" href="{{$nav.admin.0}}">{{$nav.admin.1}}</a></li>{{/if}}
+			
+			{{if $nav.help}}<li><a id="nav-help-link" class="nav-link {{$nav.help.2}}" href="{{$nav.help.0}}">{{$nav.help.1}}</a></li>{{/if}}
+
+			{{if $nav.login}}<li><a id="nav-login-link" class="nav-link {{$nav.login.2}}" href="{{$nav.login.0}}">{{$nav.login.1}}</a></li> {{/if}}
+			{{if $nav.logout}}<li><a id="nav-logout-link" class="nav-commlink nav-sep {{$nav.logout.2}}" href="{{$nav.logout.0}}">{{$nav.logout.1}}</a></li> {{/if}}
+		</ul>
+	</div>
+</nav>
+
+
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li class="{4}"><a href="{0}"><img data-src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
+</ul>
+
+
diff --git a/view/theme/testbubble/templates/photo_album.tpl b/view/theme/testbubble/templates/photo_album.tpl
new file mode 100644
index 000000000..7ca7bd9d6
--- /dev/null
+++ b/view/theme/testbubble/templates/photo_album.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="photo-album-image-wrapper" id="photo-album-image-wrapper-{{$id}}">
+	<a href="{{$photolink}}" class="photo-album-photo-link" id="photo-album-photo-link-{{$id}}" title="{{$phototitle}}">
+		<img src="{{$imgsrc}}" alt="{{$imgalt}}" title="{{$phototitle}}" class="photo-album-photo lframe  resize" id="photo-album-photo-{{$id}}" />
+	</div>
+		<p class='caption'>{{$desc}}</p>		
+	</a>
+	</div>
+<div class="photo-album-image-wrapper-end"></div>
diff --git a/view/theme/testbubble/templates/photo_top.tpl b/view/theme/testbubble/templates/photo_top.tpl
new file mode 100644
index 000000000..915609b7f
--- /dev/null
+++ b/view/theme/testbubble/templates/photo_top.tpl
@@ -0,0 +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-{{$id}}">
+	<div id="photo-album-wrapper-inner">
+	<a href="{{$photo.link}}" class="photo-top-photo-link" id="photo-top-photo-link-{{$id}}" title="{{$photo.title}}"><img src="{{$photo.src}}" alt="{{$phoyo.alt}}" title="{{$photo.title}}" class="photo-top-photo" id="photo-top-photo-{{$id}}" /></a>
+	</div>
+	<div class="photo-top-album-name"><a href="{{$photo.album.link}}" class="photo-top-album-link" title="{{$photo.album.alt}}" >{{$photo.album.name}}</a></div>
+</div>
+<div class="photo-top-image-wrapper-end"></div>
diff --git a/view/theme/testbubble/templates/photo_view.tpl b/view/theme/testbubble/templates/photo_view.tpl
new file mode 100644
index 000000000..fa5af03a1
--- /dev/null
+++ b/view/theme/testbubble/templates/photo_view.tpl
@@ -0,0 +1,45 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<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>
+
+<div id="photo-photo" class="lframe">
+	{{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}">{{$prevlink.1}}</a></div>{{/if}}
+	<a href="{{$photo.href}}" title="{{$photo.title}}"><img src="{{$photo.src}}" /></a>
+	{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}">{{$nextlink.1}}</a></div>{{/if}}
+</div>
+
+<div id="photo-photo-end"></div>
+<div id="photo-caption" >{{$desc}}</div>
+{{if $tags}}
+<div id="in-this-photo-text">{{$tags.0}}</div>
+<div id="in-this-photo">{{$tags.1}}</div>
+{{/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/theme/testbubble/templates/profile_entry.tpl b/view/theme/testbubble/templates/profile_entry.tpl
new file mode 100644
index 000000000..66997c378
--- /dev/null
+++ b/view/theme/testbubble/templates/profile_entry.tpl
@@ -0,0 +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 mframe" id="profile-listing-photo-{{$id}}" src="{{$photo}}" alt="{{$alt}}" /></a>
+</div>
+<div class="profile-listing-photo-end"></div>
+<div class="profile-listing-name" id="profile-listing-name-{{$id}}"><a href="profiles/{{$id}}" class="profile-listing-edit-link" >{{$profile_name}}</a></div>
+<div class='profile-visible'>{{$visible}}</div>
+</div>
+<div class="profile-listing-end"></div>
+
diff --git a/view/theme/testbubble/templates/profile_vcard.tpl b/view/theme/testbubble/templates/profile_vcard.tpl
new file mode 100644
index 000000000..96e37d5e4
--- /dev/null
+++ b/view/theme/testbubble/templates/profile_vcard.tpl
@@ -0,0 +1,50 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="vcard">
+	<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}}" 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 $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/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}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
+
+	{{include file="diaspora_vcard.tpl"}}
+	
+	<div id="profile-extra-links">
+		<ul>
+			{{if $connect}}
+				<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
+			{{/if}}
+		</ul>
+	</div>
+</div>
+
+{{$contact_block}}
+
+
diff --git a/view/theme/testbubble/templates/saved_searches_aside.tpl b/view/theme/testbubble/templates/saved_searches_aside.tpl
new file mode 100644
index 000000000..6778dde36
--- /dev/null
+++ b/view/theme/testbubble/templates/saved_searches_aside.tpl
@@ -0,0 +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}}
+	
+	<ul id="saved-search-ul">
+		{{foreach $saved as $search}}
+		<li class="saved-search-li clear">
+			<a onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" class="icon savedsearchdrop drophide" href="network/?f=&amp;remove=1&amp;search={{$search.encodedterm}}"></a>
+			<a class="savedsearchterm" href="network/?f=&amp;search={{$search.encodedterm}}">{{$search.term}}</a>
+		</li>
+		{{/foreach}}
+	</ul>
+	<div class="clear"></div>
+</div>
diff --git a/view/theme/testbubble/templates/search_item.tpl b/view/theme/testbubble/templates/search_item.tpl
new file mode 100644
index 000000000..0d77d544a
--- /dev/null
+++ b/view/theme/testbubble/templates/search_item.tpl
@@ -0,0 +1,58 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="wall-item-outside-wrapper {{$item.indent}} {{$item.shiny}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
+	<div class="wall-item-content-wrapper {{$item.indent}} {{$item.shiny}}" id="wall-item-content-wrapper-{{$item.id}}" >
+		<div class="wall-item-info" id="wall-item-info-{{$item.id}}">
+			<div class="wall-item-photo-wrapper mframe" id="wall-item-photo-wrapper-{{$item.id}}" 
+				 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
+				 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
+				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+				<div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+					<ul>
+						{{$item.item_photo_menu}}
+					</ul>
+				</div>
+			</div>
+			<div class="wall-item-photo-end"></div>	
+			<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{if $item.location}}<span class="icon globe"></span>{{$item.location}} {{/if}}</div>
+		</div>
+		<div class="wall-item-lock-wrapper">
+				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
+				{{else}}<div class="wall-item-lock"></div>{{/if}}			
+		</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.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 class="wall-item-content" id="wall-item-content-{{$item.id}}" >
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			<div class="wall-item-title-end"></div>
+			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
+		</div>
+		<div class="wall-item-author">
+				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>
+				
+		</div>			
+		
+	</div>
+	<div class="wall-item-wrapper-end"></div>
+
+
+	<div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
+	{{if $item.conv}}
+			<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
+	{{/if}}
+	</div>
+	<div class="wall-item-wrapper-end"></div>
+</div>
+
+<div class="wall-item-outside-wrapper-end {{$item.indent}} {{$item.shiny}}" ></div>
diff --git a/view/theme/testbubble/templates/wall_thread.tpl b/view/theme/testbubble/templates/wall_thread.tpl
new file mode 100644
index 000000000..5c1a70f73
--- /dev/null
+++ b/view/theme/testbubble/templates/wall_thread.tpl
@@ -0,0 +1,112 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{if $item.comment_firstcollapsed}}
+	<div class="hide-comments-outer">
+	<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> <span id="hide-comments-{{$item.id}}" class="hide-comments fakelink" onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
+	</div>
+	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
+{{/if}}
+<div id="tread-wrapper-{{$item.id}}" class="tread-wrapper {{$item.toplevel}}">
+<div class="wall-item-outside-wrapper {{$item.indent}} {{$item.shiny}} wallwall" id="wall-item-outside-wrapper-{{$item.id}}" >
+	<div class="wall-item-content-wrapper {{$item.indent}} {{$item.shiny}}" id="wall-item-content-wrapper-{{$item.id}}" >
+		<div class="wall-item-info{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}">
+			{{if $item.owner_url}}
+			<div class="wall-item-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
+				<a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
+				<img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" /></a>
+			</div>
+			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
+			{{/if}}
+			<div class="wall-item-photo-wrapper mframe{{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-location" id="wall-item-location-{{$item.id}}">{{if $item.location}}<span class="icon globe"></span>{{$item.location}} {{/if}}</div>
+		</div>
+		<div class="wall-item-lock-wrapper">
+				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
+				{{else}}<div class="wall-item-lock"></div>{{/if}}
+		</div>
+		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			<div class="wall-item-title-end"></div>
+			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}
+					<div class="body-tag">
+						{{foreach $item.tags as $tag}}
+							<span class='tag'>{{$tag}}</span>
+						{{/foreach}}
+					</div>
+			</div>
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
+			{{if $item.vote}}
+			<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$item.id}}">
+				<a href="#" class="icon like" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></a>
+				{{if $item.vote.dislike}}<a href="#" class="icon dislike" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>{{/if}}
+				{{if $item.vote.share}}<a href="#" class="icon recycle wall-item-share-buttons" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>{{/if}}
+				<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+			</div>
+			{{/if}}
+			{{if $item.plink}}
+				<div class="wall-item-links-wrapper"><a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="icon remote-link"></a></div>
+			{{/if}}
+			{{if $item.edpost}}
+				<a class="editpost icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
+			{{/if}}
+			 
+			{{if $item.star}}
+			<a href="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}"></a>
+			{{/if}}
+			{{if $item.tagger}}
+			<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon tagged" title="{{$item.tagger.add}}"></a>
+			{{/if}}
+			
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
+			</div>
+				{{if $item.drop.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 class="wall-item-author">
+			<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
+			<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>
+		</div>	
+	</div>	
+	<div class="wall-item-wrapper-end"></div>
+	<div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
+	<div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
+	{{if $item.threaded}}
+	{{if $item.comment}}
+	<div class="wall-item-comment-wrapper {{$item.indent}} {{$item.shiny}}" >
+		{{$item.comment}}
+	</div>
+	{{/if}}
+	{{/if}}
+</div>
+
+<div class="wall-item-outside-wrapper-end {{$item.indent}} {{$item.shiny}}" ></div>
+
+{{foreach $item.children as $child}}
+	{{include file="{{$child.template}}" item=$child}}
+{{/foreach}}
+
+{{if $item.flatten}}
+<div class="wall-item-comment-wrapper" >
+	{{$item.comment}}
+</div>
+{{/if}}
+</div>
+{{if $item.comment_lastcollapsed}}</div>{{/if}}
diff --git a/view/theme/vier/templates/comment_item.tpl b/view/theme/vier/templates/comment_item.tpl
new file mode 100644
index 000000000..b683f1242
--- /dev/null
+++ b/view/theme/vier/templates/comment_item.tpl
@@ -0,0 +1,56 @@
+{{*
+ *	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" />
+				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >
+					<a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});">{{$comment}}</textarea>
+				{{if $qcomment}}
+					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
+					<option value=""></option>
+				{{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;" >
+
+				<div class="comment-edit-bb">
+	                                <a title="{{$edimg}}" onclick="insertFormatting('{{$comment}}','img',{{$id}});"><i class="icon-picture"></i></a>      
+	                                <a title="{{$edurl}}" onclick="insertFormatting('{{$comment}}','url',{{$id}});"><i class="icon-bookmark"></i></a>
+	                                <a title="{{$edvideo}}" onclick="insertFormatting('{{$comment}}','video',{{$id}});"><i class="icon-film"></i></a>
+                                                                                
+	                                <a title="{{$eduline}}" onclick="insertFormatting('{{$comment}}','u',{{$id}});"><i class="icon-underline"></i></a>
+	                                <a title="{{$editalic}}" onclick="insertFormatting('{{$comment}}','i',{{$id}});"><i class="icon-italic"></i></a>
+	                                <a title="{{$edbold}}" onclick="insertFormatting('{{$comment}}','b',{{$id}});"><i class="icon-bold"></i></a>
+	                                <a title="{{$edquote}}" onclick="insertFormatting('{{$comment}}','quote',{{$id}});"><i class="icon-comments"></i></a>
+
+                                </div>
+					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
+					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
+					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>
diff --git a/view/theme/vier/templates/mail_list.tpl b/view/theme/vier/templates/mail_list.tpl
new file mode 100644
index 000000000..c4d9d6807
--- /dev/null
+++ b/view/theme/vier/templates/mail_list.tpl
@@ -0,0 +1,13 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="mail-list-wrapper">
+	<span class="mail-subject {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span>
+	<span class="mail-from">{{$from_name}}</span>
+	<span class="mail-date">{{$date}}</span>
+	<span class="mail-count">{{$count}}</span>
+	
+	<a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="mail-delete"><i class="icon-trash icon-large"></i></a>
+</div>
diff --git a/view/theme/vier/templates/nav.tpl b/view/theme/vier/templates/nav.tpl
new file mode 100644
index 000000000..f4754e2d6
--- /dev/null
+++ b/view/theme/vier/templates/nav.tpl
@@ -0,0 +1,150 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<header>
+	{{* {{$langselector}} *}}
+
+	<div id="site-location">{{$sitelocation}}</div>
+	<div id="banner">{{$banner}}</div>
+</header>
+<nav>
+	<ul>
+		{{if $nav.community}}
+			<li id="nav-community-link" class="nav-menu {{$sel.community}}">
+				<a class="{{$nav.community.2}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
+			</li>
+		{{/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"></span>
+			</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"></span>
+			</li>
+		{{/if}}
+		{{if $nav.messages}}
+			<li id="nav-messages-linkmenu" class="nav-menu">
+				<a href="{{$nav.messages.0}}" rel="#nav-messages-menu" title="{{$nav.messages.1}}">{{$nav.messages.1}}
+                        	<span id="mail-update" class="nav-notify"></span></a>
+                        	<ul id="nav-messages-menu" class="menu-popup">
+                                	<li id="nav-messages-see-all"><a href="{{$nav.messages.0}}">{{$nav.messages.1}}</a></li>
+                                        <li id="nav-messages-see-all"><a href="{{$nav.messages.new.0}}">{{$nav.messages.new.1}}</a></li>
+                        	</ul>
+                        </li>           
+                {{/if}}
+
+		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear"></span></a>
+			<ul id="nav-site-menu" class="menu-popup">
+				{{if $nav.manage}}<li><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a></li>{{/if}}				
+				{{if $nav.help}} <li><a class="{{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a></li>{{/if}}
+				<li><a class="{{$nav.search.2}}" href="friendica" title="Site Info / Impressum" >Info/Impressum</a></li>
+				<li><a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a></li>
+				{{if $nav.delegations}}<li><a class="{{$nav.delegations.2}}" href="{{$nav.delegations.0}}" title="{{$nav.delegations.3}}">{{$nav.delegations.1}}</a></li>{{/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}}
+				{{if $nav.login}}<li><a class="{{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><li>{{/if}}
+			</ul>		
+		</li>
+		{{if $nav.notifications}}
+			<li  id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" title="{{$nav.notifications.1}}"><span class="icon s22 notify"></span></a>
+				<span id="notify-update" class="nav-notify"></span>
+				<ul id="nav-notifications-menu" class="menu-popup">
+					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
+					<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
+					<li class="empty">{{$emptynotifications}}</li>
+				</ul>
+			</li>		
+		{{/if}}		
+		
+<!--		
+		{{if $nav.help}} 
+		<li id="nav-help-link" class="nav-menu {{$sel.help}}">
+			<a class="{{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a>
+		</li>
+		{{/if}}
+-->
+
+		{{if $userinfo}}
+			<li id="nav-user-linklabel" class="nav-menu"><a href="#" rel="#nav-user-menu" title="{{$sitelocation}}">{{$userinfo.name}}</a>
+			<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="{{$sitelocation}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"></a>
+				<ul id="nav-user-menu" class="menu-popup">
+					{{foreach $nav.usermenu as $usermenu}}
+						<li><a class="{{$usermenu.2}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}">{{$usermenu.1}}</a></li>
+					{{/foreach}}
+					{{if $nav.notifications}}<li><a class="{{$nav.notifications.2}}" href="{{$nav.notifications.0}}" title="{{$nav.notifications.3}}" >{{$nav.notifications.1}}</a></li>{{/if}}
+					{{if $nav.messages}}<li><a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.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}}	
+				</ul>
+			</li>
+		{{/if}}
+		
+		{{if $nav.search}}
+                <li id="search-box">
+                        <form method="get" action="{{$nav.search.0}}">
+                        	<input id="search-text" class="nav-menu-search" type="text" value="" name="search">
+                        </form>
+                </li>
+		{{/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}}
+	</ul>
+
+</nav>
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li><a href="{0}"><img data-src="{1}">{2} <span class="notif-when">{3}</span></a></li>
+</ul>
+
+{{*
+
+{{if $nav.logout}}<a id="nav-logout-link" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a> {{/if}}
+{{if $nav.login}}<a id="nav-login-link" class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a> {{/if}}
+
+<span id="nav-link-wrapper" >
+
+{{if $nav.register}}<a id="nav-register-link" class="nav-commlink {{$nav.register.2}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a>{{/if}}
+
+<a id="nav-help-link" class="nav-link {{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a>
+	
+{{if $nav.apps}}<a id="nav-apps-link" class="nav-link {{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a>{{/if}}
+
+<a id="nav-search-link" class="nav-link {{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a>
+<a id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a>
+
+{{if $nav.admin}}<a id="nav-admin-link" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a>{{/if}}
+
+{{if $nav.notifications}}
+<a id="nav-notify-link" class="nav-commlink {{$nav.notifications.2}}" href="{{$nav.notifications.0}}" title="{{$nav.notifications.3}}" >{{$nav.notifications.1}}</a>
+<span id="notify-update" class="nav-ajax-left"></span>
+{{/if}}
+{{if $nav.messages}}
+<a id="nav-messages-link" class="nav-commlink {{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>
+<span id="mail-update" class="nav-ajax-left"></span>
+{{/if}}
+
+{{if $nav.manage}}<a id="nav-manage-link" class="nav-commlink {{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a>{{/if}}
+{{if $nav.settings}}<a id="nav-settings-link" class="nav-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a>{{/if}}
+{{if $nav.profiles}}<a id="nav-profiles-link" class="nav-link {{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a>{{/if}}
+
+
+</span>
+<span id="nav-end"></span>
+<span id="banner">{{$banner}}</span>
+*}}
diff --git a/view/theme/vier/templates/profile_edlink.tpl b/view/theme/vier/templates/profile_edlink.tpl
new file mode 100644
index 000000000..97990f7be
--- /dev/null
+++ b/view/theme/vier/templates/profile_edlink.tpl
@@ -0,0 +1,6 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="clear"></div>
diff --git a/view/theme/vier/templates/profile_vcard.tpl b/view/theme/vier/templates/profile_vcard.tpl
new file mode 100644
index 000000000..9e0da287c
--- /dev/null
+++ b/view/theme/vier/templates/profile_vcard.tpl
@@ -0,0 +1,70 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="vcard">
+
+	<div class="tool">
+		<div class="fn label">{{$profile.name}}</div>
+		{{if $profile.edit}}
+			<div class="action">
+			<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
+			<ul id="profiles-menu" class="menu-popup">
+				{{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>
+				<li><a href="profiles" >{{$profile.edit.3}}</a></li>
+								
+			</ul>
+			</div>
+		{{else}}
+			<div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="{{$editprofile}}" href="profiles" ></a></div>
+		{{/if}}
+	</div>
+
+
+	<div id="profile-photo-wrapper"><img class="photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></div>
+	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
+
+
+	{{if $location}}
+		<dl class="location"><dt class="location-label">{{$location}}</dt><br> 
+		<dd class="adr">
+			{{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/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 $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/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}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
+
+	{{include file="diaspora_vcard.tpl"}}
+	
+	<div id="profile-extra-links">
+		<ul>
+			{{if $connect}}
+				<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
+			{{/if}}
+		</ul>
+	</div>
+</div>
+
+{{$contact_block}}
+
+
diff --git a/view/theme/vier/templates/search_item.tpl b/view/theme/vier/templates/search_item.tpl
new file mode 100644
index 000000000..0a62fd584
--- /dev/null
+++ b/view/theme/vier/templates/search_item.tpl
@@ -0,0 +1,97 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+
+<div class="wall-item-decor">
+	<span class="icon star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred}}">{{$item.star.starred}}</span>
+	{{if $item.lock}}<span class="icon lock fakelink" onclick="lockview(event,{{$item.id}});" title="{{$item.lock}}">{{$item.lock}}</span>{{/if}}	
+	<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+</div>
+
+<div class="wall-item-container {{$item.indent}} {{$item.shiny}} ">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper"
+				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
+				onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+					<img src="{{$item.thumb}}" class="contact-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
+				</a>
+				<a href="#" rel="#wall-item-photo-menu-{{$item.id}}" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-{{$item.id}}">menu</a>
+				<ul class="wall-item-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
+				{{$item.item_photo_menu}}
+				</ul>
+				
+			</div>
+		</div>
+		<div class="wall-item-actions-author">
+			<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a> 
+			<span class="wall-item-ago">
+				{{if $item.plink}}<a class="link" title="{{$item.plink.title}}" href="{{$item.plink.href}}" style="color: #999">{{$item.ago}}</a>{{else}} {{$item.ago}} {{/if}}
+				{{if $item.lock}}<span class="fakelink" style="color: #999" onclick="lockview(event,{{$item.id}});">{{$item.lock}}</span> {{/if}}
+			</span>
+		</div>
+		<div class="wall-item-content">
+			{{if $item.title}}<h2><a href="{{$item.plink.href}}">{{$item.title}}</a></h2>{{/if}}
+			{{$item.body}}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+			{{foreach $item.tags as $tag}}
+				<span class='tag'>{{$tag}}</span>
+			{{/foreach}}
+
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="">
+			<!-- {{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.href}}"><i class="icon-link icon-large"></i></a>{{/if}} -->
+			{{if $item.conv}}<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'><i class="icon-link icon-large"></i></a>{{/if}}
+		</div>
+		<div class="wall-item-actions">
+
+			<div class="wall-item-location">{{$item.location}}&nbsp;</div>	
+			
+			<div class="wall-item-actions-social">
+			{{if $item.star}}
+				<a href="#" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classdo}}"  title="{{$item.star.do}}">{{$item.star.do}}</a>
+				<a href="#" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classundo}}"  title="{{$item.star.undo}}">{{$item.star.undo}}</a>
+				<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="{{$item.star.classtagger}}" title="{{$item.star.tagger}}">{{$item.star.tagger}}</a>
+			{{/if}}
+			
+			{{if $item.vote}}
+				<a href="#" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false">{{$item.vote.like.1}}</a>
+				<a href="#" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false">{{$item.vote.dislike.1}}</a>
+			{{/if}}
+						
+			{{if $item.vote.share}}
+				<a href="#" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false">{{$item.vote.share.1}}</a>
+			{{/if}}			
+			</div>
+			
+			<div class="wall-item-actions-tools">
+
+				{{if $item.drop.pagedrop}}
+					<input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
+				{{/if}}
+				{{if $item.drop.dropping}}
+					<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$item.drop.delete}}">{{$item.drop.delete}}</a>
+				{{/if}}
+				{{if $item.edpost}}
+					<a class="icon edit s16" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
+				{{/if}}
+			</div>
+			
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links"></div>
+		<div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
+		<div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>	
+	</div>
+</div>
diff --git a/view/theme/vier/templates/threaded_conversation.tpl b/view/theme/vier/templates/threaded_conversation.tpl
new file mode 100644
index 000000000..dc3e918f6
--- /dev/null
+++ b/view/theme/vier/templates/threaded_conversation.tpl
@@ -0,0 +1,45 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{$live_update}}
+
+{{foreach $threads as $thread}}
+
+<div id="tread-wrapper-{{$thread.id}}" class="tread-wrapper {{if $thread.threaded}}threaded{{/if}}  {{$thread.toplevel}}">
+       
+       
+		{{if $thread.type == tag}}
+			{{include file="wall_item_tag.tpl" item=$thread}}
+		{{else}}
+			{{include file="{{$thread.template}}" item=$thread}}
+		{{/if}}
+		
+</div>
+{{/foreach}}
+
+<div id="conversation-end"></div>
+
+{{if $dropping}}
+<a id="item-delete-selected" href="#" onclick="deleteCheckedItems();return false;">
+	<span class="icon s22 delete text">{{$dropping}}</span>
+</a>
+<img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
+{{/if}}
+
+<script>
+// jquery color plugin from https://raw.github.com/gist/1891361/17747b50ad87f7a59a14b4e0f38d8f3fb6a18b27/gistfile1.js
+    (function(d){d.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor","borderTopColor","color","outlineColor"],function(f,e){d.fx.step[e]=function(g){if(!g.colorInit){g.start=c(g.elem,e);g.end=b(g.end);g.colorInit=true}g.elem.style[e]="rgb("+[Math.max(Math.min(parseInt((g.pos*(g.end[0]-g.start[0]))+g.start[0]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[1]-g.start[1]))+g.start[1]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[2]-g.start[2]))+g.start[2]),255),0)].join(",")+")"}});function b(f){var e;if(f&&f.constructor==Array&&f.length==3){return f}if(e=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(f)){return[parseInt(e[1]),parseInt(e[2]),parseInt(e[3])]}if(e=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(f)){return[parseFloat(e[1])*2.55,parseFloat(e[2])*2.55,parseFloat(e[3])*2.55]}if(e=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(f)){return[parseInt(e[1],16),parseInt(e[2],16),parseInt(e[3],16)]}if(e=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(f)){return[parseInt(e[1]+e[1],16),parseInt(e[2]+e[2],16),parseInt(e[3]+e[3],16)]}if(e=/rgba\(0, 0, 0, 0\)/.exec(f)){return a.transparent}return a[d.trim(f).toLowerCase()]}function c(g,e){var f;do{f=d.curCSS(g,e);if(f!=""&&f!="transparent"||d.nodeName(g,"body")){break}e="backgroundColor"}while(g=g.parentNode);return b(f)}var a={transparent:[255,255,255]}})(jQuery);
+    var colWhite = {backgroundColor:'#EFF0F1'};
+    var colShiny = {backgroundColor:'#FCE94F'};
+</script>
+
+{{if $mode == display}}
+<script>
+    var id = window.location.pathname.split("/").pop();
+    $(window).scrollTop($('#item-'+id).position().top);
+    $('#item-'+id).animate(colWhite, 1000).animate(colShiny).animate(colWhite, 2000);   
+</script>
+{{/if}}
+
diff --git a/view/theme/vier/templates/wall_thread.tpl b/view/theme/vier/templates/wall_thread.tpl
new file mode 100644
index 000000000..f2f6f186e
--- /dev/null
+++ b/view/theme/vier/templates/wall_thread.tpl
@@ -0,0 +1,177 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{if $mode == display}}
+{{else}}
+{{if $item.comment_firstcollapsed}}
+	<div class="hide-comments-outer">
+		<span id="hide-comments-total-{{$item.id}}" 
+			class="hide-comments-total">{{$item.num_comments}}</span>
+			<span id="hide-comments-{{$item.id}}" 
+				class="hide-comments fakelink" 
+				onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
+			{{if $item.thread_level==3}} - 
+			<span id="hide-thread-{{$item}}-id"
+				class="fakelink"
+				onclick="showThread({{$item.id}});">expand</span> /
+			<span id="hide-thread-{{$item}}-id"
+				class="fakelink"
+				onclick="hideThread({{$item.id}});">collapse</span> thread{{/if}}
+	</div>
+	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
+{{/if}}
+{{/if}}
+
+{{if $item.thread_level!=1}}<div class="children">{{/if}}
+
+<div class="wall-item-decor">
+	<span class="icon s22 star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred}}">{{$item.star.starred}}</span>
+	{{if $item.lock}}<span class="icon s22 lock fakelink" onclick="lockview(event,{{$item.id}});" title="{{$item.lock}}">{{$item.lock}}</span>{{/if}}	
+	<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+</div>
+
+<div class="wall-item-container {{$item.indent}} {{$item.shiny}} " id="item-{{$item.id}}">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}"
+				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
+				onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="contact-photo-link" id="wall-item-photo-link-{{$item.id}}">
+					<img src="{{$item.thumb}}" class="contact-photo {{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
+				</a>
+				<a href="#" rel="#wall-item-photo-menu-{{$item.id}}" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-{{$item.id}}">menu</a>
+				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
+				{{$item.item_photo_menu}}
+				</ul>
+				
+			</div>
+			{{if $item.owner_url}}
+			<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
+				<a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="contact-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
+					<img src="{{$item.owner_photo}}" class="contact-photo {{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" alt="{{$item.owner_name}}" />
+				</a>
+			</div>
+			{{/if}}			
+		</div>
+		<div class="wall-item-actions-author">
+			<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a>
+			 {{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> <!-- {{$item.vwall}} -->{{/if}}
+			<span class="wall-item-ago">
+				{{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.href}}" style="color: #999">{{$item.ago}}</a>{{else}} {{$item.ago}} {{/if}}
+				{{if $item.lock}}<span class="fakelink" style="color: #999" onclick="lockview(event,{{$item.id}});">{{$item.lock}}</span> {{/if}}
+			</span>
+		</div>
+
+		<div itemprop="description" class="wall-item-content">
+			{{if $item.title}}<h2><a href="{{$item.plink.href}}" class="{{$item.sparkle}}">{{$item.title}}</a></h2>{{/if}}
+			{{$item.body}}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+			{{foreach $item.hashtags as $tag}}
+				<span class='tag'>{{$tag}}</span>
+			{{/foreach}}
+  			{{foreach $item.mentions as $tag}}
+				<span class='mention'>{{$tag}}</span>
+			{{/foreach}}
+               {{foreach $item.folders as $cat}}
+                    <span class='folder'>{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
+               {{/foreach}}
+                {{foreach $item.categories as $cat}}
+                    <span class='category'>{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
+                {{/foreach}}
+		</div>
+	</div>	
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+			{{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.href}}"><i class="icon-link icon-large"></i></a>{{/if}}
+		</div>
+		<div class="wall-item-actions">
+			<div class="wall-item-actions-social">
+			{{if $item.threaded}}{{if $item.comment}}
+				<span id="comment-{{$item.id}}" class="fakelink togglecomment" onclick="openClose('item-comments-{{$item.id}}');"><i class="icon-comment"></i></span>
+			{{/if}}{{/if}}
+			{{if $item.vote}}
+				<a href="#" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"><i class="icon-thumbs-up icon-large"></i></a>
+				{{if $item.vote.dislike}}
+				<a href="#" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"><i class="icon-thumbs-down icon-large"></i></a>
+				{{/if}}
+			{{/if}}
+			{{if $item.vote.share}}
+				<a href="#" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"><i class="icon-retweet icon-large"></i></a>
+			{{/if}}
+			{{if $item.star}}
+				<a href="#" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classdo}}"  title="{{$item.star.do}}"><i class="icon-star icon-large"></i></a>
+				<a href="#" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classundo}}"  title="{{$item.star.undo}}"><i class="icon-star-empty icon-large"></i></a>
+			{{/if}}
+			{{if $item.tagger}}
+				<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="{{$item.tagger.class}}" title="{{$item.tagger.add}}"><i class="icon-tags icon-large"></i></a>
+			{{/if}}
+			{{if $item.filer}}
+                                <a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"><i class="icon-folder-close icon-large"></i></a>
+			{{/if}}
+			</div>
+			<div class="wall-item-location">{{$item.location}} {{$item.postopts}}</div>				
+			<div class="wall-item-actions-tools">
+
+				{{if $item.drop.pagedrop}}
+					<input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
+				{{/if}}
+				{{if $item.drop.dropping}}
+					<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}"><i class="icon-trash icon-large"></i></a>
+				{{/if}}
+				{{if $item.edpost}}
+					<a href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="icon-edit icon-large"></i></a>
+				{{/if}}
+			</div>
+			
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-like" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
+		<div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>	
+	</div>
+	
+	{{if $item.threaded}}{{if $item.comment}}
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}" style="display: none;">
+					{{$item.comment}}
+		</div>
+	</div>
+	{{/if}}{{/if}}
+</div>
+
+
+{{foreach $item.children as $child}}
+	{{if $item.type == tag}}
+		{{include file="wall_item_tag.tpl" item=$child}}
+	{{else}}
+		{{include file="{{$item.template}}" item=$child}}
+	{{/if}}
+{{/foreach}}
+
+{{if $item.thread_level!=1}}</div>{{/if}}
+
+
+{{if $mode == display}}
+{{else}}
+{{if $item.comment_lastcollapsed}}</div>{{/if}}
+{{/if}}
+
+{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
+<div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}">{{$item.comment}}</div>
+{{/if}}{{/if}}{{/if}}
+
+
+{{if $item.flatten}}
+<div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}">{{$item.comment}}</div>
+{{/if}}