diff --git a/view/templates/admin/features.tpl b/view/templates/admin/features.tpl
index 46a7abea26..42058d5caf 100644
--- a/view/templates/admin/features.tpl
+++ b/view/templates/admin/features.tpl
@@ -15,7 +15,7 @@
 			</div>
 		{{/foreach}}
 
-		<div class="settings-submit-wrapper" >
+		<div class="settings-submit-wrapper">
 			<input type="submit" name="submit" class="settings-features-submit" value="{{$submit}}" />
 		</div>
 	</div>
diff --git a/view/templates/album_edit.tpl b/view/templates/album_edit.tpl
index b6f24ec3b2..dd4459fe9e 100644
--- a/view/templates/album_edit.tpl
+++ b/view/templates/album_edit.tpl
@@ -1,10 +1,10 @@
 
 <div id="photo-album-edit-wrapper">
-<form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/{{$nickname}}/album/{{$hexalbum}}" method="post" >
+<form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/{{$nickname}}/album/{{$hexalbum}}" method="post">
 
 
-<label id="photo-album-edit-name-label" for="photo-album-edit-name" >{{$nametext}}</label>
-<input type="text" size="64" name="albumname" value="{{$album}}" >
+<label id="photo-album-edit-name-label" for="photo-album-edit-name">{{$nametext}}</label>
+<input type="text" size="64" name="albumname" value="{{$album}}">
 
 <div id="photo-album-edit-name-end"></div>
 
@@ -12,4 +12,4 @@
 
 </form>
 </div>
-<div id="photo-album-edit-end" ></div>
+<div id="photo-album-edit-end"></div>
diff --git a/view/templates/birthdays_reminder.tpl b/view/templates/birthdays_reminder.tpl
index 6aa51d4702..5fb75a993d 100644
--- a/view/templates/birthdays_reminder.tpl
+++ b/view/templates/birthdays_reminder.tpl
@@ -1,7 +1,7 @@
 
 {{if $count}}
 <div id="birthday-notice" class="birthday-notice fakelink {{$classtoday}}" onclick="openClose('birthday-wrapper');">{{$event_reminders}} ({{$count}})</div>
-<div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">{{$event_title}}</div>
+<div id="birthday-wrapper" style="display: none;"><div id="birthday-title">{{$event_title}}</div>
 <div id="birthday-title-end"></div>
 {{foreach $events as $event}}
 <div class="birthday-list" id="birthday-{{$event.id}}"> <a href="{{$event.link}}">{{$event.title}}</a> {{$event.date}} </div>
diff --git a/view/templates/comment_item.tpl b/view/templates/comment_item.tpl
index 856637e26c..02d34c47e6 100644
--- a/view/templates/comment_item.tpl
+++ b/view/templates/comment_item.tpl
@@ -11,13 +11,13 @@
 				<input type="hidden" name="jsreload" value="{{$jsreload}}" />
 				<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-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
 				</div>
 				<div class="comment-edit-photo-end"></div>
 				<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" placeholder="{{$comment}}" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});">{{if $threaded != false}}{{$default}}{{/if}}</textarea>
 				{{if $qcomment}}
-					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
+					<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});">
 					<option value=""></option>
 				{{foreach $qcomment as $qc}}
 					<option value="{{$qc}}">{{$qc}}</option>
@@ -26,7 +26,7 @@
 				{{/if}}
 
 				<div class="comment-edit-text-end"></div>
-				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
+				<div class="comment-edit-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>{{/if}}
 					<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
diff --git a/view/templates/contact/advanced.tpl b/view/templates/contact/advanced.tpl
index 004de53c15..f7708ac577 100644
--- a/view/templates/contact/advanced.tpl
+++ b/view/templates/contact/advanced.tpl
@@ -9,7 +9,7 @@
 </div>
 <br />
 
-<form id="contact-advanced-form" action="contact/{{$contact_id}}/advanced" method="post" >
+<form id="contact-advanced-form" action="contact/{{$contact_id}}/advanced" method="post">
 
 	<!-- <h4>{{$contact_name}}</h4> -->
 
diff --git a/view/templates/contact_edit.tpl b/view/templates/contact_edit.tpl
index c98b44e439..44751eacc7 100644
--- a/view/templates/contact_edit.tpl
+++ b/view/templates/contact_edit.tpl
@@ -1,11 +1,11 @@
-<div id="contact-edit-wrapper" >
+<div id="contact-edit-wrapper">
 
 	{{* Insert Tab-Nav *}}
 	{{$tab_str nofilter}}
 
 
-	<div id="contact-edit-nav-wrapper" >
-		<form action="contact/{{$contact_id}}" method="post" >
+	<div id="contact-edit-nav-wrapper">
+		<form action="contact/{{$contact_id}}" method="post">
 			<div id="contact-edit-links">
 				<div id="contact-edit-status-wrapper">
 					<span id="contact-edit-contact-status">{{$contact_status}}</span>
@@ -14,7 +14,7 @@
 					<div id="contact-edit-actions">
 						<a class="btn" rel="#contact-actions-menu" href="#" id="contact-edit-actions-button">{{$contact_action_button}}</a>
 
-						<ul role="menu" aria-haspopup="true" id="contact-actions-menu" class="menu-popup" >
+						<ul role="menu" aria-haspopup="true" id="contact-actions-menu" class="menu-popup">
 							{{if $lblsuggest}}<li role="menuitem"><a  href="#" title="{{$contact_actions.suggest.title}}" onclick="window.location.href='{{$contact_actions.suggest.url}}'; return false;">{{$contact_actions.suggest.label}}</a></li>{{/if}}
 							{{if $poll_enabled}}<li role="menuitem"><a  href="#" title="{{$contact_actions.update.title}}" onclick="window.location.href='{{$contact_actions.update.url}}'; return false;">{{$contact_actions.update.label}}</a></li>{{/if}}
 							{{if $contact_actions.updateprofile}}<li role="menuitem"><a href="{{$contact_actions.updateprofile.url}}" title="{{$contact_actions.updateprofile.title}}">{{$contact_actions.updateprofile.label}}</a></li>{{/if}}
@@ -64,7 +64,7 @@
 			<div id="contact-edit-settings">
 				<input type="hidden" name="contact_id" value="{{$contact_id}}">
 
-					<div id="contact-edit-end" ></div>
+					<div id="contact-edit-end"></div>
 					{{include file="field_checkbox.tpl" field=$notify}}
 					{{if $fetch_further_information}}
 						{{include file="field_select.tpl" field=$fetch_further_information}}
diff --git a/view/templates/contact_template.tpl b/view/templates/contact_template.tpl
index 06918533ca..31a2d15d6e 100644
--- a/view/templates/contact_template.tpl
+++ b/view/templates/contact_template.tpl
@@ -1,9 +1,9 @@
 
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}" >
-	<div class="contact-entry-photo-wrapper" >
+<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)" >
+		onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$contact.id}}\'); closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)">
 
 			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>
 
@@ -30,17 +30,17 @@
 	</div>
 
 	<div class="contact-entry-desc">
-		<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >
+		<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}">
 			{{$contact.name}}
 			{{if $contact.account_type}} <span class="contact-entry-details" id="contact-entry-accounttype-{{$contact.id}}">({{$contact.account_type}})</span>{{/if}}
 		</div>
-		{{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
-		{{if $contact.itemurl}}<div class="contact-entry-details" id="contact-entry-url-{{$contact.id}}" >{{$contact.itemurl}}</div>{{/if}}
-		{{if $contact.tags}}<div class="contact-entry-details" id="contact-entry-tags-{{$contact.id}}" >{{$contact.tags}}</div>{{/if}}
-		{{if $contact.details}}<div class="contact-entry-details" id="contact-entry-details-{{$contact.id}}" >{{$contact.details}}</div>{{/if}}
-		{{if $contact.network}}<div class="contact-entry-details" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>{{/if}}
+		{{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}">{{$contact.alt_text}}</div>{{/if}}
+		{{if $contact.itemurl}}<div class="contact-entry-details" id="contact-entry-url-{{$contact.id}}">{{$contact.itemurl}}</div>{{/if}}
+		{{if $contact.tags}}<div class="contact-entry-details" id="contact-entry-tags-{{$contact.id}}">{{$contact.tags}}</div>{{/if}}
+		{{if $contact.details}}<div class="contact-entry-details" id="contact-entry-details-{{$contact.id}}">{{$contact.details}}</div>{{/if}}
+		{{if $contact.network}}<div class="contact-entry-details" id="contact-entry-network-{{$contact.id}}">{{$contact.network}}</div>{{/if}}
 		
 	</div>
 
-	<div class="contact-entry-end" ></div>
+	<div class="contact-entry-end"></div>
 </div>
diff --git a/view/templates/contacts-template.tpl b/view/templates/contacts-template.tpl
index b320b0d050..1631640a0a 100644
--- a/view/templates/contacts-template.tpl
+++ b/view/templates/contacts-template.tpl
@@ -4,7 +4,7 @@
 {{if $finding}}<h4>{{$finding}}</h4>{{/if}}
 
 <div id="contacts-search-wrapper">
-<form id="contacts-search-form" action="{{$cmd}}" method="get" >
+<form id="contacts-search-form" action="{{$cmd}}" method="get">
 <span class="contacts-search-desc">{{$desc nofilter}}</span>
 <input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="{{$search}}" />
 <input type="submit" name="submit" id="contacts-search-submit" value="{{$submit}}" />
diff --git a/view/templates/conversation.tpl b/view/templates/conversation.tpl
index 761a31a842..2f1222e5db 100644
--- a/view/templates/conversation.tpl
+++ b/view/templates/conversation.tpl
@@ -21,8 +21,8 @@
 
 {{if $dropping}}
 <div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
-  <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
-  <div id="item-delete-selected-desc" >{{$dropping}}</div>
+  <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);"></div>
+  <div id="item-delete-selected-desc">{{$dropping}}</div>
 </div>
 <div id="item-delete-selected-end"></div>
 {{/if}}
diff --git a/view/templates/dfrn_req_confirm.tpl b/view/templates/dfrn_req_confirm.tpl
index 693f8cbf92..2e586ec33c 100644
--- a/view/templates/dfrn_req_confirm.tpl
+++ b/view/templates/dfrn_req_confirm.tpl
@@ -1,6 +1,6 @@
 
 
-<p id="dfrn-request-homecoming" >
+<p id="dfrn-request-homecoming">
 {{$welcome}}
 <br />
 {{$please}}
@@ -16,7 +16,7 @@
 <input type="checkbox" name="hidden-contact" value="1" />
 
 
-<div id="dfrn-request-homecoming-submit-wrapper" >
+<div id="dfrn-request-homecoming-submit-wrapper">
 <input id="dfrn-request-homecoming-submit" type="submit" name="submit" value="{{$submit}}" />
 </div>
 </form>
\ No newline at end of file
diff --git a/view/templates/directory_header.tpl b/view/templates/directory_header.tpl
index 14b1074dc9..e277c29dac 100644
--- a/view/templates/directory_header.tpl
+++ b/view/templates/directory_header.tpl
@@ -8,7 +8,7 @@
 {{/if}}
 
 <div id="directory-search-wrapper">
-	<form id="directory-search-form" action="{{$search_mod}}" method="get" >
+	<form id="directory-search-form" action="{{$search_mod}}" method="get">
 		<span class="dirsearch-desc">{{$desc nofilter}}</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" />
@@ -25,6 +25,6 @@
 	{{include file="contact_template.tpl"}}
 {{/foreach}}
 
-<div class="directory-end" ></div>
+<div class="directory-end"></div>
 
 {{$paginate nofilter}}
diff --git a/view/templates/directory_item.tpl b/view/templates/directory_item.tpl
index 4dbe8a951f..e80c4b9ab4 100644
--- a/view/templates/directory_item.tpl
+++ b/view/templates/directory_item.tpl
@@ -1,9 +1,9 @@
 
 
-<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}}" >
+<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.alt_text}}" title="{{$entry.alt_text}}" />
 			</a>
 		</div>
diff --git a/view/templates/event.tpl b/view/templates/event.tpl
index 62317519b0..c8250c8ef3 100644
--- a/view/templates/event.tpl
+++ b/view/templates/event.tpl
@@ -2,7 +2,7 @@
 {{foreach $events as $event}}
 	<div class="event">
 	
-	{{if $event.item.author_name}}<a href="{{$event.item.author_link}}" ><img src="{{$event.item.author_avatar}}" height="32" width="32" />{{$event.item.author_name}}</a>{{/if}}
+	{{if $event.item.author_name}}<a href="{{$event.item.author_link}}"><img src="{{$event.item.author_avatar}}" height="32" width="32" />{{$event.item.author_name}}</a>{{/if}}
 	{{$event.html nofilter}}
 	{{if $event.plink.orig}}<a href="{{$event.plink.orig}}" title="{{$event.plink.orig_title}}" target="_blank" rel="noopener noreferrer" 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}}
diff --git a/view/templates/event_form.tpl b/view/templates/event_form.tpl
index 0527c69905..b22c3c64f4 100644
--- a/view/templates/event_form.tpl
+++ b/view/templates/event_form.tpl
@@ -5,7 +5,7 @@
 {{$desc nofilter}}
 </p>
 
-<form id="event-edit-form" action="{{$post}}" method="post" >
+<form id="event-edit-form" action="{{$post}}" method="post">
 
 <input type="hidden" name="event_id" value="{{$eid}}" />
 <input type="hidden" name="cid" value="{{$cid}}" />
diff --git a/view/templates/events.tpl b/view/templates/events.tpl
index 7f55e52d86..07943bd5c0 100644
--- a/view/templates/events.tpl
+++ b/view/templates/events.tpl
@@ -2,7 +2,7 @@
 {{$tabs nofilter}}
 {{include file="section_title.tpl"}}
 
-<div id="new-event-link"><a href="{{$new_event.0}}" >{{$new_event.1}}</a></div>
+<div id="new-event-link"><a href="{{$new_event.0}}">{{$new_event.1}}</a></div>
 
 <div id="event-calendar-wrapper">
 	<a href="{{$previus.0}}" class="prevcal {{$previus.2}}"><div id="event-calendar-prev" class="icon s22 prev" title="{{$previus.1}}"></div></a>
@@ -14,8 +14,8 @@
 
 {{foreach $events as $event}}
 	<div class="event">
-	{{if $event.is_first}}<hr /><a name="link-{{$event.j}}" ><div class="event-list-date">{{$event.d}}</div></a>{{/if}}
-	{{if $event.item.author_name}}<a href="{{$event.item.author_link}}" ><img src="{{$event.item.author_avatar}}" height="32" width="32" />{{$event.item.author_name}}</a>{{/if}}
+	{{if $event.is_first}}<hr /><a name="link-{{$event.j}}"><div class="event-list-date">{{$event.d}}</div></a>{{/if}}
+	{{if $event.item.author_name}}<a href="{{$event.item.author_link}}"><img src="{{$event.item.author_avatar}}" height="32" width="32" />{{$event.item.author_name}}</a>{{/if}}
 	{{$event.html nofilter}}
 	{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" target="_blank" rel="noopener noreferrer" 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}}
diff --git a/view/templates/events_js.tpl b/view/templates/events_js.tpl
index ab375401a2..dfafc6a3ce 100644
--- a/view/templates/events_js.tpl
+++ b/view/templates/events_js.tpl
@@ -2,6 +2,6 @@
 {{$tabs nofilter}}
 <h2>{{$title}}</h2>
 
-<div id="new-event-link"><a href="{{$new_event.0}}" >{{$new_event.1}}</a></div>
+<div id="new-event-link"><a href="{{$new_event.0}}">{{$new_event.1}}</a></div>
 
 <div id="events-calendar"></div>
diff --git a/view/templates/events_reminder.tpl b/view/templates/events_reminder.tpl
index 2fcb1908d7..228a741b02 100644
--- a/view/templates/events_reminder.tpl
+++ b/view/templates/events_reminder.tpl
@@ -1,7 +1,7 @@
 
 {{if $count}}
 <div id="event-notice" class="birthday-notice fakelink {{$classtoday}}" onclick="openClose('event-wrapper');">{{$event_reminders}} ({{$count}})</div>
-<div id="event-wrapper" style="display: none;" ><div id="event-title">{{$event_title}}</div>
+<div id="event-wrapper" style="display: none;"><div id="event-title">{{$event_title}}</div>
 <div id="event-title-end"></div>
 {{foreach $events as $event}}
 <div class="event-list" id="event-{{$event.id}}"> <a class="ajax-popupbox" href="events/?id={{$event.id}}">{{$event.title}}</a> - {{$event.date}} </div>
diff --git a/view/templates/field_combobox.tpl b/view/templates/field_combobox.tpl
index a22be7f467..3e6e06052f 100644
--- a/view/templates/field_combobox.tpl
+++ b/view/templates/field_combobox.tpl
@@ -2,8 +2,8 @@
 	<div class='field combobox'>
 		<label for='id_{{$field.0}}' id='id_{{$field.0}}_label'>{{$field.1}}</label>
 		{{* html5 don't work on Chrome, Safari and IE9
-		<input id="id_{{$field.0}}" type="text" list="data_{{$field.0}}" >
-		<datalist id="data_{{$field.0}}" >
+		<input id="id_{{$field.0}}" type="text" list="data_{{$field.0}}">
+		<datalist id="data_{{$field.0}}">
 		   {{foreach $field.4 as $opt=>$val}}<option value="{{$val}}">{{/foreach}}
 		</datalist> *}}
 		
diff --git a/view/templates/filebrowser.tpl b/view/templates/filebrowser.tpl
index 683ca4ec6e..7afcad3903 100644
--- a/view/templates/filebrowser.tpl
+++ b/view/templates/filebrowser.tpl
@@ -1,7 +1,7 @@
 <!--
 	This is the template used by mod/fbrowser.php
 -->
-<script type="text/javascript" src="{{$baseurl}}/view/js/ajaxupload.js?v={{$smarty.const.FRIENDICA_VERSION}}" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/js/ajaxupload.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
 <script type="text/javascript" src="{{$baseurl}}/view/js/filebrowser.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
 <script>
 	$(function() {
diff --git a/view/templates/filer_dialog.tpl b/view/templates/filer_dialog.tpl
index 77f48e8aee..aa74200989 100644
--- a/view/templates/filer_dialog.tpl
+++ b/view/templates/filer_dialog.tpl
@@ -1,5 +1,5 @@
 
 {{include file="field_combobox.tpl"}}
-<div class="settings-submit-wrapper" >
+<div class="settings-submit-wrapper">
 	<input id="filer_save" type="button" class="settings-submit" value="{{$submit}}" />
 </div>
diff --git a/view/templates/group_drop.tpl b/view/templates/group_drop.tpl
index b9a6953d8b..e28411d036 100644
--- a/view/templates/group_drop.tpl
+++ b/view/templates/group_drop.tpl
@@ -1,5 +1,5 @@
 
-<div class="group-delete-wrapper button" id="group-delete-wrapper-{{$id}}" >
+<div class="group-delete-wrapper button" id="group-delete-wrapper-{{$id}}">
 	<a href="group/drop/{{$id}}?t={{$form_security_token}}"
 		onclick="return confirmDelete();"
 		id="group-delete-icon-{{$id}}"
diff --git a/view/templates/group_edit.tpl b/view/templates/group_edit.tpl
index cc12bc736c..1984dc197a 100644
--- a/view/templates/group_edit.tpl
+++ b/view/templates/group_edit.tpl
@@ -3,16 +3,16 @@
 
 
 {{if $editable == 1}}
-<div id="group-edit-wrapper" >
-	<form action="group/{{$gid}}" id="group-edit-form" method="post" >
+<div id="group-edit-wrapper">
+	<form action="group/{{$gid}}" id="group-edit-form" method="post">
 		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 		
 		{{include file="field_input.tpl" field=$gname}}
 		{{if $drop}}{{$drop nofilter}}{{/if}}
-		<div id="group-edit-submit-wrapper" >
-			<input type="submit" name="submit" value="{{$submit}}" >
+		<div id="group-edit-submit-wrapper">
+			<input type="submit" name="submit" value="{{$submit}}">
 		</div>
-		<div id="group-edit-select-end" ></div>
+		<div id="group-edit-select-end"></div>
 	</form>
 </div>
 {{/if}}
diff --git a/view/templates/group_selection.tpl b/view/templates/group_selection.tpl
index 52546af2a5..7d01df7a78 100644
--- a/view/templates/group_selection.tpl
+++ b/view/templates/group_selection.tpl
@@ -1,9 +1,9 @@
 
 <div class="field custom">
 <label for="group-selection" id="group-selection-lbl">{{$label}}</label>
-<select name="group-selection" id="group-selection" >
+<select name="group-selection" id="group-selection">
 {{foreach $groups as $group}}
-<option value="{{$group.id}}" {{if $group.selected}}selected="selected"{{/if}} >{{$group.name}}</option>
+<option value="{{$group.id}}"{{if $group.selected}} selected="selected"{{/if}}>{{$group.name}}</option>
 {{/foreach}}
 </select>
 </div>
diff --git a/view/templates/head.tpl b/view/templates/head.tpl
index 1decacd5d0..5ba9e47a31 100644
--- a/view/templates/head.tpl
+++ b/view/templates/head.tpl
@@ -32,19 +32,19 @@
 <!--[if IE]>
 <script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
 <![endif]-->
-<script type="text/javascript" src="view/js/modernizr.js?v={{$smarty.const.FRIENDICA_VERSION}}" ></script>
-<script type="text/javascript" src="view/asset/jquery/dist/jquery.min.js?v={{$smarty.const.FRIENDICA_VERSION}}" ></script>
-<script type="text/javascript" src="view/js/jquery.textinputs.js?v={{$smarty.const.FRIENDICA_VERSION}}" ></script>
-<script type="text/javascript" src="view/asset/textcomplete/dist/textcomplete.min.js?v={{$smarty.const.FRIENDICA_VERSION}}" ></script>
-<script type="text/javascript" src="view/js/autocomplete.js?v={{$smarty.const.FRIENDICA_VERSION}}" ></script>
+<script type="text/javascript" src="view/js/modernizr.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
+<script type="text/javascript" src="view/asset/jquery/dist/jquery.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
+<script type="text/javascript" src="view/js/jquery.textinputs.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
+<script type="text/javascript" src="view/asset/textcomplete/dist/textcomplete.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
+<script type="text/javascript" src="view/js/autocomplete.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
 <script type="text/javascript" src="view/asset/jquery-colorbox/jquery.colorbox-min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
 <script type="text/javascript" src="view/asset/jgrowl/jquery.jgrowl.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
 <script type="text/javascript" src="view/asset/jquery-datetimepicker/build/jquery.datetimepicker.full.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
-<script type="text/javascript" src="view/asset/perfect-scrollbar/dist/js/perfect-scrollbar.jquery.min.js?v={{$smarty.const.FRIENDICA_VERSION}}" ></script>
+<script type="text/javascript" src="view/asset/perfect-scrollbar/dist/js/perfect-scrollbar.jquery.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
 <script type="text/javascript" src="view/asset/imagesloaded/imagesloaded.pkgd.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
-<script type="text/javascript" src="view/asset/base64/base64.min.js?v={{$smarty.const.FRIENDICA_VERSION}}" ></script>
+<script type="text/javascript" src="view/asset/base64/base64.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
 <script type="text/javascript" src="view/asset/dompurify/dist/purify.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
-<script type="text/javascript" src="view/js/main.js?v={{$smarty.const.FRIENDICA_VERSION}}" ></script>
+<script type="text/javascript" src="view/js/main.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
 <script>
 
 	// Lifted from https://css-tricks.com/snippets/jquery/move-cursor-to-end-of-textarea-or-input/
diff --git a/view/templates/hovercard.tpl b/view/templates/hovercard.tpl
index 4f41c204ee..862871dca9 100644
--- a/view/templates/hovercard.tpl
+++ b/view/templates/hovercard.tpl
@@ -1,4 +1,4 @@
-<div class="basic-content" >
+<div class="basic-content">
 	<div class="hover-card-details">
 		<div class="hover-card-header left-align">
 			<div class="hover-card-pic left-align">
diff --git a/view/templates/invite.tpl b/view/templates/invite.tpl
index 6f161fd4f5..6ce9d51462 100644
--- a/view/templates/invite.tpl
+++ b/view/templates/invite.tpl
@@ -1,5 +1,5 @@
 
-<form action="invite" method="post" id="invite-form" >
+<form action="invite" method="post" id="invite-form">
 
 	<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
diff --git a/view/templates/jot-header.tpl b/view/templates/jot-header.tpl
index db2e893e9b..ba186bc825 100644
--- a/view/templates/jot-header.tpl
+++ b/view/templates/jot-header.tpl
@@ -40,7 +40,7 @@ function enableOnUser(){
 }
 
 </script>
-<script type="text/javascript" src="{{$baseurl}}/view/js/ajaxupload.js?v={{$smarty.const.FRIENDICA_VERSION}}" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/js/ajaxupload.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
 <script>
 	var ispublic = '{{$ispublic nofilter}}';
 
diff --git a/view/templates/jot.tpl b/view/templates/jot.tpl
index c0f463e48a..167e47da52 100644
--- a/view/templates/jot.tpl
+++ b/view/templates/jot.tpl
@@ -1,11 +1,11 @@
-<div id="profile-jot-wrapper" >
+<div id="profile-jot-wrapper">
 	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
+		<div id="profile-jot-desc">&nbsp;</div>
 		<div id="character-counter" class="grey"></div>
 	</div>
 	<div id="profile-jot-banner-end"></div>
 
-	<form id="profile-jot-form" action="{{$action}}" method="post" >
+	<form id="profile-jot-form" action="{{$action}}" method="post">
 		<input type="hidden" name="wall" value="{{$wall}}" />
 		<input type="hidden" name="post_type" value="{{$posttype}}" />
 		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
@@ -30,31 +30,31 @@
 <div id="profile-jot-submit-wrapper" class="jothidden">
 	<input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" />
 
-	<div id="profile-upload-wrapper" style="display: {{$visitor}};" >
-		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="{{$upload}}"></a></div>
+	<div id="profile-upload-wrapper" style="display: {{$visitor}};">
+		<div id="wall-image-upload-div"><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="{{$upload}}"></a></div>
 	</div>
-	<div id="profile-attach-wrapper" style="display: {{$visitor}};" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="{{$attach}}"></a></div>
+	<div id="profile-attach-wrapper" style="display: {{$visitor}};">
+		<div id="wall-file-upload-div"><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="{{$attach}}"></a></div>
 	</div>
 
-	<div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
+	<div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);">
 		<a id="profile-link" class="icon link" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
 	</div>
-	<div id="profile-video-wrapper" style="display: {{$visitor}};" >
+	<div id="profile-video-wrapper" style="display: {{$visitor}};">
 		<a id="profile-video" class="icon video" title="{{$video}}" onclick="jotVideoURL();return false;"></a>
 	</div>
-	<div id="profile-audio-wrapper" style="display: {{$visitor}};" >
+	<div id="profile-audio-wrapper" style="display: {{$visitor}};">
 		<a id="profile-audio" class="icon audio" title="{{$audio}}" onclick="jotAudioURL();return false;"></a>
 	</div>
-	<div id="profile-location-wrapper" style="display: {{$visitor}};" >
+	<div id="profile-location-wrapper" style="display: {{$visitor}};">
 		<a id="profile-location" class="icon globe" title="{{$setloc}}" onclick="jotGetLocation();return false;"></a>
 	</div>
-	<div id="profile-nolocation-wrapper" style="display: none;" >
+	<div id="profile-nolocation-wrapper" style="display: none;">
 		<a id="profile-nolocation" class="icon noglobe" title="{{$noloc}}" onclick="jotClearLocation();return false;"></a>
 	</div>
 
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" >
-		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}}"  title="{{$permset}}" ></a>{{$bang}}
+	<div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};">
+		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}}"  title="{{$permset}}"></a>{{$bang}}
 	</div>
 
 	<!-- {{if $preview}}<span onclick="preview_post();" id="jot-preview-link" class="fakelink">{{$preview}}</span>{{/if}} -->
@@ -67,7 +67,7 @@
 	{{$jotplugins nofilter}}
 	</div>
 
-	<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
+	<div id="profile-rotator-wrapper" style="display: {{$visitor}};">
 		<img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
 	</div>
 
diff --git a/view/templates/login.tpl b/view/templates/login.tpl
index 733c218164..cfca193177 100644
--- a/view/templates/login.tpl
+++ b/view/templates/login.tpl
@@ -1,6 +1,6 @@
 
 
-<form id="login-form" action="{{$dest_url}}" role="form" method="post" >
+<form id="login-form" action="{{$dest_url}}" role="form" method="post">
 <div id="login-group" role="group" aria-labelledby="login-head">
 	<input type="hidden" name="auth-params" value="login" />
 
@@ -10,7 +10,7 @@
 	{{include file="field_input.tpl" field=$lname}}
 	{{include file="field_password.tpl" field=$lpassword}}
 	<div id="login-lost-password-link">
-		<a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
+		<a href="lostpass" title="{{$lostpass}}" id="lost-password-link">{{$lostlink}}</a>
 	</div>
 	</div>
 	
@@ -20,7 +20,7 @@
 		</div>
 	{{/if}}
 
-	<div id="login-submit-wrapper" >
+	<div id="login-submit-wrapper">
 		<input type="submit" name="submit" id="login-submit-button" value="{{$login}}" />
 	</div>
 
diff --git a/view/templates/logout.tpl b/view/templates/logout.tpl
index ba66f831cc..df5df0dbd7 100644
--- a/view/templates/logout.tpl
+++ b/view/templates/logout.tpl
@@ -1,5 +1,5 @@
 
-<form action="{{$dest_url}}" method="post" >
+<form action="{{$dest_url}}" method="post">
 <div class="logout-wrapper">
 <input type="hidden" name="auth-params" value="logout" />
 <input type="submit" name="submit" id="logout-button" value="{{$logout}}" />
diff --git a/view/templates/lostpass.tpl b/view/templates/lostpass.tpl
index 3c4f422197..4348d9ef8c 100644
--- a/view/templates/lostpass.tpl
+++ b/view/templates/lostpass.tpl
@@ -5,13 +5,13 @@
 {{$desc nofilter}}
 </p>
 
-<form action="lostpass" method="post" >
+<form action="lostpass" method="post">
 <div id="login-name-wrapper">
         <label for="login-name" id="label-login-name">{{$name}}</label>
         <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
 </div>
 <div id="login-extra-end"></div>
-<div id="login-submit-wrapper" >
+<div id="login-submit-wrapper">
         <input type="submit" name="submit" id="lostpass-submit-button" value="{{$submit}}" />
 </div>
 <div id="login-submit-end"></div>
diff --git a/view/templates/mail_conv.tpl b/view/templates/mail_conv.tpl
index 905bf36254..588f2509a3 100644
--- a/view/templates/mail_conv.tpl
+++ b/view/templates/mail_conv.tpl
@@ -1,14 +1,14 @@
 
 <div class="mail-conv-outside-wrapper">
-	<div class="mail-conv-sender" >
-		<a href="{{$mail.from_url}}" title="{{$mail.from_addr}}" 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">
+		<a href="{{$mail.from_url}}" title="{{$mail.from_addr}}" class="mail-conv-sender-url"><img class="mframe mail-conv-sender-photo{{$mail.sparkle}}" src="{{$mail.from_photo}}" heigth="80" width="80" alt="{{$mail.from_name}}" /></a>
 	</div>
-	<div class="mail-conv-detail" >
-		<div class="mail-conv-sender-name" >{{$mail.from_name}}</div>
+	<div class="mail-conv-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 nofilter}}</div>
-	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
+	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}"><a href="message/drop/{{$mail.id}}" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);"></a></div><div class="mail-conv-delete-end"></div>
 	<div class="mail-conv-outside-wrapper-end"></div>
 </div>
 </div>
diff --git a/view/templates/mail_list.tpl b/view/templates/mail_list.tpl
index 04f23a3714..1c3b8c2290 100644
--- a/view/templates/mail_list.tpl
+++ b/view/templates/mail_list.tpl
@@ -1,14 +1,14 @@
 
 <div class="mail-list-outside-wrapper">
-	<div class="mail-list-sender" >
-		<a href="{{$from_url}}" title="{{$from_addr}}" class="mail-list-sender-url" ><img class="mail-list-sender-photo{{$sparkle}}" src="{{$from_photo}}" height="80" width="80" alt="{{$from_name}}" title="{{$from_addr}}" /></a>
+	<div class="mail-list-sender">
+		<a href="{{$from_url}}" title="{{$from_addr}}" class="mail-list-sender-url"><img class="mail-list-sender-photo{{$sparkle}}" src="{{$from_photo}}" height="80" width="80" alt="{{$from_name}}" title="{{$from_addr}}" /></a>
 	</div>
 	<div class="mail-list-detail">
-		<div class="mail-list-sender-name" >{{$from_name}}</div>
+		<div class="mail-list-sender-name">{{$from_name}}</div>
 		<div class="mail-list-date">{{$date}}</div>
 		<div class="mail-list-subject"><a href="message/{{$id}}" class="mail-list-link">{{$subject}}</a></div>
-	<div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-{{$id}}" >
-		<a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="icon drophide mail-list-delete	delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>
+	<div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-{{$id}}">
+		<a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="icon drophide mail-list-delete	delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);"></a>
 	</div>
 </div>
 </div>
diff --git a/view/templates/micropro_img.tpl b/view/templates/micropro_img.tpl
index ff0ff15e67..8c22280898 100644
--- a/view/templates/micropro_img.tpl
+++ b/view/templates/micropro_img.tpl
@@ -1,6 +1,6 @@
 
-<div class="contact-block-div {{if $class}}{{$class}}{{/if}}">
-	<a class="contact-block-link {{if $class}}{{$class }}{{/if}} {{if $sparkle}}sparkle{{/if}} {{if $click}}fakelink{{/if}}" {{if $redir}}target="redir"{{/if}} {{if $url}}href="{{$url}}"{{/if}} {{if $click}}onclick="{{$click}}"{{/if}} >
-		<img class="contact-block-img {{if $class}}{{$class }}{{/if}} {{if $sparkle}}sparkle{{/if}}" src="{{$photo}}" title="{{$title}}" alt="{{$name}}" />
+<div class="contact-block-div{{if $class}} {{$class}}{{/if}}">
+	<a class="contact-block-link{{if $class}} {{$class }}{{/if}}{{if $sparkle}} sparkle{{/if}}{{if $click}} fakelink{{/if}}"{{if $redir}} target="redir"{{/if}}{{if $url}} href="{{$url}}"{{/if}}{{if $click}} onclick="{{$click}}"{{/if}}>
+		<img class="contact-block-img{{if $class}} {{$class }}{{/if}}{{if $sparkle}} sparkle{{/if}}" src="{{$photo}}" title="{{$title}}" alt="{{$name}}"/>
 	</a>
 </div>
diff --git a/view/templates/msg-header.tpl b/view/templates/msg-header.tpl
index 1e1d51661b..d372878002 100644
--- a/view/templates/msg-header.tpl
+++ b/view/templates/msg-header.tpl
@@ -1,7 +1,7 @@
 <script language="javascript" type="text/javascript">
 	$("#prvmail-text").editor_autocomplete(baseurl + '/search/acl');
 </script>
-<script type="text/javascript" src="view/js/ajaxupload.js?v={{$smarty.const.FRIENDICA_VERSION}}" ></script>
+<script type="text/javascript" src="view/js/ajaxupload.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
 <script>
 	$(document).ready(function() {
 		var uploader = new window.AjaxUpload(
diff --git a/view/templates/nav.tpl b/view/templates/nav.tpl
index 07e9469a8c..fbce697eaf 100644
--- a/view/templates/nav.tpl
+++ b/view/templates/nav.tpl
@@ -4,41 +4,41 @@
 
 	<div id="site-location">{{$sitelocation}}</div>
 
-	{{if $nav.logout}}<a id="nav-logout-link" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a> {{/if}}
-	{{if $nav.login}}<a id="nav-login-link" class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a> {{/if}}
+	{{if $nav.logout}}<a id="nav-logout-link" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}">{{$nav.logout.1}}</a> {{/if}}
+	{{if $nav.login}}<a id="nav-login-link" class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}">{{$nav.login.1}}</a> {{/if}}
 
-	<span id="nav-link-wrapper" >
+	<span id="nav-link-wrapper">
 
-	{{if $nav.register}}<a id="nav-register-link" class="nav-commlink {{$nav.register.2}} {{$sel.register}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a>{{/if}}
+	{{if $nav.register}}<a id="nav-register-link" class="nav-commlink {{$nav.register.2}} {{$sel.register}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}">{{$nav.register.1}}</a>{{/if}}
 		
-	{{if $nav.help}} <a id="nav-help-link" class="nav-link {{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a>{{/if}}
+	{{if $nav.help}} <a id="nav-help-link" class="nav-link {{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}">{{$nav.help.1}}</a>{{/if}}
 
-	{{if $nav.tos}} <a id="nav-tos-link" class="nav-link {{$nav.tos.2}}" href="{{$nav.tos.0}}" title="{{$nav.tos.3}}" >{{$nav.tos.1}}</a>{{/if}}
+	{{if $nav.tos}} <a id="nav-tos-link" class="nav-link {{$nav.tos.2}}" href="{{$nav.tos.0}}" title="{{$nav.tos.3}}">{{$nav.tos.1}}</a>{{/if}}
 		
-	{{if $nav.apps}}<a id="nav-apps-link" class="nav-link {{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a>{{/if}}
+	{{if $nav.apps}}<a id="nav-apps-link" class="nav-link {{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}">{{$nav.apps.1}}</a>{{/if}}
 
-	<a accesskey="s" id="nav-search-link" class="nav-link {{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a>
-	<a id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a>
+	<a accesskey="s" id="nav-search-link" class="nav-link {{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}">{{$nav.search.1}}</a>
+	<a id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}">{{$nav.directory.1}}</a>
 
-	{{if $nav.admin}}<a accesskey="a" id="nav-admin-link" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a>{{/if}}
+	{{if $nav.admin}}<a accesskey="a" id="nav-admin-link" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}">{{$nav.admin.1}}</a>{{/if}}
 
 	{{if $nav.network}}
-	<a accesskey="n" id="nav-network-link" class="nav-commlink {{$nav.network.2}} {{$sel.network}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
+	<a accesskey="n" id="nav-network-link" class="nav-commlink {{$nav.network.2}} {{$sel.network}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}">{{$nav.network.1}}</a>
 	<span id="net-update" class="nav-ajax-left"></span>
 	{{/if}}
 	{{if $nav.home}}
-	<a accesskey="p" id="nav-home-link" class="nav-commlink {{$nav.home.2}} {{$sel.home}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a>
+	<a accesskey="p" id="nav-home-link" class="nav-commlink {{$nav.home.2}} {{$sel.home}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}">{{$nav.home.1}}</a>
 	<span id="home-update" class="nav-ajax-left"></span>
 	{{/if}}
 	{{if $nav.community}}
-	<a accesskey="c" id="nav-community-link" class="nav-commlink {{$nav.community.2}} {{$sel.community}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
+	<a accesskey="c" id="nav-community-link" class="nav-commlink {{$nav.community.2}} {{$sel.community}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}">{{$nav.community.1}}</a>
 	{{/if}}
 	{{if $nav.introductions}}
-	<a id="nav-notification-link" class="nav-commlink {{$nav.introductions.2}} {{$sel.introductions}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a>
+	<a id="nav-notification-link" class="nav-commlink {{$nav.introductions.2}} {{$sel.introductions}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}">{{$nav.introductions.1}}</a>
 	<span id="intro-update" class="nav-ajax-left"></span>
 	{{/if}}
 	{{if $nav.messages}}
-	<a id="nav-messages-link" class="nav-commlink {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>
+	<a id="nav-messages-link" class="nav-commlink {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}">{{$nav.messages.1}}</a>
 	<span id="mail-update" class="nav-ajax-left"></span>
 	{{/if}}
 
@@ -58,9 +58,9 @@
 		{{/if}}		
 
 	{{if $nav.settings}}<a id="nav-settings-link" class="nav-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a>{{/if}}
-	{{if $nav.profiles}}<a id="nav-profiles-link" class="nav-link {{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a>{{/if}}
+	{{if $nav.profiles}}<a id="nav-profiles-link" class="nav-link {{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}">{{$nav.profiles.1}}</a>{{/if}}
 
-	{{if $nav.contacts}}<a id="nav-contacts-link" class="nav-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a>{{/if}}
+	{{if $nav.contacts}}<a id="nav-contacts-link" class="nav-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}">{{$nav.contacts.1}}</a>{{/if}}
 	</span>
 	<span id="nav-end"></span>
 	<span id="banner">{{$banner nofilter}}</span>
diff --git a/view/templates/notifications/intros.tpl b/view/templates/notifications/intros.tpl
index 3943e72326..97e74d460d 100644
--- a/view/templates/notifications/intros.tpl
+++ b/view/templates/notifications/intros.tpl
@@ -1,6 +1,6 @@
 <h2>{{$header}}</h2>
 
-<div class="intro-wrapper" id="intro-{{$contact_id}}" >
+<div class="intro-wrapper" id="intro-{{$contact_id}}">
 
 <p class="intro-desc">{{$str_notification_type}} {{$str_type}}</p>
 <img id="photo-{{$contact_id}}" class="intro-photo" src="{{$photo}}" width="175" height=175" title="{{$fullname}}" alt="{{$fullname}}" />
@@ -25,9 +25,9 @@
 	{{include file="field_radio.tpl" field=$follower}}
 </div>
 
-<input type="hidden" name="dfrn_id" value="{{$dfrn_id}}" >
-<input type="hidden" name="intro_id" value="{{$intro_id}}" >
-<input type="hidden" name="contact_id" value="{{$contact_id}}" >
+<input type="hidden" name="dfrn_id" value="{{$dfrn_id}}">
+<input type="hidden" name="intro_id" value="{{$intro_id}}">
+<input type="hidden" name="contact_id" value="{{$contact_id}}">
 
 <input class="intro-submit-approve" type="submit" name="submit" value="{{$approve}}" />
 </form>
diff --git a/view/templates/notifications/netfriend.tpl b/view/templates/notifications/netfriend.tpl
index 465d7eb2ba..51b2c40f5e 100644
--- a/view/templates/notifications/netfriend.tpl
+++ b/view/templates/notifications/netfriend.tpl
@@ -8,7 +8,7 @@
 <div class="intro-approve-as-friend-wrapper">
 	<label class="intro-approve-as-friend-label" for="intro-approve-as-friend-{{$intro_id}}">{{$as_friend}}</label>
 	<input type="radio" name="duplex" id="intro-approve-as-friend-{{$intro_id}}" class="intro-approve-as-friend" {{$friend_selected}} value="1" />
-	<div class="intro-approve-friend-break" ></div>	
+	<div class="intro-approve-friend-break"></div>
 </div>
 <div class="intro-approve-as-friend-end"></div>
 <div class="intro-approve-as-fan-wrapper">
diff --git a/view/templates/notifications/suggestions.tpl b/view/templates/notifications/suggestions.tpl
index d0c013ac5b..4ecc39d81b 100644
--- a/view/templates/notifications/suggestions.tpl
+++ b/view/templates/notifications/suggestions.tpl
@@ -1,12 +1,12 @@
 
 
-<div class="intro-wrapper" >
+<div class="intro-wrapper">
 
 <p class="intro-desc">{{$str_notification_type}} {{$str_type}}</p>
 {{if $madeby}}<div class="intro-madeby">{{$lbl_madeby}} {{$madeby}}</div>{{/if}}
-<div class="intro-fullname" >{{$fullname}}</div>
-<a class="intro-url-link" href="{{$url}}" ><img class="intro-photo lframe" src="{{$photo}}" width="175" height="175" title="{{$fullname}}" alt="{{$fullname}}" /></a>
-<div class="intro-note" >{{$note}}</div>
+<div class="intro-fullname">{{$fullname}}</div>
+<a class="intro-url-link" href="{{$url}}"><img class="intro-photo lframe" src="{{$photo}}" width="175" height="175" title="{{$fullname}}" alt="{{$fullname}}" /></a>
+<div class="intro-note">{{$note}}</div>
 <div class="intro-wrapper-end"></div>
 <form class="intro-form" action="notification/{{$intro_id}}" method="post">
 <input class="intro-submit-ignore" type="submit" name="submit" value="{{$ignore}}" />
diff --git a/view/templates/oembed_video.tpl b/view/templates/oembed_video.tpl
index 52e11defd5..3e8606ce57 100644
--- a/view/templates/oembed_video.tpl
+++ b/view/templates/oembed_video.tpl
@@ -1,4 +1,4 @@
-<a class="embed_video" href="{{$embedurl}}" onclick='this.innerHTML=window.atob("{{$escapedhtml}}"); this.classList.add("active"); return false;'>
-	<img width='{{$tw}}' height='{{$th}}' src='{{$turl}}' >
-	<div style='width: {{$tw}}px; height: {{$th}}px;'></div>
+<a class="embed_video" href="{{$embedurl}}" onclick="this.innerHTML=window.atob('{{$escapedhtml}}'); this.classList.add('active'); return false;">
+	<img width="{{$tw}}" height="{{$th}}" src="{{$turl}}">
+	<div style="width: {{$tw}}px; height: {{$th}}px;"></div>
 </a>
diff --git a/view/templates/photo_album.tpl b/view/templates/photo_album.tpl
index 724a2abb39..653284701d 100644
--- a/view/templates/photo_album.tpl
+++ b/view/templates/photo_album.tpl
@@ -6,9 +6,9 @@
 {{if $drop}}
 <div id="album-drop-link"><a href="{{$drop.1}}" title="{{$drop.0}}">{{$drop.0}}</a></div>
 {{/if}}
-<div class="photos-upload-link" ><a href="{{$order.1}}" title="{{$order.0}}">{{$order.0}}</a></div>
+<div class="photos-upload-link"><a href="{{$order.1}}" title="{{$order.0}}">{{$order.0}}</a></div>
 {{if $can_post}}
-<div class="photos-upload-link" ><a href="{{$upload.1}}">{{$upload.0}}</a></div>
+<div class="photos-upload-link"><a href="{{$upload.1}}">{{$upload.0}}</a></div>
 {{/if}}
 
 {{foreach $photos as $photo}}
diff --git a/view/templates/photo_albums.tpl b/view/templates/photo_albums.tpl
index 934e818ec4..86b468e06d 100644
--- a/view/templates/photo_albums.tpl
+++ b/view/templates/photo_albums.tpl
@@ -2,7 +2,7 @@
 	<h3>{{$title}}</h3>
 	<ul role="menubar" class="sidebar-photos-albums-ul">
 		<li role="menuitem" class="sidebar-photos-albums-li">
-			<a href="{{$baseurl}}/photos/{{$nick}}" class="sidebar-photos-albums-element" title="{{$title}}" >{{$recent}}</a>
+			<a href="{{$baseurl}}/photos/{{$nick}}" class="sidebar-photos-albums-element" title="{{$title}}">{{$recent}}</a>
 		</li>
 
 		{{if $albums}}
@@ -19,6 +19,6 @@
 	</ul>
 
 	{{if $can_post}}
-	<div class="photos-upload-link" ><a href="{{$upload.1}}">{{$upload.0}}</a></div>
+	<div class="photos-upload-link"><a href="{{$upload.1}}">{{$upload.0}}</a></div>
 	{{/if}}
 </div>
diff --git a/view/templates/photo_edit.tpl b/view/templates/photo_edit.tpl
index 49a550e42b..512eaf73bf 100644
--- a/view/templates/photo_edit.tpl
+++ b/view/templates/photo_edit.tpl
@@ -1,5 +1,5 @@
 
-<form action="photos/{{$nickname}}/image/{{$resource_id}}/edit" method="post" id="photo_edit_form" >
+<form action="photos/{{$nickname}}/image/{{$resource_id}}/edit" method="post" id="photo_edit_form">
 
 	<input type="hidden" name="item_id" value="{{$item_id}}" />
 	<input type="hidden" name="origaname" value="{{$album.2}}" />
@@ -12,14 +12,14 @@
 	{{include file="field_radio.tpl" field=$rotate_cw}}
 	{{include file="field_radio.tpl" field=$rotate_ccw}}
 
-	<div id="photo-edit-perms" class="photo-edit-perms" >
+	<div id="photo-edit-perms" class="photo-edit-perms">
 		<a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="button popupbox" title="{{$permissions}}">
-			<span id="jot-perms-icon" class="icon {{$lockstate}}" ></span>{{$permissions}}
+			<span id="jot-perms-icon" class="icon {{$lockstate}}"></span>{{$permissions}}
 		</a>
 		<div id="photo-edit-perms-menu-end"></div>
 
 		<div style="display: none;">
-			<div id="photo-edit-perms-select" >
+			<div id="photo-edit-perms-select">
 				{{$aclselect nofilter}}
 			</div>
 		</div>
diff --git a/view/templates/photo_top.tpl b/view/templates/photo_top.tpl
index 902f742327..08f4366790 100644
--- a/view/templates/photo_top.tpl
+++ b/view/templates/photo_top.tpl
@@ -2,6 +2,6 @@
 	<a href="{{$photo.link}}" class="photo-top-photo-link" id="photo-top-photo-link-{{$photo.id}}" title="{{$photo.title}}">
 		<img src="{{$photo.src}}" alt="{{$photo.alt}}" title="{{$photo.title}}" class="photo-top-photo{{$photo.twist}}" id="photo-top-photo-{{$photo.id}}" />
 	</a>
-	<div class="photo-top-album-name"><a href="{{$photo.album.link}}" class="photo-top-album-link" title="{{$photo.album.alt}}" >{{$photo.album.name}}</a></div>
+	<div class="photo-top-album-name"><a href="{{$photo.album.link}}" class="photo-top-album-link" title="{{$photo.album.alt}}">{{$photo.album.name}}</a></div>
 </div>
 
diff --git a/view/templates/photos_default_uploader_submit.tpl b/view/templates/photos_default_uploader_submit.tpl
index e178e977a7..586ae58dbc 100644
--- a/view/templates/photos_default_uploader_submit.tpl
+++ b/view/templates/photos_default_uploader_submit.tpl
@@ -1,4 +1,4 @@
 
-<div class="photos-upload-submit-wrapper" >
+<div class="photos-upload-submit-wrapper">
 	<input type="submit" name="submit" value="{{$submit}}" id="photos-upload-submit" />
 </div>
diff --git a/view/templates/photos_upload.tpl b/view/templates/photos_upload.tpl
index 054fd1a335..5c5727bccb 100644
--- a/view/templates/photos_upload.tpl
+++ b/view/templates/photos_upload.tpl
@@ -3,10 +3,10 @@
 
 <div id="photos-usage-message">{{$usage}}</div>
 
-<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form" >
-	<div id="photos-upload-new-wrapper" >
+<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form">
+	<div id="photos-upload-new-wrapper">
 		<div id="photos-upload-newalbum-div">
-			<label id="photos-upload-newalbum-text" for="photos-upload-newalbum" >{{$newalbum}}</label>
+			<label id="photos-upload-newalbum-text" for="photos-upload-newalbum">{{$newalbum}}</label>
 		</div>
 		<input id="photos-upload-newalbum" type="text" name="newalbum" />
 	</div>
@@ -19,15 +19,15 @@
 	</div>
 	<div id="photos-upload-exist-end"></div>
 
-	<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
+	<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>
+		<label id="photos-upload-noshare-text" for="photos-upload-noshare">{{$nosharetext}}</label>
 	</div>
 
 
-	<div id="photos-upload-perms" class="photos-upload-perms" >
+	<div id="photos-upload-perms" class="photos-upload-perms">
 		<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button popupbox" />
-		<span id="jot-perms-icon" class="icon {{$lockstate}}" ></span>{{$permissions}}
+		<span id="jot-perms-icon" class="icon {{$lockstate}}"></span>{{$permissions}}
 		</a>
 	</div>
 	<div id="photos-upload-perms-end"></div>
@@ -45,6 +45,6 @@
 	{{$default_upload_box nofilter}}
 	{{$default_upload_submit nofilter}}
 
-	<div class="photos-upload-end" ></div>
+	<div class="photos-upload-end"></div>
 </form>
 
diff --git a/view/templates/profile/publish.tpl b/view/templates/profile/publish.tpl
index a62292ff56..4ab8550f5d 100644
--- a/view/templates/profile/publish.tpl
+++ b/view/templates/profile/publish.tpl
@@ -7,7 +7,7 @@
 		<label id="profile-publish-yes-label-{{$instance}}" for="profile-publish-yes-{{$instance}}">{{$str_yes}}</label>
 		<input type="radio" name="profile_publish_{{$instance}}" id="profile-publish-yes-{{$instance}}" {{$yes_selected}} value="1" />
 
-		<div id="profile-publish-break-{{$instance}}" ></div>	
+		<div id="profile-publish-break-{{$instance}}"></div>
 		</div>
 		<div id="profile-publish-no-wrapper-{{$instance}}">
 		<label id="profile-publish-no-label-{{$instance}}" for="profile-publish-no-{{$instance}}">{{$str_no}}</label>
diff --git a/view/templates/prv_message.tpl b/view/templates/prv_message.tpl
index 087d08dbbc..c41f1d406a 100644
--- a/view/templates/prv_message.tpl
+++ b/view/templates/prv_message.tpl
@@ -2,8 +2,8 @@
 
 <h3>{{$header}}</h3>
 
-<div id="prvmail-wrapper" >
-<form id="prvmail-form" action="message" method="post" >
+<div id="prvmail-wrapper">
+<form id="prvmail-form" action="message" method="post">
 
 {{$parent nofilter}}
 
@@ -17,15 +17,15 @@
 <textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
 
 
-<div id="prvmail-submit-wrapper" >
+<div id="prvmail-submit-wrapper">
 	<input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" />
-	<div id="prvmail-upload-wrapper" >
-		<div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
+	<div id="prvmail-upload-wrapper">
+		<div id="prvmail-upload" class="icon border camera" title="{{$upload}}"></div>
 	</div> 
-	<div id="prvmail-link-wrapper" >
-		<div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
+	<div id="prvmail-link-wrapper">
+		<div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();"></div>
 	</div> 
-	<div id="prvmail-rotator-wrapper" >
+	<div id="prvmail-rotator-wrapper">
 		<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
 	</div> 
 </div>
diff --git a/view/templates/register.tpl b/view/templates/register.tpl
index d79da2d33a..bf6c9e37aa 100644
--- a/view/templates/register.tpl
+++ b/view/templates/register.tpl
@@ -13,40 +13,40 @@
 	<p id="register-fill-ext">{{$fillext}}</p>
 
 {{if $oidlabel}}
-	<div id="register-openid-wrapper" >
-	<label for="register-openid" id="label-register-openid" >{{$oidlabel}}</label><input type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="{{$openid}}" >
+	<div id="register-openid-wrapper">
+	<label for="register-openid" id="label-register-openid">{{$oidlabel}}</label><input type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="{{$openid}}">
 	</div>
-	<div id="register-openid-end" ></div>
+	<div id="register-openid-end"></div>
 {{/if}}
 
 {{if $invitations}}
 	<p id="register-invite-desc">{{$invite_desc nofilter}}</p>
-	<div id="register-invite-wrapper" >
-		<label for="register-invite" id="label-register-invite" >{{$invite_label}}</label>
-		<input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" value="{{$invite_id}}" >
+	<div id="register-invite-wrapper">
+		<label for="register-invite" id="label-register-invite">{{$invite_label}}</label>
+		<input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" value="{{$invite_id}}">
 	</div>
-	<div id="register-name-end" ></div>
+	<div id="register-name-end"></div>
 {{/if}}
 
-	<div id="register-name-wrapper" >
-		<label for="register-name" id="label-register-name" >{{$namelabel}}</label>
+	<div id="register-name-wrapper">
+		<label for="register-name" id="label-register-name">{{$namelabel}}</label>
 		<input type="text" maxlength="60" size="32" name="username" id="register-name" value="{{$username}}" required>
 	</div>
-	<div id="register-name-end" ></div>
+	<div id="register-name-end"></div>
 
 
 	{{if !$additional}}
-		<div id="register-email-wrapper" >
-			<label for="register-email" id="label-register-email" >{{$addrlabel}}</label>
+		<div id="register-email-wrapper">
+			<label for="register-email" id="label-register-email">{{$addrlabel}}</label>
 			<input type="text" maxlength="60" size="32" name="field1" id="register-email" value="{{$email}}" required>
 		</div>
-		<div id="register-email-end" ></div>
+		<div id="register-email-end"></div>
 
-		<div id="register-repeat-wrapper" >
-			<label for="register-repeat" id="label-register-repeat" >{{$addrlabel2}}</label>
+		<div id="register-repeat-wrapper">
+			<label for="register-repeat" id="label-register-repeat">{{$addrlabel2}}</label>
 			<input type="text" maxlength="60" size="32" name="repeat" id="register-repeat" value="" required>
 		</div>
-		<div id="register-repeat-end" ></div>
+		<div id="register-repeat-end"></div>
 	{{/if}}
 
 {{if $ask_password}}
@@ -54,13 +54,13 @@
 	{{include file="field_password.tpl" field=$password2}}
 {{/if}}
 
-	<p id="register-nickname-desc" >{{$nickdesc nofilter}}</p>
+	<p id="register-nickname-desc">{{$nickdesc nofilter}}</p>
 
-	<div id="register-nickname-wrapper" >
-		<label for="register-nickname" id="label-register-nickname" >{{$nicklabel}}</label>
+	<div id="register-nickname-wrapper">
+		<label for="register-nickname" id="label-register-nickname">{{$nicklabel}}</label>
 		<input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" value="{{$nickname}}" required><div id="register-sitename">@{{$sitename}}</div>
 	</div>
-	<div id="register-nickname-end" ></div>
+	<div id="register-nickname-end"></div>
 
 	<input type="input" id=tarpit" name="email" style="display: none;" placeholder="Don't enter anything here"/>
 
@@ -87,7 +87,7 @@
 	<div id="register-submit-wrapper">
 		<input type="submit" name="submit" id="register-submit-button" value="{{$regbutt}}" />
 	</div>
-	<div id="register-submit-end" ></div>
+	<div id="register-submit-end"></div>
 
 	{{if !$additional}}
 		<h3>{{$importh}}</h3>
diff --git a/view/templates/removeme.tpl b/view/templates/removeme.tpl
index 1e52bfa4e5..2f64483fd3 100644
--- a/view/templates/removeme.tpl
+++ b/view/templates/removeme.tpl
@@ -5,7 +5,7 @@
 
 <div id="remove-account-desc">{{$desc nofilter}}</div>
 
-<form action="{{$basedir}}/removeme" autocomplete="off" method="post" >
+<form action="{{$basedir}}/removeme" autocomplete="off" method="post">
 <input type="hidden" name="verify" value="{{$hash}}" />
 
 <div id="remove-account-pass-wrapper">
diff --git a/view/templates/settings/nick_set.tpl b/view/templates/settings/nick_set.tpl
index a6dc4d74ca..432c20d6ca 100644
--- a/view/templates/settings/nick_set.tpl
+++ b/view/templates/settings/nick_set.tpl
@@ -2,4 +2,4 @@
 <div id="settings-nick-wrapper">
 	<div id="settings-nickname-desc" class="info-message">{{$desc nofilter}}</div>
 </div>
-<div id="settings-nick-end" ></div>
+<div id="settings-nick-end"></div>
diff --git a/view/templates/settings/oauth_edit.tpl b/view/templates/settings/oauth_edit.tpl
index eed9f6ea33..86eb7663d6 100644
--- a/view/templates/settings/oauth_edit.tpl
+++ b/view/templates/settings/oauth_edit.tpl
@@ -10,7 +10,7 @@
 {{include file="field_input.tpl" field=$redirect}}
 {{include file="field_input.tpl" field=$icon}}
 
-<div class="settings-submit-wrapper" >
+<div class="settings-submit-wrapper">
 <input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 <!-- <input type="submit" name="cancel" class="settings-submit" value="{{$cancel}}" /> -->
 </div>
diff --git a/view/templates/settings/profile/index_head.tpl b/view/templates/settings/profile/index_head.tpl
index c4dec1539d..60b832bd81 100644
--- a/view/templates/settings/profile/index_head.tpl
+++ b/view/templates/settings/profile/index_head.tpl
@@ -1 +1 @@
-<script type="text/javascript" src="view/js/country.js?v={{$smarty.const.FRIENDICA_VERSION}}" ></script>
\ No newline at end of file
+<script type="text/javascript" src="view/js/country.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
\ No newline at end of file
diff --git a/view/templates/settings/profile/photo/crop.tpl b/view/templates/settings/profile/photo/crop.tpl
index 679c9d1350..d3e4fbb4c1 100644
--- a/view/templates/settings/profile/photo/crop.tpl
+++ b/view/templates/settings/profile/photo/crop.tpl
@@ -8,7 +8,7 @@
 		<p><img src="{{$image_url}}" id="croppa" class="imgCrop" alt="{{$title}}"></p>
 	</div>
 
-	<div id="cropimage-preview-wrapper" >
+	<div id="cropimage-preview-wrapper">
 		<div id="previewWrap" class="crop-preview"></div>
 	</div>
 
diff --git a/view/templates/settings/twofactor/recovery.tpl b/view/templates/settings/twofactor/recovery.tpl
index 8ecd0198d9..60b1ed71b7 100644
--- a/view/templates/settings/twofactor/recovery.tpl
+++ b/view/templates/settings/twofactor/recovery.tpl
@@ -18,7 +18,7 @@
 		<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
 		<div>{{$regenerate_message}}</div>
 
-		<div class="form-group pull-right settings-submit-wrapper" >
+		<div class="form-group pull-right settings-submit-wrapper">
 			<button type="submit" name="action" id="confirm-submit-button" class="btn btn-primary confirm-button" value="regenerate">{{$regenerate_label}}</button>
 		</div>
 	</form>
diff --git a/view/templates/settings/twofactor/verify.tpl b/view/templates/settings/twofactor/verify.tpl
index 03138659e2..8402b1d81c 100644
--- a/view/templates/settings/twofactor/verify.tpl
+++ b/view/templates/settings/twofactor/verify.tpl
@@ -11,7 +11,7 @@
 
 		{{include file="field_input.tpl" field=$verify_code}}
 
-		<div class="form-group settings-submit-wrapper" >
+		<div class="form-group settings-submit-wrapper">
 			<button type="submit" name="action" id="confirm-submit-button" class="btn btn-primary confirm-button" value="verify">{{$verify_label}}</button>
 		</div>
 	</form>
diff --git a/view/templates/threaded_conversation.tpl b/view/templates/threaded_conversation.tpl
index f4a47354ed..afc0eaa685 100644
--- a/view/templates/threaded_conversation.tpl
+++ b/view/templates/threaded_conversation.tpl
@@ -7,8 +7,8 @@
 
 {{if $dropping}}
 <div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
-  <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
-  <div id="item-delete-selected-desc" >{{$dropping}}</div>
+  <div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);"></div>
+  <div id="item-delete-selected-desc">{{$dropping}}</div>
 </div>
 <img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
 <div id="item-delete-selected-end"></div>
diff --git a/view/templates/uimport.tpl b/view/templates/uimport.tpl
index 05c79ab757..227c373041 100644
--- a/view/templates/uimport.tpl
+++ b/view/templates/uimport.tpl
@@ -1,14 +1,14 @@
 
-<form action="uimport" method="post" id="uimport-form" enctype="multipart/form-data">
-<h1>{{$import.title}}</h1>
-    <p>{{$import.intro}}</p>
-    <p>{{$import.instruct}}</p>
-    <p><b>{{$import.warn}}</b></p>
-     {{include file="field_custom.tpl" field=$import.field}}
-     
-     
-	<div id="register-submit-wrapper">
-		<input type="submit" name="submit" id="register-submit-button" value="{{$regbutt}}" />
-	</div>
-	<div id="register-submit-end" ></div>    
-</form>
+<form action="uimport" method="post" id="uimport-form" enctype="multipart/form-data">
+<h1>{{$import.title}}</h1>
+    <p>{{$import.intro}}</p>
+    <p>{{$import.instruct}}</p>
+    <p><b>{{$import.warn}}</b></p>
+     {{include file="field_custom.tpl" field=$import.field}}
+     
+     
+	<div id="register-submit-wrapper">
+		<input type="submit" name="submit" id="register-submit-button" value="{{$regbutt}}" />
+	</div>
+	<div id="register-submit-end"></div>
+</form>
diff --git a/view/templates/wallmessage.tpl b/view/templates/wallmessage.tpl
index 29f95fe497..b21507d495 100644
--- a/view/templates/wallmessage.tpl
+++ b/view/templates/wallmessage.tpl
@@ -4,8 +4,8 @@
 
 <h4>{{$subheader}}</h4>
 
-<div id="prvmail-wrapper" >
-<form id="prvmail-form" action="wallmessage/{{$nickname}}" method="post" >
+<div id="prvmail-wrapper">
+<form id="prvmail-form" action="wallmessage/{{$nickname}}" method="post">
 
 {{$parent nofilter}}
 
@@ -19,12 +19,12 @@
 <textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
 
 
-<div id="prvmail-submit-wrapper" >
+<div id="prvmail-submit-wrapper">
 	<input type="submit" id="prvmail-submit" name="submit" value="Submit" tabindex="13" />
-	<div id="prvmail-link-wrapper" >
-		<div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
+	<div id="prvmail-link-wrapper">
+		<div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();"></div>
 	</div> 
-	<div id="prvmail-rotator-wrapper" >
+	<div id="prvmail-rotator-wrapper">
 		<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
 	</div> 
 </div>
diff --git a/view/templates/widget/events.tpl b/view/templates/widget/events.tpl
index e9b54771d1..81dde70463 100644
--- a/view/templates/widget/events.tpl
+++ b/view/templates/widget/events.tpl
@@ -3,7 +3,7 @@
 	<h3>{{$etitle}}</h3>
 
 	<ul class="sidebar-calendar-export-ul">
-		<li role="menuitem" class="sidebar-calendar-export-li"><a href="{{$baseurl}}/cal/{{$user}}/export/ical" >{{$export_ical}}</a></li>
-		<li role="menuitem" class="sidebar-calendar-export-li"><a href="{{$baseurl}}/cal/{{$user}}/export/csv" >{{$export_csv}}</a></li>
+		<li role="menuitem" class="sidebar-calendar-export-li"><a href="{{$baseurl}}/cal/{{$user}}/export/ical">{{$export_ical}}</a></li>
+		<li role="menuitem" class="sidebar-calendar-export-li"><a href="{{$baseurl}}/cal/{{$user}}/export/csv">{{$export_csv}}</a></li>
 	</ul>
 </div>
diff --git a/view/templates/widget/follow.tpl b/view/templates/widget/follow.tpl
index 12a5621235..076940a62b 100644
--- a/view/templates/widget/follow.tpl
+++ b/view/templates/widget/follow.tpl
@@ -2,7 +2,7 @@
 <div id="follow-sidebar" class="widget">
 	<h3>{{$connect}}</h3>
 	<div id="connect-desc">{{$desc nofilter}}</div>
-	<form action="follow" method="get" >
+	<form action="follow" method="get">
 		<input id="side-follow-url" type="text" name="url" value="{{$value}}" size="24" placeholder="{{$hint}}" title="{{$hint}}" /><input id="side-follow-submit" type="submit" name="submit" value="{{$follow}}" />
 	</form>
 </div>
diff --git a/view/templates/widget/peoplefind.tpl b/view/templates/widget/peoplefind.tpl
index d4d99c2dac..7104dc6f3e 100644
--- a/view/templates/widget/peoplefind.tpl
+++ b/view/templates/widget/peoplefind.tpl
@@ -5,13 +5,13 @@
 	<form action="dirfind" method="get" />
 		<input id="side-peoplefind-url" type="text" name="search" size="24" title="{{$nv.hint}}" /><input id="side-peoplefind-submit" type="submit" name="submit" value="{{$nv.findthem}}" />
 	</form>
-	<div class="side-link" id="side-match-link"><a href="match" >{{$nv.similar}}</a></div>
-	<div class="side-link" id="side-suggest-link"><a href="suggest" >{{$nv.suggest}}</a></div>
-	<div class="side-link" id="side-directory-link"><a href="directory" >{{$nv.local_directory}}</a></div>
-	<div class="side-link" id="side-directory-link"><a href="{{$nv.global_dir}}" target="extlink" >{{$nv.directory}}</a></div>
-	<div class="side-link" id="side-random-profile-link" ><a href="randprof" target="extlink" >{{$nv.random}}</a></div>
+	<div class="side-link" id="side-match-link"><a href="match">{{$nv.similar}}</a></div>
+	<div class="side-link" id="side-suggest-link"><a href="suggest">{{$nv.suggest}}</a></div>
+	<div class="side-link" id="side-directory-link"><a href="directory">{{$nv.local_directory}}</a></div>
+	<div class="side-link" id="side-directory-link"><a href="{{$nv.global_dir}}" target="extlink">{{$nv.directory}}</a></div>
+	<div class="side-link" id="side-random-profile-link"><a href="randprof" target="extlink">{{$nv.random}}</a></div>
 	{{if $nv.inv}} 
-	<div class="side-link" id="side-invite-link" ><a href="invite" >{{$nv.inv}}</a></div>
+	<div class="side-link" id="side-invite-link"><a href="invite">{{$nv.inv}}</a></div>
 	{{/if}}
 </div>
 
diff --git a/view/templates/widget_forumlist.tpl b/view/templates/widget_forumlist.tpl
index 49e66df7b9..6d0af8ce24 100644
--- a/view/templates/widget_forumlist.tpl
+++ b/view/templates/widget_forumlist.tpl
@@ -27,7 +27,7 @@ function showHideForumlist() {
 			<a href="{{$forum.external_url}}" title="{{$forum.link_desc}}" class="label sparkle" target="_blank" rel="noopener noreferrer">
 				<img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc}}" />
 			</a>
-			<a class="forum-widget-link {{if $forum.selected}}forum-selected{{/if}}" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name}}</a>
+			<a class="forum-widget-link {{if $forum.selected}}forum-selected{{/if}}" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}">{{$forum.name}}</a>
 		</li>
 		{{/if}}
 	
@@ -37,7 +37,7 @@ function showHideForumlist() {
 			<a href="{{$forum.external_url}}" title="{{$forum.link_desc}}" class="label sparkle" target="_blank" rel="noopener noreferrer">
 				<img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc}}" />
 			</a>
-			<a class="forum-widget-link {{if $forum.selected}}forum-selected{{/if}}" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name}}</a>
+			<a class="forum-widget-link {{if $forum.selected}}forum-selected{{/if}}" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}">{{$forum.name}}</a>
 		</li>
 		{{/if}}
 		{{/foreach}}
diff --git a/view/theme/duepuntozero/templates/nav.tpl b/view/theme/duepuntozero/templates/nav.tpl
index bde59784b8..85c6b047e7 100644
--- a/view/theme/duepuntozero/templates/nav.tpl
+++ b/view/theme/duepuntozero/templates/nav.tpl
@@ -4,41 +4,41 @@
 
 	<div id="site-location">{{$sitelocation}}</div>
 
-	{{if $nav.logout}}<a id="nav-logout-link" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a> {{/if}}
-	{{if $nav.login}}<a id="nav-login-link" class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a> {{/if}}
+	{{if $nav.logout}}<a id="nav-logout-link" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}">{{$nav.logout.1}}</a> {{/if}}
+	{{if $nav.login}}<a id="nav-login-link" class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}">{{$nav.login.1}}</a> {{/if}}
 
-	<span id="nav-link-wrapper" >
+	<span id="nav-link-wrapper">
 
-	{{if $nav.register}}<a id="nav-register-link" class="nav-commlink {{$nav.register.2}} {{$sel.register}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a>{{/if}}
+	{{if $nav.register}}<a id="nav-register-link" class="nav-commlink {{$nav.register.2}} {{$sel.register}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}">{{$nav.register.1}}</a>{{/if}}
 		
-	{{if $nav.help}} <a id="nav-help-link" class="nav-link {{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a>{{/if}}
+	{{if $nav.help}} <a id="nav-help-link" class="nav-link {{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}">{{$nav.help.1}}</a>{{/if}}
 
-	{{if $nav.tos}} <a id="nav-tos-link" class="nav-link {{$nav.tos.2}}" href="{{$nav.tos.0}}" title="{{$nav.tos.3}}" >{{$nav.tos.1}}</a>{{/if}}
+	{{if $nav.tos}} <a id="nav-tos-link" class="nav-link {{$nav.tos.2}}" href="{{$nav.tos.0}}" title="{{$nav.tos.3}}">{{$nav.tos.1}}</a>{{/if}}
 		
-	{{if $nav.apps}}<a id="nav-apps-link" class="nav-link {{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a>{{/if}}
+	{{if $nav.apps}}<a id="nav-apps-link" class="nav-link {{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}">{{$nav.apps.1}}</a>{{/if}}
 
-	<a accesskey="s" id="nav-search-link" class="nav-link {{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a>
-	<a id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a>
+	<a accesskey="s" id="nav-search-link" class="nav-link {{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}">{{$nav.search.1}}</a>
+	<a id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}">{{$nav.directory.1}}</a>
 
-	{{if $nav.admin}}<a accesskey="a" id="nav-admin-link" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a>{{/if}}
+	{{if $nav.admin}}<a accesskey="a" id="nav-admin-link" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}">{{$nav.admin.1}}</a>{{/if}}
 
 	{{if $nav.network}}
-	<a accesskey="n" id="nav-network-link" class="nav-commlink {{$nav.network.2}} {{$sel.network}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
+	<a accesskey="n" id="nav-network-link" class="nav-commlink {{$nav.network.2}} {{$sel.network}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}">{{$nav.network.1}}</a>
 	<span id="net-update" class="nav-ajax-left"></span>
 	{{/if}}
 	{{if $nav.home}}
-	<a accesskey="p" id="nav-home-link" class="nav-commlink {{$nav.home.2}} {{$sel.home}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a>
+	<a accesskey="p" id="nav-home-link" class="nav-commlink {{$nav.home.2}} {{$sel.home}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}">{{$nav.home.1}}</a>
 	<span id="home-update" class="nav-ajax-left"></span>
 	{{/if}}
 	{{if $nav.community}}
-	<a accesskey="c" id="nav-community-link" class="nav-commlink {{$nav.community.2}} {{$sel.community}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
+	<a accesskey="c" id="nav-community-link" class="nav-commlink {{$nav.community.2}} {{$sel.community}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}">{{$nav.community.1}}</a>
 	{{/if}}
 	{{if $nav.introductions}}
-	<a id="nav-notification-link" class="nav-commlink {{$nav.introductions.2}} {{$sel.introductions}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a>
+	<a id="nav-notification-link" class="nav-commlink {{$nav.introductions.2}} {{$sel.introductions}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}">{{$nav.introductions.1}}</a>
 	<span id="intro-update" class="nav-ajax-left"></span>
 	{{/if}}
 	{{if $nav.messages}}
-	<a id="nav-messages-link" class="nav-commlink {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a>
+	<a id="nav-messages-link" class="nav-commlink {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}">{{$nav.messages.1}}</a>
 	<span id="mail-update" class="nav-ajax-left"></span>
 	{{/if}}
 
@@ -57,9 +57,9 @@
 		{{/if}}		
 
 	{{if $nav.settings}}<a id="nav-settings-link" class="nav-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a>{{/if}}
-	{{if $nav.profiles}}<a id="nav-profiles-link" class="nav-link {{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a>{{/if}}
+	{{if $nav.profiles}}<a id="nav-profiles-link" class="nav-link {{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}">{{$nav.profiles.1}}</a>{{/if}}
 
-	{{if $nav.contacts}}<a id="nav-contacts-link" class="nav-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a>{{/if}}
+	{{if $nav.contacts}}<a id="nav-contacts-link" class="nav-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}">{{$nav.contacts.1}}</a>{{/if}}
 
 
 	{{if $nav.delegation}}<a id="nav-delegation-link" class="nav-link {{$nav.delegation.2}} {{$sel.delegation}}" href="{{$nav.delegation.0}}" title="{{$nav.delegation.3}}">{{$nav.delegation.1}}</a>{{/if}}
diff --git a/view/theme/frio/templates/admin/users/deleted.tpl b/view/theme/frio/templates/admin/users/deleted.tpl
index 9ec127267a..cc4fa5ac02 100644
--- a/view/theme/frio/templates/admin/users/deleted.tpl
+++ b/view/theme/frio/templates/admin/users/deleted.tpl
@@ -22,7 +22,7 @@
 			{{foreach $users as $u}}
 				<tr>
 					<td><img class="avatar-nano" src="{{$u.micro}}" title="{{$u.nickname}}"></td>
-					<td><a href="{{$u.url}}" title="{{$u.nickname}}" >{{$u.name}}</a></td>
+					<td><a href="{{$u.url}}" title="{{$u.nickname}}">{{$u.name}}</a></td>
 					<td>{{$u.email}}</td>
 					<td>{{$u.deleted}}</td>
 				</tr>
diff --git a/view/theme/frio/templates/album_edit.tpl b/view/theme/frio/templates/album_edit.tpl
index 4f240922a7..76223881de 100644
--- a/view/theme/frio/templates/album_edit.tpl
+++ b/view/theme/frio/templates/album_edit.tpl
@@ -1,6 +1,6 @@
 <div id="photo-album-edit-wrapper">
-	<form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/{{$nickname}}/album/{{$hexalbum}}" method="post" >
-		<label id="photo-album-edit-name-label" for="photo-album-edit-name" >{{$nametext}}</label>
+	<form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/{{$nickname}}/album/{{$hexalbum}}" method="post">
+		<label id="photo-album-edit-name-label" for="photo-album-edit-name">{{$nametext}}</label>
 		<div class="pull-left photo-album-edit-name">
 			<input class="form-control" type="text" size="64" name="albumname" value="{{$album}}" id="photo-album-edit-name">
 		</div>
diff --git a/view/theme/frio/templates/confirm.tpl b/view/theme/frio/templates/confirm.tpl
index d17b94d760..187078b68a 100644
--- a/view/theme/frio/templates/confirm.tpl
+++ b/view/theme/frio/templates/confirm.tpl
@@ -2,7 +2,7 @@
 <form action="{{$confirm_url}}" id="confirm-form" method="{{$method}}" class="generic-page-wrapper">
 	<div id="confirm-message">{{$message}}</div>
 
-	<div class="form-group pull-right settings-submit-wrapper" >
+	<div class="form-group pull-right settings-submit-wrapper">
 		<button type="submit" name="{{$confirm_name}}" id="confirm-submit-button" class="btn btn-primary confirm-button" value="{{$confirm}}">{{$confirm}}</button>
 		<button type="submit" name="canceled" id="confirm-cancel-button" class="btn confirm-button" data-dismiss="modal">{{$cancel}}</button>
 	</div>
diff --git a/view/theme/frio/templates/contact/advanced.tpl b/view/theme/frio/templates/contact/advanced.tpl
index 9aca5997a5..c968d00f54 100644
--- a/view/theme/frio/templates/contact/advanced.tpl
+++ b/view/theme/frio/templates/contact/advanced.tpl
@@ -11,7 +11,7 @@
 	</div>
 	<br />
 
-	<form id="contact-advanced-form" action="contact/{{$contact_id}}/advanced" method="post" >
+	<form id="contact-advanced-form" action="contact/{{$contact_id}}/advanced" method="post">
 
 		<!-- <h4>{{$contact_name}}</h4> -->
 
@@ -35,7 +35,7 @@
 
 		{{include file="field_input.tpl" field=$photo}}
 
-		<div class="pull-right settings-submit-wrapper" >
+		<div class="pull-right settings-submit-wrapper">
 			<button type="submit" name="submit" class="btn btn-primary" value="{{$lbl_submit}}">{{$lbl_submit}}</button>
 		</div>
 		<div class="clear"></div>
diff --git a/view/theme/frio/templates/contact_edit.tpl b/view/theme/frio/templates/contact_edit.tpl
index 776e8f8aff..9194127dff 100644
--- a/view/theme/frio/templates/contact_edit.tpl
+++ b/view/theme/frio/templates/contact_edit.tpl
@@ -2,14 +2,14 @@
 <div class="generic-page-wrapper">
 	{{if $header}}<h3>{{$header}}:&nbsp;{{$name}}{{if $account_type}}&nbsp;<small>({{$account_type}})</small>{{/if}}</h3>{{/if}}
 
-	<div id="contact-edit-wrapper" >
+	<div id="contact-edit-wrapper">
 
 		{{* Insert Tab-Nav *}}
 		{{$tab_str nofilter}}
 
 
 		<div id="contact-edit-content-wrapper">
-			<form action="contact/{{$contact_id}}" method="post" >
+			<form action="contact/{{$contact_id}}" method="post">
 
 				{{* This is the Action menu where contact related actions like 'ignore', 'hide' can be performed *}}
 				<ul id="contact-edit-actions" class="nav nav-pills preferences">
@@ -18,7 +18,7 @@
 							<i class="fa fa-angle-down" aria-hidden="true"></i>&nbsp;{{$contact_action_button}}
 						</button>
 
-						<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="contact-edit-actions-button" aria-haspopup="true" id="contact-actions-menu" >
+						<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="contact-edit-actions-button" aria-haspopup="true" id="contact-actions-menu">
 							{{if $lblsuggest}}<li role="presentation"><a role="menuitem" href="{{$contact_actions.suggest.url}}" title="{{$contact_actions.suggest.title}}">{{$contact_actions.suggest.label}}</a></li>{{/if}}
 							{{if $poll_enabled}}<li role="presentation"><a role="menuitem" href="{{$contact_actions.update.url}}" title="{{$contact_actions.update.title}}">{{$contact_actions.update.label}}</a></li>{{/if}}
 							{{if $contact_actions.updateprofile}}<li role="presentation"><a role="menuitem" href="{{$contact_actions.updateprofile.url}}" title="{{$contact_actions.updateprofile.title}}">{{$contact_actions.updateprofile.label}}</a></li>{{/if}}
@@ -141,7 +141,7 @@
 
 								{{include file="field_checkbox.tpl" field=$hidden}}
 
-								<div class="pull-right settings-submit-wrapper" >
+								<div class="pull-right settings-submit-wrapper">
 									<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
 								</div>
 								<div class="clear"></div>
@@ -164,7 +164,7 @@
 
 								{{include file="field_textarea.tpl" field=$cinfo}}
 
-								<div class="pull-right settings-submit-wrapper" >
+								<div class="pull-right settings-submit-wrapper">
 									<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
 								</div>
 								<div class="clear"></div>
diff --git a/view/theme/frio/templates/contact_template.tpl b/view/theme/frio/templates/contact_template.tpl
index 8bb817ed59..a950500ceb 100644
--- a/view/theme/frio/templates/contact_template.tpl
+++ b/view/theme/frio/templates/contact_template.tpl
@@ -110,11 +110,11 @@
 					{{* @todo this needs some changing in core because $contact.account_type contains a translated string which may notbe the same in every language *}}
 					</h4>
 				</div>
-				{{if $contact.alt_text}}<div class="contact-entry-details contact-entry-rel" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
-				{{if $contact.itemurl}}<div class="contact-entry-details contact-entry-url" id="contact-entry-url-{{$contact.id}}" >{{$contact.itemurl}}</div>{{/if}}
-				{{if $contact.tags}}<div class="contact-entry-details" id="contact-entry-tags-{{$contact.id}}" >{{$contact.tags}}</div>{{/if}}
-				{{if $contact.details}}<div class="contact-entry-details contact-entry-tags" id="contact-entry-details-{{$contact.id}}" >{{$contact.details}}</div>{{/if}}
-				{{if $contact.network}}<div class="contact-entry-details contact-entry-network" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>{{/if}}
+				{{if $contact.alt_text}}<div class="contact-entry-details contact-entry-rel" id="contact-entry-rel-{{$contact.id}}">{{$contact.alt_text}}</div>{{/if}}
+				{{if $contact.itemurl}}<div class="contact-entry-details contact-entry-url" id="contact-entry-url-{{$contact.id}}">{{$contact.itemurl}}</div>{{/if}}
+				{{if $contact.tags}}<div class="contact-entry-details" id="contact-entry-tags-{{$contact.id}}">{{$contact.tags}}</div>{{/if}}
+				{{if $contact.details}}<div class="contact-entry-details contact-entry-tags" id="contact-entry-details-{{$contact.id}}">{{$contact.details}}</div>{{/if}}
+				{{if $contact.network}}<div class="contact-entry-details contact-entry-network" id="contact-entry-network-{{$contact.id}}">{{$contact.network}}</div>{{/if}}
 			</div>
 
 			{{* The checkbox to perform batch actions to these contacts (for batch actions have a look at contacts-template.tpl) *}}
@@ -233,11 +233,11 @@ We use this part to filter the contacts with jquery.textcomplete *}}
 					{{* @todo this needs some changing in core because $contact.account_type contains a translated string which may notbe the same in every language *}}
 					</h4>
 				</div>
-				{if $alt_text}<div class="contact-entry-details" id="contact-entry-rel-{$id}" >{$alt_text}</div>{/if}
-				{if $itemurl}<div class="contact-entry-details" id="contact-entry-url-{$id}" >{$itemurl}</div>{/if}
-				{if $tags}<div class="contact-entry-details" id="contact-entry-tags-{$id}" >{$tags}</div>{/if}
-				{if $details}<div class="contact-entry-details" id="contact-entry-details-{$id}" >{$details}</div>{/if}
-				{if $network}<div class="contact-entry-details" id="contact-entry-network-{$id}" >{$network}</div>{/if}
+				{if $alt_text}<div class="contact-entry-details" id="contact-entry-rel-{$id}">{$alt_text}</div>{/if}
+				{if $itemurl}<div class="contact-entry-details" id="contact-entry-url-{$id}">{$itemurl}</div>{/if}
+				{if $tags}<div class="contact-entry-details" id="contact-entry-tags-{$id}">{$tags}</div>{/if}
+				{if $details}<div class="contact-entry-details" id="contact-entry-details-{$id}">{$details}</div>{/if}
+				{if $network}<div class="contact-entry-details" id="contact-entry-network-{$id}">{$network}</div>{/if}
 			</div>
 
 			{{* The checkbox to perform batch actions to these contacts (for batch actions have a look at contacts-template.tpl) *}}
diff --git a/view/theme/frio/templates/contacts-template.tpl b/view/theme/frio/templates/contacts-template.tpl
index 37821a5870..ad8a267927 100644
--- a/view/theme/frio/templates/contacts-template.tpl
+++ b/view/theme/frio/templates/contacts-template.tpl
@@ -14,7 +14,7 @@
 
 	{{* The search input field to search for contacts *}}
 	<div id="contacts-search-wrapper">
-		<form id="contacts-search-form" class="navbar-form" role="search" action="{{$cmd}}" method="get" >
+		<form id="contacts-search-form" class="navbar-form" role="search" action="{{$cmd}}" method="get">
 			<div class="row">
 				<div class="form-group form-group-search">
 					<input type="text" name="search" id="contacts-search" class="search-input form-control form-search" onfocus="this.select();" value="{{$search}}" placeholder="{{$desc nofilter}}"/>
diff --git a/view/theme/frio/templates/directory_header.tpl b/view/theme/frio/templates/directory_header.tpl
index 36812916d6..f4c9f0f4b7 100644
--- a/view/theme/frio/templates/directory_header.tpl
+++ b/view/theme/frio/templates/directory_header.tpl
@@ -10,7 +10,7 @@
 
 	{{* The search input field to search for contacts *}}
 	<div id="directory-search-wrapper">
-		<form id="directory-search-form" class="navbar-form" role="search" action="{{$search_mod}}" method="get" >
+		<form id="directory-search-form" class="navbar-form" role="search" action="{{$search_mod}}" method="get">
 			<div class="row">
 				<div class="col-md-2"></div>
 				<div class="col-md-8 ">
@@ -35,7 +35,7 @@
 	{{/foreach}}
 	</ul>
 
-	<div class="directory-end" ></div>
+	<div class="directory-end"></div>
 
 	{{$paginate nofilter}}
 </div>
diff --git a/view/theme/frio/templates/event.tpl b/view/theme/frio/templates/event.tpl
index 5dcc7e6f3b..89fe283c17 100644
--- a/view/theme/frio/templates/event.tpl
+++ b/view/theme/frio/templates/event.tpl
@@ -5,8 +5,8 @@
 			<div class="media">
 				<div class="event-owner media-left">
 					{{if $event.item.author_name}}
-					<a href="{{$event.item.author_link}}" ><img src="{{$event.item.author_avatar}}" /></a>
-					<a href="{{$event.item.author_link}}" >{{$event.item.author_name}}</a>
+					<a href="{{$event.item.author_link}}"><img src="{{$event.item.author_avatar}}" /></a>
+					<a href="{{$event.item.author_link}}">{{$event.item.author_name}}</a>
 					{{/if}}
 				</div>
 				<div class="media-body">
diff --git a/view/theme/frio/templates/event_form.tpl b/view/theme/frio/templates/event_form.tpl
index 1d4f26a6bd..54dad00479 100644
--- a/view/theme/frio/templates/event_form.tpl
+++ b/view/theme/frio/templates/event_form.tpl
@@ -63,7 +63,7 @@
 			{{/if}}
 
 			{{* The submit button - saves the event *}}
-			<div class="pull-right" >
+			<div class="pull-right">
 				<button id="event-submit" type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
 			</div>
 			<div class="clear"></div>
@@ -75,7 +75,7 @@
 			{{* The textarea for the event description *}}
 			<div class="form-group">
 				<div id="event-desc-text"><b>{{$d_text}}</b></div>
-				<textarea id="comment-edit-text-desc" class="form-control text-autosize" name="desc" >{{$d_orig}}</textarea>
+				<textarea id="comment-edit-text-desc" class="form-control text-autosize" name="desc">{{$d_orig}}</textarea>
 				<ul id="event-desc-text-edit-bb" class="comment-edit-bb comment-icon-list nav nav-pills hidden-xs pull-left">
 					{{* commented out because it isn't implemented yet
 					<li>
diff --git a/view/theme/frio/templates/field_themeselect.tpl b/view/theme/frio/templates/field_themeselect.tpl
index f71b19131a..ddebc78711 100644
--- a/view/theme/frio/templates/field_themeselect.tpl
+++ b/view/theme/frio/templates/field_themeselect.tpl
@@ -4,7 +4,7 @@
 {{/if}}
 	<div class="form-group field select">
 		<label for="id_{{$field.0}}">{{$field.1}}</label>
-		<select class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" {{if $field.5=="preview"}}onchange="previewTheme(this);"{{/if}} aria-describedby="{{$field.0}}_tip" >
+		<select class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" {{if $field.5=="preview"}}onchange="previewTheme(this);"{{/if}} aria-describedby="{{$field.0}}_tip">
 	{{foreach $field.4 as $opt=>$val}}
 			<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>
 	{{/foreach}}
diff --git a/view/theme/frio/templates/group_edit.tpl b/view/theme/frio/templates/group_edit.tpl
index e02119354b..149608a9f6 100644
--- a/view/theme/frio/templates/group_edit.tpl
+++ b/view/theme/frio/templates/group_edit.tpl
@@ -43,7 +43,7 @@
 
 	{{* The search input field to search for contacts *}}
 	<div id="contacts-search-wrapper">
-		<form id="contacts-search-form" class="navbar-form" role="search" method="get" >
+		<form id="contacts-search-form" class="navbar-form" role="search" method="get">
 			<div class="row">
 				<div class="form-group form-group-search">
 					<input type="text" name="search" id="contacts-search" class="search-input form-control form-search" onfocus="this.select();" onkeyup="filterList(); return false;" />
diff --git a/view/theme/frio/templates/invite.tpl b/view/theme/frio/templates/invite.tpl
index 31da60665c..482ae54513 100644
--- a/view/theme/frio/templates/invite.tpl
+++ b/view/theme/frio/templates/invite.tpl
@@ -3,7 +3,7 @@
 
 	<h3 class="heading">{{$title}}</h3>
 
-	<form action="invite" method="post" id="invite-form" >
+	<form action="invite" method="post" id="invite-form">
 		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
 		<div id="invite-content-wrapper">
diff --git a/view/theme/frio/templates/jot.tpl b/view/theme/frio/templates/jot.tpl
index e0c602a289..4ecf6a7c3f 100644
--- a/view/theme/frio/templates/jot.tpl
+++ b/view/theme/frio/templates/jot.tpl
@@ -121,7 +121,7 @@
 							</button>
 						</li>
 						<li role="presentation" id="character-counter" class="grey jothidden text-info pull-right"></li>
-						<li role="presentation" id="profile-rotator-wrapper" class="pull-right" style="display: {{$visitor}};" >
+						<li role="presentation" id="profile-rotator-wrapper" class="pull-right" style="display: {{$visitor}};">
 							<img role="presentation" id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
 						</li>
 						<li role="presentation" id="profile-jot-plugin-wrapper">
diff --git a/view/theme/frio/templates/login.tpl b/view/theme/frio/templates/login.tpl
index 09df08bd0a..17303d1326 100644
--- a/view/theme/frio/templates/login.tpl
+++ b/view/theme/frio/templates/login.tpl
@@ -1,5 +1,5 @@
 
-<form id="login-form" action="{{$dest_url}}" role="form" method="post" >
+<form id="login-form" action="{{$dest_url}}" role="form" method="post">
 	<div id="login-group" role="group" aria-labelledby="login-head">
 		<input type="hidden" name="auth-params" value="login" />
 
@@ -9,7 +9,7 @@
 			{{include file="field_input.tpl" field=$lname}}
 			{{include file="field_password.tpl" field=$lpassword}}
 			<div id="login-lost-password-link">
-				<a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
+				<a href="lostpass" title="{{$lostpass}}" id="lost-password-link">{{$lostlink}}</a>
 			</div>
 			<div id="login-end"></div>
 		</div>
@@ -23,7 +23,7 @@
 		{{include file="field_checkbox.tpl" field=$lremember}}
 
 		<div id="login-submit-wrapper">
-			<div class="pull-right" >
+			<div class="pull-right">
 				<button type="submit" name="submit" id="login-submit-button" class="btn btn-primary" value="{{$login}}">{{$login}}</button>
 			</div>
 		</div>
diff --git a/view/theme/frio/templates/mail_conv.tpl b/view/theme/frio/templates/mail_conv.tpl
index 80f5e7547b..f410893883 100644
--- a/view/theme/frio/templates/mail_conv.tpl
+++ b/view/theme/frio/templates/mail_conv.tpl
@@ -13,7 +13,7 @@
 			<div class="mail-body">
 				{{$mail.body nofilter}}
 			</div>
-			{{*<a href="message/dropconv/{{$mail.id}}" onclick="return confirmDelete();" title="{{$delete}}" class="close pull-right" onmouseover="imgbright(this);" onmouseout="imgdull(this);" >&times;</a> *}}
+			{{*<a href="message/dropconv/{{$mail.id}}" onclick="return confirmDelete();" title="{{$delete}}" class="close pull-right" onmouseover="imgbright(this);" onmouseout="imgdull(this);">&times;</a> *}}
 		</div>
 	</div>
 	<div class="mail-conv-wrapper-end"></div>
diff --git a/view/theme/frio/templates/notifications/intros.tpl b/view/theme/frio/templates/notifications/intros.tpl
index 6e083201e0..3f100eb0bf 100644
--- a/view/theme/frio/templates/notifications/intros.tpl
+++ b/view/theme/frio/templates/notifications/intros.tpl
@@ -1,10 +1,10 @@
 
 {{* template incomming contact request and suggested contacts *}}
 
-<div class="intro-wrapper media" id="intro-{{$intro_id}}" >
+<div class="intro-wrapper media" id="intro-{{$intro_id}}">
 
 	{{* Contact Photo *}}
-	<div class="intro-photo-wrapper dropdown pull-left" >
+	<div class="intro-photo-wrapper dropdown pull-left">
 		<img id="photo-{{$intro_id}}" class="intro-photo media-object" src="{{$photo}}" title="{{$fullname}}" alt="{{$fullname}}" />
 	</div>
 
@@ -70,13 +70,13 @@
 					{{include file="field_radio.tpl" field=$friend}}
 					{{include file="field_radio.tpl" field=$follower}}
 				</div>
-				<input type="hidden" name="dfrn_id" value="{{$dfrn_id}}" >
-				<input type="hidden" name="intro_id" value="{{$intro_id}}" >
-				<input type="hidden" name="contact_id" value="{{$contact_id}}" >
+				<input type="hidden" name="dfrn_id" value="{{$dfrn_id}}">
+				<input type="hidden" name="intro_id" value="{{$intro_id}}">
+				<input type="hidden" name="contact_id" value="{{$contact_id}}">
 				{{else}}
 				{{if $note}}<div>{{$note}}</div>{{/if}}
-				<input type="hidden" name="url" value="{{$url}}" >
-				<input type="hidden" name="dfrn-url" value="{{$dfrn_url}}" >
+				<input type="hidden" name="url" value="{{$url}}">
+				<input type="hidden" name="dfrn-url" value="{{$dfrn_url}}">
 				{{/if}}
 				<div class="pull-right">
 					<button class="btn btn-primary intro-submit-approve" type="submit" name="submit" value="{{$approve}}">{{$approve}}</button>
diff --git a/view/theme/frio/templates/photo_albums.tpl b/view/theme/frio/templates/photo_albums.tpl
index f510bd9760..d19ab0638b 100644
--- a/view/theme/frio/templates/photo_albums.tpl
+++ b/view/theme/frio/templates/photo_albums.tpl
@@ -15,7 +15,7 @@
 
 	<ul role="menubar" class="sidebar-photos-albums-ul clear">
 		<li role="menuitem" class="sidebar-photos-albums-li">
-			<a href="{{$baseurl}}/photos/{{$nick}}" class="sidebar-photos-albums-element" title="{{$title}}" >{{$recent}}</a>
+			<a href="{{$baseurl}}/photos/{{$nick}}" class="sidebar-photos-albums-element" title="{{$title}}">{{$recent}}</a>
 		</li>
 
 		{{if $albums}}
diff --git a/view/theme/frio/templates/photos_upload.tpl b/view/theme/frio/templates/photos_upload.tpl
index e3bcd30692..a93211671b 100644
--- a/view/theme/frio/templates/photos_upload.tpl
+++ b/view/theme/frio/templates/photos_upload.tpl
@@ -6,16 +6,16 @@
 
 	<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form">
 		<div id="photos-upload-div" class="form-group">
-			<label id="photos-upload-text" for="photos-upload-newalbum" >{{$newalbum}}</label>
+			<label id="photos-upload-text" for="photos-upload-newalbum">{{$newalbum}}</label>
 
 			<input id="photos-upload-album-select" class="form-control" placeholder="{{$existalbumtext}}" list="dl-photo-upload" type="text" name="album" size="4">
 			<datalist id="dl-photo-upload">{{$albumselect  nofilter}}</datalist>
 		</div>
 		<div id="photos-upload-end" class="clearfix"></div>
 
-		<div id="photos-upload-noshare-div" class="photos-upload-noshare-div checkbox pull-left" >
+		<div id="photos-upload-noshare-div" class="photos-upload-noshare-div checkbox pull-left">
 			<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>
+			<label id="photos-upload-noshare-text" for="photos-upload-noshare">{{$nosharetext}}</label>
 		</div>
 
 		{{if $alt_uploader}}
diff --git a/view/theme/frio/templates/prv_message.tpl b/view/theme/frio/templates/prv_message.tpl
index f936741c02..741116bb10 100644
--- a/view/theme/frio/templates/prv_message.tpl
+++ b/view/theme/frio/templates/prv_message.tpl
@@ -1,6 +1,6 @@
 
 <div id="prvmail-wrapper">
-<form id="prvmail-form" action="message" method="post" >
+<form id="prvmail-form" action="message" method="post">
 
 	{{$parent nofilter}}
 
diff --git a/view/theme/frio/templates/register.tpl b/view/theme/frio/templates/register.tpl
index c2ac174361..6ef70b3e67 100644
--- a/view/theme/frio/templates/register.tpl
+++ b/view/theme/frio/templates/register.tpl
@@ -13,41 +13,41 @@
 
 		{{if $oidlabel}}
 		<div id="register-openid-wrapper" class="form-group">
-			<label for="register-openid" id="label-register-openid" >{{$oidlabel}}</label>
+			<label for="register-openid" id="label-register-openid">{{$oidlabel}}</label>
 			<input type="text" maxlength="60" size="32" name="openid_url" class="openid form-control" id="register-openid" value="{{$openid}}">
 			<span class="help-block" id="openid_url_tip">{{$fillwith}}&nbsp;{{$fillext}}</span>
 		</div>
-		<div id="register-openid-end" ></div>
+		<div id="register-openid-end"></div>
 		{{/if}}
 
 		{{if $invitations}}
 		<div id="register-invite-wrapper" class="form-group">
-			<label for="register-invite" id="label-register-invite" >{{$invite_label}}</label>
+			<label for="register-invite" id="label-register-invite">{{$invite_label}}</label>
 			<input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" class="form-control" value="{{$invite_id}}">
 			<span class="help-block" id="invite_id_tip">{{$invite_desc nofilter}}</span>
 		</div>
-		<div id="register-name-end" ></div>
+		<div id="register-name-end"></div>
 		{{/if}}
 
 		<div id="register-name-wrapper" class="form-group">
-			<label for="register-name" id="label-register-name" >{{$namelabel}}</label>
+			<label for="register-name" id="label-register-name">{{$namelabel}}</label>
 			<input type="text" maxlength="60" size="32" name="username" id="register-name" class="form-control" value="{{$username}}" required>
 		</div>
-		<div id="register-name-end" ></div>
+		<div id="register-name-end"></div>
 
 
 		{{if !$additional}}
 			<div id="register-email-wrapper" class="form-group">
-				<label for="register-email" id="label-register-email" >{{$addrlabel}}</label>
+				<label for="register-email" id="label-register-email">{{$addrlabel}}</label>
 				<input type="text" maxlength="60" size="32" name="field1" id="register-email" class="form-control" value="{{$email}}" required>
 			</div>
-			<div id="register-email-end" ></div>
+			<div id="register-email-end"></div>
 
 			<div id="register-repeat-wrapper" class="form-group">
-				<label for="register-repeat" id="label-register-repeat" >{{$addrlabel2}}</label>
+				<label for="register-repeat" id="label-register-repeat">{{$addrlabel2}}</label>
 				<input type="text" maxlength="60" size="32" name="repeat" id="register-repeat" class="form-control" value="" required>
 			</div>
-			<div id="register-repeat-end" ></div>
+			<div id="register-repeat-end"></div>
 		{{/if}}
 
 		{{if $ask_password}}
@@ -56,11 +56,11 @@
 		{{/if}}
 
 		<div id="register-nickname-wrapper" class="form-group">
-			<label for="register-nickname" id="label-register-nickname" >{{$nicklabel}}</label>
+			<label for="register-nickname" id="label-register-nickname">{{$nicklabel}}</label>
 			<input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" class="form-control" value="{{$nickname}}" required>
 			<span class="help-block" id="nickname_tip">{{$nickdesc nofilter}}</span>
 		</div>
-		<div id="register-nickname-end" ></div>
+		<div id="register-nickname-end"></div>
 
 		{{if $additional}}
 			{{include file="field_password.tpl" field=$parent_password}}
diff --git a/view/theme/frio/templates/removeme.tpl b/view/theme/frio/templates/removeme.tpl
index 2410363d5e..ad687e8972 100644
--- a/view/theme/frio/templates/removeme.tpl
+++ b/view/theme/frio/templates/removeme.tpl
@@ -5,7 +5,7 @@
 	<div id="remove-account-wrapper">
 		<div id="remove-account-desc">{{$desc nofilter}}</div>
 
-		<form action="{{$basedir}}/removeme" autocomplete="off" method="post" >
+		<form action="{{$basedir}}/removeme" autocomplete="off" method="post">
 			<input type="hidden" name="verify" value="{{$hash}}" />
 
 			<div id="remove-account-pass-wrapper" class="form-group">
@@ -14,7 +14,7 @@
 			</div>
 			<div id="remove-account-pass-end"></div>
 
-			<div class="form-group pull-right settings-submit-wrapper" >
+			<div class="form-group pull-right settings-submit-wrapper">
 				<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}"><i class="fa fa-trash fa-fw"></i>&nbsp;{{$submit}}</button>
 			</div>
 			<div class="clear"></div>
diff --git a/view/theme/frio/templates/settings/connectors.tpl b/view/theme/frio/templates/settings/connectors.tpl
index 2f3564c94b..6818c66bd5 100644
--- a/view/theme/frio/templates/settings/connectors.tpl
+++ b/view/theme/frio/templates/settings/connectors.tpl
@@ -64,7 +64,7 @@
 			{{include file="field_select.tpl" field=$mail_action}}
 			{{include file="field_input.tpl" field=$mail_movetofolder}}
 
-			<div class="settings-submit-wrapper" >
+			<div class="settings-submit-wrapper">
 				<input type="submit" id="imap-submit" name="imap-submit" class="settings-submit" value="{{$submit}}" />
 			</div>
 		</div>
diff --git a/view/theme/frio/templates/settings/display.tpl b/view/theme/frio/templates/settings/display.tpl
index 6e018dfc9c..8036f7259a 100644
--- a/view/theme/frio/templates/settings/display.tpl
+++ b/view/theme/frio/templates/settings/display.tpl
@@ -1,6 +1,6 @@
 <div class="generic-page-wrapper">
 	<h1>{{$ptitle}}</h1>
-	<form action="settings/display" id="settings-form" method="post" autocomplete="off" >
+	<form action="settings/display" id="settings-form" method="post" autocomplete="off">
 		<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
 
 		<div class="panel-group panel-group-settings" id="settings" role="tablist" aria-multiselectable="true">
diff --git a/view/theme/frio/templates/settings/oauth_edit.tpl b/view/theme/frio/templates/settings/oauth_edit.tpl
index 419e1b203f..bd650bc082 100644
--- a/view/theme/frio/templates/settings/oauth_edit.tpl
+++ b/view/theme/frio/templates/settings/oauth_edit.tpl
@@ -10,7 +10,7 @@
 	{{include file="field_input.tpl" field=$redirect}}
 	{{include file="field_input.tpl" field=$icon}}
 
-	<div class="form-group pull-right settings-submit-wrapper" >
+	<div class="form-group pull-right settings-submit-wrapper">
 		<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
 	</div>
 	<div class="clear"></div>
diff --git a/view/theme/frio/templates/theme_settings.tpl b/view/theme/frio/templates/theme_settings.tpl
index c9b350865e..7dfc49719a 100644
--- a/view/theme/frio/templates/theme_settings.tpl
+++ b/view/theme/frio/templates/theme_settings.tpl
@@ -1,5 +1,5 @@
 <script src="{{$baseurl}}/view/theme/quattro/jquery.tools.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
-<script type="text/javascript" src="{{$baseurl}}/view/js/ajaxupload.js?v={{$smarty.const.FRIENDICA_VERSION}}" ></script>
+<script type="text/javascript" src="{{$baseurl}}/view/js/ajaxupload.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
 
 <div class="form-group field select">
 	<label for="id_{{$scheme.0}}">{{$scheme.1}}</label>
diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index 2d9d0a8ab4..de46a12ac7 100644
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -104,7 +104,7 @@ as the value of $top_child_total (this is done at the end of this file)
 
 			{{* The litle overlay avatar picture if someone is posting directly to a wall or a forum *}}
 			{{if $item.owner_url}}
-			<div aria-hidden="true" class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
+			<div aria-hidden="true" class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}">
 				<a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="contact-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
 					<img src="{{$item.owner_photo}}" class="contact-photo {{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" alt="{{$item.owner_name}}" />
 				</a>
diff --git a/view/theme/frio/templates/widget/peoplefind.tpl b/view/theme/frio/templates/widget/peoplefind.tpl
index b6d1e3ff27..7c69e6bff3 100644
--- a/view/theme/frio/templates/widget/peoplefind.tpl
+++ b/view/theme/frio/templates/widget/peoplefind.tpl
@@ -11,14 +11,14 @@
 	</form>
 
 	{{* Directory links *}}
-	<div class="side-link" id="side-directory-link"><a href="directory" >{{$nv.local_directory}}</a></div>
-	<div class="side-link" id="side-directory-link"><a href="{{$nv.global_dir}}" target="extlink" >{{$nv.directory}}</a></div>
+	<div class="side-link" id="side-directory-link"><a href="directory">{{$nv.local_directory}}</a></div>
+	<div class="side-link" id="side-directory-link"><a href="{{$nv.global_dir}}" target="extlink">{{$nv.directory}}</a></div>
 	{{* Additional links *}}
-	<div class="side-link" id="side-match-link"><a href="match" >{{$nv.similar}}</a></div>
-	<div class="side-link" id="side-suggest-link"><a href="suggest" >{{$nv.suggest}}</a></div>
-	<div class="side-link" id="side-random-profile-link" ><a href="randprof" target="extlink" >{{$nv.random}}</a></div>
+	<div class="side-link" id="side-match-link"><a href="match">{{$nv.similar}}</a></div>
+	<div class="side-link" id="side-suggest-link"><a href="suggest">{{$nv.suggest}}</a></div>
+	<div class="side-link" id="side-random-profile-link"><a href="randprof" target="extlink">{{$nv.random}}</a></div>
 
 	{{if $nv.inv}} 
-	<div class="side-link" id="side-invite-link" ><button type="button" class="btn-link" onclick="addToModal('invite'); return false;">{{$nv.inv}}</button></div>
+	<div class="side-link" id="side-invite-link"><button type="button" class="btn-link" onclick="addToModal('invite'); return false;">{{$nv.inv}}</button></div>
 	{{/if}}
 </div>
diff --git a/view/theme/quattro/templates/contact_template.tpl b/view/theme/quattro/templates/contact_template.tpl
index 2d59a8a256..13eea60de0 100644
--- a/view/theme/quattro/templates/contact_template.tpl
+++ b/view/theme/quattro/templates/contact_template.tpl
@@ -1,10 +1,10 @@
 
-<div class="contact-wrapper" id="contact-entry-wrapper-{{$id}}" >
-	{{if $contact.ignlnk}}<a href="{{$contact.ignlnk}}" title="{{$contact.ignore}}" class="icon drophide profile-match-ignore" onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" ></a>{{/if}}
-	<div class="contact-photo-wrapper" >
+<div class="contact-wrapper" id="contact-entry-wrapper-{{$id}}">
+	{{if $contact.ignlnk}}<a href="{{$contact.ignlnk}}" title="{{$contact.ignore}}" class="icon drophide profile-match-ignore" onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();"></a>{{/if}}
+	<div class="contact-photo-wrapper">
 		<div class="contact-photo mframe" id="contact-entry-photo-{{$contact.id}}"
 		onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}}); openMenu('contact-photo-menu-button-{{$contact.id}}')" 
-		onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$contact.id}}\'); closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)" >
+		onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$contact.id}}\'); closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)">
 
 			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>
 
@@ -26,15 +26,15 @@
 		</div>
 			
 	</div>
-	<div class="contact-name" id="contact-entry-name-{{$contact.id}}" >
+	<div class="contact-name" id="contact-entry-name-{{$contact.id}}">
 		{{$contact.name}}
 		{{if $contact.account_type}} <span class="contact-entry-details" id="contact-entry-accounttype-{{$contact.id}}">({{$contact.account_type}})</span>{{/if}}
 	</div>
-	{{if $contact.alt_text}}<div class="contact-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
-	{{if $contact.itemurl}}<div class="contact-details" id="contact-entry-url-{{$contact.id}}" >{{$contact.itemurl}}</div>{{/if}}
-	{{if $contact.tags}}<div class="contact-details" id="contact-entry-tags-{{$contact.id}}" >{{$contact.tags}}</div>{{/if}}
-	{{if $contact.details}}<div class="contact-details" id="contact-entry-details-{{$contact.id}}" >{{$contact.details}}</div>{{/if}}
-	{{if $contact.network}}<div class="contact-details" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>{{/if}}
+	{{if $contact.alt_text}}<div class="contact-details" id="contact-entry-rel-{{$contact.id}}">{{$contact.alt_text}}</div>{{/if}}
+	{{if $contact.itemurl}}<div class="contact-details" id="contact-entry-url-{{$contact.id}}">{{$contact.itemurl}}</div>{{/if}}
+	{{if $contact.tags}}<div class="contact-details" id="contact-entry-tags-{{$contact.id}}">{{$contact.tags}}</div>{{/if}}
+	{{if $contact.details}}<div class="contact-details" id="contact-entry-details-{{$contact.id}}">{{$contact.details}}</div>{{/if}}
+	{{if $contact.network}}<div class="contact-details" id="contact-entry-network-{{$contact.id}}">{{$contact.network}}</div>{{/if}}
 
 	{{if $contact.connlnk}}
 	<div class="contact-entry-connect"><a href="{{$contact.connlnk}}" title="{{$contact.conntxt}}">{{$contact.conntxt}}</a></div>
diff --git a/view/theme/quattro/templates/event_form.tpl b/view/theme/quattro/templates/event_form.tpl
index 9cb0bdc4ed..8054ba8762 100644
--- a/view/theme/quattro/templates/event_form.tpl
+++ b/view/theme/quattro/templates/event_form.tpl
@@ -3,7 +3,7 @@
 
 <p>{{$desc nofilter}}</p>
 
-<form id="event-edit-form" action="{{$post}}" method="post" >
+<form id="event-edit-form" action="{{$post}}" method="post">
 
 	<input type="hidden" name="event_id" value="{{$eid}}" />
 	<input type="hidden" name="cid" value="{{$cid}}" />
@@ -30,7 +30,7 @@
 
 	{{$acl nofilter}}
 
-	<div class="settings-submit-wrapper" >
+	<div class="settings-submit-wrapper">
 		<input id="event-edit-preview" type="submit" name="preview" value="{{$preview}}" onclick="doEventPreview(); return false;" />
 		<input id="event-submit" type="submit" name="submit" value="{{$submit}}" />
 	</div>
diff --git a/view/theme/quattro/templates/events-js.tpl b/view/theme/quattro/templates/events-js.tpl
index bfe446f9fd..62b9e6667c 100644
--- a/view/theme/quattro/templates/events-js.tpl
+++ b/view/theme/quattro/templates/events-js.tpl
@@ -1,6 +1,6 @@
 
 {{$tabs nofilter}}
-<h2>{{$title}} <a class="actionbutton" href="{{$new_event.0}}" ><i class="icon add s10"></i> {{$new_event.1}}</a></h2>
+<h2>{{$title}} <a class="actionbutton" href="{{$new_event.0}}"><i class="icon add s10"></i> {{$new_event.1}}</a></h2>
 
 <div id="new-event-link"></div>
 
diff --git a/view/theme/quattro/templates/events.tpl b/view/theme/quattro/templates/events.tpl
index 6df1cf94b7..052846f109 100644
--- a/view/theme/quattro/templates/events.tpl
+++ b/view/theme/quattro/templates/events.tpl
@@ -1,5 +1,5 @@
 {{$tabs nofilter}}
-<h2>{{$title}} <a class="actionbutton" href="{{$new_event.0}}" ><i class="icon add s10"></i> {{$new_event.1}}</a></h2>
+<h2>{{$title}} <a class="actionbutton" href="{{$new_event.0}}"><i class="icon add s10"></i> {{$new_event.1}}</a></h2>
 
 <div id="event-calendar-wrapper">
 	<a href="{{$previus.0}}" class="prevcal {{$previus.2}}"><div id="event-calendar-prev" class="icon s22 prev" title="{{$previus.1}}"></div></a>
@@ -10,8 +10,8 @@
 
 {{foreach $events as $event}}
 	<div class="event">
-	{{if $event.is_first}}<hr /><a name="link-{{$event.j}}" ><div class="event-list-date">{{$event.d}}</div></a>{{/if}}
-	{{if $event.item.author_name}}<a href="{{$event.item.author_link}}" ><img src="{{$event.item.author_avatar}}" height="32" width="32" />{{$event.item.author_name}}</a>{{/if}}
+	{{if $event.is_first}}<hr /><a name="link-{{$event.j}}"><div class="event-list-date">{{$event.d}}</div></a>{{/if}}
+	{{if $event.item.author_name}}<a href="{{$event.item.author_link}}"><img src="{{$event.item.author_avatar}}" height="32" width="32" />{{$event.item.author_name}}</a>{{/if}}
 	{{$event.html nofilter}}
 	{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" target="_blank" rel="noopener noreferrer" 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}}
diff --git a/view/theme/quattro/templates/jot.tpl b/view/theme/quattro/templates/jot.tpl
index d4aff2cb2c..0c23244081 100644
--- a/view/theme/quattro/templates/jot.tpl
+++ b/view/theme/quattro/templates/jot.tpl
@@ -35,7 +35,7 @@
 			{{$jotplugins nofilter}}
 
 			{{if !$is_edit}}
-			<li class="perms"><a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon s22 {{$lockstate}} {{$bang}}"  title="{{$permset}}" ></a></li>
+			<li class="perms"><a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon s22 {{$lockstate}} {{$bang}}"  title="{{$permset}}"></a></li>
 			{{/if}}
 			<li class="submit"><input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" /></li>
 			<li id="profile-rotator" class="loading" style="display: none"><img src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}"  /></li>
diff --git a/view/theme/quattro/templates/mail_conv.tpl b/view/theme/quattro/templates/mail_conv.tpl
index 1e791f6185..c7ddd7e718 100644
--- a/view/theme/quattro/templates/mail_conv.tpl
+++ b/view/theme/quattro/templates/mail_conv.tpl
@@ -46,15 +46,15 @@
 
 
 <div class="mail-conv-outside-wrapper">
-	<div class="mail-conv-sender" >
-		<a href="{{$mail.from_url}}" title="{{$mail.from_addr}}" 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}}" title="{{$mail.from_addr}}" /></a>
+	<div class="mail-conv-sender">
+		<a href="{{$mail.from_url}}" title="{{$mail.from_addr}}" 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}}" title="{{$mail.from_addr}}" /></a>
 	</div>
-	<div class="mail-conv-detail" >
-		<div class="mail-conv-sender-name" >{{$mail.from_name}}</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 nofilter}}</div>
-	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
+	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}"><a href="message/drop/{{$mail.id}}" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);"></a></div><div class="mail-conv-delete-end"></div>
 	<div class="mail-conv-outside-wrapper-end"></div>
 </div>
 </div>
diff --git a/view/theme/quattro/templates/nav.tpl b/view/theme/quattro/templates/nav.tpl
index 13b3aa1d30..fc757c9a4d 100644
--- a/view/theme/quattro/templates/nav.tpl
+++ b/view/theme/quattro/templates/nav.tpl
@@ -13,36 +13,36 @@
 						<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}}	
+					{{if $nav.notifications}}<li><a class="{{$nav.notifications.2}}" href="{{$nav.notifications.0}}" title="{{$nav.notifications.3}}">{{$nav.notifications.1}}</a></li>{{/if}}
+					{{if $nav.messages}}<li><a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}">{{$nav.messages.1}}</a></li>{{/if}}
+					{{if $nav.contacts}}<li><a class="{{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}">{{$nav.contacts.1}}</a></li>{{/if}}
 				</ul>
 			</li>
 		{{/if}}
 
 		{{if $nav.community}}
 			<li id="nav-community-link" class="nav-menu {{$sel.community}}">
-				<a class="{{$nav.community.2}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
+				<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 accesskey="n" class="{{$nav.network.2}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
+				<a accesskey="n" class="{{$nav.network.2}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}">{{$nav.network.1}}</a>
 				<span id="net-update" class="nav-notification"></span>
 			</li>
 		{{/if}}
 
 		{{if $nav.home}}
 			<li id="nav-home-link" class="nav-menu {{$sel.home}}">
-				<a accesskey="p" class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a>
+				<a accesskey="p" class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}">{{$nav.home.1}}</a>
 				<span id="home-update" class="nav-notification"></span>
 			</li>
 		{{/if}}
 
 		{{if $nav.introductions}}
 			<li id="nav-introductions-link" class="nav-menu-icon {{$sel.introductions}}">
-				<a class="{{$nav.introductions.2}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >
+				<a class="{{$nav.introductions.2}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}">
 				    <span class="icon s22 intro">{{$nav.introductions.1}}</a>
 				</a>
 				<span id="intro-update" class="nav-notification"></span>
@@ -51,7 +51,7 @@
 
 		{{if $nav.messages}}
 			<li id="nav-messages-link" class="nav-menu-icon {{$sel.messages}}">
-				<a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >
+				<a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}">
 				    <span class="icon s22 mail">{{$nav.messages.1}}</a>
 				</a>
 				<span id="mail-update" class="nav-notification"></span>
@@ -74,30 +74,30 @@
 				{{if $nav.delegation}}<li><a class="{{$nav.delegation.2}}" href="{{$nav.delegation.0}}" title="{{$nav.delegation.3}}">{{$nav.delegation.1}}</a></li>{{/if}}
 
 				{{if $nav.settings}}<li><a class="{{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>{{/if}}
-				{{if $nav.admin}}<li><a accesskey="a" class="{{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a></li>{{/if}}
+				{{if $nav.admin}}<li><a accesskey="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}}
+				{{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}}
 				{{if $nav.tos}}<li><a class="menu-sep {{$nav.tos.2}}" href="{{$nav.tos.0}}" title="{{$nav.tos.3}}">{{$nav.tos.1}}</a></li>{{/if}}
 			</ul>
 		</li>
 
 		{{if $nav.help}} 
 		<li id="nav-help-link" class="nav-menu {{$sel.help}}">
-			<a class="{{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a>
+			<a class="{{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}">{{$nav.help.1}}</a>
 		</li>
 		{{/if}}
 
 		<li id="nav-search-link" class="nav-menu {{$sel.search}}">
-			<a accesskey="s" class="{{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a>
+			<a accesskey="s" class="{{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}">{{$nav.search.1}}</a>
 		</li>
 		<li id="nav-directory-link" class="nav-menu {{$sel.directory}}">
-			<a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a>
+			<a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}">{{$nav.directory.1}}</a>
 		</li>
 		
 		{{if $nav.apps}}
 			<li id="nav-apps-link" class="nav-menu {{$sel.apps}}">
-				<a class=" {{$nav.apps.2}}" href="#" rel="#nav-apps-menu" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a>
+				<a class=" {{$nav.apps.2}}" href="#" rel="#nav-apps-menu" title="{{$nav.apps.3}}">{{$nav.apps.1}}</a>
 				<ul id="nav-apps-menu" class="menu-popup">
 					{{foreach $apps as $ap}}
 					<li>{{$ap nofilter}}</li>
diff --git a/view/theme/quattro/templates/photo_item.tpl b/view/theme/quattro/templates/photo_item.tpl
index 4a43d2cb81..ee64f5eda5 100644
--- a/view/theme/quattro/templates/photo_item.tpl
+++ b/view/theme/quattro/templates/photo_item.tpl
@@ -68,7 +68,7 @@
 		<div class="wall-item-like" id="wall-item-like-{{$id}}">{{$like nofilter}}</div>
 		<div class="wall-item-dislike" id="wall-item-dislike-{{$id}}">{{$dislike nofilter}}</div>
 		{{if $conv}}
-		<div class="wall-item-conv" id="wall-item-conv-{{$id}}" >
+		<div class="wall-item-conv" id="wall-item-conv-{{$id}}">
 			<a href='{{$conv.href}}' id='context-{{$id}}' title='{{$conv.title}}'>{{$conv.title}}</a>
 		</div>
 		{{/if}}
diff --git a/view/theme/quattro/templates/profile/vcard.tpl b/view/theme/quattro/templates/profile/vcard.tpl
index a0f0f25025..b849a44353 100644
--- a/view/theme/quattro/templates/profile/vcard.tpl
+++ b/view/theme/quattro/templates/profile/vcard.tpl
@@ -9,7 +9,7 @@
 				<li>
 					<a href="{{$profile.edit.0}}">{{$profile.edit.1}}</a>
 				</li>
-				<li><a href="settings/profile/photo" >{{$profile.menu.chg_photo}}</a></li>
+				<li><a href="settings/profile/photo">{{$profile.menu.chg_photo}}</a></li>
 			</ul>
 			</div>
 		{{/if}}
diff --git a/view/theme/quattro/templates/wall_item_tag.tpl b/view/theme/quattro/templates/wall_item_tag.tpl
index 71c7e0844f..5f2021b3ef 100644
--- a/view/theme/quattro/templates/wall_item_tag.tpl
+++ b/view/theme/quattro/templates/wall_item_tag.tpl
@@ -59,9 +59,9 @@
 
 {{* top thread comment box *}}
 {{if $item.threaded}}{{if $item.comment_html}}{{if $item.thread_level==1}}
-<div class="wall-item-comment-wrapper" >{{$item.comment_html nofilter}}</div>
+<div class="wall-item-comment-wrapper">{{$item.comment_html nofilter}}</div>
 {{/if}}{{/if}}{{/if}}
 
 {{if $item.flatten}}
-<div class="wall-item-comment-wrapper" >{{$item.comment_html nofilter}}</div>
+<div class="wall-item-comment-wrapper">{{$item.comment_html nofilter}}</div>
 {{/if}}
diff --git a/view/theme/quattro/templates/widget_forumlist.tpl b/view/theme/quattro/templates/widget_forumlist.tpl
index 79a283481b..d99d628635 100644
--- a/view/theme/quattro/templates/widget_forumlist.tpl
+++ b/view/theme/quattro/templates/widget_forumlist.tpl
@@ -24,7 +24,7 @@ function showHideForumlist() {
 			<a href="{{$forum.external_url}}" title="{{$forum.link_desc}}" class="label sparkle" target="_blank" rel="noopener noreferrer">
 				<img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc}}" />
 			</a>
-			<a class="forum-widget-link" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name}}</a>
+			<a class="forum-widget-link" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}">{{$forum.name}}</a>
 		</li>
 		{{/if}}
 	
@@ -34,7 +34,7 @@ function showHideForumlist() {
 			<a href="{{$forum.external_url}}" title="{{$forum.link_desc}}" class="label sparkle" target="_blank" rel="noopener noreferrer">
 				<img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc}}" />
 			</a>
-			<a class="forum-widget-link" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name}}</a>
+			<a class="forum-widget-link" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}">{{$forum.name}}</a>
 		</li>
 		{{/if}}
 		{{/foreach}}
diff --git a/view/theme/smoothly/templates/jot-header.tpl b/view/theme/smoothly/templates/jot-header.tpl
index 3f0040ddf3..7acb8812e9 100644
--- a/view/theme/smoothly/templates/jot-header.tpl
+++ b/view/theme/smoothly/templates/jot-header.tpl
@@ -48,7 +48,7 @@ function enableOnUser(){
 
 </script>
 
-<script type="text/javascript" src="view/js/ajaxupload.js?v={{$smarty.const.FRIENDICA_VERSION}}" >
+<script type="text/javascript" src="view/js/ajaxupload.js?v={{$smarty.const.FRIENDICA_VERSION}}">
 </script>
 
 <script>
diff --git a/view/theme/smoothly/templates/jot.tpl b/view/theme/smoothly/templates/jot.tpl
index 07c452c7e0..61d6b5b014 100644
--- a/view/theme/smoothly/templates/jot.tpl
+++ b/view/theme/smoothly/templates/jot.tpl
@@ -1,11 +1,11 @@
-<div id="profile-jot-wrapper" >
+<div id="profile-jot-wrapper">
 	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
+		<div id="profile-jot-desc">&nbsp;</div>
 		<div id="character-counter" class="grey" style="display: none;">0</div>
 	</div>
 	<div id="profile-jot-banner-end"></div>
 
-	<form id="profile-jot-form" action="{{$action}}" method="post" >
+	<form id="profile-jot-form" action="{{$action}}" method="post">
 		<input type="hidden" name="wall" value="{{$wall}}" />
 		<input type="hidden" name="post_type" value="{{$posttype}}" />
 		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
@@ -30,33 +30,33 @@
 			</textarea>
 		</div>
 
-	<div id="profile-upload-wrapper" class="jot-tool" style="display: none;" >
-		<div id="wall-image-upload-div" ><a onclick="return false;" id="wall-image-upload" class="icon border camera" title="{{$upload}}"></a></div>
+	<div id="profile-upload-wrapper" class="jot-tool" style="display: none;">
+		<div id="wall-image-upload-div"><a onclick="return false;" id="wall-image-upload" class="icon border camera" title="{{$upload}}"></a></div>
 	</div>
-	<div id="profile-attach-wrapper" class="jot-tool" style="display: none;" >
-		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon border attach" title="{{$attach}}"></a></div>
+	<div id="profile-attach-wrapper" class="jot-tool" style="display: none;">
+		<div id="wall-file-upload-div"><a href="#" onclick="return false;" id="wall-file-upload" class="icon border attach" title="{{$attach}}"></a></div>
 	</div>
-	<div id="profile-link-wrapper" class="jot-tool" style="display: none;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
+	<div id="profile-link-wrapper" class="jot-tool" style="display: none;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);">
 		<a href="#" id="profile-link" class="icon border  link" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
 	</div>
-	<div id="profile-video-wrapper" class="jot-tool" style="display: none;" >
+	<div id="profile-video-wrapper" class="jot-tool" style="display: none;">
 		<a href="#" id="profile-video" class="icon border  video" title="{{$video}}" onclick="jotVideoURL(); return false;"></a>
 	</div>
-	<div id="profile-audio-wrapper" class="jot-tool" style="display: none;" >
+	<div id="profile-audio-wrapper" class="jot-tool" style="display: none;">
 		<a href="#" id="profile-audio" class="icon border  audio" title="{{$audio}}" onclick="jotAudioURL(); return false;"></a>
 	</div>
-	<div id="profile-location-wrapper" class="jot-tool" style="display: none;" >
+	<div id="profile-location-wrapper" class="jot-tool" style="display: none;">
 		<a href="#" id="profile-location" class="icon border  globe" title="{{$setloc}}" onclick="jotGetLocation(); return false;"></a>
 	</div>
-	<div id="profile-nolocation-wrapper" class="jot-tool" style="display: none;" >
+	<div id="profile-nolocation-wrapper" class="jot-tool" style="display: none;">
 		<a href="#" id="profile-nolocation" class="icon border  noglobe" title="{{$noloc}}" onclick="jotClearLocation(); return false;"></a>
 	</div>
 
-	<span onclick="preview_post();" id="jot-preview-link" class="fakelink" style="display: none;" >{{$preview}}</span>
+	<span onclick="preview_post();" id="jot-preview-link" class="fakelink" style="display: none;">{{$preview}}</span>
 
 	<div id="profile-jot-submit-wrapper" style="display:none;padding-left: 400px;">
 		<input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" />
-		<div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" >
+		<div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};">
             <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}} sharePerms" title="{{$permset}}"></a>{{$bang}}</div>
 	</div>
 
diff --git a/view/theme/smoothly/templates/nav.tpl b/view/theme/smoothly/templates/nav.tpl
index 5ce1eb3bb7..6d8ad1071e 100644
--- a/view/theme/smoothly/templates/nav.tpl
+++ b/view/theme/smoothly/templates/nav.tpl
@@ -17,7 +17,7 @@
 		</ul>
 	</div>
 	
-	<div id="user-menu" >
+	<div id="user-menu">
 		<a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="{{$nav.home.0}}">{{$sitelocation}}</a>
 		
 		<ul id="user-menu-popup" 
diff --git a/view/theme/smoothly/templates/tools.tpl b/view/theme/smoothly/templates/tools.tpl
index 2ee4a3e41a..081c246b45 100644
--- a/view/theme/smoothly/templates/tools.tpl
+++ b/view/theme/smoothly/templates/tools.tpl
@@ -1,7 +1,7 @@
 
 <nav>
 
-	{{if $nav.logout}}<a id="nav-logout-link" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a> {{/if}}
-	{{if $nav.login}}<a id="nav-login-link" class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a> {{/if}}
+	{{if $nav.logout}}<a id="nav-logout-link" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}">{{$nav.logout.1}}</a> {{/if}}
+	{{if $nav.login}}<a id="nav-login-link" class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}">{{$nav.login.1}}</a> {{/if}}
 
 </nav>
diff --git a/view/theme/smoothly/templates/widget/follow.tpl b/view/theme/smoothly/templates/widget/follow.tpl
index 4d5248530e..664556b362 100644
--- a/view/theme/smoothly/templates/widget/follow.tpl
+++ b/view/theme/smoothly/templates/widget/follow.tpl
@@ -2,7 +2,7 @@
 <div id="follow-sidebar" class="widget">
 	<h3>{{$connect}}</h3>
 	<div id="connect-desc">{{$desc nofilter}}</div>
-	<form action="follow" method="post" >
+	<form action="follow" method="post">
 		<input id="side-follow-url" type="text-sidebar" name="url" size="24" title="{{$hint}}" /><input id="side-follow-submit" type="submit" name="submit" value="{{$follow}}" />
 	</form>
 </div>
diff --git a/view/theme/vier/templates/ch_directory_item.tpl b/view/theme/vier/templates/ch_directory_item.tpl
index 6813e1186e..2945051f80 100644
--- a/view/theme/vier/templates/ch_directory_item.tpl
+++ b/view/theme/vier/templates/ch_directory_item.tpl
@@ -1,9 +1,9 @@
 
 
-<div class="directory-item" id="directory-item-{{$id}}" >
-	<div class="directory-photo-wrapper" id="directory-photo-wrapper-{{$id}}" > 
-		<div class="directory-photo" id="directory-photo-{{$id}}" >
-			<a href="{{$profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$id}}" >
+<div class="directory-item" id="directory-item-{{$id}}">
+	<div class="directory-photo-wrapper" id="directory-photo-wrapper-{{$id}}">
+		<div class="directory-photo" id="directory-photo-{{$id}}">
+			<a href="{{$profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$id}}">
 				<img class="directory-photo-img" src="{{$photo}}" alt="{{$alt_text}}" title="{{$alt_text}}" />
 			</a>
 		</div>
diff --git a/view/theme/vier/templates/contact_edit.tpl b/view/theme/vier/templates/contact_edit.tpl
index f89915d5f9..23c510502c 100644
--- a/view/theme/vier/templates/contact_edit.tpl
+++ b/view/theme/vier/templates/contact_edit.tpl
@@ -1,12 +1,12 @@
 
-<div id="contact-edit-wrapper" >
+<div id="contact-edit-wrapper">
 
 	{{* Insert Tab-Nav *}}
 	{{$tab_str nofilter}}
 
 
-	<div id="contact-edit-nav-wrapper" >
-		<form action="contact/{{$contact_id}}" method="post" >
+	<div id="contact-edit-nav-wrapper">
+		<form action="contact/{{$contact_id}}" method="post">
 			<div id="contact-edit-links">
 				<div id="contact-edit-status-wrapper">
 					<span id="contact-edit-contact-status">{{$contact_status}}</span>
@@ -15,7 +15,7 @@
 					<div id="contact-edit-actions">
 						<a class="btn" id="contact-edit-actions-button">{{$contact_action_button}}</a>
 
-						<ul role="menu" aria-haspopup="true" id="contact-actions-menu" class="menu-popup" >
+						<ul role="menu" aria-haspopup="true" id="contact-actions-menu" class="menu-popup">
 							{{if $lblsuggest}}<li role="menuitem"><a  href="#" title="{{$contact_actions.suggest.title}}" onclick="window.location.href='{{$contact_actions.suggest.url}}'; return false;">{{$contact_actions.suggest.label}}</a></li>{{/if}}
 							{{if $poll_enabled}}<li role="menuitem"><a  href="#" title="{{$contact_actions.update.title}}" onclick="window.location.href='{{$contact_actions.update.url}}'; return false;">{{$contact_actions.update.label}}</a></li>{{/if}}
 							{{if $contact_actions.updateprofile}}<li role="menuitem"><a href="{{$contact_actions.updateprofile.url}}" title="{{$contact_actions.updateprofile.title}}">{{$contact_actions.updateprofile.label}}</a></li>{{/if}}
@@ -65,7 +65,7 @@
 			<div id="contact-edit-settings">
 				<input type="hidden" name="contact_id" value="{{$contact_id}}">
 
-					<div id="contact-edit-end" ></div>
+					<div id="contact-edit-end"></div>
 					{{include file="field_checkbox.tpl" field=$notify}}
 					{{if $fetch_further_information}}
 						{{include file="field_select.tpl" field=$fetch_further_information}}
diff --git a/view/theme/vier/templates/contact_template.tpl b/view/theme/vier/templates/contact_template.tpl
index c4ed99caa4..e99aab93d2 100644
--- a/view/theme/vier/templates/contact_template.tpl
+++ b/view/theme/vier/templates/contact_template.tpl
@@ -1,9 +1,9 @@
 
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}" >
-	<div class="contact-entry-photo-wrapper" >
+<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)" > -->
+		onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$contact.id}}\'); closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)"> -->
 
 			<!-- <a href="{{$contact.url}}" title="{{$contact.img_hover}}" /></a> -->
 			<img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" />
@@ -28,22 +28,22 @@
 		</div>
 			
 	</div>
-	<div class="contact-entry-photo-end" ></div>
+	<div class="contact-entry-photo-end"></div>
 	
 	<div class="contact-entry-desc">
-		<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >
+		<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}">
 			{{$contact.name}}
 			{{if $contact.account_type}} <span class="contact-entry-details" id="contact-entry-accounttype-{{$contact.id}}">({{$contact.account_type}})</span>{{/if}}
 		</div>
-		{{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
+		{{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}">{{$contact.alt_text}}</div>{{/if}}
 		<div class="contact-entry-details">
-		{{if $contact.itemurl}}<span class="contact-entry-details" id="contact-entry-url-{{$contact.id}}" >{{$contact.itemurl}}</span>{{/if}}
-		{{if $contact.network}}<span class="contact-entry-details" id="contact-entry-network-{{$contact.id}}" > ({{$contact.network}})</span>{{/if}}
+		{{if $contact.itemurl}}<span class="contact-entry-details" id="contact-entry-url-{{$contact.id}}">{{$contact.itemurl}}</span>{{/if}}
+		{{if $contact.network}}<span class="contact-entry-details" id="contact-entry-network-{{$contact.id}}"> ({{$contact.network}})</span>{{/if}}
 		</div>
-		{{if $contact.tags}}<div class="contact-entry-details" id="contact-entry-tags-{{$contact.id}}" >{{$contact.tags}}</div>{{/if}}
-		{{if $contact.details}}<div class="contact-entry-details" id="contact-entry-details-{{$contact.id}}" >{{$contact.details}}</div>{{/if}}
+		{{if $contact.tags}}<div class="contact-entry-details" id="contact-entry-tags-{{$contact.id}}">{{$contact.tags}}</div>{{/if}}
+		{{if $contact.details}}<div class="contact-entry-details" id="contact-entry-details-{{$contact.id}}">{{$contact.details}}</div>{{/if}}
 	</div>
 
 
-	<div class="contact-entry-end" ></div>
+	<div class="contact-entry-end"></div>
 </div>
diff --git a/view/theme/vier/templates/event_form.tpl b/view/theme/vier/templates/event_form.tpl
index e2090e3c65..e93de71c6f 100644
--- a/view/theme/vier/templates/event_form.tpl
+++ b/view/theme/vier/templates/event_form.tpl
@@ -6,7 +6,7 @@
 {{$desc nofilter}}
 </p>
 
-<form id="event-edit-form" action="{{$post}}" method="post" >
+<form id="event-edit-form" action="{{$post}}" method="post">
 
 <input type="hidden" name="event_id" value="{{$eid}}" />
 <input type="hidden" name="cid" value="{{$cid}}" />
diff --git a/view/theme/vier/templates/nav.tpl b/view/theme/vier/templates/nav.tpl
index 7982d5efa4..32a588f3d7 100644
--- a/view/theme/vier/templates/nav.tpl
+++ b/view/theme/vier/templates/nav.tpl
@@ -14,7 +14,7 @@
 		</li>
 		{{if $nav.home}}
 			<li role="menuitem" id="nav-home-link" class="nav-menu {{$sel.home}}">
-				<a accesskey="p" class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >
+				<a accesskey="p" class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}">
 					<span class="desktop-view">{{$nav.home.1}}</span>
 					<i class="icon s22 icon-home mobile-view"><span class="sr-only">{{$nav.home.1}}</span></i>
 					<span id="home-update" class="nav-notification"></span>
@@ -23,7 +23,7 @@
 		{{/if}}
 		{{if $nav.network}}
 			<li role="menuitem" id="nav-network-link" class="nav-menu {{$sel.network}}">
-				<a accesskey="n" class="{{$nav.network.2}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >
+				<a accesskey="n" class="{{$nav.network.2}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}">
 					<span class="desktop-view">{{$nav.network.1}}</span>
 					<i class="icon s22 icon-th mobile-view"><span class="sr-only">{{$nav.network.1}}</span></i>
 					<span id="net-update" class="nav-notification"></span>
@@ -32,23 +32,23 @@
 		{{/if}}
 		{{if $nav.events}}
 			<li role="menuitem" id="nav-events-link" class="nav-menu {{$sel.events}}">
-				<a accesskey="e" class="{{$nav.events.2}} desktop-view" href="{{$nav.events.0}}" title="{{$nav.events.3}}" >{{$nav.events.1}}</a>
-				<a class="{{$nav.events.2}} mobile-view" href="{{$nav.events.0}}" title="{{$nav.events.3}}" ><i class="icon s22 icon-calendar"></i></a>
+				<a accesskey="e" class="{{$nav.events.2}} desktop-view" href="{{$nav.events.0}}" title="{{$nav.events.3}}">{{$nav.events.1}}</a>
+				<a class="{{$nav.events.2}} mobile-view" href="{{$nav.events.0}}" title="{{$nav.events.3}}"><i class="icon s22 icon-calendar"></i></a>
 			</li>
 		{{/if}}
 		{{if $nav.community}}
 			<li role="menuitem" id="nav-community-link" class="nav-menu {{$sel.community}}">
-				<a accesskey="c" class="{{$nav.community.2}} desktop-view" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
-				<a class="{{$nav.community.2}} mobile-view" href="{{$nav.community.0}}" title="{{$nav.community.3}}" ><i class="icon s22 icon-bullseye"></i></a>
+				<a accesskey="c" class="{{$nav.community.2}} desktop-view" href="{{$nav.community.0}}" title="{{$nav.community.3}}">{{$nav.community.1}}</a>
+				<a class="{{$nav.community.2}} mobile-view" href="{{$nav.community.0}}" title="{{$nav.community.3}}"><i class="icon s22 icon-bullseye"></i></a>
 			</li>
 		{{/if}}
 
 		<li role="menu" aria-haspopup="true" id="nav-site-linkmenu" class="nav-menu-icon"><a><span class="icon s22 icon-question"><span class="sr-only">{{$nav.help.3}}</span></span></a>
 			<ul id="nav-site-menu" class="menu-popup">
-				{{if $nav.help}} <li role="menuitem"><a class="{{$nav.help.2}}" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a></li>{{/if}}
-				<li role="menuitem"><a class="{{$nav.about.2}}" href="{{$nav.about.0}}" title="{{$nav.about.3}}" >{{$nav.about.1}}</a></li>
-				{{if $nav.tos}}<a class="{{$nav.tos.2}}" href="{{$nav.tos.0}}" title="{{$nav.tos.3}}" >{{$nav.tos.1}}</a></li>{{/if}}
-				<li role="menuitem"><a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a></li>
+				{{if $nav.help}} <li role="menuitem"><a class="{{$nav.help.2}}" href="{{$nav.help.0}}" title="{{$nav.help.3}}">{{$nav.help.1}}</a></li>{{/if}}
+				<li role="menuitem"><a class="{{$nav.about.2}}" href="{{$nav.about.0}}" title="{{$nav.about.3}}">{{$nav.about.1}}</a></li>
+				{{if $nav.tos}}<a class="{{$nav.tos.2}}" href="{{$nav.tos.0}}" title="{{$nav.tos.3}}">{{$nav.tos.1}}</a></li>{{/if}}
+				<li role="menuitem"><a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}">{{$nav.directory.1}}</a></li>
 			</ul>
 		</li>
 
@@ -80,31 +80,31 @@
 			<li role="menu" aria-haspopup="true" id="nav-user-linkmenu" class="nav-menu">
 				<a accesskey="u" title="{{$sitelocation}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span id="nav-user-linklabel">{{$userinfo.name}}</span><span id="intro-update" class="nav-notification"></span></a>
 				<ul id="nav-user-menu" class="menu-popup">
-					<li role="menuitem"> <a  class="{{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a> </li>
-					{{if $nav.introductions}}<li role="menuitem"><a class="{{$nav.introductions.2}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a><span id="intro-update-li" class="nav-notification"></span></li>{{/if}}
-					{{if $nav.contacts}}<li role="menuitem"><a class="{{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a></li>{{/if}}
-					{{if $nav.messages}}<li role="menuitem"><a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}} <span id="mail-update-li" class="nav-notification"></span></a></li>{{/if}}
+					<li role="menuitem"> <a  class="{{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}">{{$nav.search.1}}</a> </li>
+					{{if $nav.introductions}}<li role="menuitem"><a class="{{$nav.introductions.2}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}">{{$nav.introductions.1}}</a><span id="intro-update-li" class="nav-notification"></span></li>{{/if}}
+					{{if $nav.contacts}}<li role="menuitem"><a class="{{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}">{{$nav.contacts.1}}</a></li>{{/if}}
+					{{if $nav.messages}}<li role="menuitem"><a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}">{{$nav.messages.1}} <span id="mail-update-li" class="nav-notification"></span></a></li>{{/if}}
 					{{if $nav.delegation}}<li role="menuitem"><a class="{{$nav.delegation.2}}" href="{{$nav.delegation.0}}" title="{{$nav.delegation.3}}">{{$nav.delegation.1}}</a></li>{{/if}}
 					{{if $nav.usermenu.1}}<li role="menuitem"><a class="{{$nav.usermenu.1.2}}" href="{{$nav.usermenu.1.0}}" title="{{$nav.usermenu.1.3}}">{{$nav.usermenu.1.1}}</a></li>{{/if}}
 					{{if $nav.settings}}<li role="menuitem"><a class="{{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>{{/if}}
 					{{if $nav.admin}}
 					<li role="menuitem">
-						<a accesskey="a" class="{{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a>
+						<a accesskey="a" class="{{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}">{{$nav.admin.1}}</a>
 					</li>
 					{{/if}}
-					{{if $nav.logout}}<li role="menuitem"><a class="menu-sep {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>{{/if}}
+					{{if $nav.logout}}<li role="menuitem"><a class="menu-sep {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}">{{$nav.logout.1}}</a></li>{{/if}}
 				</ul>
 			</li>
 		{{/if}}
 
 		{{if $nav.login}}
 			<li role="menuitem" id="nav-login-link" class="nav-menu">
-				<a class="{{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a>
+				<a class="{{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}">{{$nav.login.1}}</a>
 			</li>
 		{{/if}}
 		{{if $nav.logout}}
 			<li role="menuitem" id="nav-logout-link" class="nav-menu">
-				<a class="{{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a>
+				<a class="{{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}">{{$nav.logout.1}}</a>
 			</li>
 		{{/if}}
 
@@ -124,13 +124,13 @@
 
 		{{if $nav.admin}}
 			<li role="menuitem" id="nav-admin-link" class="nav-menu">
-				<a accesskey="a" class="{{$nav.admin.2}} icon-sliders" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" ><span class="sr-only">{{$nav.admin.3}}</span></a>
+				<a accesskey="a" class="{{$nav.admin.2}} icon-sliders" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}"><span class="sr-only">{{$nav.admin.3}}</span></a>
 			</li>
 		{{/if}}
 
 		{{if $nav.apps}}
 			<li role="menu" aria-haspopup="true" id="nav-apps-link" class="nav-menu {{$sel.apps}}">
-				<a class=" {{$nav.apps.2}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a>
+				<a class=" {{$nav.apps.2}}" title="{{$nav.apps.3}}">{{$nav.apps.1}}</a>
 				<ul id="nav-apps-menu" class="menu-popup">
 					{{foreach $apps as $ap}}
 					<li role="menuitem">{{$ap nofilter}}</li>
diff --git a/view/theme/vier/templates/wall_item_tag.tpl b/view/theme/vier/templates/wall_item_tag.tpl
index 76e587f00a..01207ab117 100644
--- a/view/theme/vier/templates/wall_item_tag.tpl
+++ b/view/theme/vier/templates/wall_item_tag.tpl
@@ -59,9 +59,9 @@
 
 {{* top thread comment box *}}
 {{if $item.threaded}}{{if $item.comment_html}}{{if $item.thread_level==1}}
-<div class="wall-item-comment-wrapper" >{{$item.comment_html nofilter}}</div>
+<div class="wall-item-comment-wrapper">{{$item.comment_html nofilter}}</div>
 {{/if}}{{/if}}{{/if}}
 
 {{if $item.flatten}}
-<div class="wall-item-comment-wrapper" >{{$item.comment_html nofilter}}</div>
+<div class="wall-item-comment-wrapper">{{$item.comment_html nofilter}}</div>
 {{/if}}
diff --git a/view/theme/vier/templates/wall_thread.tpl b/view/theme/vier/templates/wall_thread.tpl
index f8c54d6ae7..2d7f856c1c 100644
--- a/view/theme/vier/templates/wall_thread.tpl
+++ b/view/theme/vier/templates/wall_thread.tpl
@@ -73,7 +73,7 @@
 		</div>
 
 		<div itemprop="description" class="wall-item-content">
-			{{if $item.title}}<h2><a href="{{$item.plink.href}}" class="{{$item.sparkle}} p-name">{{$item.title}}</a></h2>{{/if}}
+			{{if $item.title}}<h2><a href="{{$item.plink.href}}" class="{{$item.sparkle}} p-name" dir="auto">{{$item.title}}</a></h2>{{/if}}
 			<div class="wall-item-body e-content {{if !$item.title}}p-name{{/if}}" dir="auto">{{$item.body_html nofilter}}</div>
 		</div>
 	</div>
diff --git a/view/theme/vier/templates/widget_forumlist_right.tpl b/view/theme/vier/templates/widget_forumlist_right.tpl
index 088db80b30..23ddaa889d 100644
--- a/view/theme/vier/templates/widget_forumlist_right.tpl
+++ b/view/theme/vier/templates/widget_forumlist_right.tpl
@@ -25,7 +25,7 @@ function showHideForumlist() {
 			<a href="{{$forum.external_url}}" title="{{$forum.link_desc}}" class="label sparkle" target="_blank" rel="noopener noreferrer">
 				<img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc}}" />
 			</a>
-			<a class="forum-widget-link {{if $forum.selected}}forum-selected{{/if}}" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name}}</a>
+			<a class="forum-widget-link {{if $forum.selected}}forum-selected{{/if}}" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}">{{$forum.name}}</a>
 		</li>
 		{{/if}}
 	
@@ -35,7 +35,7 @@ function showHideForumlist() {
 			<a href="{{$forum.external_url}}" title="{{$forum.link_desc}}" class="label sparkle" target="_blank" rel="noopener noreferrer">
 				<img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc}}" />
 			</a>
-			<a class="forum-widget-link {{if $forum.selected}}forum-selected{{/if}}" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name}}</a>
+			<a class="forum-widget-link {{if $forum.selected}}forum-selected{{/if}}" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}">{{$forum.name}}</a>
 		</li>
 		{{/if}}
 		{{/foreach}}