diff --git a/view/smarty3/comment_item.tpl b/view/smarty3/comment_item.tpl
index 40a3e30ad2..caf98168d0 100644
--- a/view/smarty3/comment_item.tpl
+++ b/view/smarty3/comment_item.tpl
@@ -12,7 +12,7 @@
 				<input type="hidden" name="type" value="{{$type}}" />
 				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
 				<input type="hidden" name="parent" value="{{$parent}}" />
-				<input type="hidden" name="return" value="{{$return_path}}" />
+				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
 				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
 				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
 				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
diff --git a/view/smarty3/confirm.tpl b/view/smarty3/confirm.tpl
new file mode 100644
index 0000000000..df8d26eaa7
--- /dev/null
+++ b/view/smarty3/confirm.tpl
@@ -0,0 +1,19 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<center>
+<form action="{{$confirm_url}}" id="confirm-form" method="{{$method}}">
+
+	<span id="confirm-message">{{$message}}</span>
+	{{foreach $extra_inputs as $input}}
+	<input type="hidden" name="{{$input.name}}" value="{{$input.value}}" />
+	{{/foreach}}
+
+	<input class="confirm-button" id="confirm-submit-button" type="submit" name="{{$confirm_name}}" value="{{$confirm}}" />
+	<input class="confirm-button" id="confirm-cancel-button" type="submit" name="canceled" value="{{$cancel}}" />
+
+</form>
+</center>
+
diff --git a/view/smarty3/contact_template.tpl b/view/smarty3/contact_template.tpl
index 8143a82808..8e0e1acc7f 100644
--- a/view/smarty3/contact_template.tpl
+++ b/view/smarty3/contact_template.tpl
@@ -16,7 +16,13 @@
 			<span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">menu</span>
                 <div class="contact-photo-menu" id="contact-photo-menu-{{$contact.id}}">
                     <ul>
-                        {{$contact.photo_menu}}
+						{{foreach $contact.photo_menu as $c}}
+						{{if $c.2}}
+						<li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+						{{else}}
+						<li><a href="{{$c.1}}">{{$c.0}}</a></li>
+						{{/if}}
+						{{/foreach}}
                     </ul>
                 </div>
 			{{/if}}
diff --git a/view/smarty3/like_noshare.tpl b/view/smarty3/like_noshare.tpl
index b8258d64a6..62a16227db 100644
--- a/view/smarty3/like_noshare.tpl
+++ b/view/smarty3/like_noshare.tpl
@@ -5,6 +5,8 @@
  *}}
 <div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$id}}">
 	<a href="#" class="icon like" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false"></a>
+	{{if $nolike}}
 	<a href="#" class="icon dislike" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false"></a>
+	{{/if}}
 	<img id="like-rotator-{{$id}}" class="like-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
 </div>
diff --git a/view/smarty3/manage.tpl b/view/smarty3/manage.tpl
new file mode 100644
index 0000000000..857402c04d
--- /dev/null
+++ b/view/smarty3/manage.tpl
@@ -0,0 +1,22 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$title}}</h3>
+<div id="identity-manage-desc">{{$desc}}</div>
+<div id="identity-manage-choose">{{$choose}}</div>
+<div id="identity-selector-wrapper">
+	<form action="manage" method="post" >
+	<select name="identity" size="4" onchange="this.form.submit();" >
+
+	{{foreach $identities as $id}}
+		<option {{$id.selected}} value="{{$id.uid}}">{{$id.username}} ({{$id.nickname}})</option>
+	{{/foreach}}
+
+	</select>
+	<div id="identity-select-break"></div>
+
+	{{*<!--<input id="identity-submit" type="submit" name="submit" value="{{$submit}}" />-->*}}
+</div></form>
+
diff --git a/view/smarty3/navigation.tpl b/view/smarty3/navigation.tpl
new file mode 100644
index 0000000000..28229c5699
--- /dev/null
+++ b/view/smarty3/navigation.tpl
@@ -0,0 +1,108 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*
+ # LOGIN/REGISTER
+ *}}
+<center>
+{{* Use nested if's since the Friendica template engine doesn't support AND or OR in if statements *}}
+{{if $nav.login}}
+<div id="navigation-login-wrapper" >
+{{else}}
+{{if $nav.register}}
+<div id="navigation-login-wrapper" >
+{{/if}}
+{{/if}}
+{{if $nav.login}}<a id="navigation-login-link" class="navigation-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><br/> {{/if}}
+{{if $nav.register}}<a id="navigation-register-link" class="navigation-link {{$nav.register.2}} {{$sel.register}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a><br/>{{/if}}
+{{if $nav.login}}
+</div>
+{{else}}
+{{if $nav.register}}
+</div>
+{{/if}}
+{{/if}}
+
+{{*
+ # NETWORK/HOME
+ *}}
+{{if $nav.network}}
+<div id="navigation-network-wrapper" >
+{{else}}
+{{if $nav.home}}
+<div id="navigation-network-wrapper" >
+{{else}}
+{{if $nav.community}}
+<div id="navigation-network-wrapper" >
+{{/if}}
+{{/if}}
+{{/if}}
+{{if $nav.network}}
+<a id="navigation-network-link" class="navigation-link navigation-commlink {{$nav.network.2}} {{$sel.network}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a><br/>
+<a class="navigation-link navigation-commlink" href="{{$nav.net_reset.0}}" title="{{$nav.net_reset.3}}">{{$nav.net_reset.1}}</a><br/>
+{{/if}}
+{{if $nav.home}}
+<a id="navigation-home-link" class="navigation-link navigation-commlink {{$nav.home.2}} {{$sel.home}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a><br/>
+{{/if}}
+{{if $nav.community}}
+<a id="navigation-community-link" class="navigation-link navigation-commlink {{$nav.community.2}} {{$sel.community}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a><br/>
+{{/if}}
+{{if $nav.network}}
+</div>
+{{else}}
+{{if $nav.home}}
+</div>
+{{else}}
+{{if $nav.community}}
+</div>
+{{/if}}
+{{/if}}
+{{/if}}
+
+{{*
+ # PRIVATE MESSAGES
+ *}}
+{{if $nav.messages}}
+<div id="navigation-messages-wrapper">
+<a id="navigation-messages-link" class="navigation-link navigation-commlink {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a><br/>
+</div>
+{{/if}}
+
+	
+{{*
+ # CONTACTS
+ *}}
+<div id="navigation-contacts-wrapper">
+{{if $nav.contacts}}<a id="navigation-contacts-link" class="navigation-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a><br/>{{/if}}
+<a id="navigation-directory-link" class="navigation-link {{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a><br/>
+{{if $nav.introductions}}
+<a id="navigation-notify-link" class="navigation-link navigation-commlink {{$nav.introductions.2}} {{$sel.introductions}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a><br/>
+{{/if}}
+</div>
+
+{{*
+ # NOTIFICATIONS
+ *}}
+{{if $nav.notifications}}
+<div id="navigation-notifications-wrapper">
+<a id="navigation-notifications-link" class="navigation-link navigation-commlink" href="{{$nav.notifications.0}}" rel="#navigation-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a><br/>
+</div>
+{{/if}}		
+
+{{*
+ # MISCELLANEOUS
+ *}}
+<div id="navigation-misc-wrapper">
+{{if $nav.settings}}<a id="navigation-settings-link" class="navigation-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a><br/>{{/if}}
+{{if $nav.manage}}<a id="navigation-manage-link" class="navigation-link navigation-commlink {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a><br/>{{/if}}
+{{if $nav.profiles}}<a id="navigation-profiles-link" class="navigation-link {{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a><br/>{{/if}}
+{{if $nav.admin}}<a id="navigation-admin-link" class="navigation-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a><br/>{{/if}}
+<a id="navigation-search-link" class="navigation-link {{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a><br/>
+{{if $nav.apps}}<a id="navigation-apps-link" class="navigation-link {{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a><br/>{{/if}}
+{{if $nav.help}} <a id="navigation-help-link" class="navigation-link {{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a><br/>{{/if}}
+</div>
+
+{{if $nav.logout}}<a id="navigation-logout-link" class="navigation-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a><br/>{{/if}}
+</center>
diff --git a/view/smarty3/photos_default_uploader_box.tpl b/view/smarty3/photos_default_uploader_box.tpl
new file mode 100644
index 0000000000..001d0a3db9
--- /dev/null
+++ b/view/smarty3/photos_default_uploader_box.tpl
@@ -0,0 +1,6 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<input id="photos-upload-choose" type="file" name="userfile" />
diff --git a/view/smarty3/photos_default_uploader_submit.tpl b/view/smarty3/photos_default_uploader_submit.tpl
new file mode 100644
index 0000000000..87d065d6ea
--- /dev/null
+++ b/view/smarty3/photos_default_uploader_submit.tpl
@@ -0,0 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="photos-upload-submit-wrapper" >
+	<input type="submit" name="submit" value="{{$submit}}" id="photos-upload-submit" />
+</div>
diff --git a/view/smarty3/photos_upload.tpl b/view/smarty3/photos_upload.tpl
index 052ed059a1..f2e95a9b14 100644
--- a/view/smarty3/photos_upload.tpl
+++ b/view/smarty3/photos_upload.tpl
@@ -44,9 +44,10 @@
 
 	<div id="photos-upload-spacer"></div>
 
-	{{$uploader}}
+	{{$alt_uploader}}
 
-	{{$default}}
+	{{$default_upload_box}}
+	{{$default_upload_submit}}
 
 	<div class="photos-upload-end" ></div>
 </form>
diff --git a/view/theme/comix-plain/smarty3/comment_item.tpl b/view/theme/comix-plain/smarty3/comment_item.tpl
index 21b7d03563..6e1bdd7747 100644
--- a/view/theme/comix-plain/smarty3/comment_item.tpl
+++ b/view/theme/comix-plain/smarty3/comment_item.tpl
@@ -8,7 +8,7 @@
 				<input type="hidden" name="type" value="{{$type}}" />
 				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
 				<input type="hidden" name="parent" value="{{$parent}}" />
-				<input type="hidden" name="return" value="{{$return_path}}" />
+				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
 				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
 				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
 				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
diff --git a/view/theme/comix/smarty3/comment_item.tpl b/view/theme/comix/smarty3/comment_item.tpl
index 21b7d03563..6e1bdd7747 100644
--- a/view/theme/comix/smarty3/comment_item.tpl
+++ b/view/theme/comix/smarty3/comment_item.tpl
@@ -8,7 +8,7 @@
 				<input type="hidden" name="type" value="{{$type}}" />
 				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
 				<input type="hidden" name="parent" value="{{$parent}}" />
-				<input type="hidden" name="return" value="{{$return_path}}" />
+				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
 				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
 				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
 				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
diff --git a/view/theme/decaf-mobile/smarty3/acl_selector.tpl b/view/theme/decaf-mobile/smarty3/acl_selector.tpl
index 49f22ef981..b5e8307268 100644
--- a/view/theme/decaf-mobile/smarty3/acl_selector.tpl
+++ b/view/theme/decaf-mobile/smarty3/acl_selector.tpl
@@ -14,7 +14,7 @@
 </div>
 
 <div class="acl-list-item" rel="acl-template" style="display:none">
-	<img data-src="{0}"><p>{1}{7}</p>
+	<img data-src="{0}"><p>{1}</p>
 	<a href="#" class='acl-button-show'>{{$show}}</a>
 	<a href="#" class='acl-button-hide'>{{$hide}}</a>
 </div>
diff --git a/view/theme/decaf-mobile/smarty3/login.tpl b/view/theme/decaf-mobile/smarty3/login.tpl
index d220321ec9..69d0531815 100644
--- a/view/theme/decaf-mobile/smarty3/login.tpl
+++ b/view/theme/decaf-mobile/smarty3/login.tpl
@@ -21,9 +21,9 @@
 
 	<br />
 	<div id='login-footer'>
-	<div class="login-extra-links">
+	{{*<!--<div class="login-extra-links">
 	By signing in you agree to the latest <a href="tos.html" title="{{$tostitle}}" id="terms-of-service-link" >{{$toslink}}</a> and <a href="privacy.html" title="{{$privacytitle}}" id="privacy-link" >{{$privacylink}}</a>
-	</div>
+	</div>-->*}}
 
 	<br />
 	{{include file="field_checkbox.tpl" field=$lremember}}
diff --git a/view/theme/decaf-mobile/smarty3/register.tpl b/view/theme/decaf-mobile/smarty3/register.tpl
index 7dd8c77ca4..3f64bb6725 100644
--- a/view/theme/decaf-mobile/smarty3/register.tpl
+++ b/view/theme/decaf-mobile/smarty3/register.tpl
@@ -67,9 +67,9 @@
 	{{$publish}}
 
 	<div id="register-footer">
-	<div class="agreement">
+	{{*<!--<div class="agreement">
 	By clicking '{{$regbutt}}' you are agreeing to the latest <a href="tos.html" title="{{$tostitle}}" id="terms-of-service-link" >{{$toslink}}</a> and <a href="privacy.html" title="{{$privacytitle}}" id="privacy-link" >{{$privacylink}}</a>
-	</div>
+	</div>-->*}}
 	<br />
 
 	<div id="register-submit-wrapper">
diff --git a/view/theme/decaf-mobile/smarty3/wall_thread.tpl b/view/theme/decaf-mobile/smarty3/wall_thread.tpl
index 97769f3017..058ae43cc5 100644
--- a/view/theme/decaf-mobile/smarty3/wall_thread.tpl
+++ b/view/theme/decaf-mobile/smarty3/wall_thread.tpl
@@ -100,7 +100,6 @@
 	{{*<!--<div class="wall-item-wrapper-end"></div>-->*}}
 	<div class="wall-item-like wall-item-like-full {{$item.indent}}" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
 	<div class="wall-item-dislike wall-item-dislike-full {{$item.indent}}" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
-	<div class="wall-item-boring wall-item-boring-full {{$item.indent}}" id="wall-item-boring-{{$item.id}}">{{$item.boring}}</div>
 
 	{{if $item.threaded}}
 	{{if $item.comment}}
diff --git a/view/theme/decaf-mobile/smarty3/wall_thread_toponly.tpl b/view/theme/decaf-mobile/smarty3/wall_thread_toponly.tpl
index 6a4da1acc4..af8626a844 100644
--- a/view/theme/decaf-mobile/smarty3/wall_thread_toponly.tpl
+++ b/view/theme/decaf-mobile/smarty3/wall_thread_toponly.tpl
@@ -84,7 +84,6 @@
 	</div>	
 	<div class="wall-item-like {{$item.indent}}" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
 	<div class="wall-item-dislike {{$item.indent}}" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
-	<div class="wall-item-boring {{$item.indent}}" id="wall-item-boring-{{$item.id}}">{{$item.boring}}</div>
 
 	<div class="hide-comments-outer">
 	<a href="display/{{$user.nickname}}/{{$item.id}}"><span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.total_comments_num}} {{$item.total_comments_text}}</span></a>
diff --git a/view/theme/diabook/smarty3/comment_item.tpl b/view/theme/diabook/smarty3/comment_item.tpl
index c38991f52a..a03d0f2a64 100644
--- a/view/theme/diabook/smarty3/comment_item.tpl
+++ b/view/theme/diabook/smarty3/comment_item.tpl
@@ -8,7 +8,7 @@
 				<input type="hidden" name="type" value="{{$type}}" />
 				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
 				<input type="hidden" name="parent" value="{{$parent}}" />
-				<input type="hidden" name="return" value="{{$return_path}}" />
+				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
 				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
 				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
 
diff --git a/view/theme/diabook/smarty3/contact_template.tpl b/view/theme/diabook/smarty3/contact_template.tpl
index 8143a82808..8e0e1acc7f 100644
--- a/view/theme/diabook/smarty3/contact_template.tpl
+++ b/view/theme/diabook/smarty3/contact_template.tpl
@@ -16,7 +16,13 @@
 			<span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">menu</span>
                 <div class="contact-photo-menu" id="contact-photo-menu-{{$contact.id}}">
                     <ul>
-                        {{$contact.photo_menu}}
+						{{foreach $contact.photo_menu as $c}}
+						{{if $c.2}}
+						<li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+						{{else}}
+						<li><a href="{{$c.1}}">{{$c.0}}</a></li>
+						{{/if}}
+						{{/foreach}}
                     </ul>
                 </div>
 			{{/if}}
diff --git a/view/theme/dispy/smarty3/comment_item.tpl b/view/theme/dispy/smarty3/comment_item.tpl
index 136ed2d36f..b30aede3da 100644
--- a/view/theme/dispy/smarty3/comment_item.tpl
+++ b/view/theme/dispy/smarty3/comment_item.tpl
@@ -8,7 +8,7 @@
 				<input type="hidden" name="type" value="{{$type}}" />
 				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
 				<input type="hidden" name="parent" value="{{$parent}}" />
-				<input type="hidden" name="return" value="{{$return_path}}" />
+				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
 				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
 				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
 				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
diff --git a/view/theme/dispy/smarty3/contact_template.tpl b/view/theme/dispy/smarty3/contact_template.tpl
index 800e19b142..d22acd5a6b 100644
--- a/view/theme/dispy/smarty3/contact_template.tpl
+++ b/view/theme/dispy/smarty3/contact_template.tpl
@@ -16,7 +16,13 @@
 			<span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">menu</span>
                 <div class="contact-photo-menu" id="contact-photo-menu-{{$contact.id}}">
                     <ul>
-                        {{$contact.photo_menu}}
+						{{foreach $contact.photo_menu as $c}}
+						{{if $c.2}}
+						<li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+						{{else}}
+						<li><a href="{{$c.1}}">{{$c.0}}</a></li>
+						{{/if}}
+						{{/foreach}}
                     </ul>
                 </div>
 			{{/if}}
diff --git a/view/theme/duepuntozero/smarty3/comment_item.tpl b/view/theme/duepuntozero/smarty3/comment_item.tpl
index edf19395b4..f4655078dd 100644
--- a/view/theme/duepuntozero/smarty3/comment_item.tpl
+++ b/view/theme/duepuntozero/smarty3/comment_item.tpl
@@ -12,7 +12,7 @@
 				<input type="hidden" name="type" value="{{$type}}" />
 				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
 				<input type="hidden" name="parent" value="{{$parent}}" />
-				<input type="hidden" name="return" value="{{$return_path}}" />
+				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
 				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
 				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
 				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
diff --git a/view/theme/facepark/smarty3/comment_item.tpl b/view/theme/facepark/smarty3/comment_item.tpl
index 9a0efdc233..50bbd89e49 100644
--- a/view/theme/facepark/smarty3/comment_item.tpl
+++ b/view/theme/facepark/smarty3/comment_item.tpl
@@ -8,7 +8,7 @@
 				<input type="hidden" name="type" value="{{$type}}" />
 				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
 				<input type="hidden" name="parent" value="{{$parent}}" />
-				<input type="hidden" name="return" value="{{$return_path}}" />
+				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
 				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
 				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
 				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
diff --git a/view/theme/frost-mobile/smarty3/comment_item.tpl b/view/theme/frost-mobile/smarty3/comment_item.tpl
index a5baa14a3d..1b22ea9c6e 100644
--- a/view/theme/frost-mobile/smarty3/comment_item.tpl
+++ b/view/theme/frost-mobile/smarty3/comment_item.tpl
@@ -3,7 +3,7 @@
  *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
  *
  *}}
-<!--		<script>
+{{*<!--		<script>
 		$(document).ready( function () {
 			$(document).mouseup(function(e) {
 				var container = $("#comment-edit-wrapper-{{$id}}");
@@ -13,25 +13,25 @@
 				}
 			});
 		});
-		</script>-->
+		</script>-->*}}
 
 		<div class="comment-wwedit-wrapper {{$indent}}" id="comment-edit-wrapper-{{$id}}" style="display: block;" >
 			<form class="comment-edit-form {{$indent}}" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;" >
-<!--			<span id="hide-commentbox-{{$id}}" class="hide-commentbox fakelink" onclick="showHideCommentBox({{$id}});">{{$comment}}</span>
-			<form class="comment-edit-form" style="display: none;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">-->
+{{*<!--			<span id="hide-commentbox-{{$id}}" class="hide-commentbox fakelink" onclick="showHideCommentBox({{$id}});">{{$comment}}</span>
+			<form class="comment-edit-form" style="display: none;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">-->*}}
 				<input type="hidden" name="type" value="{{$type}}" />
 				<input type="hidden" name="source" value="{{$sourceapp}}" />
 				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
 				<input type="hidden" name="parent" value="{{$parent}}" />
-				<input type="hidden" name="return" value="{{$return_path}}" />
+				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
 				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
 				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
 				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
 
-				<!--<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >-->
+				{{*<!--<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >-->*}}
 					<a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-{{$id}}" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
-				<!--</div>-->
-				<!--<div class="comment-edit-photo-end"></div>-->
+				{{*<!--</div>-->*}}
+				{{*<!--<div class="comment-edit-photo-end"></div>-->*}}
 				<ul class="comment-edit-bb-{{$id}}">
 					<li><a class="editicon boldbb shadow"
 						style="cursor: pointer;" title="{{$edbold}}"
@@ -48,7 +48,7 @@
 					<li><a class="editicon codebb shadow"
 						style="cursor: pointer;" title="{{$edcode}}"
 						onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
-<!--					<li><a class="editicon imagebb shadow"
+{{*<!--					<li><a class="editicon imagebb shadow"
 						style="cursor: pointer;" title="{{$edimg}}"
 						onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
 					<li><a class="editicon urlbb shadow"
@@ -56,10 +56,10 @@
 						onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
 					<li><a class="editicon videobb shadow"
 						style="cursor: pointer;" title="{{$edvideo}}"
-						onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>-->
+						onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>-->*}}
 				</ul>	
-				<!--<div class="comment-edit-bb-end"></div>-->
-<!--				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose({{$id}});" >{{$comment}}</textarea>-->
+				{{*<!--<div class="comment-edit-bb-end"></div>-->*}}
+{{*<!--				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose({{$id}});" >{{$comment}}</textarea>-->*}}
 				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" >{{$comment}}</textarea>
 				{{if $qcomment}}
 					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
@@ -73,11 +73,11 @@
 				<div class="comment-edit-text-end"></div>
 				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
 					<input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
-					<!--<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="preview-link fakelink">{{$preview}}</span>
-					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>-->
+					{{*<!--<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="preview-link fakelink">{{$preview}}</span>
+					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>-->*}}
 				</div>
 
-				<!--<div class="comment-edit-end"></div>-->
+				{{*<!--<div class="comment-edit-end"></div>-->*}}
 			</form>
 
 		</div>
diff --git a/view/theme/frost-mobile/smarty3/contact_template.tpl b/view/theme/frost-mobile/smarty3/contact_template.tpl
index 2f903f494d..7d257dabcc 100644
--- a/view/theme/frost-mobile/smarty3/contact_template.tpl
+++ b/view/theme/frost-mobile/smarty3/contact_template.tpl
@@ -10,16 +10,22 @@
 		onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}});" 
 		onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)" >
 
-<!--			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>-->
+{{*<!--			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>-->*}}
 			<span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">
 			<img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" />
 			</span>
 
 			{{if $contact.photo_menu}}
-<!--			<span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">menu</span>-->
+{{*<!--			<span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">menu</span>-->*}}
                 <div class="contact-photo-menu" id="contact-photo-menu-{{$contact.id}}">
                     <ul>
-                        {{$contact.photo_menu}}
+						{{foreach $contact.photo_menu as $c}}
+						{{if $c.2}}
+						<li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+						{{else}}
+						<li><a href="{{$c.1}}">{{$c.0}}</a></li>
+						{{/if}}
+						{{/foreach}}
                     </ul>
                 </div>
 			{{/if}}
diff --git a/view/theme/frost-mobile/smarty3/photos_upload.tpl b/view/theme/frost-mobile/smarty3/photos_upload.tpl
index 0c4a26077b..d0b5135cb7 100644
--- a/view/theme/frost-mobile/smarty3/photos_upload.tpl
+++ b/view/theme/frost-mobile/smarty3/photos_upload.tpl
@@ -23,6 +23,8 @@
 	</div>
 	<div id="photos-upload-exist-end"></div>
 
+	{{$default_upload_box}}
+
 	<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
 		<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" checked />
 		<label id="photos-upload-noshare-text" for="photos-upload-noshare" >{{$nosharetext}}</label>
@@ -44,9 +46,9 @@
 
 	<div id="photos-upload-spacer"></div>
 
-	{{$uploader}}
+	{{$alt_uploader}}
 
-	{{$default}}
+	{{$default_upload_submit}}
 
 	<div class="photos-upload-end" ></div>
 </form>
diff --git a/view/theme/frost/smarty3/comment_item.tpl b/view/theme/frost/smarty3/comment_item.tpl
index 2f341072a0..4b18abce2e 100644
--- a/view/theme/frost/smarty3/comment_item.tpl
+++ b/view/theme/frost/smarty3/comment_item.tpl
@@ -3,7 +3,7 @@
  *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
  *
  *}}
-<!--		<script>
+{{*<!--		<script>
 		$(document).ready( function () {
 			$(document).mouseup(function(e) {
 				var container = $("#comment-edit-wrapper-{{$id}}");
@@ -13,24 +13,24 @@
 				}
 			});
 		});
-		</script>-->
+		</script>-->*}}
 
 		<div class="comment-wwedit-wrapper {{$indent}}" id="comment-edit-wrapper-{{$id}}" style="display: block;">
 			<form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
-<!--			<span id="hide-commentbox-{{$id}}" class="hide-commentbox fakelink" onclick="showHideCommentBox({{$id}});">{{$comment}}</span>
-			<form class="comment-edit-form" style="display: none;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">-->
+{{*<!--			<span id="hide-commentbox-{{$id}}" class="hide-commentbox fakelink" onclick="showHideCommentBox({{$id}});">{{$comment}}</span>
+			<form class="comment-edit-form" style="display: none;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">-->*}}
 				<input type="hidden" name="type" value="{{$type}}" />
 				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
 				<input type="hidden" name="parent" value="{{$parent}}" />
-				<input type="hidden" name="return" value="{{$return_path}}" />
+				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
 				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
 				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
 				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
 
-<!--				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >-->
+{{*<!--				<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >-->*}}
 					<a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-{{$id}}" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
-<!--				</div>-->
-				<!--<div class="comment-edit-photo-end"></div>-->
+{{*<!--				</div>-->*}}
+				{{*<!--<div class="comment-edit-photo-end"></div>-->*}}
 				<ul class="comment-edit-bb" id="comment-edit-bb-{{$id}}">
 					<li><a class="editicon boldbb shadow"
 						style="cursor: pointer;" title="{{$edbold}}"
@@ -57,8 +57,8 @@
 						style="cursor: pointer;" title="{{$edvideo}}"
 						onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
 				</ul>	
-<!--				<div class="comment-edit-bb-end"></div>-->
-<!--				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose({{$id}});" >{{$comment}}</textarea>-->
+{{*<!--				<div class="comment-edit-bb-end"></div>-->*}}
+{{*<!--				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose({{$id}});" >{{$comment}}</textarea>-->*}}
 				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" >{{$comment}}</textarea>
 				{{if $qcomment}}
 					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
@@ -76,7 +76,7 @@
 					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
 				</div>
 
-				<!--<div class="comment-edit-end"></div>-->
+				{{*<!--<div class="comment-edit-end"></div>-->*}}
 			</form>
 
 		</div>
diff --git a/view/theme/frost/smarty3/contact_template.tpl b/view/theme/frost/smarty3/contact_template.tpl
index 649829606c..7eba7efeee 100644
--- a/view/theme/frost/smarty3/contact_template.tpl
+++ b/view/theme/frost/smarty3/contact_template.tpl
@@ -16,7 +16,13 @@
 			<span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">menu</span>
                 <div class="contact-photo-menu" id="contact-photo-menu-{{$contact.id}}">
                     <ul>
-                        {{$contact.photo_menu}}
+						{{foreach $contact.photo_menu as $c}}
+						{{if $c.2}}
+						<li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+						{{else}}
+						<li><a href="{{$c.1}}">{{$c.0}}</a></li>
+						{{/if}}
+						{{/foreach}}
                     </ul>
                 </div>
 			{{/if}}
diff --git a/view/theme/frost/smarty3/photos_upload.tpl b/view/theme/frost/smarty3/photos_upload.tpl
index 233672a312..4c829a2962 100644
--- a/view/theme/frost/smarty3/photos_upload.tpl
+++ b/view/theme/frost/smarty3/photos_upload.tpl
@@ -24,6 +24,7 @@
 	<div id="photos-upload-exist-end"></div>
 
 	<div id="photos-upload-choosefile-outer-wrapper">
+	{{$default_upload_box}}
 	<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
 		<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" checked />
 		<div id="photos-upload-noshare-label">
@@ -46,9 +47,9 @@
 
 	<div id="photos-upload-spacer"></div>
 
-	{{$uploader}}
+	{{$alt_uploader}}
 
-	{{$default}}
+	{{$default_upload_submit}}
 
 	<div class="photos-upload-end" ></div>
 	</div>
diff --git a/view/theme/quattro/smarty3/comment_item.tpl b/view/theme/quattro/smarty3/comment_item.tpl
index 1e6a6e69c4..eca1f14f40 100644
--- a/view/theme/quattro/smarty3/comment_item.tpl
+++ b/view/theme/quattro/smarty3/comment_item.tpl
@@ -8,7 +8,7 @@
 				<input type="hidden" name="type" value="{{$type}}" />
 				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
 				<input type="hidden" name="parent" value="{{$parent}}" />
-				<input type="hidden" name="return" value="{{$return_path}}" />
+				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
 				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
 				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
 				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
diff --git a/view/theme/quattro/smarty3/contact_template.tpl b/view/theme/quattro/smarty3/contact_template.tpl
index 9788388e76..c74a513b8f 100644
--- a/view/theme/quattro/smarty3/contact_template.tpl
+++ b/view/theme/quattro/smarty3/contact_template.tpl
@@ -15,7 +15,13 @@
 			{{if $contact.photo_menu}}
 			<a href="#" rel="#contact-photo-menu-{{$contact.id}}" class="contact-photo-menu-button icon s16 menu" id="contact-photo-menu-button-{{$contact.id}}">menu</a>
 			<ul class="contact-photo-menu menu-popup" id="contact-photo-menu-{{$contact.id}}">
-				{{$contact.photo_menu}}
+				{{foreach $contact.photo_menu as $c}}
+				{{if $c.2}}
+				<li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+				{{else}}
+				<li><a href="{{$c.1}}">{{$c.0}}</a></li>
+				{{/if}}
+				{{/foreach}}
 			</ul>
 			{{/if}}
 		</div>
diff --git a/view/theme/testbubble/smarty3/comment_item.tpl b/view/theme/testbubble/smarty3/comment_item.tpl
index 95ea5afd75..ef993e8f53 100644
--- a/view/theme/testbubble/smarty3/comment_item.tpl
+++ b/view/theme/testbubble/smarty3/comment_item.tpl
@@ -8,7 +8,7 @@
 				<input type="hidden" name="type" value="{{$type}}" />
 				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
 				<input type="hidden" name="parent" value="{{$parent}}" />
-				<input type="hidden" name="return" value="{{$return_path}}" />
+				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
 				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
 				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
 				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
diff --git a/view/theme/vier/smarty3/comment_item.tpl b/view/theme/vier/smarty3/comment_item.tpl
index 45b3c6891b..b683f12424 100644
--- a/view/theme/vier/smarty3/comment_item.tpl
+++ b/view/theme/vier/smarty3/comment_item.tpl
@@ -12,7 +12,7 @@
 				<input type="hidden" name="type" value="{{$type}}" />
 				<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
 				<input type="hidden" name="parent" value="{{$parent}}" />
-				<input type="hidden" name="return" value="{{$return_path}}" />
+				{{*<!--<input type="hidden" name="return" value="{{$return_path}}" />-->*}}
 				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
 				<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
 				<input type="hidden" name="post_id_random" value="{{$rand_num}}" />