diff --git a/view/theme/frio/templates/removeme.tpl b/view/theme/frio/templates/removeme.tpl
new file mode 100644
index 0000000000..2e599a0dab
--- /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_features.tpl b/view/theme/frio/templates/settings_features.tpl
new file mode 100644
index 0000000000..8d92caa5da
--- /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" 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 0000000000..ffd40f2ab6
--- /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 0000000000..91dfa04551
--- /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>