rebase and update themes

37 files changed, 364 insertions, 130 deletions

diff --git a/view/theme/fancyred/tpl/smarty3/conv_item.tpl b/view/theme/fancyred/tpl/smarty3/conv_item.tpl
new file mode 100644
index 000000000..cf0f02f03
--- /dev/null
+++ b/view/theme/fancyred/tpl/smarty3/conv_item.tpl
@@ -0,0 +1,117 @@
+{{if $item.comment_firstcollapsed}}
+	<div class="hide-comments-outer">
+	<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> <span id="hide-comments-{{$item.id}}" class="hide-comments fakelink" onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
+	</div>
+	<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
+{{/if}}
+<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper {{$item.toplevel}}">
+<a name="{{$item.id}}" ></a>
+<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" >
+	<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" >
+		<div class="wall-item-info{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}">
+			{{if $item.owner_url}}
+			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
+				<a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
+				<img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" /></a>
+			</div>
+			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
+			{{/if}}
+			<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}" 
+				onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
+                onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
+				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+				<img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
+				<span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
+                <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
+                    <ul>
+                        {{$item.item_photo_menu}}
+                    </ul>
+                </div>
+
+			</div>
+			<div class="wall-item-photo-end"></div>
+			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
+				{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
+				{{else}}<div class="wall-item-lock"></div>{{/if}}	
+				<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
+			</div>
+		</div>
+		<div class="wall-item-author">
+				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}{{/if}}<br />
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.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}} <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-like {{$item.indent}}" id="wall-item-like-{{$item.id}}">{{$item.showlike}}</div>
+        <div class="wall-item-dislike {{$item.indent}}" id="wall-item-dislike-{{$item.id}}">{{$item.showdislike}}</div>
+
+		<div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
+			{{if $item.like}}
+				<a href="#" class="icon like item-tool" title="{{$item.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></a>
+			{{/if}}
+			{{if $item.dislike}}
+				<a href="#" class="icon dislike item-tool" title="{{$item.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>
+			{{/if}}
+			{{if $item.share}}
+				<a href="#" class="icon recycle item-tool" title="{{$item.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>
+			{{/if}}
+			{{if $item.plink}}
+				<a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="icon item-tool remote-link{{$item.sparkle}}"></a>
+			{{/if}}
+			{{if $item.edpost}}
+				<a class="editpost icon pencil item-tool" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
+			{{/if}}			 
+			{{if $item.star}}
+			<a href="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon item-tool {{$item.star.isstarred}}" title="{{$item.star.toggle}}"></a>
+			{{/if}}
+			{{if $item.tagger}}
+			<a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon item-tool tagged" title="{{$item.tagger.tagit}}"></a>
+			{{/if}}
+			{{if $item.filer}}
+			<a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon item-tool" title="{{$item.filer}}"></a>
+			{{/if}}			
+			<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
+
+			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
+				{{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
+			</div>
+				{{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
+			<div class="wall-item-delete-end"></div>
+       		</div>
+	</div>	
+ <div class="wall-item-wrapper-end"></div>
+
+<div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
+</div>
+{{if $item.toplevel}}
+{{foreach $item.children as $item}}
+	{{include file="{{$item.template}}"}}
+{{/foreach}}
+{{/if}}
+
+<div class="wall-item-comment-wrapper" >
+	{{$item.comment}}
+</div>
+
+
+</div>
+{{if $item.comment_lastcollapsed}}</div>{{/if}}
diff --git a/view/theme/fancyred/tpl/smarty3/theme_settings.tpl b/view/theme/fancyred/tpl/smarty3/theme_settings.tpl
new file mode 100644
index 000000000..72749d9ce
--- /dev/null
+++ b/view/theme/fancyred/tpl/smarty3/theme_settings.tpl
@@ -0,0 +1,7 @@
+{{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="fancyred-settings-submit" />
+</div>
diff --git a/view/theme/redbasic/tpl/smarty3/theme_settings.tpl b/view/theme/redbasic/tpl/smarty3/theme_settings.tpl
new file mode 100644
index 000000000..27f356b92
--- /dev/null
+++ b/view/theme/redbasic/tpl/smarty3/theme_settings.tpl
@@ -0,0 +1,7 @@
+{{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="redbasic-settings-submit" />
+</div>
diff --git a/view/tpl/smarty3/abook_edit.tpl b/view/tpl/smarty3/abook_edit.tpl
index 2a2711a66..623f13dd4 100644
--- a/view/tpl/smarty3/abook_edit.tpl
+++ b/view/tpl/smarty3/abook_edit.tpl
@@ -1,18 +1,20 @@
 
 <h2>{{$header}}</h2>
 
+<h3>{{$addr}}</h3>
 
 <div id="connection-flag-tabs">
 {{$tabs}}
 </div>
 
 <div id="contact-edit-wrapper">
-<br />
-<h3>Slide to adjust your degree of friendship</h3>
 
-{{$slide}}
+{{if $slide}}
+<h3>{{$lbl_slider}}</h3>
 
+{{$slide}}
 
+{{/if}}
 
 <h3>Permissions</h3>
 
@@ -21,11 +23,14 @@
 <input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" />
 
 <br />
-<b>Quick Links:</b>
-<a href="" style="background-color: #CCC; padding: 3px; border-radius: 5px; margin-left: 15px;">Full Sharing</a><a href="" style="background-color: #CCC; padding: 3px; border-radius: 5px; margin-left: 15px;">Cautious Sharing</a><a href="" style="background-color: #CCC; padding: 3px; border-radius: 5px; margin-left: 15px;">Follow Only</a><br />
+<b>{{$quick}}</b>
+<ul>
+<li><a href="#" onclick="connectFullShare(); return false;">{{$full}}</a></li>
+<li><a href="#" onclick="connectCautiousShare(); return false;">{{$cautious}}</a></li>
+<li><a href="#" onclick="connectFollowOnly(); return false;">{{$follow}}</a></li>
 <br />
 
-<div id="abook-advanced" class="fakelink" onclick="openClose('abook-advanced-panel');">Advanced Permissions</div>
+<div id="abook-advanced" class="fakelink" onclick="openClose('abook-advanced-panel');">{{$advanced}}</div>
 
 <div id="abook-advanced-panel" style="display: none;">
 
diff --git a/view/tpl/smarty3/build_query.tpl b/view/tpl/smarty3/build_query.tpl
new file mode 100644
index 000000000..cd978d86e
--- /dev/null
+++ b/view/tpl/smarty3/build_query.tpl
@@ -0,0 +1,50 @@
+<script> 
+
+	var bParam_cmd = "{{$baseurl}}/update_{{$pgtype}}";
+
+
+	var bParam_uid = {{$uid}};
+	var bParam_gid = {{$gid}};
+	var bParam_cid = {{$cid}};
+	var bParam_cmin = {{$cmin}};
+	var bParam_cmax = {{$cmax}};
+	var bParam_star = {{$star}};
+	var bParam_liked = {{$liked}};
+	var bParam_conv = {{$conv}};
+	var bParam_spam = {{$spam}};
+	var bParam_new = {{$nouveau}};
+	var bParam_page = {{$page}};
+	var bParam_wall = {{$wall}};
+
+	var bParam_search = "{{$search}}";
+	var bParam_order = "{{$order}}";
+	var bParam_file = "{{$file}}";
+	var bParam_cats = "{{$cats}}";
+	var bParam_dend = "{{$dend}}";
+	var bParam_dbegin = "{{$dbegin}}";
+
+	function buildCmd() {
+		var udargs = ((page_load) ? "/load" : "");
+		var bCmd = bParam_cmd + udargs + "?f=" ;
+		if(bParam_uid) bCmd = bCmd + "&p=" + bParam_uid;
+		if(bParam_cmin != 0) bCmd = bCmd + "&cmin=" + bParam_cmin;
+		if(bParam_cmax != 99) bCmd = bCmd + "&cmax=" + bParam_cmax;
+		if(bParam_gid != 0) { bCmd = bCmd + "&gid=" + bParam_gid; } else
+		if(bParam_cid != 0) { bCmd = bCmd + "&cid=" + bParam_cid; }
+		if(bParam_star != 0) bCmd = bCmd + "&star=" + bParam_star;
+		if(bParam_liked != 0) bCmd = bCmd + "&liked=" + bParam_liked;
+		if(bParam_conv!= 0) bCmd = bCmd + "&conv=" + bParam_conv;
+		if(bParam_spam != 0) bCmd = bCmd + "&spam=" + bParam_spam;
+		if(bParam_new != 0) bCmd = bCmd + "&new=" + bParam_new;
+		if(bParam_wall != 0) bCmd = bCmd + "&wall=" + bParam_wall;
+		if(bParam_search != "") bCmd = bCmd + "&search=" + bParam_search;
+		if(bParam_file != "") bCmd = bCmd + "&file=" + bParam_file;
+		if(bParam_cats != "") bCmd = bCmd + "&cats=" + bParam_cats;
+		if(bParam_dend != "") bCmd = bCmd + "&dend=" + bParam_dend;
+		if(bParam_dbegin != "") bCmd = bCmd + "&dbegin=" + bParam_dbegin;
+		if(bParam_page != 1) bCmd = bCmd + "&page=" + bParam_page;
+		return(bCmd);
+	}
+
+</script>
+
diff --git a/view/tpl/smarty3/chanview.tpl b/view/tpl/smarty3/chanview.tpl
new file mode 100644
index 000000000..7e375d3e6
--- /dev/null
+++ b/view/tpl/smarty3/chanview.tpl
@@ -0,0 +1 @@
+<iframe id="remote-channel" width="100%" src="{{$url}}" onload="resize_iframe()"></iframe>
diff --git a/view/tpl/smarty3/common_tabs.tpl b/view/tpl/smarty3/common_tabs.tpl
index ef8b3d356..78138d6a9 100644
--- a/view/tpl/smarty3/common_tabs.tpl
+++ b/view/tpl/smarty3/common_tabs.tpl
@@ -3,3 +3,4 @@
 		<li {{if $tab.id}}id="{{$tab.id}}"{{/if}}><a href="{{$tab.url}}" class="tab button {{$tab.sel}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
 	{{/foreach}}
 </ul>
+<div class="tabs-end"></div>
\ No newline at end of file
diff --git a/view/tpl/smarty3/contact_block.tpl b/view/tpl/smarty3/contact_block.tpl
index e688af287..91b8b4cfa 100644
--- a/view/tpl/smarty3/contact_block.tpl
+++ b/view/tpl/smarty3/contact_block.tpl
@@ -1,5 +1,5 @@
 <div id="contact-block">
-<h4 class="contact-block-h4">{{$contacts}}</h4>
+<div id="contact-block-numcontacts">{{$contacts}}</div>
 {{if $micropro}}
 		<a class="allcontact-link" href="viewcontacts/{{$nickname}}">{{$viewcontacts}}</a>
 		<div class='contact-block-content'>
diff --git a/view/tpl/smarty3/contact_template.tpl b/view/tpl/smarty3/contact_template.tpl
index 31b42fe87..5cb0e8c20 100644
--- a/view/tpl/smarty3/contact_template.tpl
+++ b/view/tpl/smarty3/contact_template.tpl
@@ -1,17 +1,9 @@
 
 <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.edit}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>
-
-		</div>
-			
+		<a href="{{$contact.edit}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" alt="{{$contact.name}}" /></a>
 	</div>
 	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div>
-
+	<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div>
 	<div class="contact-entry-end" ></div>
 </div>
diff --git a/view/tpl/smarty3/conv_frame.tpl b/view/tpl/smarty3/conv_frame.tpl
index 7f65b64d2..1b7267191 100644
--- a/view/tpl/smarty3/conv_frame.tpl
+++ b/view/tpl/smarty3/conv_frame.tpl
@@ -9,3 +9,6 @@
 </div>
 <div id="item-delete-selected-end"></div>
 {{/if}}
+
+<img id="page-spinner" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
+
diff --git a/view/tpl/smarty3/conv_item.tpl b/view/tpl/smarty3/conv_item.tpl
index 01e7bcb12..a3e1ba7db 100644
--- a/view/tpl/smarty3/conv_item.tpl
+++ b/view/tpl/smarty3/conv_item.tpl
@@ -11,7 +11,7 @@
 		<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}}">
+				<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>
@@ -19,7 +19,7 @@
 			<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}}">
+				<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}}">
@@ -98,24 +98,18 @@
 	<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>
 
-			{{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>
+{{if $item.toplevel}}
 {{foreach $item.children as $item}}
 	{{include file="{{$item.template}}"}}
 {{/foreach}}
+{{/if}}
 
-{{if $item.flatten}}
 <div class="wall-item-comment-wrapper" >
 	{{$item.comment}}
 </div>
-{{/if}}
+
+
 </div>
 {{if $item.comment_lastcollapsed}}</div>{{/if}}
diff --git a/view/tpl/smarty3/convobj.tpl b/view/tpl/smarty3/convobj.tpl
new file mode 100644
index 000000000..d5cee1170
--- /dev/null
+++ b/view/tpl/smarty3/convobj.tpl
@@ -0,0 +1,4 @@
+{{foreach $threads as $item}}
+{{include file="{{$item.template}}"}}
+{{/foreach}}
+
diff --git a/view/tpl/smarty3/directory_header.tpl b/view/tpl/smarty3/directory_header.tpl
index c2ca64682..5d703e2dd 100644
--- a/view/tpl/smarty3/directory_header.tpl
+++ b/view/tpl/smarty3/directory_header.tpl
@@ -1,16 +1,16 @@
-<h1>{{$sitedir}}</h1>
+<h1>{{$dirlbl}}</h1>
 
-{{$globaldir}}
-{{$admin}}
+{{if $search}}
+<h4>{{$finddsc}} {{$safetxt}}</h4> 
+{{/if}}
 
-{{$finding}}
+{{foreach $entries as $entry}}
 
-<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>
+{{include file="direntry.tpl"}}
+
+{{/foreach}}
+
+
+
+<div class="directory-end"></div>
 
diff --git a/view/tpl/smarty3/direntry.tpl b/view/tpl/smarty3/direntry.tpl
new file mode 100644
index 000000000..a7d1a3e3a
--- /dev/null
+++ b/view/tpl/smarty3/direntry.tpl
@@ -0,0 +1,11 @@
+
+<div class="directory-item lframe" id="directory-item-{{$entry.id}}" >
+	<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$entry.id}}" > 
+		<div class="contact-photo" id="directory-photo-{{$entry.id}}" >
+			<a href="{{$entry.profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$entry.id}}" ><img class="directory-photo-img" src="{{$entry.photo}}" alt="{{$entry.alttext}}" title="{{$entry.alttext}}" /></a>
+		</div>
+	</div>
+
+	<div class="contact-name" id="directory-name-{{$entry.id}}">{{$entry.name}}</div>
+	<div class="contact-details">{{$entry.details}}</div>
+</div>
diff --git a/view/tpl/smarty3/edpost_head.tpl b/view/tpl/smarty3/edpost_head.tpl
new file mode 100644
index 000000000..890b746bf
--- /dev/null
+++ b/view/tpl/smarty3/edpost_head.tpl
@@ -0,0 +1 @@
+<h2>{{$title}}</h2>
diff --git a/view/tpl/smarty3/email_notify_html.tpl b/view/tpl/smarty3/email_notify_html.tpl
index 38c933aac..bf5272277 100644
--- a/view/tpl/smarty3/email_notify_html.tpl
+++ b/view/tpl/smarty3/email_notify_html.tpl
@@ -7,7 +7,7 @@
 <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 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/fred-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/smarty3/field_acheckbox.tpl b/view/tpl/smarty3/field_acheckbox.tpl
index 818c59721..d51770be5 100644
--- a/view/tpl/smarty3/field_acheckbox.tpl
+++ b/view/tpl/smarty3/field_acheckbox.tpl
@@ -1,7 +1,7 @@
 	
 	<div class='field acheckbox'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
-		<input type="checkbox" class="abook-edit-them" name='{{$field.0}}' id='id_{{$field.0}}' value="1" disabled="disabled" {{if $field.2}}checked="checked"{{/if}} />
-		<input type="checkbox" class="abook-edit-me" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} {{if $field.5}} disabled="disabled" {{/if}}/>
+		<input type="checkbox" class="abook-edit-them" name='{{$field.0}}' id='them_id_{{$field.0}}' value="1" disabled="disabled" {{if $field.2}}checked="checked"{{/if}} />
+		<input type="checkbox" class="abook-edit-me" name='{{$field.0}}' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} {{if $field.5}} disabled="disabled" {{/if}}/>
 		<span class='field_abook_help'>{{$field.6}}</span>
 	</div>
diff --git a/view/tpl/smarty3/head.tpl b/view/tpl/smarty3/head.tpl
index 06650648d..115be47dd 100644
--- a/view/tpl/smarty3/head.tpl
+++ b/view/tpl/smarty3/head.tpl
@@ -12,7 +12,7 @@
 
 {{$head_js}}
 
-<link rel="shortcut icon" href="{{$baseurl}}/images/friendica-32.png" />
+<link rel="shortcut icon" href="{{$baseurl}}/images/red.png" />
 <link rel="search"
          href="{{$baseurl}}/opensearch" 
          type="application/opensearchdescription+xml" 
diff --git a/view/tpl/smarty3/intros.tpl b/view/tpl/smarty3/intros.tpl
index 6132bfc75..3b857a19e 100644
--- a/view/tpl/smarty3/intros.tpl
+++ b/view/tpl/smarty3/intros.tpl
@@ -1,27 +1,17 @@
 
 <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">
+<form class="intro-form" action="intro" method="post">
 <input class="intro-submit-ignore" type="submit" name="submit" value="{{$ignore}}" />
+<input class="intro-submit-block" type="submit" name="submit" value="{{$block}}" />
 <input class="intro-submit-discard" type="submit" name="submit" value="{{$discard}}" />
-</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}}" >
+{{* {{include file="field_checkbox.tpl" field=$activity}} *}}
 <input type="hidden" name="contact_id" value="{{$contact_id}}" >
 
-{{$dfrn_text}}
-
 <input class="intro-submit-approve" type="submit" name="submit" value="{{$approve}}" />
 </form>
 </div>
diff --git a/view/tpl/smarty3/intros_header.tpl b/view/tpl/smarty3/intros_header.tpl
new file mode 100644
index 000000000..15096c7f8
--- /dev/null
+++ b/view/tpl/smarty3/intros_header.tpl
@@ -0,0 +1 @@
+<h3>{{$title}}</h3>
diff --git a/view/tpl/smarty3/login.tpl b/view/tpl/smarty3/login.tpl
index dbd193017..4ddf54716 100644
--- a/view/tpl/smarty3/login.tpl
+++ b/view/tpl/smarty3/login.tpl
@@ -11,6 +11,8 @@
 		{{if $register}}<a href="{{$register.link}}" title="{{$register.title}}" id="register-link">{{$register.desc}}</a>{{/if}}
         <a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
 	</div>
+
+	{{include file="field_checkbox.tpl" field=$remember}}
 	
 	<div id="login-standard-end"></div>
 
diff --git a/view/tpl/smarty3/mail_conv.tpl b/view/tpl/smarty3/mail_conv.tpl
index 1bff55108..bfa9491f4 100644
--- a/view/tpl/smarty3/mail_conv.tpl
+++ b/view/tpl/smarty3/mail_conv.tpl
@@ -1,9 +1,9 @@
 <div class="mail-conv-outside-wrapper">
 	<div class="mail-conv-sender" >
 		<a href="{{$mail.from_url}}" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo{{$mail.sparkle}}" src="{{$mail.from_photo}}" heigth="80" width="80" alt="{{$mail.from_name}}" /></a>
+		<div class="mail-conv-sender-name" >{{$mail.from_name}}</div>
 	</div>
 	<div class="mail-conv-detail" >
-		<div class="mail-conv-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>
diff --git a/view/tpl/smarty3/mail_list.tpl b/view/tpl/smarty3/mail_list.tpl
index b08c2ca7a..e6aaedb30 100644
--- a/view/tpl/smarty3/mail_list.tpl
+++ b/view/tpl/smarty3/mail_list.tpl
@@ -1,9 +1,12 @@
 <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">
+		<a href="{{$from_url}}" class="mail-list-sender-url" ><img class="mail-list-sender-photo" src="{{$from_photo}}" height="32" width="32" alt="{{$from_name}}" /></a>
 		<div class="mail-list-sender-name" >{{$from_name}}</div>
+	</div>
+	<div class="mail-list-recip" >
+		<a href="{{$to_url}}" class="mail-list-recip-url" ><img class="mail-list-recip-photo" src="{{$to_photo}}" height="32" width="32" alt="{{$to_name}}" /></a>
+		<div class="mail-list-recip-name" >{{$to_name}}</div>
+	</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}}" >
diff --git a/view/tpl/smarty3/micropro_img.tpl b/view/tpl/smarty3/micropro_img.tpl
new file mode 100644
index 000000000..23b7bd281
--- /dev/null
+++ b/view/tpl/smarty3/micropro_img.tpl
@@ -0,0 +1 @@
+<div class="contact-block-div{{if $class}} {{$class}}{{/if}}"><a class="contact-block-link{{if $class}} {{$class}}{{/if}}{{if $click}} fakelink{{/if}}" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}}><img class="contact-block-img{{if $class}} {{$class}}{{/if}}" src="{{$photo}}" title="{{$title}}" alt="{{$name}}" /></a></div>
diff --git a/view/tpl/smarty3/micropro_txt.tpl b/view/tpl/smarty3/micropro_txt.tpl
new file mode 100644
index 000000000..295e7940d
--- /dev/null
+++ b/view/tpl/smarty3/micropro_txt.tpl
@@ -0,0 +1 @@
+<div class="contact-block-textdiv{{if $class}} {{$class}}{{/if}}"><a class="contact-block-link{{if $class}} {{$class}}{{/if}}{{if $click}} fakelink{{/if}}" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}} title="{{$title}}">{{$name}}</a></div>
diff --git a/view/tpl/smarty3/nav.tpl b/view/tpl/smarty3/nav.tpl
index 649ec67f6..6fb0343bc 100644
--- a/view/tpl/smarty3/nav.tpl
+++ b/view/tpl/smarty3/nav.tpl
@@ -10,45 +10,46 @@
 			</li>
 		{{/if}}
 
-		{{if $userinfo}}
-			<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="{{$userinfo.name}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"></a>
-				{{if $localuser}}
-				<ul id="nav-user-menu" class="menu-popup">
-					{{foreach $nav.usermenu as $usermenu}}
-						<li><a class="{{$usermenu.2}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}">{{$usermenu.1}}</a></li>
-					{{/foreach}}
-					
-					{{if $nav.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>
-				{{/if}}
-			</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>
+				<a class="{{$nav.network.2}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" ><span class="icon network">{{$nav.network.1}}</span></a>
+				<span id="net-update" class="nav-notify fakelink" onclick="notify_popup('network'); return false;" ></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>
+				<a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" ><span class="icon home">{{$nav.home.1}}</span></a>
+				<span id="home-update" class="nav-notify fakelink" onclick="notify_popup('home'); return false;" ></span>
+			</li>
+		{{/if}}
+
+		{{if $nav.messages}}
+			<li id="nav-mail-link" class="nav-menu {{$sel.messages}}">
+				<a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><span class="icon mail">{{$nav.messages.1}}</span></a>
+				<span id="mail-update" class="nav-notify fakelink" onclick="notify_popup('mail'); return false;" ></span>
+			</li>
+		{{/if}}
+
+		{{if $nav.all_events}}
+			<li id="nav-all-events-link" class="nav-menu {{$sel.all_events}}">
+				<a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" ><span class="icon events">{{$nav.all_events.1}}</span></a>
+				<span id="all-events-update" class="nav-notify fakelink" onclick="notify_popup('all_events'); return false;" ></span>
+			</li>
+		{{/if}}
+
+		{{if $nav.intros}}
+			<li id="nav-intros-link" class="nav-menu {{$sel.intros}}">
+				<a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" ><span class="icon introductions">{{$nav.intros.1}}</span></a>
+				<span id="intro-update" class="nav-notify"></span>
 			</li>
 		{{/if}}
 		
 
 	{{if $nav.notifications}}
 
-		<li id="nav-notifications-linkmenu" class="nav-menu fakelink" onclick="notify_popup(); return false;" title="{{$nav.notifications.1}}"><span class="icon s22 notify">{{$nav.notifications.1}}</span></a>
+		<li id="nav-notifications-linkmenu" class="nav-menu fakelink" onclick="notify_popup('notify'); return false;" 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">
 				<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
@@ -58,18 +59,34 @@
 		</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>
+	{{if $nav.settings}}
+		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">{{$nav.settings.1}}</span></a>
 			<ul id="nav-site-menu" class="menu-popup">
 				{{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.manage}}<li><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a></li>{{/if}}				
-				{{if $nav.profiles}}<li><a class="{{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}">{{$nav.profiles.1}}</a></li>{{/if}}				
 
 				{{if $nav.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}}
+		{{if $userinfo}}
+			<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="{{$userinfo.name}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"></a>
+				{{if $localuser}}
+				<ul id="nav-user-menu" class="menu-popup">
+					{{foreach $nav.usermenu as $usermenu}}
+						<li><a class="{{$usermenu.2}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}">{{$usermenu.1}}</a></li>
+					{{/foreach}}
+				{{if $nav.profiles}}<li><a class="{{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}">{{$nav.profiles.1}}</a></li>{{/if}}				
+					{{if $nav.manage}}<li><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a></li>{{/if}}				
+
+					{{if $nav.contacts}}<li><a class="{{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a></li>{{/if}}	
+				{{if $nav.logout}}<li><a class="menu-sep {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>{{/if}}
+
+				</ul>
+				{{/if}}
+			</li>
+		{{/if}}
+		{{if $nav.login}}<li id="nav-login-link" class="nav-menu {{$nav.login.2}}"><a href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><li>{{/if}}
 
 		{{if $nav.help}} 
 		<li id="nav-help-link" class="nav-menu {{$sel.help}}">
diff --git a/view/tpl/smarty3/profile_advanced.tpl b/view/tpl/smarty3/profile_advanced.tpl
index 812132f0c..39bbada0d 100644
--- a/view/tpl/smarty3/profile_advanced.tpl
+++ b/view/tpl/smarty3/profile_advanced.tpl
@@ -40,10 +40,10 @@
 </dl>
 {{/if}}
 
-{{if $profile.pub_keywords}}
+{{if $profile.keywords}}
 <dl id="aprofile-tags" class="aprofile">
- <dt>{{$profile.pub_keywords.0}}</dt>
- <dd>{{$profile.pub_keywords.1}}</dd>
+ <dt>{{$profile.keywords.0}}</dt>
+ <dd>{{$profile.keywords.1}}</dd>
 </dl>
 {{/if}}
 
diff --git a/view/tpl/smarty3/profile_edit.tpl b/view/tpl/smarty3/profile_edit.tpl
index d4647ad5f..84a4d5afb 100644
--- a/view/tpl/smarty3/profile_edit.tpl
+++ b/view/tpl/smarty3/profile_edit.tpl
@@ -4,6 +4,7 @@
 
 <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>
@@ -142,17 +143,10 @@
 
 <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}}" />
+<input type="text" size="32" name="keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$keywords}}" />
 </div><div id="profile-edit-pubkeywords-desc">{{$lbl_pubdsc}}</div>
 <div id="profile-edit-pubkeywords-end"></div>
 
-<div 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>
@@ -314,4 +308,4 @@
 
 </form>
 </div>
-<script type="text/javascript">Fill_Country('{{$country_name}}');Fill_States('{{$region}}');</script>
+
diff --git a/view/tpl/smarty3/profile_photo.tpl b/view/tpl/smarty3/profile_photo.tpl
index d73779e20..40eb206a3 100644
--- a/view/tpl/smarty3/profile_photo.tpl
+++ b/view/tpl/smarty3/profile_photo.tpl
@@ -4,20 +4,23 @@
 <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" />
+<label id="profile-photo-upload-label" class="form-label" for="profile-photo-upload">{{$lbl_upfile}}</label>
+<input name="userfile" class="form-input" type="file" id="profile-photo-upload" size="48" />
+<div class="clear"></div>
+
+<label id="profile-photo-profiles-label" class="form-label" for="profile-photo-profiles">{{$lbl_profiles}}</label>
+<select name="profile" id="profile-photo-profiles" class="form-input" >
 {{foreach $profiles as $p}}
 <option value="{{$p.id}}" {{if $p.default}}selected="selected"{{/if}}>{{$p.name}}</option>
 {{/foreach}}
 </select>
+<div class="clear"></div>
 
 <div id="profile-photo-submit-wrapper">
 <input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}">
 </div>
+</div>
 
 </form>
 
diff --git a/view/tpl/smarty3/profile_vcard.tpl b/view/tpl/smarty3/profile_vcard.tpl
index d9bbd177c..13460c2d9 100644
--- a/view/tpl/smarty3/profile_vcard.tpl
+++ b/view/tpl/smarty3/profile_vcard.tpl
@@ -1,9 +1,23 @@
 <div class="vcard">
 
-	<div class="fn label">{{$profile.name}}</div>
-	
+	{{if $profile.edit}}
+	<div class="action">
+	<a class="profile-edit-side-link icon edit" rel="#profiles-menu" title="{{$profile.edit.3}}" href="#" ><span>{{$profile.edit.1}}</span></a>
+	<ul id="profiles-menu" class="menu-popup">
+		{{foreach $profile.menu.entries as $e}}
+		<li>
+			<a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a>
+		</li>
+		{{/foreach}}
+		<li><a href="profile_photo" >{{$profile.menu.chg_photo}}</a></li>
+		<li><a href="profiles/new" id="profile-listing-new-link">{{$profile.menu.cr_new}}</a></li>
 				
-	
+	</ul>
+	</div>
+	{{/if}}
+
+	<div class="fn label">{{$profile.name}}</div>
+		
 	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
 	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
 
@@ -31,18 +45,8 @@
 	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" >{{$profile.homepage}}</a></dd></dl>{{/if}}
 
 	
-	<div 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>
-
+<div id="vcard-end"></div>
 {{$contact_block}}
 
 
diff --git a/view/tpl/smarty3/prv_message.tpl b/view/tpl/smarty3/prv_message.tpl
index 66007f803..f8cbd01cc 100644
--- a/view/tpl/smarty3/prv_message.tpl
+++ b/view/tpl/smarty3/prv_message.tpl
@@ -7,7 +7,13 @@
 {{$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" />
diff --git a/view/tpl/smarty3/settings_display.tpl b/view/tpl/smarty3/settings_display.tpl
index f8b4c5130..2645ce740 100644
--- a/view/tpl/smarty3/settings_display.tpl
+++ b/view/tpl/smarty3/settings_display.tpl
@@ -6,7 +6,7 @@
 {{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_input.tpl" field=$itemspage}}
 {{include file="field_checkbox.tpl" field=$nosmile}}
 
 
diff --git a/view/tpl/smarty3/settings_features.tpl b/view/tpl/smarty3/settings_features.tpl
index 3145f60ee..47d755ee6 100644
--- a/view/tpl/smarty3/settings_features.tpl
+++ b/view/tpl/smarty3/settings_features.tpl
@@ -5,7 +5,11 @@
 <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
 {{foreach $features as $f}}
-	{{include file="field_yesno.tpl" field=$f}}
+<h3 class="settings-heading">{{$f.0}}</h3>
+
+{{foreach $f.1 as $fcat}}
+    {{include file="{{$field_yesno}}" field=$fcat}}
+{{/foreach}}
 {{/foreach}}
 
 <div class="settings-submit-wrapper" >
diff --git a/view/tpl/smarty3/threaded_conversation.tpl b/view/tpl/smarty3/threaded_conversation.tpl
index e452fc0b5..c20f8a3d6 100644
--- a/view/tpl/smarty3/threaded_conversation.tpl
+++ b/view/tpl/smarty3/threaded_conversation.tpl
@@ -1,5 +1,7 @@
 {{foreach $threads as $thread}}
-{{include file="{{$thread.template}}" item=$thread}}
+{{foreach $thread.items as $thread_item}} 
+{{include file="{{$thread_item.template}}" item=$thread_item}}
+{{/foreach}}
 {{/foreach}}
 
 <div id="conversation-end"></div>
diff --git a/view/tpl/smarty3/toggle_mobile_footer.tpl b/view/tpl/smarty3/toggle_mobile_footer.tpl
new file mode 100644
index 000000000..82c0197ba
--- /dev/null
+++ b/view/tpl/smarty3/toggle_mobile_footer.tpl
@@ -0,0 +1,2 @@
+<a id="toggle_mobile_link" href="{{$toggle_link}}">{{$toggle_text}}</a>
+
diff --git a/view/tpl/smarty3/wall_thread.tpl b/view/tpl/smarty3/wall_thread.tpl
index 6b5d34d84..39d0bee25 100644
--- a/view/tpl/smarty3/wall_thread.tpl
+++ b/view/tpl/smarty3/wall_thread.tpl
@@ -11,7 +11,7 @@
 		<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}}">
+				<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>
@@ -19,7 +19,7 @@
 			<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}}">
+				<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}}">
@@ -37,7 +37,7 @@
 			</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 />
+				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" 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}}" >
diff --git a/view/tpl/smarty3/xchan_vcard.tpl b/view/tpl/smarty3/xchan_vcard.tpl
index ed0adb966..5d754356f 100644
--- a/view/tpl/smarty3/xchan_vcard.tpl
+++ b/view/tpl/smarty3/xchan_vcard.tpl
@@ -2,3 +2,14 @@
 <div class="fn">{{$name}}</div>
 <div id="profile-photo-wrapper"><img class="vcard-photo photo" src="{{$photo}}" alt="name" /></div>
 </div>
+
+
+	
+<div id="profile-extra-links">
+<ul>
+{{if $connect}}
+	<li><a id="follow-link" href="follow?f=&url={{$follow}}">{{$connect}}</a></li>
+{{/if}}
+</ul>
+</div>
+