Merge remote-tracking branch 'upstream/master' into bootstrap

Conflicts:
	view/php/theme_init.php

46 files changed, 292 insertions, 122 deletions

diff --git a/view/tpl/_conv_item.tpl b/view/tpl/_conv_item.tpl
new file mode 100755
index 000000000..b6e3df7c4
--- /dev/null
+++ b/view/tpl/_conv_item.tpl
@@ -0,0 +1,118 @@
+{{if $item.comment_firstcollapsed}}
+	<div class="hide-comments-outer">
+	<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> <span id="hide-comments-{{$item.id}}" class="hide-comments fakelink" onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
+	</div>
+	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
+{{/if}}
+<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper {{$item.toplevel}}">
+<a name="{{$item.id}}" ></a>
+<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" >
+	<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" >
+		<div class="wall-item-info{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}">
+			{{if $item.owner_url}}
+			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
+				<a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
+				<img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" /></a>
+			</div>
+			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
+			{{/if}}
+			<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}" 
+				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
+                onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
+				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+                <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+                    <ul>
+                        {{$item.item_photo_menu}}
+                    </ul>
+                </div>
+
+			</div>
+			<div class="wall-item-photo-end"></div>
+			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
+				{{if $item.lock}}<i class="wall-item-lock icon-lock lockview" title="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" ></i>
+				{{else}}<div class="wall-item-lock"></div>{{/if}}	
+				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
+			</div>
+		</div>
+		<div class="wall-item-author">
+				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.via}} <a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}<br />
+
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i>&nbsp;{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</div>
+		</div>			
+		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
+			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
+			<div class="wall-item-title-end"></div>
+			<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}
+					<div class="body-tag">
+						{{foreach $item.tags as $tag}}
+							<span class='tag'>{{$tag}}</span>
+						{{/foreach}}
+					</div>
+			{{if $item.has_cats}}
+			<div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+
+			{{if $item.has_folders}}
+			<div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a> {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			</div>
+			{{/if}}
+			</div>
+		</div>
+		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
+			{{if $item.like}}
+				<i class="icon-thumbs-up-alt item-tool" title="{{$item.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></i>
+			{{/if}}
+			{{if $item.dislike}}
+				<i class="icon-thumbs-down-alt item-tool" title="{{$item.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></i>
+			{{/if}}
+			{{if $item.share}}
+				<i class="icon-retweet item-tool" title="{{$item.share.0}}" onclick="jotShare({{$item.id}}); return false"></i>
+			{{/if}}
+			{{if $item.plink}}
+				<i class="icon-external-link item-tool" onclick="window.location.href='{{$item.plink.href}}'; return false;" title="{{$item.plink.title}}"></i>
+			{{/if}}
+			{{if $item.edpost}}
+				<i class="editpost icon-pencil item-tool" onclick="window.location.href='{{$item.edpost.0}}'; return false;" title="{{$item.edpost.1}}"></i>
+			{{/if}}			 
+			{{if $item.star}}
+			<i id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item item-tool {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></i>
+			{{/if}}
+			{{if $item.tagger}}
+			<i id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon-tag item-tool" title="{{$item.tagger.tagit}}"></i>
+			{{/if}}
+			{{if $item.filer}}
+			<i id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item icon-folder-open item-tool" title="{{$item.filer}}"></i>
+			{{/if}}			
+			<div id="like-rotator-{{$item.id}}" class="like-rotator"></div>
+
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
+				{{if $item.drop.dropping}}<a class="wall-item-delete-link" id="wall-item-delete-link-{{$item.id}}" href="item/drop/{{$item.id}}" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ><i class="icon-remove drop-icons item-tool"></i></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 class="wall-item-like {{$item.indent}}" id="wall-item-like-{{$item.id}}">{{$item.showlike}}</div>
+			<div class="wall-item-dislike {{$item.indent}}" id="wall-item-dislike-{{$item.id}}">{{$item.showdislike}}</div>
+
+		</div>
+	</div>	
+
+	<div class="wall-item-wrapper-end"></div>
+
+<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
+</div>
+{{if $item.toplevel}}
+{{foreach $item.children as $child}}
+	{{include file="{{$child.template}}" item=$child}}
+{{/foreach}}
+{{/if}}
+
+<div class="wall-item-comment-wrapper" >
+	{{$item.comment}}
+</div>
+
+
+</div>
+{{if $item.comment_lastcollapsed}}</div>{{/if}}
diff --git a/view/tpl/_group_side.tpl b/view/tpl/_group_side.tpl
new file mode 100755
index 000000000..e350087f0
--- /dev/null
+++ b/view/tpl/_group_side.tpl
@@ -0,0 +1,33 @@
+<div class="panel panel-default" id="group-sidebar">
+<div class="panel-heading"><h3 class="panel-title">{{$title}}</h3></div>
+
+<div class="panel-body" 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 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>
+</div>
+
+
diff --git a/view/tpl/_saved_searches_aside.tpl b/view/tpl/_saved_searches_aside.tpl
new file mode 100755
index 000000000..2ca2ef6ea
--- /dev/null
+++ b/view/tpl/_saved_searches_aside.tpl
@@ -0,0 +1,15 @@
+<div class="panel panel-default" id="saved-search-list">
+<div class="panel-heading">	<h3 class="panel-title" id="search">{{$title}}</h3></div>
+<div class="panel-body">
+	{{$searchbox}}
+	
+	<ul id="saved-search-ul">
+		{{foreach $saved as $search}}
+		<li id="search-term-{{$search.id}}" class="saved-search-li clear">
+			<a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="network/?f=&amp;remove=1&amp;search={{$search.encodedterm}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer savedsearchdrop" ></i></a>
+			<a id="saved-search-term-{{$search.id}}" class="savedsearchterm" href="network/?f=&amp;search={{$search.encodedterm}}">{{$search.displayterm}}</a>
+		</li>
+		{{/foreach}}
+	</ul></div>
+	<div class="clear"></div>
+</div>
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 30abcc6b3..590213fd3 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -16,6 +16,10 @@
 
 <div id="contact-edit-wrapper">
 
+{{if $last_update}}
+{{$lastupdtext}} {{$last_update}}
+{{/if}}
+
 {{if $notself}}
 {{if $slide}}
 <h3>{{$lbl_slider}}</h3>
@@ -30,7 +34,7 @@
 <h3>{{$permlbl}}</h3>
 <div id="perm-desc" class="descriptive-text">{{$permnote}}</div>
 
-<form id="abook-edit-form" action="connections/{{$contact_id}}" method="post" >
+<form id="abook-edit-form" action="connedit/{{$contact_id}}" method="post" >
 <input type="hidden" name="contact_id" value="{{$contact_id}}">
 <input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" />
 
diff --git a/view/tpl/admin_plugins.tpl b/view/tpl/admin_plugins.tpl
index 729ba5dc8..40821c534 100755
--- a/view/tpl/admin_plugins.tpl
+++ b/view/tpl/admin_plugins.tpl
@@ -4,7 +4,7 @@
 		<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 class='toggleplugin' href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}?a=t&amp;t={{$form_security_token}}' title="{{if $p.1==on}}Disable{{else}}Enable{{/if}}" ><i class='{{if $p.1==on}}icon-check{{else}}icon-check-empty{{/if}} admin-icons'></i></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}}
 
diff --git a/view/tpl/admin_plugins_details.tpl b/view/tpl/admin_plugins_details.tpl
index f72142e41..1c1a59879 100755
--- a/view/tpl/admin_plugins_details.tpl
+++ b/view/tpl/admin_plugins_details.tpl
@@ -1,7 +1,7 @@
 <div class = "generic-content-wrapper" 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><i class='toggleplugin {{if $status==on}}icon-check{{else}}icon-check-empty{{/if}} admin-icons'></i> {{$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}}
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index d0a5254fe..b0f9d4a74 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -47,6 +47,7 @@
     {{include file="field_select.tpl" field=$theme_mobile}}
     {{include file="field_select.tpl" field=$theme_accessibility}}
     {{include file="field_input.tpl" field=$site_channel}}
+    {{include file="field_checkbox.tpl" field=$no_login_on_homepage}}
 
 	
 	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
diff --git a/view/tpl/admin_summary.tpl b/view/tpl/admin_summary.tpl
index d3665626f..24cdd57cc 100755
--- a/view/tpl/admin_summary.tpl
+++ b/view/tpl/admin_summary.tpl
@@ -14,27 +14,23 @@
 		<dt>{{$users.0}}</dt>
 		<dd>{{$users.1}}</dd>
 	</dl>
-	{{foreach $accounts as $p}}
+	<!-- $accounts is empty
+		{{foreach $accounts as $p}}
 		<dl>
 			<dt>{{$p.0}}</dt>
 			<dd>{{if $p.1}}{{$p.1}}{{else}}0{{/if}}</dd>
 		</dl>
-	{{/foreach}}
-
-
+	{{/foreach}} -->
 	<dl>
 		<dt>{{$plugins.0}}</dt>
-		
-		{{foreach $plugins.1 as $p}}
-			<dd>{{$p}}</dd>
-		{{/foreach}}
-		
+		<dd>
+		{{foreach $plugins.1 as $p}} {{$p}} {{/foreach}}
+		&nbsp;
+		</dd>
 	</dl>
-
 	<dl>
 		<dt>{{$version.0}}</dt>
-		<dd>{{$version.1}} - {{$build}}</dt>
+		<dd>{{$version.1}} - {{$build}}</dd>
 	</dl>
 
-
 </div>
diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl
index 770df7eba..3549dc5c2 100755
--- a/view/tpl/admin_users.tpl
+++ b/view/tpl/admin_users.tpl
@@ -34,8 +34,8 @@
 					<td class="email">{{$u.email}}</td>
 					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}" /></td>
 					<td class="tools">
-						<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title='{{$approve}}'><span class='icon like'></span></a>
-						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><span class='icon dislike'></span></a>
+						<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title='{{$approve}}'><i class='icon-thumbs-up-alt admin-icons'></i></a>
+						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><i class='icon-thumbs-down-alt admin-icons'></i></a>
 					</td>
 				</tr>
 			{{/foreach}}
@@ -55,7 +55,6 @@
 			<table id='users'>
 				<thead>
 				<tr>
-					<th></th>
 					{{foreach $th_users as $th}}<th>{{$th}}</th>{{/foreach}}
 					<th></th>
 					<th></th>
@@ -64,15 +63,21 @@
 				<tbody>
 				{{foreach $users as $u}}
 					<tr>
-						<td><img src="{{$u.micro}}" alt="{{$u.nickname}}" title="{{$u.nickname}}"></td>
-						<td class='email'>{{$u.account_email}}</td>
+						<td class='account_id'>{{$u.account_id}}</td>
+						<td class='email'>{{if $u.blocked}}
+							<i>{{$u.account_email}}</i>
+						{{else}}
+							<strong>{{$u.account_email}}</strong>
+						{{/if}}</td>
+						<td class='channels'>{{$u.channels}}</td>
 						<td class='register_date'>{{$u.account_created}}</td>
 						<td class='login_date'>{{$u.account_lastlog}}</td>
+						<td class='account_expires'>{{$u.account_expires}}</td>
 						<td class='service_class'>{{$u.account_service_class}}</td>
-						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
+						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.account_id}}" name="user[]" value="{{$u.account_id}}"/></td>
 						<td class="tools">
-							<a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><span class='icon block {{if $u.blocked==0}}dim{{/if}}'></span></a>
-							<a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><span class='icon drop'></span></a>
+							<a href="{{$baseurl}}/admin/users/block/{{$u.account_id}}?t={{$form_security_token}}" title='{{if ($u.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class='icon-ban-circle admin-icons {{if ($u.blocked)}}dim{{/if}}'></i></a>
+							<a href="{{$baseurl}}/admin/users/delete/{{$u.account_id}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><i class='icon-remove admin-icons'></i></a>
 						</td>
 					</tr>
 				{{/foreach}}
diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
index b8e2b4730..1ea619774 100755
--- a/view/tpl/comment_item.tpl
+++ b/view/tpl/comment_item.tpl
@@ -61,7 +61,7 @@
 				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
 					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
 					{{if $preview}}
-					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
+					<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink"><i class="icon-eye-open comment-icon comment-preview-icon" title="{{$preview}}"></i></span>
 					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
 					{{/if}}
 				</div>
diff --git a/view/tpl/conv_frame.tpl b/view/tpl/conv_frame.tpl
index 596246708..aa7b55e9b 100755
--- a/view/tpl/conv_frame.tpl
+++ b/view/tpl/conv_frame.tpl
@@ -1,14 +1,5 @@
 <div id="threads-begin"></div>
 <div id="threads-end"></div>
 <div id="conversation-end"></div>
-
-{{if $dropping}}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
-  <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
-  <div id="item-delete-selected-desc" >{{$dropping}}</div>
-</div>
-<div id="item-delete-selected-end"></div>
-{{/if}}
-
 <div id="page-spinner"></div>
 
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 781746b4b..fb36f5dca 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -89,7 +89,7 @@
 			<div id="like-rotator-{{$item.id}}" class="like-rotator"></div>
 
 			<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();" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ><i class="icon-remove drop-icons item-tool"></i></a>{{/if}}
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" ><i class="icon-remove drop-icons item-tool"></i></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>
diff --git a/view/tpl/conversation.tpl b/view/tpl/conversation.tpl
index 8948fd474..97d64327a 100755
--- a/view/tpl/conversation.tpl
+++ b/view/tpl/conversation.tpl
@@ -18,11 +18,3 @@
 {{/foreach}}
 <div id="threads-end"></div>
 <div id="conversation-end"></div>
-
-{{if $dropping}}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
-  <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
-  <div id="item-delete-selected-desc" >{{$dropping}}</div>
-</div>
-<div id="item-delete-selected-end"></div>
-{{/if}}
diff --git a/view/tpl/design_tools.tpl b/view/tpl/design_tools.tpl
index eb082dc37..80a538231 100644
--- a/view/tpl/design_tools.tpl
+++ b/view/tpl/design_tools.tpl
@@ -1,7 +1,9 @@
 <div id="design-tools" class="widget design-tools">
 <h3>{{$title}}</h3>
+<ul>
 <li><a href="blocks/{{$who}}">{{$blocks}}</a></li>
 <li><a href="menu">{{$menus}}</a></li>
 <li><a href="layouts/{{$who}}">{{$layout}}</a></li>
 <li><a href="webpages/{{$who}}">{{$pages}}</a></li>
+</ul>
 </div>
diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl
index 85939ac22..cf149341e 100755
--- a/view/tpl/email_notify_html.tpl
+++ b/view/tpl/email_notify_html.tpl
@@ -5,9 +5,9 @@
 	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 </head>
 <body>
-<table style="border:1px solid #ccc">
+<table style="border:1px solid #ccc; background-color: #FFFFFF; color: #000000;">
 	<tbody>
-	<tr><td colspan="2" style="background:#ff0000; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px; float:left;" src='{{$siteurl}}/images/rhash-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 colspan="2" style="background:#c60032; 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/rm-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>
diff --git a/view/tpl/event.tpl b/view/tpl/event.tpl
index 58a19eb76..e0977e262 100755
--- a/view/tpl/event.tpl
+++ b/view/tpl/event.tpl
@@ -3,8 +3,8 @@
 	
 	{{if $event.item.author.xchan_name}}<a href="{{$event.item.author.xchan_url}}" ><img src="{{$event.item.author.xchan_photo_s}}" height="32" width="32" />{{$event.item.author.xchan_name}}</a>{{/if}}
 	{{$event.html}}
-	{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}"  class="plink-event-link icon s22 remote-link"></a>{{/if}}
-	{{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link icon s22 pencil"></a>{{/if}}
+	{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}"  class="plink-event-link"><i class="icon-external-link" ></i></a>{{/if}}
+	{{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link"><i class="icon-pencil"></i></a>{{/if}}
 	</div>
 	<div class="clear"></div>
 {{/foreach}}
diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl
index f661eac87..da4dda82e 100755
--- a/view/tpl/event_form.tpl
+++ b/view/tpl/event_form.tpl
@@ -7,7 +7,7 @@
 <form action="{{$post}}" method="post" >
 
 <input type="hidden" name="event_id" value="{{$eid}}" />
-<input type="hidden" name="cid" value="{{$cid}}" />
+<input type="hidden" name="xchan" value="{{$xchan}}" />
 <input type="hidden" name="mid" value="{{$mid}}" />
 
 <div id="event-start-text">{{$s_text}}</div>
diff --git a/view/tpl/field_input.tpl b/view/tpl/field_input.tpl
index d5b3d6b4e..a584f95e7 100755
--- a/view/tpl/field_input.tpl
+++ b/view/tpl/field_input.tpl
@@ -1,6 +1,6 @@
 	<div class='field input'>
 		<label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label>
-		<input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}">{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}}
+		<input name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}">{{if $field.4}} <span class="required">{{$field.4}}</span> {{/if}}
 		<span id='help_{{$field.0}}' class='field_help'>{{$field.3}}</span>
 		<div id='end_{{$field.0}}' class='field_end'></div>
 	</div>
diff --git a/view/tpl/group_drop.tpl b/view/tpl/group_drop.tpl
index 670136db7..850e7101f 100755
--- a/view/tpl/group_drop.tpl
+++ b/view/tpl/group_drop.tpl
@@ -2,8 +2,6 @@
 	<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>
+		class="group-delete-icon" ><i class="icon-remove drop-icons"></i></a>
 </div>
 <div class="group-delete-end"></div>
diff --git a/view/tpl/group_side.tpl b/view/tpl/group_side.tpl
index ebc820530..a0ed7a82d 100755
--- a/view/tpl/group_side.tpl
+++ b/view/tpl/group_side.tpl
@@ -13,7 +13,7 @@
 					/>
 				{{/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>
+					<a class="groupsideedit" href="{{$group.edit.href}}" title="{{$edittext}}"><i id="edit-sidebar-group-element-{{$group.id}}" class="group-edit-icon iconspacer icon-pencil"></i></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>
@@ -23,11 +23,6 @@
   <div id="sidebar-new-group">
   <a href="group/new">{{$createtext}}</a>
   </div>
-  {{if $ungrouped}}
-  <div id="sidebar-ungrouped">
-  <a href="nogroup">{{$ungrouped}}</a>
-  </div>
-  {{/if}}
 </div>
 
 
diff --git a/view/tpl/install_checks.tpl b/view/tpl/install_checks.tpl
index 2068df916..2f773f746 100755
--- a/view/tpl/install_checks.tpl
+++ b/view/tpl/install_checks.tpl
@@ -3,7 +3,7 @@
 <form  action="{{$baseurl}}/index.php?q=setup" method="post">
 <table>
 {{foreach $checks as $check}}
-	<tr><td>{{$check.title}} </td><td><span class="icon s22 {{if $check.status}}on{{else}}{{if $check.required}}off{{else}}yellow{{/if}}{{/if}}"></td><td>{{if $check.required}}(required){{/if}}</td></tr>
+	<tr><td>{{$check.title}} </td><td><i class="{{if $check.status}}icon-check{{else}}{{if $check.required}}icon-check-empty{{else}}icon-exclamation{{/if}}{{/if}}"></i></td><td>{{if $check.required}}(required){{/if}}</td></tr>
 	{{if $check.help}}
 	<tr><td colspan="3"><blockquote>{{$check.help}}</blockquote></td></tr>
 	{{/if}}
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 72553f944..abe1c0924 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -24,7 +24,7 @@
 		<div id="jot-pagetitle-wrap"><input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}" class="jothidden" style="display:none" /></div>
 		{{/if}}
 		<div id="jot-text-wrap">
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{if $content}}{{$content}}{{else}}{{$share}}{{/if}}</textarea>
+		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" placeholder="{{$share}}">{{$content}}</textarea>
 		</div>
 		<div id="profile-jot-text-loading"></div>
 
@@ -71,7 +71,7 @@
 	</div>
 	{{/if}}
 
-	{{if $preview}}<span onclick="preview_post();" id="jot-preview-link" class="fakelink">{{$preview}}</span>{{/if}}
+	{{if $preview}}<span onclick="preview_post();" id="jot-preview-link" class="fakelink"><i class="icon-eye-open jot-icons" title="{{$preview}}"></i></span>{{/if}}
 
 
 	<div id="profile-jot-perms-end"></div>
diff --git a/view/tpl/lang_selector.tpl b/view/tpl/lang_selector.tpl
index 945cbf51e..159eeea7e 100755
--- a/view/tpl/lang_selector.tpl
+++ b/view/tpl/lang_selector.tpl
@@ -1,4 +1,4 @@
-<div id="lang-select-icon" class="icon s22 language" title="{{$title}}" onclick="openClose('language-selector');" ></div>
+<div id="lang-select-icon" title="{{$title}}" onclick="openClose('language-selector');" ><i class="icon-flag"></i></div>
 <div id="language-selector" style="display: none;" >
 	<form action="#" method="post" >
 		<select name="system_language" onchange="this.form.submit();" >
diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl
index 84bdb451a..f794ffc78 100755
--- a/view/tpl/mail_conv.tpl
+++ b/view/tpl/mail_conv.tpl
@@ -8,9 +8,9 @@
 		<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}}" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" ><i class="icon-remove mail-icons drop-icons"></i></a></div><div class="mail-conv-delete-end"></div>
+	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="mail/drop/{{$mail.id}}" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" ><i class="icon-remove mail-icons drop-icons"></i></a></div><div class="mail-conv-delete-end"></div>
 	{{if $mail.can_recall}}
-	<div class="mail-conv-recall-wrapper" id="mail-conv-recall-wrapper-{{$mail.id}}" ><a href="message/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}" class="mail-conv-recall-icon" ><i class="icon-undo mail-icons drop-icons"></i></a></div><div class="mail-conv-recall-end"></div>
+	<div class="mail-conv-recall-wrapper" id="mail-conv-recall-wrapper-{{$mail.id}}" ><a href="mail/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}" class="mail-conv-recall-icon" ><i class="icon-undo mail-icons drop-icons"></i></a></div><div class="mail-conv-recall-end"></div>
 	{{/if}}
 	<div class="mail-conv-outside-wrapper-end"></div>
 </div>
diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl
index 24966ad1d..e17a206a0 100755
--- a/view/tpl/mail_list.tpl
+++ b/view/tpl/mail_list.tpl
@@ -1,7 +1,7 @@
 <div class="generic-content-wrapper" id="mail-list-wrapper">
 	<a href="{{$from_url}}" class ="mail-list" ><img class="mail-list-sender-photo" src="{{$from_photo}}" alt="{{$from_name}}" /></a>
 	<span class="mail-list">{{$from_name}}</span>
-	<span class="mail-list" {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span>
+	<span class="mail-list {{if $seen}}seen{{else}}unseen{{/if}}"><a href="mail/{{$id}}" class="mail-link">{{$subject}}</a></span>
 	<span class="mail-list" title="{{$date}}">{{$date}}</span>
 	<span class="mail-list mail-list-remove"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" ><i class="icon-remove mail-icons drop-icons"></i></a></span>
 	<div class="clear">&nbsp;</div>
diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl
index ef61be809..8f13f80c9 100644
--- a/view/tpl/mitemedit.tpl
+++ b/view/tpl/mitemedit.tpl
@@ -14,6 +14,26 @@
 {{include file="field_input.tpl" field=$mitem_order}}
 {{include file="field_checkbox.tpl" field=$usezid}}
 {{include file="field_checkbox.tpl" field=$newwin}}
+
+<div id="settings-default-perms" class="settings-default-perms" >
+	<a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" >{{$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>
+
+
+
 <div class="mitemedit-submit-wrapper" >
 <input type="submit" name="submit" class="mitemedit-submit" value="{{$submit}}" />
 </div>
diff --git a/view/tpl/notes.tpl b/view/tpl/notes.tpl
new file mode 100644
index 000000000..09932e545
--- /dev/null
+++ b/view/tpl/notes.tpl
@@ -0,0 +1,10 @@
+<div class="widget">
+<script>
+$("#note-text").live('input paste',function(e){
+	$.post('notes', { 'note_text' : $('#note-text').val() });
+});
+</script>
+
+<h3>{{$banner}}</h3>
+<textarea name="note_text" id="note-text">{{$text}}</textarea>
+</div>
diff --git a/view/tpl/opensearch.tpl b/view/tpl/opensearch.tpl
index 26fb5a799..ea260c6ae 100755
--- a/view/tpl/opensearch.tpl
+++ b/view/tpl/opensearch.tpl
@@ -3,11 +3,11 @@
 	<ShortName>Red Matrix@{{$nodename}}</ShortName>
 	<Description>Search in The Red Matrix@{{$nodename}}</Description>
 	<Contact>http://github.com/friendica/red/</Contact>
-	<Image height="16" width="16" type="image/png">{{$baseurl}}/images/rhash-16.png</Image>
-	<Image height="64" width="64" type="image/png">{{$baseurl}}/images/rhash-64.png</Image>
+	<Image height="16" width="16" type="image/png">{{$baseurl}}/images/rm-16.png</Image>
+	<Image height="64" width="64" type="image/png">{{$baseurl}}/images/rm-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
+</OpenSearchDescription>
diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl
index aef341d41..45b3d7d4b 100755
--- a/view/tpl/peoplefind.tpl
+++ b/view/tpl/peoplefind.tpl
@@ -7,8 +7,8 @@
 	</form>
 	<br />
 	{{if $similar}}<a href="match" >{{$similar}}</a><br />{{/if}}
-	<a href="suggest" >{{$suggest}}</a><br />
+	{{if $loggedin}}<a href="suggest" >{{$suggest}}</a><br />{{/if}}
 	<a href="randprof" >{{$random}}</a><br />
-	{{if $inv}}<a href="invite" >{{$inv}}</a>{{/if}}
+	{{if $loggedin}}{{if $inv}}<a href="invite" >{{$inv}}</a>{{/if}}{{/if}}
 </div>
 
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index d2016e41c..c170d47a3 100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -1,7 +1,7 @@
 {{include file="prettyphoto.tpl"}}
-<div class="photo-album-image-wrapper" id="photo-album-image-wrapper-{{$id}}">
+<div class="photo-album-image-wrapper{{$twist}}" id="photo-album-image-wrapper-{{$id}}">
 	<a href="{{$photolink}}" class="photo-album-photo-link" id="photo-album-photo-link-{{$id}}" title="{{$phototitle}}" rel="{{$rel}}">
-		<img src="{{$imgsrc}}" alt="{{$imgalt}}" title="{{$phototitle}}" class="photo-album-photo lframe resize{{$twist}}" id="photo-album-photo-{{$id}}" />
+		<img src="{{$imgsrc}}" alt="{{$imgalt}}" title="{{$phototitle}}" class="photo-album-photo lframe resize" id="photo-album-photo-{{$id}}" />
 		<p class='caption'>{{$desc}}</p>		
 	</a>
 </div>
diff --git a/view/tpl/photo_drop.tpl b/view/tpl/photo_drop.tpl
index 94ef5a3ee..cb7ae17ba 100755
--- a/view/tpl/photo_drop.tpl
+++ b/view/tpl/photo_drop.tpl
@@ -1,4 +1,4 @@
 <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>
+	<a href="item/drop/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" ><i class="icon-remove drop-icons"></i></a>
 </div>
 <div class="wall-item-delete-end"></div>
diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl
index 183389b9b..196b3ac6d 100755
--- a/view/tpl/profile_edit.tpl
+++ b/view/tpl/profile_edit.tpl
@@ -108,8 +108,10 @@
 <label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}} </label>
 {{$marital}}
 </div>
+<div class="clear"></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}}" />
+<div class="clear"></div>
 <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}}" />
 
diff --git a/view/tpl/profile_edlink.tpl b/view/tpl/profile_edlink.tpl
deleted file mode 100755
index 247bfaace..000000000
--- a/view/tpl/profile_edlink.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="{{$editprofile}}" href="profiles/{{$profid}}" ></a></div>
-<div class="clear"></div>
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index 31f601d86..aaee02ab5 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -2,7 +2,7 @@
 
 	{{if $profile.edit}}
 	<div class="action">
-	<a class="profile-edit-side-link icon edit" rel="#profiles-menu" title="{{$profile.edit.3}}" href="#" ><span>{{$profile.edit.1}}</span></a>
+	<a class="profile-edit-side-link" rel="#profiles-menu" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil vcard-profile-edit-icon" title="{{$profile.edit.1}}" ></i></a>
 	<ul id="profiles-menu" class="menu-popup">
 		{{foreach $profile.menu.entries as $e}}
 		<li>
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
index b7654dc2d..3330a338f 100755
--- a/view/tpl/prv_message.tpl
+++ b/view/tpl/prv_message.tpl
@@ -1,7 +1,7 @@
 <h3>{{$header}}</h3>
 
 <div id="prvmail-wrapper" >
-<form id="prvmail-form" action="message" method="post" >
+<form id="prvmail-form" action="mail" method="post" >
 
 {{$parent}}
 
diff --git a/view/tpl/saved_searches.tpl b/view/tpl/saved_searches.tpl
new file mode 100644
index 000000000..d0f9e2b0e
--- /dev/null
+++ b/view/tpl/saved_searches.tpl
@@ -0,0 +1,14 @@
+<div class="widget" id="saved-search-list">
+	<h3 id="search">{{$title}}</h3>
+	{{$searchbox}}
+	
+	<ul id="saved-search-ul">
+		{{foreach $saved as $search}}
+		<li id="search-term-{{$search.id}}" class="saved-search-li clear">
+			<a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="{{$search.dellink}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer" ></i></a>
+			<a id="saved-search-term-{{$search.id}}" class="savedsearchterm{{if $search.selected}} search-selected{{/if}}" href="{{$search.srchlink}}">{{$search.displayterm}}</a>
+		</li>
+		{{/foreach}}
+	</ul>
+	<div class="clear"></div>
+</div>
diff --git a/view/tpl/saved_searches_aside.tpl b/view/tpl/saved_searches_aside.tpl
index ea336f969..615eca39d 100755
--- a/view/tpl/saved_searches_aside.tpl
+++ b/view/tpl/saved_searches_aside.tpl
@@ -6,7 +6,7 @@
 		{{foreach $saved as $search}}
 		<li id="search-term-{{$search.id}}" class="saved-search-li clear">
 			<a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="network/?f=&amp;remove=1&amp;search={{$search.encodedterm}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer savedsearchdrop" ></i></a>
-			<a id="saved-search-term-{{$search.id}}" class="savedsearchterm" href="network/?f=&amp;search={{$search.encodedterm}}">{{$search.displayterm}}</a>
+			<a id="saved-search-term-{{$search.id}}" class="savedsearchterm{{if $search.selected}} search-selected{{/if}}" href="network/?f=&amp;search={{$search.encodedterm}}">{{$search.displayterm}}</a>
 		</li>
 		{{/foreach}}
 	</ul>
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
index 853bbfdcd..c5acfa4a4 100755
--- a/view/tpl/search_item.tpl
+++ b/view/tpl/search_item.tpl
@@ -29,17 +29,11 @@
 		<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 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}}
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" ><i class="icon-remove drop-icons item-tool"></i></a>{{/if}}
 			</div>
 				{{if $item.drop.pagedropping}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
 			<div class="wall-item-delete-end"></div>
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 10378e599..7b6add231 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -4,7 +4,7 @@
 {{$nickname_block}}
 
 <form action="settings" id="settings-form" method="post" autocomplete="off" >
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}' />
 
 <h3 class="settings-heading">{{$h_basic}}</h3>
 
@@ -52,28 +52,8 @@
 
 {{include file="field_input.tpl" field=$cntunkmail}}
 
-
-{{if $expireisfixed}}
-{{* Remove above line when expire is working *}}
-{{include file="field_input.tpl" field=$expire.days}}
-
-
-<div class="field input">
-	<span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="{{$expire.advanced}}">{{$expire.label}}</a></span>
-	<div style="display: none;">
-		<div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
-			<h3>{{$expire.advanced}}</h3>
-			{{include file="field_yesno.tpl" field=$expire.items}}
-			{{include file="field_yesno.tpl" field=$expire.starred}}
-			{{include file="field_yesno.tpl" field=$expire.network_only}}
-		</div>
-	</div>
-
-</div>
-{{/if}}
-
 <div id="settings-default-perms" class="settings-default-perms" >
-	<a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>{{$permissions}} {{$permdesc}}</a>
+	<a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" >{{$permissions}} {{$permdesc}}</a>
 	<div id="settings-default-perms-menu-end"></div>
 
 	<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >
diff --git a/view/tpl/settings_oauth.tpl b/view/tpl/settings_oauth.tpl
index fa1d0946f..8b76e9eec 100755
--- a/view/tpl/settings_oauth.tpl
+++ b/view/tpl/settings_oauth.tpl
@@ -23,8 +23,8 @@
 			{{/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>
+		<a href="{{$baseurl}}/settings/oauth/edit/{{$app.client_id}}" title="{{$edit}}"><i class="icon-pencil"></i></a>
+		<a href="{{$baseurl}}/settings/oauth/delete/{{$app.client_id}}?t={{$form_security_token}}" title="{{$delete}}"><i class="icon-remove"></i></a>
 		{{/if}}		
 	</div>
 	{{/foreach}}
diff --git a/view/tpl/siteinfo.tpl b/view/tpl/siteinfo.tpl
index f6647110c..a60b406cf 100755
--- a/view/tpl/siteinfo.tpl
+++ b/view/tpl/siteinfo.tpl
@@ -2,7 +2,7 @@
 <p></p>
 <p>{{$description}}</p>
 {{if $version}}
-<p>{{$version}}</p>
+<p>{{$version}}{{if $commit}}+{{$commit}}{{/if}}</p>
 {{/if}}
 <p>{{$web_location}}</p>
 <p>{{$visit}}</p>
diff --git a/view/tpl/sources_edit.tpl b/view/tpl/sources_edit.tpl
index 6e9cee32b..34023e03f 100644
--- a/view/tpl/sources_edit.tpl
+++ b/view/tpl/sources_edit.tpl
@@ -4,7 +4,7 @@
 
 <form action="sources" method="post">
 <input type="hidden" name="source" value="{{$id}}" />
-<input type="hidden" id="id_xchan" name="xchan" value="{{$xchan}}" />
+<input type="hidden" id="id_abook" name="abook" value="{{$abook}}" />
 {{include file="field_input.tpl" field=$name}}
 {{include file="field_textarea.tpl" field=$words}}
 
diff --git a/view/tpl/sources_new.tpl b/view/tpl/sources_new.tpl
index 267245ae4..3c6a4be30 100644
--- a/view/tpl/sources_new.tpl
+++ b/view/tpl/sources_new.tpl
@@ -3,7 +3,7 @@
 <div class="descriptive-text">{{$desc}}</div>
 
 <form action="sources" method="post">
-<input type="hidden" id="id_xchan" name="xchan" value="{{$xchan}}" />
+<input type="hidden" id="id_abook" name="abook" value="{{$abook}}" />
 {{include file="field_input.tpl" field=$name}}
 {{include file="field_textarea.tpl" field=$words}}
 
diff --git a/view/tpl/suggest_friends.tpl b/view/tpl/suggest_friends.tpl
index 80a606912..0388504d2 100755
--- a/view/tpl/suggest_friends.tpl
+++ b/view/tpl/suggest_friends.tpl
@@ -1,8 +1,8 @@
 <div class="profile-match-wrapper">
-	<a href="{{$entry.ignlnk}}" title="{{$entry.ignore}}" class="icon drophide smalldrop profile-match-ignore" onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" ></a>
+	<a href="{{$entry.ignlnk}}" title="{{$entry.ignore}}" class="profile-match-ignore" onclick="return confirmDelete();" ><i class="icon-remove drop-icons"></i></a>
 	<div class="profile-match-photo">
 		<a href="{{$entry.url}}">
-			<img src="{{$entry.photo}}" alt="{{$entry.name}}" width="80" height="80" title="{{$entry.name}} [{{$entry.url}}]" />
+			<img src="{{$entry.photo}}" alt="{{$entry.name}}" width="80" height="80" title="{{$entry.name}} [{{$entry.profile}}]" />
 		</a>
 	</div>
 	<div class="profile-match-break"></div>
diff --git a/view/tpl/suggest_widget.tpl b/view/tpl/suggest_widget.tpl
new file mode 100644
index 000000000..eba8b496e
--- /dev/null
+++ b/view/tpl/suggest_widget.tpl
@@ -0,0 +1,10 @@
+<div class="widget">
+<h3>{{$title}}</h3>
+{{if $entries}}
+{{foreach $entries as $child}}
+{{include file="suggest_friends.tpl" entry=$child}}
+{{/foreach}}
+{{/if}}
+<div class="clear"></div>
+<div class="suggest-widget-more"><a href="suggest">{{$more}}</a></div>
+</div>
\ No newline at end of file
diff --git a/view/tpl/threaded_conversation.tpl b/view/tpl/threaded_conversation.tpl
index 2d71f01ab..ea5c3c281 100755
--- a/view/tpl/threaded_conversation.tpl
+++ b/view/tpl/threaded_conversation.tpl
@@ -6,11 +6,3 @@
 {{/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}}