From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sun, 27 Oct 2019 14:09:00 +0000 (-0400)
Subject: Move profile-related templates to sub-folder
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9803c96db4aead03bedac7d17598a829d94c6a46;p=friendica.git

Move profile-related templates to sub-folder
---

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 341727ceef..d9524a7390 100644
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -527,7 +527,7 @@ class Profile
 
 		$p['url'] = Contact::magicLink(($p['url'] ?? '') ?: $profile_url);
 
-		$tpl = Renderer::getMarkupTemplate('profile_vcard.tpl');
+		$tpl = Renderer::getMarkupTemplate('profile/vcard.tpl');
 		$o .= Renderer::replaceMacros($tpl, [
 			'$profile' => $p,
 			'$xmpp' => $xmpp,
@@ -747,8 +747,6 @@ class Profile
 		$uid = intval($a->profile['uid']);
 
 		if ($a->profile['name']) {
-			$tpl = Renderer::getMarkupTemplate('profile_advanced.tpl');
-
 			$profile = [];
 
 			$profile['fullname'] = [DI::l10n()->t('Full Name:'), $a->profile['name']];
@@ -875,6 +873,7 @@ class Profile
 				$profile['edit'] = [DI::baseUrl() . '/profiles/' . $a->profile['id'], DI::l10n()->t('Edit profile'), '', DI::l10n()->t('Edit profile')];
 			}
 
+			$tpl = Renderer::getMarkupTemplate('profile/advanced.tpl');
 			return Renderer::replaceMacros($tpl, [
 				'$title' => DI::l10n()->t('Profile'),
 				'$basic' => DI::l10n()->t('Basic'),
diff --git a/src/Module/Register.php b/src/Module/Register.php
index 8a92b25088..98af06543d 100644
--- a/src/Module/Register.php
+++ b/src/Module/Register.php
@@ -87,7 +87,7 @@ class Register extends BaseModule
 		if (DI::config()->get('system', 'publish_all')) {
 			$profile_publish = '<input type="hidden" name="profile_publish_reg" value="1" />';
 		} else {
-			$publish_tpl = Renderer::getMarkupTemplate('profile_publish.tpl');
+			$publish_tpl = Renderer::getMarkupTemplate('profile/publish.tpl');
 			$profile_publish = Renderer::replaceMacros($publish_tpl, [
 				'$instance'     => 'reg',
 				'$pubdesc'      => DI::l10n()->t('Include your profile in member directory?'),
diff --git a/view/templates/profile/advanced.tpl b/view/templates/profile/advanced.tpl
new file mode 100644
index 0000000000..44e763f393
--- /dev/null
+++ b/view/templates/profile/advanced.tpl
@@ -0,0 +1,184 @@
+
+{{include file="section_title.tpl"}}
+
+<dl id="aprofile-fullname" class="aprofile">
+ <dt>{{$profile.fullname.0}}</dt>
+ <dd>{{$profile.fullname.1}}</dd>
+</dl>
+
+{{if $profile.membersince}}
+<dl id="aprofile-membersince" class="aprofile">
+ <dt>{{$profile.membersince.0}}</dt>
+ <dd>{{$profile.membersince.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.gender}}
+<dl id="aprofile-gender" class="aprofile">
+ <dt>{{$profile.gender.0}}</dt>
+ <dd>{{$profile.gender.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.birthday}}
+<dl id="aprofile-birthday" class="aprofile">
+ <dt>{{$profile.birthday.0}}</dt>
+ <dd>{{$profile.birthday.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.age}}
+<dl id="aprofile-age" class="aprofile">
+ <dt>{{$profile.age.0}}</dt>
+ <dd>{{$profile.age.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.marital}}
+<dl id="aprofile-marital" class="aprofile">
+ <dt><span class="heart">&hearts;</span>  {{$profile.marital.0}}</dt>
+ <dd>{{$profile.marital.1}}{{if $profile.marital.with}} ({{$profile.marital.with nofilter}}){{/if}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.sexual}}
+<dl id="aprofile-sexual" class="aprofile">
+ <dt>{{$profile.sexual.0}}</dt>
+ <dd>{{$profile.sexual.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.pub_keywords}}
+<dl id="aprofile-tags" class="aprofile">
+ <dt>{{$profile.pub_keywords.0}}</dt>
+ <dd>{{$profile.pub_keywords.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.homepage}}
+<dl id="aprofile-homepage" class="aprofile">
+ <dt>{{$profile.homepage.0}}</dt>
+ <dd>{{$profile.homepage.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.hometown}}
+<dl id="aprofile-hometown" class="aprofile">
+ <dt>{{$profile.hometown.0}}</dt>
+ <dd>{{$profile.hometown.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.politic}}
+<dl id="aprofile-politic" class="aprofile">
+ <dt>{{$profile.politic.0}}</dt>
+ <dd>{{$profile.politic.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.religion}}
+<dl id="aprofile-religion" class="aprofile">
+ <dt>{{$profile.religion.0}}</dt>
+ <dd>{{$profile.religion.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.about}}
+<dl id="aprofile-about" class="aprofile">
+ <dt>{{$profile.about.0}}</dt>
+ <dd>{{$profile.about.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.interest}}
+<dl id="aprofile-interest" class="aprofile">
+ <dt>{{$profile.interest.0}}</dt>
+ <dd>{{$profile.interest.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.likes}}
+<dl id="aprofile-likes" class="aprofile">
+ <dt>{{$profile.likes.0}}</dt>
+ <dd>{{$profile.likes.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.dislikes}}
+<dl id="aprofile-dislikes" class="aprofile">
+ <dt>{{$profile.dislikes.0}}</dt>
+ <dd>{{$profile.dislikes.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.contact}}
+<dl id="aprofile-contact" class="aprofile">
+ <dt>{{$profile.contact.0}}</dt>
+ <dd>{{$profile.contact.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+
+{{if $profile.music}}
+<dl id="aprofile-music" class="aprofile">
+ <dt>{{$profile.music.0}}</dt>
+ <dd>{{$profile.music.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+
+{{if $profile.book}}
+<dl id="aprofile-book" class="aprofile">
+ <dt>{{$profile.book.0}}</dt>
+ <dd>{{$profile.book.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+
+{{if $profile.tv}}
+<dl id="aprofile-tv" class="aprofile">
+ <dt>{{$profile.tv.0}}</dt>
+ <dd>{{$profile.tv.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+
+{{if $profile.film}}
+<dl id="aprofile-film" class="aprofile">
+ <dt>{{$profile.film.0}}</dt>
+ <dd>{{$profile.film.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+
+{{if $profile.romance}}
+<dl id="aprofile-romance" class="aprofile">
+ <dt>{{$profile.romance.0}}</dt>
+ <dd>{{$profile.romance.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+
+{{if $profile.work}}
+<dl id="aprofile-work" class="aprofile">
+ <dt>{{$profile.work.0}}</dt>
+ <dd>{{$profile.work.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.education}}
+<dl id="aprofile-education" class="aprofile">
+ <dt>{{$profile.education.0}}</dt>
+ <dd>{{$profile.education.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+
+{{if $profile.forumlist}}
+<dl id="aprofile-forumlist" class="aprofile">
+ <dt>{{$profile.forumlist.0}}</dt>
+ <dd>{{$profile.forumlist.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+
diff --git a/view/templates/profile/publish.tpl b/view/templates/profile/publish.tpl
new file mode 100644
index 0000000000..a62292ff56
--- /dev/null
+++ b/view/templates/profile/publish.tpl
@@ -0,0 +1,17 @@
+
+<p id="profile-publish-desc-{{$instance}}">
+{{$pubdesc}}
+</p>
+
+		<div id="profile-publish-yes-wrapper-{{$instance}}">
+		<label id="profile-publish-yes-label-{{$instance}}" for="profile-publish-yes-{{$instance}}">{{$str_yes}}</label>
+		<input type="radio" name="profile_publish_{{$instance}}" id="profile-publish-yes-{{$instance}}" {{$yes_selected}} value="1" />
+
+		<div id="profile-publish-break-{{$instance}}" ></div>	
+		</div>
+		<div id="profile-publish-no-wrapper-{{$instance}}">
+		<label id="profile-publish-no-label-{{$instance}}" for="profile-publish-no-{{$instance}}">{{$str_no}}</label>
+		<input type="radio" name="profile_publish_{{$instance}}" id="profile-publish-no-{{$instance}}" {{$no_selected}} value="0"  />
+
+		<div id="profile-publish-end-{{$instance}}"></div>
+		</div>
diff --git a/view/templates/profile/vcard.tpl b/view/templates/profile/vcard.tpl
new file mode 100644
index 0000000000..1ee3302669
--- /dev/null
+++ b/view/templates/profile/vcard.tpl
@@ -0,0 +1,74 @@
+
+<div class="vcard h-card">
+
+	<div class="fn label p-name">{{$profile.name}}</div>
+	
+	{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
+	
+	{{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
+
+	{{if $profile.picdate}}
+		<div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></a></div>
+	{{else}}
+		<div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}" alt="{{$profile.name}}"></a></div>
+	{{/if}}
+	{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
+	{{if $profile.network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_link nofilter}}</dd></dl>{{/if}}
+	{{if $location}}
+		<dl class="location"><dt class="location-label">{{$location}}</dt> 
+		<dd class="adr h-adr">
+			{{if $profile.address}}<div class="street-address p-street-address">{{$profile.address nofilter}}</div>{{/if}}
+			<span class="city-state-zip">
+				<span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+				<span class="region p-region">{{$profile.region}}</span>
+				<span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
+			</span>
+			{{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
+		</dd>
+		</dl>
+	{{/if}}
+
+	{{if $profile.xmpp}}
+		<dl class="xmpp">
+		<dt class="xmpp-label">{{$xmpp}}</dt>
+		<dd class="xmpp-data">{{$profile.xmpp}}</dd>
+		</dl>
+	{{/if}}
+
+	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{$profile.gender}}</dd></dl>{{/if}}
+	
+	{{if $profile.pubkey}}<div class="key u-key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
+
+	{{if $contacts}}<div class="contacts" style="display:none;">{{$contacts}}</div>{{/if}}
+
+	{{if $updated}}<div class="updated" style="display:none;">{{$updated}}</div>{{/if}}
+
+	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
+
+	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank">{{$profile.homepage}}</a></dd></dl>{{/if}}
+
+	{{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about nofilter}}</dd></dl>{{/if}}
+
+	{{include file="diaspora_vcard.tpl"}}
+
+	<div id="profile-extra-links">
+		<ul>
+			{{if $unfollow_link}}
+				<li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
+			{{/if}}
+			{{if $follow_link}}
+				<li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
+			{{/if}}
+			{{if $wallmessage_link}}
+				<li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
+			{{/if}}
+			{{if $subscribe_feed_link}}
+				<li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
+			{{/if}}
+		</ul>
+	</div>
+</div>
+
+{{$contact_block nofilter}}
+
+
diff --git a/view/templates/profile_advanced.tpl b/view/templates/profile_advanced.tpl
deleted file mode 100644
index 44e763f393..0000000000
--- a/view/templates/profile_advanced.tpl
+++ /dev/null
@@ -1,184 +0,0 @@
-
-{{include file="section_title.tpl"}}
-
-<dl id="aprofile-fullname" class="aprofile">
- <dt>{{$profile.fullname.0}}</dt>
- <dd>{{$profile.fullname.1}}</dd>
-</dl>
-
-{{if $profile.membersince}}
-<dl id="aprofile-membersince" class="aprofile">
- <dt>{{$profile.membersince.0}}</dt>
- <dd>{{$profile.membersince.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.gender}}
-<dl id="aprofile-gender" class="aprofile">
- <dt>{{$profile.gender.0}}</dt>
- <dd>{{$profile.gender.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.birthday}}
-<dl id="aprofile-birthday" class="aprofile">
- <dt>{{$profile.birthday.0}}</dt>
- <dd>{{$profile.birthday.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.age}}
-<dl id="aprofile-age" class="aprofile">
- <dt>{{$profile.age.0}}</dt>
- <dd>{{$profile.age.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.marital}}
-<dl id="aprofile-marital" class="aprofile">
- <dt><span class="heart">&hearts;</span>  {{$profile.marital.0}}</dt>
- <dd>{{$profile.marital.1}}{{if $profile.marital.with}} ({{$profile.marital.with nofilter}}){{/if}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.sexual}}
-<dl id="aprofile-sexual" class="aprofile">
- <dt>{{$profile.sexual.0}}</dt>
- <dd>{{$profile.sexual.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.pub_keywords}}
-<dl id="aprofile-tags" class="aprofile">
- <dt>{{$profile.pub_keywords.0}}</dt>
- <dd>{{$profile.pub_keywords.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.homepage}}
-<dl id="aprofile-homepage" class="aprofile">
- <dt>{{$profile.homepage.0}}</dt>
- <dd>{{$profile.homepage.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.hometown}}
-<dl id="aprofile-hometown" class="aprofile">
- <dt>{{$profile.hometown.0}}</dt>
- <dd>{{$profile.hometown.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.politic}}
-<dl id="aprofile-politic" class="aprofile">
- <dt>{{$profile.politic.0}}</dt>
- <dd>{{$profile.politic.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.religion}}
-<dl id="aprofile-religion" class="aprofile">
- <dt>{{$profile.religion.0}}</dt>
- <dd>{{$profile.religion.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.about}}
-<dl id="aprofile-about" class="aprofile">
- <dt>{{$profile.about.0}}</dt>
- <dd>{{$profile.about.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.interest}}
-<dl id="aprofile-interest" class="aprofile">
- <dt>{{$profile.interest.0}}</dt>
- <dd>{{$profile.interest.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.likes}}
-<dl id="aprofile-likes" class="aprofile">
- <dt>{{$profile.likes.0}}</dt>
- <dd>{{$profile.likes.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.dislikes}}
-<dl id="aprofile-dislikes" class="aprofile">
- <dt>{{$profile.dislikes.0}}</dt>
- <dd>{{$profile.dislikes.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.contact}}
-<dl id="aprofile-contact" class="aprofile">
- <dt>{{$profile.contact.0}}</dt>
- <dd>{{$profile.contact.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.music}}
-<dl id="aprofile-music" class="aprofile">
- <dt>{{$profile.music.0}}</dt>
- <dd>{{$profile.music.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.book}}
-<dl id="aprofile-book" class="aprofile">
- <dt>{{$profile.book.0}}</dt>
- <dd>{{$profile.book.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.tv}}
-<dl id="aprofile-tv" class="aprofile">
- <dt>{{$profile.tv.0}}</dt>
- <dd>{{$profile.tv.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.film}}
-<dl id="aprofile-film" class="aprofile">
- <dt>{{$profile.film.0}}</dt>
- <dd>{{$profile.film.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.romance}}
-<dl id="aprofile-romance" class="aprofile">
- <dt>{{$profile.romance.0}}</dt>
- <dd>{{$profile.romance.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.work}}
-<dl id="aprofile-work" class="aprofile">
- <dt>{{$profile.work.0}}</dt>
- <dd>{{$profile.work.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.education}}
-<dl id="aprofile-education" class="aprofile">
- <dt>{{$profile.education.0}}</dt>
- <dd>{{$profile.education.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.forumlist}}
-<dl id="aprofile-forumlist" class="aprofile">
- <dt>{{$profile.forumlist.0}}</dt>
- <dd>{{$profile.forumlist.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-
diff --git a/view/templates/profile_publish.tpl b/view/templates/profile_publish.tpl
deleted file mode 100644
index a62292ff56..0000000000
--- a/view/templates/profile_publish.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-
-<p id="profile-publish-desc-{{$instance}}">
-{{$pubdesc}}
-</p>
-
-		<div id="profile-publish-yes-wrapper-{{$instance}}">
-		<label id="profile-publish-yes-label-{{$instance}}" for="profile-publish-yes-{{$instance}}">{{$str_yes}}</label>
-		<input type="radio" name="profile_publish_{{$instance}}" id="profile-publish-yes-{{$instance}}" {{$yes_selected}} value="1" />
-
-		<div id="profile-publish-break-{{$instance}}" ></div>	
-		</div>
-		<div id="profile-publish-no-wrapper-{{$instance}}">
-		<label id="profile-publish-no-label-{{$instance}}" for="profile-publish-no-{{$instance}}">{{$str_no}}</label>
-		<input type="radio" name="profile_publish_{{$instance}}" id="profile-publish-no-{{$instance}}" {{$no_selected}} value="0"  />
-
-		<div id="profile-publish-end-{{$instance}}"></div>
-		</div>
diff --git a/view/templates/profile_vcard.tpl b/view/templates/profile_vcard.tpl
deleted file mode 100644
index 1ee3302669..0000000000
--- a/view/templates/profile_vcard.tpl
+++ /dev/null
@@ -1,74 +0,0 @@
-
-<div class="vcard h-card">
-
-	<div class="fn label p-name">{{$profile.name}}</div>
-	
-	{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
-	
-	{{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
-
-	{{if $profile.picdate}}
-		<div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></a></div>
-	{{else}}
-		<div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}" alt="{{$profile.name}}"></a></div>
-	{{/if}}
-	{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
-	{{if $profile.network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_link nofilter}}</dd></dl>{{/if}}
-	{{if $location}}
-		<dl class="location"><dt class="location-label">{{$location}}</dt> 
-		<dd class="adr h-adr">
-			{{if $profile.address}}<div class="street-address p-street-address">{{$profile.address nofilter}}</div>{{/if}}
-			<span class="city-state-zip">
-				<span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-				<span class="region p-region">{{$profile.region}}</span>
-				<span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
-			</span>
-			{{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
-		</dd>
-		</dl>
-	{{/if}}
-
-	{{if $profile.xmpp}}
-		<dl class="xmpp">
-		<dt class="xmpp-label">{{$xmpp}}</dt>
-		<dd class="xmpp-data">{{$profile.xmpp}}</dd>
-		</dl>
-	{{/if}}
-
-	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{$profile.gender}}</dd></dl>{{/if}}
-	
-	{{if $profile.pubkey}}<div class="key u-key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
-
-	{{if $contacts}}<div class="contacts" style="display:none;">{{$contacts}}</div>{{/if}}
-
-	{{if $updated}}<div class="updated" style="display:none;">{{$updated}}</div>{{/if}}
-
-	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
-
-	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank">{{$profile.homepage}}</a></dd></dl>{{/if}}
-
-	{{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about nofilter}}</dd></dl>{{/if}}
-
-	{{include file="diaspora_vcard.tpl"}}
-
-	<div id="profile-extra-links">
-		<ul>
-			{{if $unfollow_link}}
-				<li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
-			{{/if}}
-			{{if $follow_link}}
-				<li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
-			{{/if}}
-			{{if $wallmessage_link}}
-				<li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
-			{{/if}}
-			{{if $subscribe_feed_link}}
-				<li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
-			{{/if}}
-		</ul>
-	</div>
-</div>
-
-{{$contact_block nofilter}}
-
-
diff --git a/view/theme/duepuntozero/templates/profile/vcard.tpl b/view/theme/duepuntozero/templates/profile/vcard.tpl
new file mode 100644
index 0000000000..3c933c8333
--- /dev/null
+++ b/view/theme/duepuntozero/templates/profile/vcard.tpl
@@ -0,0 +1,60 @@
+
+<div class="vcard h-card">
+
+	<div class="fn label p-name">{{$profile.name}}</div>
+	
+	{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
+	
+	{{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
+	<div id="profile-photo-wrapper"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
+
+	{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
+
+	{{if $profile.network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_link nofilter}}</dd></dl>{{/if}}
+
+	{{if $location}}
+		<dl class="location"><dt class="location-label">{{$location}}</dt> 
+		<dd class="adr h-adr">
+			{{if $profile.address}}<div class="street-address p-street-address">{{$profile.address nofilter}}</div>{{/if}}
+			<span class="city-state-zip">
+				<span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+				<span class="region p-region">{{$profile.region}}</span>
+				<span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
+			</span>
+			{{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
+		</dd>
+		</dl>
+	{{/if}}
+
+	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{$profile.gender}}</dd></dl>{{/if}}
+	
+	{{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
+
+	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
+
+	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
+
+	{{include file="diaspora_vcard.tpl"}}
+
+	<div id="profile-vcard-break"></div>
+	<div id="profile-extra-links">
+		<ul>
+			{{if $unfollow_link}}
+				<li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
+			{{/if}}
+			{{if $follow_link}}
+				<li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
+			{{/if}}
+			{{if $wallmessage_link}}
+				<li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
+			{{/if}}
+			{{if $subscribe_feed_link}}
+				<li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
+			{{/if}}
+		</ul>
+	</div>
+</div>
+
+{{$contact_block nofilter}}
+
+
diff --git a/view/theme/duepuntozero/templates/profile_vcard.tpl b/view/theme/duepuntozero/templates/profile_vcard.tpl
deleted file mode 100644
index 3c933c8333..0000000000
--- a/view/theme/duepuntozero/templates/profile_vcard.tpl
+++ /dev/null
@@ -1,60 +0,0 @@
-
-<div class="vcard h-card">
-
-	<div class="fn label p-name">{{$profile.name}}</div>
-	
-	{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
-	
-	{{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
-	<div id="profile-photo-wrapper"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
-
-	{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
-
-	{{if $profile.network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_link nofilter}}</dd></dl>{{/if}}
-
-	{{if $location}}
-		<dl class="location"><dt class="location-label">{{$location}}</dt> 
-		<dd class="adr h-adr">
-			{{if $profile.address}}<div class="street-address p-street-address">{{$profile.address nofilter}}</div>{{/if}}
-			<span class="city-state-zip">
-				<span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-				<span class="region p-region">{{$profile.region}}</span>
-				<span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
-			</span>
-			{{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
-		</dd>
-		</dl>
-	{{/if}}
-
-	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{$profile.gender}}</dd></dl>{{/if}}
-	
-	{{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
-
-	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
-
-	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
-
-	{{include file="diaspora_vcard.tpl"}}
-
-	<div id="profile-vcard-break"></div>
-	<div id="profile-extra-links">
-		<ul>
-			{{if $unfollow_link}}
-				<li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
-			{{/if}}
-			{{if $follow_link}}
-				<li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
-			{{/if}}
-			{{if $wallmessage_link}}
-				<li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
-			{{/if}}
-			{{if $subscribe_feed_link}}
-				<li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
-			{{/if}}
-		</ul>
-	</div>
-</div>
-
-{{$contact_block nofilter}}
-
-
diff --git a/view/theme/frio/templates/profile/advanced.tpl b/view/theme/frio/templates/profile/advanced.tpl
new file mode 100644
index 0000000000..3ca4000e6a
--- /dev/null
+++ b/view/theme/frio/templates/profile/advanced.tpl
@@ -0,0 +1,234 @@
+<div id="profile-page" class="generic-page-wrapper">
+	<h3 class="">{{$title}}</h3>
+
+	{{* The link to edit the profile*}}
+	{{if $profile.edit}}
+	<ul class="nav nav-pills preferences">
+		<li class="pull-right">
+			<a class="btn btn-link btn-sm" type="button" id="profile-edit-link" href="{{$profile.edit.0}}" title="{{$profile.edit.3}}">
+				<i class="fa fa-pencil-square-o" aria-hidden="true"></i>&nbsp;{{$profile.edit.1}}
+			</a>
+		</li>
+	</ul>
+	<div class="clear"></div>
+	{{/if}}
+
+	{{* Frio does split the profile information in "standard" and "advanced". This is the tab menu for swithching between this modes *}}
+	<ul id="profile-menu" class="nav nav-tabs" role="tablist">
+		<li role="presentation" class="active">
+			<a href="#profile-content-standard" aria-controls="profile-content-standard" role="tab" data-toggle="tab">{{$basic}}</a>
+		</li>
+		<li role="presentation">
+			<a href="#profile-content-advanced" aria-controls="profile-content-advanced" role="tab" data-toggle="tab">{{$advanced}}</a>
+		</li>
+	</ul>
+
+	<div class="tab-content">
+		<div role="tabpanel" class="tab-pane active" id="profile-content-standard">
+			<div id="aprofile-fullname" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.fullname.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.fullname.1}}</div>
+			</div>
+
+			{{if $profile.membersince}}
+			<div id="aprofile-membersince" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.membersince.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.membersince.1}}</div>
+			</div>
+			{{/if}}
+
+			{{if $profile.gender}}
+			<div id="aprofile-gender" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.gender.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.gender.1}}</div>
+			</div>
+			{{/if}}
+
+			{{if $profile.birthday}}
+			<div id="aprofile-birthday" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.birthday.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.birthday.1}}</div>
+			</div>
+			{{/if}}
+
+			{{if $profile.age}}
+			<div id="aprofile-age" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.age.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.age.1}}</div>
+			</div>
+			{{/if}}
+
+			{{if $profile.hometown}}
+			<div id="aprofile-hometown" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.hometown.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.hometown.1}}</div>
+			</div>
+			{{/if}}
+
+			{{if $profile.marital}}
+			<div id="aprofile-marital" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted"><span class="heart">&hearts;</span>  {{$profile.marital.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.marital.1}}{{if $profile.marital.with}} ({{$profile.marital.with nofilter}}){{/if}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}</div>
+			</div>
+			{{/if}}
+
+			{{if $profile.homepage}}
+			<div id="aprofile-homepage" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.homepage.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.homepage.1 nofilter}}</div>
+			</div>
+			{{/if}}
+
+			{{if $profile.about}}
+			<div id="aprofile-about" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.about.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.about.1 nofilter}}</div>
+			</div>
+			{{/if}}
+
+			{{if $profile.pub_keywords}}
+			<div id="aprofile-tags" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.pub_keywords.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.pub_keywords.1}}</div>
+			</div>
+			{{/if}}
+		</div>
+
+		<div role="tabpanel" class="tab-pane advanced" id="profile-content-advanced">
+			{{if $profile.sexual}}
+			<div id="aprofile-sexual" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.sexual.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.sexual.1}}</div>
+			</div>
+			{{/if}}
+
+			{{if $profile.politic}}
+			<div id="aprofile-politic" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.politic.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.politic.1}}</div>
+			</div>
+			{{/if}}
+
+			{{if $profile.religion}}
+			<div id="aprofile-religion" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.religion.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.religion.1}}</div>
+			</div>
+			{{/if}}
+
+
+			{{if $profile.interest}}
+			<div id="aprofile-interest" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.interest.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.interest.1 nofilter}}</div>
+			</div>
+			{{/if}}
+
+			{{if $profile.likes}}
+			<div id="aprofile-likes" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.likes.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.likes.1 nofilter}}</div>
+			</div>
+			{{/if}}
+
+			{{if $profile.dislikes}}
+			<div id="aprofile-dislikes" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.dislikes.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.dislikes.1 nofilter}}</div>
+			</div>
+			{{/if}}
+
+			{{if $profile.contact}}
+			<div id="aprofile-contact" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.contact.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.contact.1 nofilter}}</div>
+			</div>
+			{{/if}}
+
+			{{if $profile.music}}
+			<div id="aprofile-music" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.music.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.music.1 nofilter}}</div>
+			</div>
+			{{/if}}
+
+
+			{{if $profile.book}}
+			<div id="aprofile-book" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.book.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.book.1 nofilter}}</div>
+			</div>
+			{{/if}}
+
+
+			{{if $profile.tv}}
+			<div id="aprofile-tv" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.tv.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.tv.1 nofilter}}</div>
+			</div>
+			{{/if}}
+
+
+			{{if $profile.film}}
+			<div id="aprofile-film" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.film.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.film.1 nofilter}}</div>
+			</div>
+			{{/if}}
+
+
+			{{if $profile.romance}}
+			<div id="aprofile-romance" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.romance.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.romance.1 nofilter}}</div>
+			</div>
+			{{/if}}
+
+
+			{{if $profile.work}}
+			<div id="aprofile-work" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+			<hr class="profile-separator">
+			<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.work.0}}</div>
+			<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.work.1 nofilter}}</div>
+			</div>
+			{{/if}}
+
+			{{if $profile.education}}
+			<div id="aprofile-education" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.education.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.education.1 nofilter}}</div>
+			</div>
+			{{/if}}
+
+			{{if $profile.forumlist}}
+			<div id="aprofile-forumlist" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
+				<hr class="profile-separator">
+				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.forumlist.0}}</div>
+				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.forumlist.1 nofilter}}</div>
+			</div>
+			{{/if}}
+		</div>
+	</div>
+</div>
diff --git a/view/theme/frio/templates/profile/publish.tpl b/view/theme/frio/templates/profile/publish.tpl
new file mode 100644
index 0000000000..bf14cf58ab
--- /dev/null
+++ b/view/theme/frio/templates/profile/publish.tpl
@@ -0,0 +1,23 @@
+
+<div id="profile-publish-wrapper">
+	<h5 id="profile-publish-desc-{{$instance}}">
+	{{$pubdesc}}
+	</h5>
+
+	<div id="profile-publish-yes-wrapper-{{$instance}}" class="field radio">
+		<div class="radio">
+			<input type="radio" name="profile_publish_{{$instance}}" id="profile-publish-yes-{{$instance}}" {{$yes_selected}} value="1"/>
+			<label id="profile-publish-yes-label-{{$instance}}" for="profile-publish-yes-{{$instance}}">{{$str_yes}}</label>
+		</div>
+		<div id="profile-publish-break-{{$instance}}"></div>
+	</div>
+
+	<div id="profile-publish-no-wrapper-{{$instance}}" class="field radio">
+		<div class="radio">
+			<input type="radio" name="profile_publish_{{$instance}}" id="profile-publish-no-{{$instance}}" {{$no_selected}} value="0"/>
+			<label id="profile-publish-no-label-{{$instance}}" for="profile-publish-no-{{$instance}}">{{$str_no}}</label>
+		</div>
+
+		<div id="profile-publish-end-{{$instance}}"></div>
+	</div>
+</div>
diff --git a/view/theme/frio/templates/profile/vcard.tpl b/view/theme/frio/templates/profile/vcard.tpl
new file mode 100644
index 0000000000..1673a9c999
--- /dev/null
+++ b/view/theme/frio/templates/profile/vcard.tpl
@@ -0,0 +1,142 @@
+<div class="vcard h-card widget">
+
+	<div id="profile-photo-wrapper">
+		{{if $profile.picdate}}
+		<a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></a>
+		{{else}}
+		<a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}" alt="{{$profile.name}}" /></a>
+		{{/if}}
+
+		<div class="tool visible-lg visible-md">
+			{{if $profile.edit}}
+			<div class="action">
+				<a class="" href="{{$profile.edit.0}}" title="{{$profile.edit.3}}"><i class="fa fa-pencil-square-o"></i></a>
+			</div>
+			{{else}}
+				{{if $profile.menu}}
+				<div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="{{$editprofile}}" href="profiles" ></a></div>
+				{{/if}}
+			{{/if}}
+		</div>
+
+	</div>
+
+	{{* The short information which will appended to the second navbar by scrollspy *}}
+	<div id="vcard-short-info-wrapper" style="display: none;">
+		<div id="vcard-short-info" class="media" style="display: none">
+			<div id="vcard-short-photo-wrapper" class="pull-left">
+				{{if $profile.picdate}}
+				<img class="media-object" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></a>
+				{{else}}
+				<img class="media-object" src="{{$profile.photo}}" alt="{{$profile.name}}"></a>
+				{{/if}}
+			</div>
+
+			<div id="vcard-short-desc" class="media-body">
+				<h4 class="media-heading">{{$profile.name}}</h4>
+				{{if $profile.addr}}<div class="vcard-short-addr">{{$profile.addr}}</div>{{/if}}
+			</div>
+		</div>
+	</div>
+
+	<div class="panel-body">
+		<div class="profile-header">
+			<h3 class="fn p-name">{{$profile.name}}</h3>
+
+			{{if $profile.addr}}<div class="p-addr">{{include file="sub/punct_wrap.tpl" text=$profile.addr}}</div>{{/if}}
+
+			{{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
+
+			{{if $account_type}}<div class="account-type">({{$account_type}})</div>{{/if}}
+		</div>
+
+		{{if $follow_link || $unfollow_link || $wallmessage_link}}
+		<div id="profile-extra-links">
+			{{if $follow_link || $unfollow_link}}
+			<div id="dfrn-request-link-button">
+				{{if $unfollow_link}}
+				<a id="dfrn-request-link" class="btn btn-labeled btn-primary btn-sm" href="{{$unfollow_link}}">
+					<span class=""><i class="fa fa-user-times"></i></span>
+					<span class="">{{$unfollow}}</span>
+				</a>
+				{{else}}
+				<a id="dfrn-request-link" class="btn btn-labeled btn-primary btn-sm" href="{{$follow_link}}">
+					<span class=""><i class="fa fa-user-plus"></i></span>
+					<span class="">{{$follow}}</span>
+				</a>
+				{{/if}}
+			</div>
+			{{/if}}
+			{{if $wallmessage_link}}
+			<div id="wallmessage-link-botton">
+				<button type="button" id="wallmessage-link" class="btn btn-labeled btn-primary btn-sm" onclick="openWallMessage('{{$wallmessage_link}}')">
+					<span class=""><i class="fa fa-envelope"></i></span>
+					<span class="">{{$wallmessage}}</span>
+				</button>
+			</div>
+			{{/if}}
+		</div>
+		{{/if}}
+
+		<div class="clear"></div>
+
+		{{if $location}}
+		<div class="location detail">
+			<span class="location-label icon"><i class="fa fa-map-marker"></i></span>
+			<span class="adr">
+				{{if $profile.address}}<span class="street-address p-street-address">{{$profile.address nofilter}}</span>{{/if}}
+				<span class="city-state-zip">
+					<span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+					<span class="region p-region">{{$profile.region}}</span>
+					<span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
+				</span>
+				{{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
+			</span>
+		</div>
+		{{/if}}
+
+		{{if $profile.xmpp}}
+		<div class="xmpp">
+			<span class="xmpp-label icon"><i class="fa fa-comments"></i></span>
+			<span class="xmpp-data"><a href="xmpp:{{$profile.xmpp}}" rel="me" target="_blank">{{include file="sub/punct_wrap.tpl" text=$profile.xmpp}}</a></span>
+		</div>
+		{{/if}}
+
+		{{if $gender}}
+		<div class="mf detail">
+			<span class="gender-label icon"><i class="fa fa-venus-mars"></i></span>
+			<span class="p-gender">{{$profile.gender}}</span>
+		</div>
+		{{/if}}
+
+		{{if $profile.pubkey}}<div class="key u-key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
+
+		{{if $contacts}}<div class="contacts" style="display:none;">{{$contacts}}</div>{{/if}}
+
+		{{if $updated}}<div class="updated" style="display:none;">{{$updated}}</div>{{/if}}
+
+		{{if $marital}}
+		<div class="marital detail">
+			<span class="marital-label icon"><i class="fa fa-heart"></i></span>
+			<span class="marital-text icon">{{$profile.marital}}</span>
+		</div>
+		{{/if}}
+
+		{{if $homepage}}
+		<div class="homepage detail">
+			<span class="homepage-label icon"><i class="fa fa-external-link-square"></i></span>
+			<span class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank">{{include file="sub/punct_wrap.tpl" text=$profile.homepage}}</a></span>
+		</div>
+		{{/if}}
+
+		{{if $about}}<dl class="about"  style="display:none;"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about nofilter}}</dd></dl>{{/if}}
+
+		{{include file="diaspora_vcard.tpl"}}
+	</div>
+</div>
+
+{{if $contact_block}}
+<div class="widget" id="widget-contacts">
+	{{$contact_block nofilter}}
+</div>
+{{/if}}
diff --git a/view/theme/frio/templates/profile_advanced.tpl b/view/theme/frio/templates/profile_advanced.tpl
deleted file mode 100644
index 3ca4000e6a..0000000000
--- a/view/theme/frio/templates/profile_advanced.tpl
+++ /dev/null
@@ -1,234 +0,0 @@
-<div id="profile-page" class="generic-page-wrapper">
-	<h3 class="">{{$title}}</h3>
-
-	{{* The link to edit the profile*}}
-	{{if $profile.edit}}
-	<ul class="nav nav-pills preferences">
-		<li class="pull-right">
-			<a class="btn btn-link btn-sm" type="button" id="profile-edit-link" href="{{$profile.edit.0}}" title="{{$profile.edit.3}}">
-				<i class="fa fa-pencil-square-o" aria-hidden="true"></i>&nbsp;{{$profile.edit.1}}
-			</a>
-		</li>
-	</ul>
-	<div class="clear"></div>
-	{{/if}}
-
-	{{* Frio does split the profile information in "standard" and "advanced". This is the tab menu for swithching between this modes *}}
-	<ul id="profile-menu" class="nav nav-tabs" role="tablist">
-		<li role="presentation" class="active">
-			<a href="#profile-content-standard" aria-controls="profile-content-standard" role="tab" data-toggle="tab">{{$basic}}</a>
-		</li>
-		<li role="presentation">
-			<a href="#profile-content-advanced" aria-controls="profile-content-advanced" role="tab" data-toggle="tab">{{$advanced}}</a>
-		</li>
-	</ul>
-
-	<div class="tab-content">
-		<div role="tabpanel" class="tab-pane active" id="profile-content-standard">
-			<div id="aprofile-fullname" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.fullname.0}}</div>
-				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.fullname.1}}</div>
-			</div>
-
-			{{if $profile.membersince}}
-			<div id="aprofile-membersince" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-				<hr class="profile-separator">
-				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.membersince.0}}</div>
-				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.membersince.1}}</div>
-			</div>
-			{{/if}}
-
-			{{if $profile.gender}}
-			<div id="aprofile-gender" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-				<hr class="profile-separator">
-				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.gender.0}}</div>
-				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.gender.1}}</div>
-			</div>
-			{{/if}}
-
-			{{if $profile.birthday}}
-			<div id="aprofile-birthday" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-				<hr class="profile-separator">
-				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.birthday.0}}</div>
-				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.birthday.1}}</div>
-			</div>
-			{{/if}}
-
-			{{if $profile.age}}
-			<div id="aprofile-age" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-				<hr class="profile-separator">
-				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.age.0}}</div>
-				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.age.1}}</div>
-			</div>
-			{{/if}}
-
-			{{if $profile.hometown}}
-			<div id="aprofile-hometown" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-				<hr class="profile-separator">
-				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.hometown.0}}</div>
-				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.hometown.1}}</div>
-			</div>
-			{{/if}}
-
-			{{if $profile.marital}}
-			<div id="aprofile-marital" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-				<hr class="profile-separator">
-				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted"><span class="heart">&hearts;</span>  {{$profile.marital.0}}</div>
-				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.marital.1}}{{if $profile.marital.with}} ({{$profile.marital.with nofilter}}){{/if}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}</div>
-			</div>
-			{{/if}}
-
-			{{if $profile.homepage}}
-			<div id="aprofile-homepage" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-				<hr class="profile-separator">
-				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.homepage.0}}</div>
-				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.homepage.1 nofilter}}</div>
-			</div>
-			{{/if}}
-
-			{{if $profile.about}}
-			<div id="aprofile-about" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-				<hr class="profile-separator">
-				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.about.0}}</div>
-				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.about.1 nofilter}}</div>
-			</div>
-			{{/if}}
-
-			{{if $profile.pub_keywords}}
-			<div id="aprofile-tags" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-				<hr class="profile-separator">
-				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.pub_keywords.0}}</div>
-				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.pub_keywords.1}}</div>
-			</div>
-			{{/if}}
-		</div>
-
-		<div role="tabpanel" class="tab-pane advanced" id="profile-content-advanced">
-			{{if $profile.sexual}}
-			<div id="aprofile-sexual" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-				<hr class="profile-separator">
-				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.sexual.0}}</div>
-				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.sexual.1}}</div>
-			</div>
-			{{/if}}
-
-			{{if $profile.politic}}
-			<div id="aprofile-politic" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-				<hr class="profile-separator">
-				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.politic.0}}</div>
-				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.politic.1}}</div>
-			</div>
-			{{/if}}
-
-			{{if $profile.religion}}
-			<div id="aprofile-religion" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-				<hr class="profile-separator">
-				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.religion.0}}</div>
-				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.religion.1}}</div>
-			</div>
-			{{/if}}
-
-
-			{{if $profile.interest}}
-			<div id="aprofile-interest" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-				<hr class="profile-separator">
-				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.interest.0}}</div>
-				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.interest.1 nofilter}}</div>
-			</div>
-			{{/if}}
-
-			{{if $profile.likes}}
-			<div id="aprofile-likes" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-				<hr class="profile-separator">
-				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.likes.0}}</div>
-				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.likes.1 nofilter}}</div>
-			</div>
-			{{/if}}
-
-			{{if $profile.dislikes}}
-			<div id="aprofile-dislikes" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-				<hr class="profile-separator">
-				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.dislikes.0}}</div>
-				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.dislikes.1 nofilter}}</div>
-			</div>
-			{{/if}}
-
-			{{if $profile.contact}}
-			<div id="aprofile-contact" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-				<hr class="profile-separator">
-				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.contact.0}}</div>
-				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.contact.1 nofilter}}</div>
-			</div>
-			{{/if}}
-
-			{{if $profile.music}}
-			<div id="aprofile-music" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-				<hr class="profile-separator">
-				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.music.0}}</div>
-				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.music.1 nofilter}}</div>
-			</div>
-			{{/if}}
-
-
-			{{if $profile.book}}
-			<div id="aprofile-book" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-				<hr class="profile-separator">
-				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.book.0}}</div>
-				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.book.1 nofilter}}</div>
-			</div>
-			{{/if}}
-
-
-			{{if $profile.tv}}
-			<div id="aprofile-tv" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-				<hr class="profile-separator">
-				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.tv.0}}</div>
-				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.tv.1 nofilter}}</div>
-			</div>
-			{{/if}}
-
-
-			{{if $profile.film}}
-			<div id="aprofile-film" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-				<hr class="profile-separator">
-				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.film.0}}</div>
-				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.film.1 nofilter}}</div>
-			</div>
-			{{/if}}
-
-
-			{{if $profile.romance}}
-			<div id="aprofile-romance" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-				<hr class="profile-separator">
-				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.romance.0}}</div>
-				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.romance.1 nofilter}}</div>
-			</div>
-			{{/if}}
-
-
-			{{if $profile.work}}
-			<div id="aprofile-work" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-			<hr class="profile-separator">
-			<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.work.0}}</div>
-			<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.work.1 nofilter}}</div>
-			</div>
-			{{/if}}
-
-			{{if $profile.education}}
-			<div id="aprofile-education" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-				<hr class="profile-separator">
-				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.education.0}}</div>
-				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.education.1 nofilter}}</div>
-			</div>
-			{{/if}}
-
-			{{if $profile.forumlist}}
-			<div id="aprofile-forumlist" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
-				<hr class="profile-separator">
-				<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.forumlist.0}}</div>
-				<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.forumlist.1 nofilter}}</div>
-			</div>
-			{{/if}}
-		</div>
-	</div>
-</div>
diff --git a/view/theme/frio/templates/profile_publish.tpl b/view/theme/frio/templates/profile_publish.tpl
deleted file mode 100644
index bf14cf58ab..0000000000
--- a/view/theme/frio/templates/profile_publish.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-
-<div id="profile-publish-wrapper">
-	<h5 id="profile-publish-desc-{{$instance}}">
-	{{$pubdesc}}
-	</h5>
-
-	<div id="profile-publish-yes-wrapper-{{$instance}}" class="field radio">
-		<div class="radio">
-			<input type="radio" name="profile_publish_{{$instance}}" id="profile-publish-yes-{{$instance}}" {{$yes_selected}} value="1"/>
-			<label id="profile-publish-yes-label-{{$instance}}" for="profile-publish-yes-{{$instance}}">{{$str_yes}}</label>
-		</div>
-		<div id="profile-publish-break-{{$instance}}"></div>
-	</div>
-
-	<div id="profile-publish-no-wrapper-{{$instance}}" class="field radio">
-		<div class="radio">
-			<input type="radio" name="profile_publish_{{$instance}}" id="profile-publish-no-{{$instance}}" {{$no_selected}} value="0"/>
-			<label id="profile-publish-no-label-{{$instance}}" for="profile-publish-no-{{$instance}}">{{$str_no}}</label>
-		</div>
-
-		<div id="profile-publish-end-{{$instance}}"></div>
-	</div>
-</div>
diff --git a/view/theme/frio/templates/profile_vcard.tpl b/view/theme/frio/templates/profile_vcard.tpl
deleted file mode 100644
index 1673a9c999..0000000000
--- a/view/theme/frio/templates/profile_vcard.tpl
+++ /dev/null
@@ -1,142 +0,0 @@
-<div class="vcard h-card widget">
-
-	<div id="profile-photo-wrapper">
-		{{if $profile.picdate}}
-		<a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></a>
-		{{else}}
-		<a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}" alt="{{$profile.name}}" /></a>
-		{{/if}}
-
-		<div class="tool visible-lg visible-md">
-			{{if $profile.edit}}
-			<div class="action">
-				<a class="" href="{{$profile.edit.0}}" title="{{$profile.edit.3}}"><i class="fa fa-pencil-square-o"></i></a>
-			</div>
-			{{else}}
-				{{if $profile.menu}}
-				<div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="{{$editprofile}}" href="profiles" ></a></div>
-				{{/if}}
-			{{/if}}
-		</div>
-
-	</div>
-
-	{{* The short information which will appended to the second navbar by scrollspy *}}
-	<div id="vcard-short-info-wrapper" style="display: none;">
-		<div id="vcard-short-info" class="media" style="display: none">
-			<div id="vcard-short-photo-wrapper" class="pull-left">
-				{{if $profile.picdate}}
-				<img class="media-object" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></a>
-				{{else}}
-				<img class="media-object" src="{{$profile.photo}}" alt="{{$profile.name}}"></a>
-				{{/if}}
-			</div>
-
-			<div id="vcard-short-desc" class="media-body">
-				<h4 class="media-heading">{{$profile.name}}</h4>
-				{{if $profile.addr}}<div class="vcard-short-addr">{{$profile.addr}}</div>{{/if}}
-			</div>
-		</div>
-	</div>
-
-	<div class="panel-body">
-		<div class="profile-header">
-			<h3 class="fn p-name">{{$profile.name}}</h3>
-
-			{{if $profile.addr}}<div class="p-addr">{{include file="sub/punct_wrap.tpl" text=$profile.addr}}</div>{{/if}}
-
-			{{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
-
-			{{if $account_type}}<div class="account-type">({{$account_type}})</div>{{/if}}
-		</div>
-
-		{{if $follow_link || $unfollow_link || $wallmessage_link}}
-		<div id="profile-extra-links">
-			{{if $follow_link || $unfollow_link}}
-			<div id="dfrn-request-link-button">
-				{{if $unfollow_link}}
-				<a id="dfrn-request-link" class="btn btn-labeled btn-primary btn-sm" href="{{$unfollow_link}}">
-					<span class=""><i class="fa fa-user-times"></i></span>
-					<span class="">{{$unfollow}}</span>
-				</a>
-				{{else}}
-				<a id="dfrn-request-link" class="btn btn-labeled btn-primary btn-sm" href="{{$follow_link}}">
-					<span class=""><i class="fa fa-user-plus"></i></span>
-					<span class="">{{$follow}}</span>
-				</a>
-				{{/if}}
-			</div>
-			{{/if}}
-			{{if $wallmessage_link}}
-			<div id="wallmessage-link-botton">
-				<button type="button" id="wallmessage-link" class="btn btn-labeled btn-primary btn-sm" onclick="openWallMessage('{{$wallmessage_link}}')">
-					<span class=""><i class="fa fa-envelope"></i></span>
-					<span class="">{{$wallmessage}}</span>
-				</button>
-			</div>
-			{{/if}}
-		</div>
-		{{/if}}
-
-		<div class="clear"></div>
-
-		{{if $location}}
-		<div class="location detail">
-			<span class="location-label icon"><i class="fa fa-map-marker"></i></span>
-			<span class="adr">
-				{{if $profile.address}}<span class="street-address p-street-address">{{$profile.address nofilter}}</span>{{/if}}
-				<span class="city-state-zip">
-					<span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-					<span class="region p-region">{{$profile.region}}</span>
-					<span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
-				</span>
-				{{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
-			</span>
-		</div>
-		{{/if}}
-
-		{{if $profile.xmpp}}
-		<div class="xmpp">
-			<span class="xmpp-label icon"><i class="fa fa-comments"></i></span>
-			<span class="xmpp-data"><a href="xmpp:{{$profile.xmpp}}" rel="me" target="_blank">{{include file="sub/punct_wrap.tpl" text=$profile.xmpp}}</a></span>
-		</div>
-		{{/if}}
-
-		{{if $gender}}
-		<div class="mf detail">
-			<span class="gender-label icon"><i class="fa fa-venus-mars"></i></span>
-			<span class="p-gender">{{$profile.gender}}</span>
-		</div>
-		{{/if}}
-
-		{{if $profile.pubkey}}<div class="key u-key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
-
-		{{if $contacts}}<div class="contacts" style="display:none;">{{$contacts}}</div>{{/if}}
-
-		{{if $updated}}<div class="updated" style="display:none;">{{$updated}}</div>{{/if}}
-
-		{{if $marital}}
-		<div class="marital detail">
-			<span class="marital-label icon"><i class="fa fa-heart"></i></span>
-			<span class="marital-text icon">{{$profile.marital}}</span>
-		</div>
-		{{/if}}
-
-		{{if $homepage}}
-		<div class="homepage detail">
-			<span class="homepage-label icon"><i class="fa fa-external-link-square"></i></span>
-			<span class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank">{{include file="sub/punct_wrap.tpl" text=$profile.homepage}}</a></span>
-		</div>
-		{{/if}}
-
-		{{if $about}}<dl class="about"  style="display:none;"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about nofilter}}</dd></dl>{{/if}}
-
-		{{include file="diaspora_vcard.tpl"}}
-	</div>
-</div>
-
-{{if $contact_block}}
-<div class="widget" id="widget-contacts">
-	{{$contact_block nofilter}}
-</div>
-{{/if}}
diff --git a/view/theme/quattro/templates/profile/vcard.tpl b/view/theme/quattro/templates/profile/vcard.tpl
new file mode 100644
index 0000000000..fd455fba58
--- /dev/null
+++ b/view/theme/quattro/templates/profile/vcard.tpl
@@ -0,0 +1,82 @@
+<div class="vcard h-card">
+
+	<div class="tool">
+		<div class="fn label p-name">{{$profile.name}}</div>
+		{{if $profile.edit}}
+			<div class="action">
+			<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
+			<ul id="profiles-menu" class="menu-popup">
+				<li>
+					<a href="{{$profile.edit.0}}">{{$profile.edit.1}}</a>
+				</li>
+				<li><a href="settings/profile/photo" >{{$profile.menu.chg_photo}}</a></li>
+			</ul>
+			</div>
+		{{/if}}
+	</div>
+
+	{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
+
+	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
+	<div id="profile-photo-wrapper"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></div>
+
+	{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
+
+	{{if $profile.network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_link nofilter}}</dd></dl>{{/if}}
+
+	{{if $location}}
+		<dl class="location"><dt class="location-label">{{$location}}</dt> 
+		<dd class="adr h-adr">
+			{{if $profile.address}}<div class="street-address p-street-address">{{$profile.address nofilter}}</div>{{/if}}
+			<span class="city-state-zip">
+				<span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+				<span class="region p-region">{{$profile.region}}</span>
+				<span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
+			</span>
+			{{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
+		</dd>
+		</dl>
+	{{/if}}
+
+        {{if $profile.xmpp}}
+                <dl class="xmpp">
+                        <dt class="xmpp-label">{{$xmpp}}</dt>
+                        <dd class="xmpp-data">{{$profile.xmpp}}</dd>
+                </dl>
+        {{/if}}
+
+	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{$profile.gender}}</dd></dl>{{/if}}
+	
+	{{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
+
+	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
+
+	{{if $homepage}}
+	<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt>
+		<dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="external-link">{{$profile.homepage}}</a></dd>
+	</dl>
+	{{/if}}
+
+	{{include file="diaspora_vcard.tpl"}}
+
+	<div id="profile-extra-links">
+		<ul>
+			{{if $unfollow_link}}
+				<li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
+			{{/if}}
+			{{if $follow_link}}
+				<li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
+			{{/if}}
+			{{if $wallmessage_link}}
+				<li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
+			{{/if}}
+			{{if $subscribe_feed_link}}
+				<li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
+			{{/if}}
+		</ul>
+	</div>
+</div>
+
+{{$contact_block nofilter}}
+
+
diff --git a/view/theme/quattro/templates/profile_vcard.tpl b/view/theme/quattro/templates/profile_vcard.tpl
deleted file mode 100644
index cd8bd6ee7c..0000000000
--- a/view/theme/quattro/templates/profile_vcard.tpl
+++ /dev/null
@@ -1,93 +0,0 @@
-<div class="vcard h-card">
-
-	<div class="tool">
-		<div class="fn label p-name">{{$profile.name}}</div>
-		{{if $profile.edit}}
-			<div class="action">
-			<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
-			<ul id="profiles-menu" class="menu-popup">
-			{{if $profile.menu.entries}}
-				{{foreach $profile.menu.entries as $e}}
-				<li>
-					<a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a>
-				</li>
-				{{/foreach}}
-			{{else}}
-				<li>
-					<a href="{{$profile.edit.0}}">{{$profile.edit.1}}</a>
-				</li>
-			{{/if}}
-				<li><a href="profile_photo" >{{$profile.menu.chg_photo}}</a></li>
-				{{if $profile.menu.cr_new }}
-				<li><a href="profiles/new" id="profile-listing-new-link">{{$profile.menu.cr_new}}</a></li>
-				{{/if}}
-			</ul>
-			</div>
-		{{/if}}
-	</div>
-
-	{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
-
-	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
-	<div id="profile-photo-wrapper"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></div>
-
-	{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
-
-	{{if $profile.network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_link nofilter}}</dd></dl>{{/if}}
-
-	{{if $location}}
-		<dl class="location"><dt class="location-label">{{$location}}</dt> 
-		<dd class="adr h-adr">
-			{{if $profile.address}}<div class="street-address p-street-address">{{$profile.address nofilter}}</div>{{/if}}
-			<span class="city-state-zip">
-				<span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-				<span class="region p-region">{{$profile.region}}</span>
-				<span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
-			</span>
-			{{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
-		</dd>
-		</dl>
-	{{/if}}
-
-        {{if $profile.xmpp}}
-                <dl class="xmpp">
-                        <dt class="xmpp-label">{{$xmpp}}</dt>
-                        <dd class="xmpp-data">{{$profile.xmpp}}</dd>
-                </dl>
-        {{/if}}
-
-	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{$profile.gender}}</dd></dl>{{/if}}
-	
-	{{if $profile.pubkey}}<div class="key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
-
-	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
-
-	{{if $homepage}}
-	<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt>
-		<dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="external-link">{{$profile.homepage}}</a></dd>
-	</dl>
-	{{/if}}
-
-	{{include file="diaspora_vcard.tpl"}}
-
-	<div id="profile-extra-links">
-		<ul>
-			{{if $unfollow_link}}
-				<li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
-			{{/if}}
-			{{if $follow_link}}
-				<li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
-			{{/if}}
-			{{if $wallmessage_link}}
-				<li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
-			{{/if}}
-			{{if $subscribe_feed_link}}
-				<li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
-			{{/if}}
-		</ul>
-	</div>
-</div>
-
-{{$contact_block nofilter}}
-
-
diff --git a/view/theme/vier/templates/profile/advanced.tpl b/view/theme/vier/templates/profile/advanced.tpl
new file mode 100644
index 0000000000..20c4e84b13
--- /dev/null
+++ b/view/theme/vier/templates/profile/advanced.tpl
@@ -0,0 +1,186 @@
+{{if $profile.edit}}
+  <div class="profile-view-actions">
+    <a class="btn" href="{{$profile.edit.0}}" id="profile-view-edit-link" title="{{$profile.edit.3}}">{{$profile.edit.1}}</a>
+  </div>
+{{/if}}
+
+{{include file="section_title.tpl"}}
+
+<dl id="aprofile-fullname" class="aprofile">
+ <dt>{{$profile.fullname.0}}</dt>
+ <dd>{{$profile.fullname.1}}</dd>
+</dl>
+
+{{if $profile.membersince}}
+<dl id="aprofile-membersince" class="aprofile">
+ <dt>{{$profile.membersince.0}}</dt>
+ <dd>{{$profile.membersince.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.gender}}
+<dl id="aprofile-gender" class="aprofile">
+ <dt>{{$profile.gender.0}}</dt>
+ <dd>{{$profile.gender.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.birthday}}
+<dl id="aprofile-birthday" class="aprofile">
+ <dt>{{$profile.birthday.0}}</dt>
+ <dd>{{$profile.birthday.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.age}}
+<dl id="aprofile-age" class="aprofile">
+ <dt>{{$profile.age.0}}</dt>
+ <dd>{{$profile.age.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.marital}}
+<dl id="aprofile-marital" class="aprofile">
+ <dt><span class="heart">&hearts;</span>  {{$profile.marital.0}}</dt>
+ <dd>{{$profile.marital.1}}{{if $profile.marital.with}} ({{$profile.marital.with}}){{/if}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.sexual}}
+<dl id="aprofile-sexual" class="aprofile">
+ <dt>{{$profile.sexual.0}}</dt>
+ <dd>{{$profile.sexual.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.pub_keywords}}
+<dl id="aprofile-tags" class="aprofile">
+ <dt>{{$profile.pub_keywords.0}}</dt>
+ <dd>{{$profile.pub_keywords.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.homepage}}
+<dl id="aprofile-homepage" class="aprofile">
+ <dt>{{$profile.homepage.0}}</dt>
+ <dd>{{$profile.homepage.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.hometown}}
+<dl id="aprofile-hometown" class="aprofile">
+ <dt>{{$profile.hometown.0}}</dt>
+ <dd>{{$profile.hometown.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.politic}}
+<dl id="aprofile-politic" class="aprofile">
+ <dt>{{$profile.politic.0}}</dt>
+ <dd>{{$profile.politic.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.religion}}
+<dl id="aprofile-religion" class="aprofile">
+ <dt>{{$profile.religion.0}}</dt>
+ <dd>{{$profile.religion.1}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.about}}
+<dl id="aprofile-about" class="aprofile">
+ <dt>{{$profile.about.0}}</dt>
+ <dd>{{$profile.about.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.interest}}
+<dl id="aprofile-interest" class="aprofile">
+ <dt>{{$profile.interest.0}}</dt>
+ <dd>{{$profile.interest.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.likes}}
+<dl id="aprofile-likes" class="aprofile">
+ <dt>{{$profile.likes.0}}</dt>
+ <dd>{{$profile.likes.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.dislikes}}
+<dl id="aprofile-dislikes" class="aprofile">
+ <dt>{{$profile.dislikes.0}}</dt>
+ <dd>{{$profile.dislikes.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.contact}}
+<dl id="aprofile-contact" class="aprofile">
+ <dt>{{$profile.contact.0}}</dt>
+ <dd>{{$profile.contact.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+
+{{if $profile.music}}
+<dl id="aprofile-music" class="aprofile">
+ <dt>{{$profile.music.0}}</dt>
+ <dd>{{$profile.music.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+
+{{if $profile.book}}
+<dl id="aprofile-book" class="aprofile">
+ <dt>{{$profile.book.0}}</dt>
+ <dd>{{$profile.book.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+
+{{if $profile.tv}}
+<dl id="aprofile-tv" class="aprofile">
+ <dt>{{$profile.tv.0}}</dt>
+ <dd>{{$profile.tv.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+
+{{if $profile.film}}
+<dl id="aprofile-film" class="aprofile">
+ <dt>{{$profile.film.0}}</dt>
+ <dd>{{$profile.film.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+
+{{if $profile.romance}}
+<dl id="aprofile-romance" class="aprofile">
+ <dt>{{$profile.romance.0}}</dt>
+ <dd>{{$profile.romance.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+
+{{if $profile.work}}
+<dl id="aprofile-work" class="aprofile">
+ <dt>{{$profile.work.0}}</dt>
+ <dd>{{$profile.work.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.education}}
+<dl id="aprofile-education" class="aprofile">
+ <dt>{{$profile.education.0}}</dt>
+ <dd>{{$profile.education.1 nofilter}}</dd>
+</dl>
+{{/if}}
+
+{{if $profile.forumlist}}
+<dl id="aprofile-forumlist" class="aprofile">
+ <dt>{{$profile.forumlist.0}}</dt>
+ <dd>{{$profile.forumlist.1 nofilter}}</dd>
+</dl>
+{{/if}}
diff --git a/view/theme/vier/templates/profile/vcard.tpl b/view/theme/vier/templates/profile/vcard.tpl
new file mode 100644
index 0000000000..6331e84c4e
--- /dev/null
+++ b/view/theme/vier/templates/profile/vcard.tpl
@@ -0,0 +1,83 @@
+<div class="vcard h-card">
+
+	<div class="tool">
+		<div class="fn label p-name">{{$profile.name}}</div>
+		{{if $profile.edit}}
+			<div class="action">
+				<a class="icon s16 edit ttright" href="{{$profile.edit.0}}" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
+			</div>
+		{{else}}
+			{{if $profile.menu}}
+				<div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="{{$editprofile}}" href="profiles" ></a></div>
+			{{/if}}
+		{{/if}}
+	</div>
+
+	{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
+
+	{{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
+
+	{{if $profile.picdate}}
+		<div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></a></div>
+	{{else}}
+		<div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}" alt="{{$profile.name}}"></a></div>
+	{{/if}}
+
+	{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
+	{{if $profile.network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_link nofilter}}</dd></dl>{{/if}}
+	{{if $location}}
+		<dl class="location"><dt class="location-label">{{$location}}</dt> 
+		<dd class="adr h-adr">
+			{{if $profile.address}}<div class="street-address p-street-address">{{$profile.address nofilter}}</div>{{/if}}
+			<span class="city-state-zip">
+				<span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+				<span class="region p-region">{{$profile.region}}</span>
+				<span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
+			</span>
+			{{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
+		</dd>
+		</dl>
+	{{/if}}
+
+	{{if $profile.xmpp}}
+		<dl class="xmpp">
+			<dt class="xmpp-label">{{$xmpp}}</dt>
+			<dd class="xmpp-data">{{$profile.xmpp}}</dd>
+		</dl>
+	{{/if}}
+
+	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{$profile.gender}}</dd></dl>{{/if}}
+	
+	{{if $profile.pubkey}}<div class="key u-key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
+
+	{{if $contacts}}<div class="contacts" style="display:none;">{{$contacts}}</div>{{/if}}
+
+	{{if $updated}}<div class="updated" style="display:none;">{{$updated}}</div>{{/if}}
+
+	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
+
+	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="_blank">{{$profile.homepage}}</a></dd></dl>{{/if}}
+
+	{{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about nofilter}}</dd></dl>{{/if}}
+
+	{{include file="diaspora_vcard.tpl"}}
+
+	<div id="profile-extra-links">
+		<ul>
+			{{if $unfollow_link}}
+				<li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
+			{{/if}}
+			{{if $follow_link}}
+				<li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
+			{{/if}}
+			{{if $wallmessage_link}}
+				<li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
+			{{/if}}
+			{{if $subscribe_feed_link}}
+				<li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
+			{{/if}}
+		</ul>
+	</div>
+</div>
+
+{{$contact_block nofilter}}
diff --git a/view/theme/vier/templates/profile_advanced.tpl b/view/theme/vier/templates/profile_advanced.tpl
deleted file mode 100644
index 20c4e84b13..0000000000
--- a/view/theme/vier/templates/profile_advanced.tpl
+++ /dev/null
@@ -1,186 +0,0 @@
-{{if $profile.edit}}
-  <div class="profile-view-actions">
-    <a class="btn" href="{{$profile.edit.0}}" id="profile-view-edit-link" title="{{$profile.edit.3}}">{{$profile.edit.1}}</a>
-  </div>
-{{/if}}
-
-{{include file="section_title.tpl"}}
-
-<dl id="aprofile-fullname" class="aprofile">
- <dt>{{$profile.fullname.0}}</dt>
- <dd>{{$profile.fullname.1}}</dd>
-</dl>
-
-{{if $profile.membersince}}
-<dl id="aprofile-membersince" class="aprofile">
- <dt>{{$profile.membersince.0}}</dt>
- <dd>{{$profile.membersince.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.gender}}
-<dl id="aprofile-gender" class="aprofile">
- <dt>{{$profile.gender.0}}</dt>
- <dd>{{$profile.gender.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.birthday}}
-<dl id="aprofile-birthday" class="aprofile">
- <dt>{{$profile.birthday.0}}</dt>
- <dd>{{$profile.birthday.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.age}}
-<dl id="aprofile-age" class="aprofile">
- <dt>{{$profile.age.0}}</dt>
- <dd>{{$profile.age.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.marital}}
-<dl id="aprofile-marital" class="aprofile">
- <dt><span class="heart">&hearts;</span>  {{$profile.marital.0}}</dt>
- <dd>{{$profile.marital.1}}{{if $profile.marital.with}} ({{$profile.marital.with}}){{/if}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.sexual}}
-<dl id="aprofile-sexual" class="aprofile">
- <dt>{{$profile.sexual.0}}</dt>
- <dd>{{$profile.sexual.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.pub_keywords}}
-<dl id="aprofile-tags" class="aprofile">
- <dt>{{$profile.pub_keywords.0}}</dt>
- <dd>{{$profile.pub_keywords.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.homepage}}
-<dl id="aprofile-homepage" class="aprofile">
- <dt>{{$profile.homepage.0}}</dt>
- <dd>{{$profile.homepage.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.hometown}}
-<dl id="aprofile-hometown" class="aprofile">
- <dt>{{$profile.hometown.0}}</dt>
- <dd>{{$profile.hometown.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.politic}}
-<dl id="aprofile-politic" class="aprofile">
- <dt>{{$profile.politic.0}}</dt>
- <dd>{{$profile.politic.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.religion}}
-<dl id="aprofile-religion" class="aprofile">
- <dt>{{$profile.religion.0}}</dt>
- <dd>{{$profile.religion.1}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.about}}
-<dl id="aprofile-about" class="aprofile">
- <dt>{{$profile.about.0}}</dt>
- <dd>{{$profile.about.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.interest}}
-<dl id="aprofile-interest" class="aprofile">
- <dt>{{$profile.interest.0}}</dt>
- <dd>{{$profile.interest.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.likes}}
-<dl id="aprofile-likes" class="aprofile">
- <dt>{{$profile.likes.0}}</dt>
- <dd>{{$profile.likes.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.dislikes}}
-<dl id="aprofile-dislikes" class="aprofile">
- <dt>{{$profile.dislikes.0}}</dt>
- <dd>{{$profile.dislikes.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.contact}}
-<dl id="aprofile-contact" class="aprofile">
- <dt>{{$profile.contact.0}}</dt>
- <dd>{{$profile.contact.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.music}}
-<dl id="aprofile-music" class="aprofile">
- <dt>{{$profile.music.0}}</dt>
- <dd>{{$profile.music.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.book}}
-<dl id="aprofile-book" class="aprofile">
- <dt>{{$profile.book.0}}</dt>
- <dd>{{$profile.book.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.tv}}
-<dl id="aprofile-tv" class="aprofile">
- <dt>{{$profile.tv.0}}</dt>
- <dd>{{$profile.tv.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.film}}
-<dl id="aprofile-film" class="aprofile">
- <dt>{{$profile.film.0}}</dt>
- <dd>{{$profile.film.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.romance}}
-<dl id="aprofile-romance" class="aprofile">
- <dt>{{$profile.romance.0}}</dt>
- <dd>{{$profile.romance.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-
-{{if $profile.work}}
-<dl id="aprofile-work" class="aprofile">
- <dt>{{$profile.work.0}}</dt>
- <dd>{{$profile.work.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.education}}
-<dl id="aprofile-education" class="aprofile">
- <dt>{{$profile.education.0}}</dt>
- <dd>{{$profile.education.1 nofilter}}</dd>
-</dl>
-{{/if}}
-
-{{if $profile.forumlist}}
-<dl id="aprofile-forumlist" class="aprofile">
- <dt>{{$profile.forumlist.0}}</dt>
- <dd>{{$profile.forumlist.1 nofilter}}</dd>
-</dl>
-{{/if}}
diff --git a/view/theme/vier/templates/profile_vcard.tpl b/view/theme/vier/templates/profile_vcard.tpl
deleted file mode 100644
index 6331e84c4e..0000000000
--- a/view/theme/vier/templates/profile_vcard.tpl
+++ /dev/null
@@ -1,83 +0,0 @@
-<div class="vcard h-card">
-
-	<div class="tool">
-		<div class="fn label p-name">{{$profile.name}}</div>
-		{{if $profile.edit}}
-			<div class="action">
-				<a class="icon s16 edit ttright" href="{{$profile.edit.0}}" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
-			</div>
-		{{else}}
-			{{if $profile.menu}}
-				<div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="{{$editprofile}}" href="profiles" ></a></div>
-			{{/if}}
-		{{/if}}
-	</div>
-
-	{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
-
-	{{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
-
-	{{if $profile.picdate}}
-		<div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></a></div>
-	{{else}}
-		<div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}" alt="{{$profile.name}}"></a></div>
-	{{/if}}
-
-	{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
-	{{if $profile.network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_link nofilter}}</dd></dl>{{/if}}
-	{{if $location}}
-		<dl class="location"><dt class="location-label">{{$location}}</dt> 
-		<dd class="adr h-adr">
-			{{if $profile.address}}<div class="street-address p-street-address">{{$profile.address nofilter}}</div>{{/if}}
-			<span class="city-state-zip">
-				<span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-				<span class="region p-region">{{$profile.region}}</span>
-				<span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
-			</span>
-			{{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
-		</dd>
-		</dl>
-	{{/if}}
-
-	{{if $profile.xmpp}}
-		<dl class="xmpp">
-			<dt class="xmpp-label">{{$xmpp}}</dt>
-			<dd class="xmpp-data">{{$profile.xmpp}}</dd>
-		</dl>
-	{{/if}}
-
-	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{$profile.gender}}</dd></dl>{{/if}}
-	
-	{{if $profile.pubkey}}<div class="key u-key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
-
-	{{if $contacts}}<div class="contacts" style="display:none;">{{$contacts}}</div>{{/if}}
-
-	{{if $updated}}<div class="updated" style="display:none;">{{$updated}}</div>{{/if}}
-
-	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
-
-	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" class="u-url" rel="me" target="_blank">{{$profile.homepage}}</a></dd></dl>{{/if}}
-
-	{{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about nofilter}}</dd></dl>{{/if}}
-
-	{{include file="diaspora_vcard.tpl"}}
-
-	<div id="profile-extra-links">
-		<ul>
-			{{if $unfollow_link}}
-				<li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
-			{{/if}}
-			{{if $follow_link}}
-				<li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
-			{{/if}}
-			{{if $wallmessage_link}}
-				<li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
-			{{/if}}
-			{{if $subscribe_feed_link}}
-				<li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
-			{{/if}}
-		</ul>
-	</div>
-</div>
-
-{{$contact_block nofilter}}