diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 4e8ba06e3..68c971c48 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -1747,13 +1747,12 @@ ul.dropdown-menu li:hover {
 /* PAGES */
 
 /* Profile-page */
-.generic-page-wrapper ,#profile-page, .settings-content-wrapper,
+.generic-page-wrapper ,#profile-page, .profile_photo-content-wrapper, photos-content-wrapper,
 .contacts-content-wrapper, .suggest-content-wrapper, .common-content-wrapper,
 .allfriends-content-wrapper, .match-content-wrapper, .dirfind-content-wrapper,
 .directory-content-wrapper, .manage-content-wrapper, .notes-content-wrapper,
 .events-content-wrapper, .message-content-wrapper, .apps-content-wrapper, 
-.notifications-content-wrapper, .admin-content-wrapper, .group-content-wrapper,
-.profile_photo-content-wrapper, photos-content-wrapper {
+.notifications-content-wrapper, .admin-content-wrapper, .group-content-wrapper {
     min-height: calc(100vh - 150px);
     padding: 15px;
     padding-bottom: 20px;
@@ -1971,11 +1970,11 @@ ul li:hover .contact-wrapper a.contact-action-link:hover {
 #profile-listing-new-link-wrapper {
     margin-bottom: 20px;
 }
-.profiles-content-wrapper #profile-edit-wrapper {
+.panel-group-settings {
     margin-left: -15px;
     margin-right: -15px;
 }
-.profiles-content-wrapper #profile-edit-wrapper > .panel {
+.panel-group-settings > .panel {
     padding-left: 15px;
     padding-right: 15px;
 }
@@ -2003,6 +2002,12 @@ ul li:hover .contact-wrapper a.contact-action-link:hover {
     font-family: FontAwesome;
     content: "\f0da";
 }
+#settings-nick-wrapper {
+    margin-bottom: 20px;
+}
+.group {
+    margin-left: 20px;
+}
 /*
 * Overwriting for transparency and other colors
 */
diff --git a/view/theme/frio/templates/field_intcheckbox.tpl b/view/theme/frio/templates/field_intcheckbox.tpl
new file mode 100644
index 000000000..192cf7384
--- /dev/null
+++ b/view/theme/frio/templates/field_intcheckbox.tpl
@@ -0,0 +1,7 @@
+
+	<div class="form-group field checkbox">
+		<input type="checkbox" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.3|escape:'html'}}" {{if $field.2}}checked="checked"{{/if}} aria-describedby='{{$field.0}}_tip'>
+		<label for="id_{{$field.0}}">{{$field.1}}</label>
+		<span class="help-block" role="tooltip">{{$field.4}}</span>
+	</div>
+	<div class="clear"></div>
diff --git a/view/theme/frio/templates/profile_edit.tpl b/view/theme/frio/templates/profile_edit.tpl
index 09dfc33f2..5d82c1c14 100644
--- a/view/theme/frio/templates/profile_edit.tpl
+++ b/view/theme/frio/templates/profile_edit.tpl
@@ -69,7 +69,7 @@
 
 		{{* friendica differs in $detailled_profile (all fields available and a short Version if this is variable false *}}
 		{{if $detailled_profile}}
-		<div class="panel-group" id="profile-edit-wrapper" role="tablist" aria-multiselectable="true">
+		<div class="panel-group panel-group-settings" id="profile-edit-wrapper" role="tablist" aria-multiselectable="true">
 			{{* The personal settings *}}
 			<div class="panel">
 				<div class="section-subtitle-wrapper" role="tab" id="personal">
diff --git a/view/theme/frio/templates/profile_listing_header.tpl b/view/theme/frio/templates/profile_listing_header.tpl
index 7b612f959..e042ff72a 100644
--- a/view/theme/frio/templates/profile_listing_header.tpl
+++ b/view/theme/frio/templates/profile_listing_header.tpl
@@ -1,5 +1,5 @@
 
-<div class="gerneric-page-wrapper">
+<div class="generic-page-wrapper">
 	<div class="section-title-wrapper">
 		<h2>{{$header}}</h2>
 	</div>
diff --git a/view/theme/frio/templates/removeme.tpl b/view/theme/frio/templates/removeme.tpl
new file mode 100644
index 000000000..2e599a0da
--- /dev/null
+++ b/view/theme/frio/templates/removeme.tpl
@@ -0,0 +1,24 @@
+<div class="generic-page-wrapper">
+	{{* include the title template for the settings title *}}
+	{{include file="section_title.tpl" title=$title }}
+
+	<div id="remove-account-wrapper">
+		<div id="remove-account-desc">{{$desc}}</div>
+
+		<form action="{{$basedir}}/removeme" autocomplete="off" method="post" >
+			<input type="hidden" name="verify" value="{{$hash}}" />
+
+			<div id="remove-account-pass-wrapper" class="form-group">
+				<label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label>
+				<input type="password" id="remove-account-pass" class="form-control" name="qxz_password" />
+			</div>
+			<div id="remove-account-pass-end"></div>
+
+			<div class="form-group pull-right settings-submit-wrapper" >
+				<button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}"><i class="fa fa-trash fa-fw"></i>&nbsp;{{$submit}}</button>
+			</div>
+			<div class="clear"></div>
+		</form>
+	</div>
+</div>
+
diff --git a/view/theme/frio/templates/settings.tpl b/view/theme/frio/templates/settings.tpl
new file mode 100644
index 000000000..6eed613dd
--- /dev/null
+++ b/view/theme/frio/templates/settings.tpl
@@ -0,0 +1,309 @@
+<div class="generic-page-wrapper">
+	{{* include the title template for the settings title *}}
+	{{include file="section_title.tpl" title=$ptitle }}
+
+	{{$nickname_block}}
+
+	<form action="settings" id="settings-form" method="post" autocomplete="off" >
+		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+		{{* We organize the settings in collapsable panel-groups *}}
+		<div class="panel-group panel-group-settings" id="settings" role="tablist" aria-multiselectable="true">
+			{{* The password setting section *}}
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="password-settings">
+					<h4>
+						<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#settings" href="#password-settings-collapse" aria-expanded="true" aria-controls="basic-settings-collapse">
+							{{$h_pass}}
+						</a>
+					</h4>
+				</div>
+				<div id="password-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="password-settings">
+					<div class="section-content-tools-wrapper">
+						{{include file="field_password.tpl" field=$password1}}
+						{{include file="field_password.tpl" field=$password2}}
+						{{include file="field_password.tpl" field=$password3}}
+
+						{{if $oid_enable}}
+						{{include file="field_input.tpl" field=$openid}}
+						{{/if}}
+
+						<div class="form-group pull-right settings-submit-wrapper" >
+							<button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+						</div>
+						<div class="clear"></div>
+					</div>
+				</div>
+			</div>
+
+			{{* The basic setting section *}}
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="basic-settings">
+					<h4>
+						<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#settings" href="#basic-settings-collapse" aria-expanded="true" aria-controls="basic-settings-collapse">
+							{{$h_basic}}
+						</a>
+					</h4>
+				</div>
+				<div id="basic-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="basic-settings">
+					<div class="section-content-tools-wrapper">
+
+						{{include file="field_input.tpl" field=$username}}
+						{{include file="field_input.tpl" field=$email}}
+						{{include file="field_password.tpl" field=$password4}}
+						{{include file="field_custom.tpl" field=$timezone}}
+						{{include file="field_select.tpl" field=$language}}
+						{{include file="field_input.tpl" field=$defloc}}
+						{{include file="field_checkbox.tpl" field=$allowloc}}
+
+						<div class="form-group pull-right settings-submit-wrapper" >
+							<button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+						</div>
+						<div class="clear"></div>
+					</div>
+				</div>
+			</div>
+
+			{{* The privacity setting section *}}
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="privacy-settings">
+					<h4>
+						<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#settings" href="#privacy-settings-collapse" aria-expanded="true" aria-controls="privacy-settings-collapse">
+							{{$h_prv}}
+						</a>
+					</h4>
+				</div>
+				<div id="privacy-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="privacy-settings">
+					<div class="section-content-tools-wrapper">
+
+						<input type="hidden" name="visibility" value="{{$visibility}}" />
+
+						{{include file="field_input.tpl" field=$maxreq}}
+
+						{{$profile_in_dir}}
+
+						{{$profile_in_net_dir}}
+
+						{{$hide_friends}}
+
+						{{$hide_wall}}
+
+						{{$blockwall}}
+
+						{{$blocktags}}
+
+						{{$suggestme}}
+
+						{{$unkmail}}
+
+
+						{{include file="field_input.tpl" field=$cntunkmail}}
+
+						{{include file="field_input.tpl" field=$expire.days}}
+
+
+						<div id="settings-advanced-expire">
+							<a id="advanced-expire-menu" title="{{$expire.advanced}}" data-toggle="modal" data-target="#aeModal">{{$expire.label}}</a>
+
+							{{* The modal for advanced-expire *}}
+							<div class="modal" id="aeModal">
+								<div class="modal-dialog">
+									<div class="modal-content">
+										<div class="modal-header">
+											<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+											<h4 class="modal-title">{{$expire.advanced}}</h4>
+										</div>
+										<div class="modal-body">
+											{{include file="field_yesno.tpl" field=$expire.items}}
+											{{include file="field_yesno.tpl" field=$expire.notes}}
+											{{include file="field_yesno.tpl" field=$expire.starred}}
+											{{include file="field_yesno.tpl" field=$expire.network_only}}
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+
+						{{* Block for setting default permissions *}}
+						<div id="settings-default-perms" class="settings-default-perms">
+							<a id="settings-default-perms-menu" class="settings-default-perms" data-toggle="modal" data-target="#aclModal">{{$permissions}} {{$permdesc}}</a>
+							<div id="settings-default-perms-menu-end"></div>
+
+							{{* We include the aclModal directly into the template since we cant use frio's default modal *}}
+							<div class="modal" id="aclModal">
+								<div class="modal-dialog">
+									<div class="modal-content">
+										<div class="modal-header">
+											<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+											<h4 class="modal-title">{{$permissions}}</h4>
+										</div>
+										<div class="modal-body">
+											{{$aclselect}}
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+						<br/>
+						<div class="clear"></div>
+
+						{{$group_select}}
+
+
+						<div class="form-group pull-right settings-submit-wrapper" >
+							<button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+						</div>
+						<div class="clear"></div>
+					</div>
+				</div>
+			</div>
+
+			{{* The notification setting section *}}
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="notification-settings">
+					<h4>
+						<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#settings" href="#notification-settings-collapse" aria-expanded="true" aria-controls="notification-settings-collapse">
+							{{$h_not}}
+						</a>
+					</h4>
+				</div>
+				<div id="notification-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="notification-settings">
+					<div class="section-content-tools-wrapper">
+						<div id="settings-notifications">
+
+							<div id="settings-activity-desc"><h4>{{$activity_options}}</h4></div>
+
+							<div class="group">
+								{{include file="field_checkbox.tpl" field=$post_newfriend}}
+								{{include file="field_checkbox.tpl" field=$post_joingroup}}
+								{{include file="field_checkbox.tpl" field=$post_profilechange}}
+							</div>
+
+
+							<div id="settings-notify-desc"><h4>{{$lbl_not}}</h4></div>
+
+							<div class="group">
+								{{include file="field_intcheckbox.tpl" field=$notify1}}
+								{{include file="field_intcheckbox.tpl" field=$notify2}}
+								{{include file="field_intcheckbox.tpl" field=$notify3}}
+								{{include file="field_intcheckbox.tpl" field=$notify4}}
+								{{include file="field_intcheckbox.tpl" field=$notify5}}
+								{{include file="field_intcheckbox.tpl" field=$notify6}}
+								{{include file="field_intcheckbox.tpl" field=$notify7}}
+								{{include file="field_intcheckbox.tpl" field=$notify8}}
+							</div>
+
+							{{include file="field_checkbox.tpl" field=$email_textonly}}
+
+
+							{{* commented out because it was commented out in the original template 
+							<div class="field">
+							 <button onclick="javascript:Notification.requestPermission(function(perm){if(perm === 'granted')alert('{{$desktop_notifications_success_message}}');});return false;">{{$desktop_notifications}}</button>
+							 <span class="field_help">{{$desktop_notifications_note}}</span>
+							</div>
+							*}}
+
+							{{include file="field_yesno.tpl" field=$desktop_notifications}}
+							<script>
+								(function(){
+									var elm = $("#id_{{$desktop_notifications.0}}_onoff");
+									var ckbox = $("#id_{{$desktop_notifications.0}}");
+
+									if (getNotificationPermission() === 'granted') {
+										ckbox.val(1);
+										elm.find(".off").addClass("hidden");
+										elm.find(".on").removeClass("hidden");
+									}
+									if (getNotificationPermission() === null) {
+										elm.parent(".field.yesno").hide();
+									}
+
+									$("#id_{{$desktop_notifications.0}}_onoff").on("click", function(e){
+
+										if (Notification.permission === 'granted') {
+											localStorage.setItem('notification-permissions', ckbox.val()==1 ? 'granted' : 'denied');
+										} else if (Notification.permission === 'denied') {
+											localStorage.setItem('notification-permissions', 'denied');
+
+											ckbox.val(0);
+											elm.find(".on").addClass("hidden");
+											elm.find(".off").removeClass("hidden");
+
+										} else if (Notification.permission === 'default') {
+											Notification.requestPermission(function(choice) {
+												if (choice === 'granted') {
+													localStorage.setItem('notification-permissions', ckbox.val()==1 ? 'granted' : 'denied');
+
+												} else {
+													localStorage.setItem('notification-permissions', 'denied');
+													ckbox.val(0);
+													elm.find(".on").addClass("hidden");
+													elm.find(".off").removeClass("hidden");
+												}
+											});
+										}
+
+										//console.log(getNotificationPermission());
+									})
+								})();
+							</script>
+						</div>
+
+						<div class="form-group pull-right settings-submit-wrapper" >
+							<button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+						</div>
+						<div class="clear"></div>
+					</div>
+				</div>
+			</div>
+
+			{{* The additional account setting section *}}
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="additional-account-settings">
+					<h4>
+						<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#settings" href="#additional-account-settings-collapse" aria-expanded="true" aria-controls="additional-account-settings-collapse">
+							{{$h_advn}}
+						</a>
+					</h4>
+				</div>
+				<div id="additional-account-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="additional-account-settings">
+					<div class="section-content-tools-wrapper">
+
+						<div id="settings-pagetype-desc">{{$h_descadvn}}</div>
+
+						{{$pagetype}}
+
+						<div class="form-group pull-right settings-submit-wrapper" >
+							<button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+						</div>
+						<div class="clear"></div>
+					</div>
+				</div>
+			</div>
+
+			{{* The relocate setting section *}}
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="relocate-settings">
+					<h4>
+						<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#settings" href="#relocate-settings-collapse" aria-expanded="true" aria-controls="relocate-settings-collapse">
+							{{$relocate}}
+						</a>
+					</h4>
+				</div>
+				<div id="relocate-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="relocate-settings">
+					<div class="section-content-tools-wrapper">
+
+						<div id="settings-pagetype-desc">{{$relocate_text}}</div>
+
+						<br/>
+						<div class="form-group pull-right settings-submit-wrapper" >
+							<button type="submit" name="submit" class="btn btn-primary" value="{{$relocate_button|escape:'html'}}">{{$relocate_button|escape:'html'}}</button>
+						</div>
+						<div class="clear"></div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</form>
+</div>
+
diff --git a/view/theme/frio/templates/settings_features.tpl b/view/theme/frio/templates/settings_features.tpl
new file mode 100644
index 000000000..6d7ec79f9
--- /dev/null
+++ b/view/theme/frio/templates/settings_features.tpl
@@ -0,0 +1,36 @@
+<div class="generic-page-wrapper">
+	{{* include the title template for the settings title *}}
+	{{include file="section_title.tpl" title=$title }}
+
+
+	<form action="settings/features" method="post" autocomplete="off">
+		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+		{{* We organize the settings in collapsable panel-groups *}}
+		<div class="panel-group panel-group-settings" id="settings" role="tablist" aria-multiselectable="true">
+			{{foreach $features as $g => $f}}
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="{{$g}}-settings-title">
+					<h4>
+						<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#settings" href="#{{$g}}-settings-content" aria-expanded="true" aria-controls="{{$g}}-settings-collapse">
+							{{$f.0}}
+						</a>
+					</h4>
+				</div>
+				<div id="{{$g}}-settings-content" class="panel-collapse collapse" role="tabpanel" aria-labelledby="{{$g}}-settings-title">
+					<div class="section-content-tools-wrapper">
+						{{foreach $f.1 as $fcat}}
+							{{include file="field_yesno.tpl" field=$fcat}}
+						{{/foreach}}
+
+						<div class="form-group pull-right settings-submit-wrapper" >
+							<button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+						</div>
+						<div class="clear"></div>
+					</div>
+				</div>
+			</div>
+			{{/foreach}}
+		</div>
+
+	</form>
+</div>
diff --git a/view/theme/frio/templates/settings_oauth.tpl b/view/theme/frio/templates/settings_oauth.tpl
new file mode 100644
index 000000000..ffd40f2ab
--- /dev/null
+++ b/view/theme/frio/templates/settings_oauth.tpl
@@ -0,0 +1,44 @@
+<div class="generic-page-wrapper">
+	{{* include the title template for the settings title *}}
+	{{include file="section_title.tpl" title=$title }}
+
+
+	<form action="settings/oauth" method="post" autocomplete="off">
+		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+		<div id="profile-edit-links">
+			<ul>
+				{{*
+				I commented this out. Initially I wanted to to load the oauth/add into a modal dialog but settings.php
+				does need $a->argv[2] === 'add' to work and argv[2] isn't available if you load a modal
+				I leave it at this place as reminder that we need an other solution in settings.php 
+
+				<li role="menuitem">
+					<a id="profile-edit-view-link" onclick="addToModal('{{$baseurl}}/settings/oauth/add')">{{$add}}</a>
+				</li>
+				*}}
+
+				<li role="menuitem">
+					<a id="profile-edit-view-link" href="{{$baseurl}}/settings/oauth/add">{{$add}}</a>
+				</li>
+			</ul>
+		</div>
+
+		{{foreach $apps as $app}}
+		<div class='oauthapp'>
+			<img src='{{$app.icon}}' class="{{if $app.icon}} {{else}}noicon{{/if}}">
+			{{if $app.name}}<h4>{{$app.name}}</h4>{{else}}<h4>{{$noname}}</h4>{{/if}}
+			{{if $app.my}}
+				{{if $app.oauth_token}}
+				<div class="settings-submit-wrapper" ><button class="settings-submit"  type="submit" name="remove" value="{{$app.oauth_token}}">{{$remove}}</button></div>
+				{{/if}}
+			{{/if}}
+			{{if $app.my}}
+			<a href="{{$baseurl}}/settings/oauth/edit/{{$app.client_id}}" class="btn" title="{{$edit|escape:'html'}}"><i class="fa fa-pencil-square-o" aria-hidden="true"></i>&nbsp;</a>
+			<a href="{{$baseurl}}/settings/oauth/delete/{{$app.client_id}}?t={{$form_security_token}}" class="btn" title="{{$delete|escape:'html'}}"><i class="fa fa-trash" aria-hidden="true"></i></a>
+			{{/if}}
+		</div>
+		{{/foreach}}
+
+	</form>
+</div>
diff --git a/view/theme/frio/templates/settings_oauth_edit.tpl b/view/theme/frio/templates/settings_oauth_edit.tpl
new file mode 100644
index 000000000..91dfa0455
--- /dev/null
+++ b/view/theme/frio/templates/settings_oauth_edit.tpl
@@ -0,0 +1,18 @@
+
+<h2 class="heading">{{$title}}</h2>
+
+<form method="POST">
+	<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+
+	{{include file="field_input.tpl" field=$name}}
+	{{include file="field_input.tpl" field=$key}}
+	{{include file="field_input.tpl" field=$secret}}
+	{{include file="field_input.tpl" field=$redirect}}
+	{{include file="field_input.tpl" field=$icon}}
+
+	<div class="form-group pull-right settings-submit-wrapper" >
+		<button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+	</div>
+	<div class="clear"></div>
+
+</form>