diff --git a/view/theme/frio/css/mod_admin.css b/view/theme/frio/css/mod_admin.css
index b690577d11..76056d4a14 100644
--- a/view/theme/frio/css/mod_admin.css
+++ b/view/theme/frio/css/mod_admin.css
@@ -2,6 +2,8 @@
 #admin-users.adminpage > h1 { padding: 0 15px; }
 #admin-users.adminpage .panel-collapse { margin-left: -15px; margin-right: -15px; }
 
+#adminpage.adminpage > h1 { padding: 0 15px; }
+
 #admin-users #users th:first-of-type { width: 1em; }
 #admin-users #users th:nth-of-type(2) { width: 40px; }
 #admin-users #users th:last-of-type { width: 1em; }
diff --git a/view/theme/frio/templates/admin/site.tpl b/view/theme/frio/templates/admin/site.tpl
new file mode 100644
index 0000000000..1205277fe4
--- /dev/null
+++ b/view/theme/frio/templates/admin/site.tpl
@@ -0,0 +1,353 @@
+
+<script>
+	$(function(){
+
+		$("#cnftheme").click(function(){
+			$.colorbox({
+				width: 800,
+				height: '90%',
+				/*onOpen: function(){
+					var theme = $("#id_theme :selected").val();
+					$("#cnftheme").attr('href',"{{$baseurl}}/admin/themes/"+theme);
+				},*/
+				href: "{{$baseurl}}/admin/themes/" + $("#id_theme :selected").val(),
+				onComplete: function(){
+					$("div#fancybox-content form").submit(function(e){
+						var url = $(this).attr('action');
+						// can't get .serialize() to work...
+						var data={};
+						$(this).find("input").each(function(){
+							data[$(this).attr('name')] = $(this).val();
+						});
+						$(this).find("select").each(function(){
+							data[$(this).attr('name')] = $(this).children(":selected").val();
+						});
+						console.log(":)", url, data);
+
+						$.post(url, data, function(data) {
+							if(timer) clearTimeout(timer);
+							NavUpdate();
+							$.colorbox.close();
+						})
+
+						return false;
+					});
+
+				}
+			});
+			return false;
+		});
+	});
+</script>
+<link rel="stylesheet" href="view/theme/frio/css/mod_admin.css" type="text/css" media="screen"/>
+
+<div id='adminpage' class="adminpage generic-page-wrapper">
+	<h1>{{$title}} - {{$page}}</h1>
+	<form action="{{$baseurl}}/admin/site" method="post">
+		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+		<div class="panel-group panel-group-settings" id="admin-settings" role="tablist" aria-multiselectable="true">
+			<!--
+			/*
+			*    General Information
+			*/ -->
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="admin-settings-general">
+					<h4>
+						<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-general-collapse" aria-expanded="false" aria-controls="admin-settings-general-collapse">
+							General Information
+						</a>
+					</h4>
+				</div>
+				<div id="admin-settings-general-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-general">
+
+					{{include file="field_input.tpl" field=$sitename}}
+					{{include file="field_input.tpl" field=$hostname}}
+					{{include file="field_input.tpl" field=$sender_email}}
+					{{include file="field_textarea.tpl" field=$banner}}
+					{{include file="field_input.tpl" field=$shortcut_icon}}
+					{{include file="field_input.tpl" field=$touch_icon}}
+					{{include file="field_textarea.tpl" field=$info}}
+					{{include file="field_select.tpl" field=$language}}
+					{{include file="field_select.tpl" field=$theme}}
+					{{include file="field_select.tpl" field=$theme_mobile}}
+					{{include file="field_select.tpl" field=$ssl_policy}}
+					{{if $ssl_policy.2 == 1}}{{include file="field_checkbox.tpl" field=$force_ssl}}{{/if}}
+					{{include file="field_checkbox.tpl" field=$hide_help}}
+					{{include file="field_select.tpl" field=$singleuser}}
+					<div class="panel-footer">
+						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit|escape:'html'}}"/>
+					</div>
+				</div>
+			</div>
+
+			<!--
+			/*
+			 *    Registration
+			 */ -->
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="admin-settings-registration">
+					<h4>
+						<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-registration-collapse" aria-expanded="false" aria-controls="admin-settings-registration-collapse">
+							{{$registration}}
+						</a>
+					</h4>
+				</div>
+				<div id="admin-settings-registration-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-registration">
+
+					{{include file="field_input.tpl" field=$register_text}}
+					{{include file="field_select.tpl" field=$register_policy}}
+					{{include file="field_input.tpl" field=$daily_registrations}}
+					{{include file="field_checkbox.tpl" field=$no_multi_reg}}
+					{{include file="field_checkbox.tpl" field=$no_openid}}
+					{{include file="field_checkbox.tpl" field=$no_regfullname}}
+					<div class="panel-footer">
+						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit|escape:'html'}}"/>
+					</div>
+				</div>
+			</div>
+
+
+
+			<!--
+				/*
+				 *    File upload
+				 */ -->
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="admin-settings-upload">
+					<h4>
+						<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-upload-collapse" aria-expanded="false" aria-controls="admin-settings-upload-collapse">
+							{{$upload}}
+						</a>
+					</h4>
+				</div>
+				<div id="admin-settings-upload-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-upload">
+
+					{{include file="field_input.tpl" field=$maximagesize}}
+					{{include file="field_input.tpl" field=$maximagelength}}
+					{{include file="field_input.tpl" field=$jpegimagequality}}
+					<div class="panel-footer">
+						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit|escape:'html'}}"/>
+					</div>
+				</div>
+			</div>
+
+
+			<!--
+			/*
+			 *    Corporate
+			 */ -->
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="admin-settings-corporate">
+					<h4>
+						<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-corporate-collapse" aria-expanded="false" aria-controls="admin-settings-corporate-collapse">
+							{{$corporate}}
+						</a>
+					</h4>
+				</div>
+				<div id="admin-settings-corporate-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-corporate">
+					{{include file="field_input.tpl" field=$allowed_sites}}
+					{{include file="field_input.tpl" field=$allowed_email}}
+					{{include file="field_input.tpl" field=$forbidden_nicknames}}
+					{{include file="field_checkbox.tpl" field=$no_oembed_rich_content}}
+					{{include file="field_input.tpl" field=$allowed_oembed}}
+					{{include file="field_checkbox.tpl" field=$block_public}}
+					{{include file="field_checkbox.tpl" field=$force_publish}}
+					{{include file="field_select.tpl" field=$community_page_style}}
+					{{include file="field_input.tpl" field=$max_author_posts_community_page}}
+
+					{{include file="field_checkbox.tpl" field=$ostatus_disabled}}
+					{{include file="field_checkbox.tpl" field=$ostatus_full_threads}}
+
+					{{if $diaspora_able}}
+					{{include file="field_checkbox.tpl" field=$diaspora_enabled}}
+					{{else}}
+					<div class='field checkbox' id='div_id_{{$diaspora_enabled.0}}'>
+						<label for='id_{{$diaspora_enabled.0}}'>{{$diaspora_enabled.1}}</label>
+						<span id='id_{{$diaspora_enabled.0}}'>{{$diaspora_not_able}}</span>
+					</div>
+					{{/if}}
+					{{include file="field_checkbox.tpl" field=$dfrn_only}}
+					{{include file="field_input.tpl" field=$global_directory}}
+					<div class="panel-footer">
+						<input type="submit" name="republish_directory" class="btn btn-primary" value="{{$republish|escape:'html'}}"/>
+					</div>
+					{{include file="field_checkbox.tpl" field=$newuser_private}}
+					{{include file="field_checkbox.tpl" field=$enotify_no_content}}
+					{{include file="field_checkbox.tpl" field=$private_addons}}
+					{{include file="field_checkbox.tpl" field=$disable_embedded}}
+					{{include file="field_checkbox.tpl" field=$allow_users_remote_self}}
+					{{include file="field_checkbox.tpl" field=$explicit_content}}
+
+					<div class="panel-footer">
+						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit|escape:'html'}}"/>
+					</div>
+				</div>
+			</div>
+
+			<!--
+			/*
+			 *    Corporate
+			 */ -->
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="admin-settings-$dvanced">
+					<h4>
+						<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-advanced-collapse" aria-expanded="false" aria-controls="admin-settings-advanced-collapse">
+							{{$advanced}}
+						</a>
+					</h4>
+				</div>
+				<div id="admin-settings-advanced-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-advanced">
+
+					{{include file="field_select.tpl" field=$rino}}
+					{{include file="field_checkbox.tpl" field=$verifyssl}}
+					{{include file="field_input.tpl" field=$proxy}}
+					{{include file="field_input.tpl" field=$proxyuser}}
+					{{include file="field_input.tpl" field=$timeout}}
+					{{include file="field_input.tpl" field=$maxloadavg_frontend}}
+					{{include file="field_input.tpl" field=$optimize_max_tablesize}}
+					{{include file="field_input.tpl" field=$optimize_fragmentation}}
+					{{include file="field_input.tpl" field=$abandon_days}}
+					{{include file="field_input.tpl" field=$temppath}}
+					{{include file="field_input.tpl" field=$basepath}}
+					{{include file="field_checkbox.tpl" field=$suppress_tags}}
+					{{include file="field_checkbox.tpl" field=$nodeinfo}}
+					{{include file="field_select.tpl" field=$check_new_version_url}}
+					<div class="panel-footer">
+						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit|escape:'html'}}"/>
+					</div>
+				</div>
+			</div>
+
+			<!--
+			/*
+			 *    Contact Directory
+			 */ -->
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="admin-settings-contacts">
+					<h4>
+						<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-contacts-collapse" aria-expanded="false" aria-controls="admin-settings-contacts-collapse">
+							{{$portable_contacts}}
+						</a>
+					</h4>
+				</div>
+				<div id="admin-settings-contacts-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-cocontactsrporate">
+
+					{{include file="field_checkbox.tpl" field=$poco_completion}}
+					{{include file="field_input.tpl" field=$poco_requery_days}}
+					{{include file="field_select.tpl" field=$poco_discovery}}
+					{{include file="field_select.tpl" field=$poco_discovery_since}}
+					{{include file="field_checkbox.tpl" field=$poco_local_search}}
+					<div class="panel-footer">
+						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit|escape:'html'}}"/>
+					</div>
+				</div>
+			</div>
+
+			<!--
+			/*
+			 *    Performance
+			 */ -->
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="admin-settings-performance">
+					<h4>
+						<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-performance-collapse" aria-expanded="false" aria-controls="admin-settings-performance-collapse">
+							{{$performance}}
+						</a>
+					</h4>
+				</div>
+				<div id="admin-settings-performance-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-performance">
+
+					{{include file="field_checkbox.tpl" field=$only_tag_search}}
+					{{include file="field_input.tpl" field=$itemcache}}
+					{{include file="field_input.tpl" field=$itemcache_duration}}
+					{{include file="field_input.tpl" field=$max_comments}}
+					{{include file="field_checkbox.tpl" field=$proxy_disabled}}
+					{{include file="field_checkbox.tpl" field=$dbclean}}
+					{{include file="field_input.tpl" field=$dbclean_expire_days}}
+					{{include file="field_input.tpl" field=$dbclean_unclaimed}}
+					{{include file="field_input.tpl" field=$dbclean_expire_conv}}
+					<div class="panel-footer">
+						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit|escape:'html'}}"/>
+					</div>
+				</div>
+			</div>
+
+			<!--
+			/*
+			 *    Worker
+			 */ -->
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="admin-settings-worker">
+					<h4>
+						<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-worker-collapse" aria-expanded="false" aria-controls="admin-settings-worker-collapse">
+							{{$worker_title}}
+						</a>
+					</h4>
+				</div>
+				<div id="admin-settings-worker-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-worker">
+
+					{{include file="field_input.tpl" field=$maxloadavg}}
+					{{include file="field_input.tpl" field=$min_memory}}
+					{{include file="field_input.tpl" field=$worker_queues}}
+					{{include file="field_checkbox.tpl" field=$worker_dont_fork}}
+					{{include file="field_checkbox.tpl" field=$worker_fastlane}}
+					{{include file="field_checkbox.tpl" field=$worker_frontend}}
+					<div class="panel-footer">
+						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit|escape:'html'}}"/>
+					</div>
+				</div>
+			</div>
+
+			<!--
+			/*
+			 *    Relay
+			 */ -->
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="admin-relay-corporate">
+					<h4>
+						<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-relay-collapse" aria-expanded="false" aria-controls="admin-settings-relay-collapse">
+							{{$relay_title}}
+						</a>
+					</h4>
+				</div>
+				<div id="admin-settings-relay-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-relay">
+
+					{{include file="field_checkbox.tpl" field=$relay_subscribe}}
+					{{include file="field_input.tpl" field=$relay_server}}
+					{{include file="field_checkbox.tpl" field=$relay_directly}}
+					{{include file="field_select.tpl" field=$relay_scope}}
+					{{include file="field_input.tpl" field=$relay_server_tags}}
+					{{include file="field_checkbox.tpl" field=$relay_user_tags}}
+					<div class="panel-footer">
+						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit|escape:'html'}}"/>
+					</div>
+				</div>
+			</div>
+	</form>
+
+	<!--
+	/*
+	 *    Relocate
+	 */ -->
+	<div class="panel">
+		<div class="section-subtitle-wrapper" role="tab" id="admin-settings-relocate">
+			<h4>
+				<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-relocate-collapse" aria-expanded="false" aria-controls="admin-settings-relocate-collapse">
+					{{$relocate}}
+				</a>
+			</h4>
+		</div>
+		<div id="admin-settings-relocate-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-relocate">
+
+			{{* separate form for relocate... *}}
+			<form action="{{$baseurl}}/admin/site" method="post">
+				<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+				{{include file="field_input.tpl" field=$relocate_url}}
+				<input type="hidden" name="page_site" value="{{$submit|escape:'html'}}">
+				<div class="panel-footer">
+					<input type="submit" name="relocate" class="btn btn-primary" value="{{$relocate_button|escape:'html'}}"/>
+				</div>
+			</form>
+		</div>
+	</div>
+</div>