diff --git a/index.php b/index.php
index bafe4c4..9cc71ff 100755
--- a/index.php
+++ b/index.php
@@ -1,15 +1,7 @@
-<?php
+<?php require_once 'site-header.php'; ?>
 
-	require_once 'site-header.php';
+<section id="">
+	asd
+</section>
 
-
-
-	echo '<section id="">';
-		echo '';
-	echo '</section>';
-
-
-
-	require_once 'site-footer.php';
-
-?>
+<?php require_once 'site-footer.php'; ?>
\ No newline at end of file
diff --git a/page-errors.php b/page-errors.php
index dfc1ad3..7943ee3 100755
--- a/page-errors.php
+++ b/page-errors.php
@@ -1,19 +1,11 @@
 <?php
-
 	require_once 'site-header.php';
 
-
-
 	$get_error = safetag($_GET['err']);
+?>
 
+<section id="errors">
+	asd
+</section>
 
-
-	echo '<section id="errors">';
-		echo $get_error;
-	echo '</section>';
-
-
-
-	require_once 'site-footer.php';
-
-?>
\ No newline at end of file
+<?php require_once 'site-footer.php'; ?>
\ No newline at end of file
diff --git a/site-config.php b/site-config.php
index 258e684..ccc8ba9 100755
--- a/site-config.php
+++ b/site-config.php
@@ -4,7 +4,7 @@
 	$site_protocol = 'https';
 	$site_domain = null;
 	$site_subdomain = null;
-	$site_url = $site_protocol.'://'.(empty($site_subdomain) ? null : $site_subdomain.'.') . $site_domain;
+	$site_url = (empty($site_domain) ? null : $site_protocol.'://'.(empty($site_subdomain) ? null : $site_subdomain.'.') . $site_domain);
 	$site_url_current = sprintf(
 		'%s://%s/%s',
 		isset($_SERVER['HTTPS']) ? 'https' : 'http',
diff --git a/site-footer.php b/site-footer.php
index ce0ff7e..0cd42f2 100755
--- a/site-footer.php
+++ b/site-footer.php
@@ -1,17 +1,5 @@
-<?php
+			</main>
+		</section>
 
-				echo '</main>';
-			echo '</section>';
-
-
-
-		echo '</body>';
-	echo '</html>';
-
-
-
-	#echo '<script type="text/javascript" src="'.url('js/jquery.min.js').'"></script>';
-	#echo '<script type="text/javascript" src="'.url('js/main'.($minified == true ? '.min.js' : '.js?'.time()), true).'"></script>';
-	#echo (!file_exists('js/pages/'.str_replace('.php', '', $filename).'.js') ? null : '<script type="text/javascript" src="'.url('js/pages'.($minified == true ? '/minified' : '').'/'.str_replace('.php', '', $filename) . ($minified == true ? '.min.js' : '.js?'.time()), true).'"></script>');
-
-?>
\ No newline at end of file
+	</body>
+</html>
\ No newline at end of file
diff --git a/site-header.php b/site-header.php
index 9292aa5..f204acf 100755
--- a/site-header.php
+++ b/site-header.php
@@ -1,67 +1,59 @@
-<?php
+<?php require_once 'site-settings.php'; ?><!DOCTYPE html>
+<html lang="<?php echo $config_sitelang; ?>">
 
-	require_once 'site-settings.php';
+	<head>
+		<title><?php echo (empty($site_title) ? 'Template' : $site_title); ?></title>
 
-	echo '<!DOCTYPE html>';
-	echo '<html lang="'.$config_sitelang.'">';
+		<meta charset="UTF-8">
+		<meta name="theme-color" content="#272e33">
 
-		echo '<head>';
-			echo '<title>';
-				echo (empty($site_title) ? 'Template' : $site_title);
-			echo '</title>';
+		<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes, maximum-scale=3">
+		<meta name="robots" content="<?php echo implode(',', $robots) . (empty($google) ? '' : (empty($robots) ? '' : ',') . implode(',', $google)); ?>">
+		<meta name="description" content="<?php echo $lang['metadata']['description']; ?>">
 
-			echo '<meta charset="UTF-8">';
-			echo '<meta name="theme-color" content="#272e33">';
+		<meta http-equiv="cache-control" content="cache">
+		<meta http-equiv="expires" content="<?php echo (60*60*24); ?>">
 
-			echo '<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes, maximum-scale=3">';
-			echo (count($robots) == 0 ? null : '<meta name="robots" content="'.implode(',', $robots).'">');
-			echo (count($google) == 0 ? null : '<meta name="robots" content="'.implode(',', $google).'">');
-			echo '<meta name="description" content="'.$lang['metadata']['description'].'">';
+		<meta property="og:locale" content="<?php echo $lang['metadata']['locale']; ?>">
+		<meta property="og:title" content="<?php echo $site_title; ?>">
+		<meta property="og:site_name" content="<?php echo $site_title; ?>">
+		<meta property="og:type" content="website">
+		<meta property="og:url" content="<?php echo $site_url_current; ?>">
+		<meta property="og:description" content="<?php echo $lang['metadata']['description']; ?>">
 
-			echo '<meta http-equiv="cache-control" content="cache">';
-			echo '<meta http-equiv="expires" content="'.(60*60*24).'">';
+		<?php if(!empty($metadata_image)) { ?>
+			<meta property="og:image" content="<?php echo $metadata_image; ?>">
+			<meta property="og:image:secure_url" content="<?php echo $metadata_image; ?>">
+			<meta property="og:image:height" content="<?php echo ($filename == null ? '512' : '256'); ?>">
+			<meta property="og:image:width" content="<?php echo ($filename == null ? '512' : '256'); ?>">
+			<meta property="og:image:type" content="image/jpeg">
+		<?php } ?>
 
-			echo '<meta property="og:locale" content="'.$lang['metadata']['locale'].'">';
-			echo '<meta property="og:title" content="'.$site_title.'">';
-			echo '<meta property="og:site_name" content="'.$site_title.'">';
-			echo '<meta property="og:type" content="website">';
-			echo '<meta property="og:url" content="'.$site_url_current.'">';
-			echo '<meta property="og:description" content="'.$lang['metadata']['description'].'">';
+		<meta property="twitter:card" content="summary_large_image">
+		<meta property="twitter:url" content="<?php echo $site_url_current; ?>">
+		<meta property="twitter:title" content="<?php echo $site_title; ?>">
+		<meta property="twitter:description" content="<?php echo $lang['metadata']['description']; ?>">
+		<?php echo (empty($metadata_image) ? null : '<meta property="twitter:image" content="'.$metadata_image.'">'); ?>
 
-			if(!empty($metadata_image)) {
-				echo '<meta property="og:image" content="'.$metadata_image.'">';
-				echo '<meta property="og:image:secure_url" content="'.$metadata_image.'">';
-				echo '<meta property="og:image:height" content="'.($filename == null ? '512' : '256').'">';
-				echo '<meta property="og:image:width" content="'.($filename == null ? '512' : '256').'">';
-				echo '<meta property="og:image:type" content="image/jpeg">';
-			}
+		<link rel="canonical" href="<?php echo $site_url_current; ?>"><?php if(!empty($site_url)) { ?>
 
-			echo '<meta property="twitter:card" content="summary_large_image">';
-			echo '<meta property="twitter:url" content="'.$site_url_current.'">';
-			echo '<meta property="twitter:title" content="'.$site_title.'">';
-			echo '<meta property="twitter:description" content="'.$lang['metadata']['description'].'">';
-			echo (empty($metadata_image) ? null : '<meta property="twitter:image" content="'.$metadata_image.'">');
+		<link href="<?php echo $site_url; ?>" rel="me"><?php } ?>
+		<?php if(file_exists('manifest.json')) { ?><link rel="manifest" href="<?php echo url('manifest.json'); ?>" crossorigin="use-credentials"><?php } ?>
 
-			echo '<link rel="canonical" href="'.$site_url_current.'">';
-			echo '<link href="'.$site_url.'" rel="me">';
-			echo (file_exists('manifest.json') ? '<link rel="manifest" href="'.url('manifest.json').'" crossorigin="use-credentials">' : null);
+		<link type="image/x-icon" rel="icon" href="<?php echo $site_favicon; ?>">
+		<?php echo (empty($site_url_cdn) ? null : '<link rel="dns-prefetch" href="'.$site_url_cdn.'" crossorigin="">'); ?>
 
-			echo '<link type="image/x-icon" rel="icon" href="'.$site_favicon.'">';
-			echo (empty($site_url_cdn) ? null : '<link rel="dns-prefetch" href="'.$site_url_cdn.'" crossorigin="">');
-
-			echo '<link type="text/css" rel="stylesheet preload" as="style" href="'.url((file_exists('css/desktop.min.css') ? 'css/desktop.min.css' : 'css/desktop.css?'.time())).'">';
-			echo (!file_exists('css/pages/'.str_replace('.php', '.css', $filename)) ? null : '<link type="text/css" rel="stylesheet preload" as="style" href="'.url((file_exists('css/pages/minified/'.str_replace('.php', '.css', $filename)) ? 'css/pages/minified/'.str_replace('.php', '.css', $filename) : 'css/pages/'.str_replace('.php', '.css', $filename).'?'.time())).'">');
-			echo '<link type="text/css" rel="stylesheet preload" as="style" href="'.url((file_exists('css/portable.min.css') ? 'css/portable.min.css' : 'css/portable.css?'.time())).'">';
-		echo '</head>';
-
-		echo '<body';
-		echo ' data-folder="'.(empty($config_folder) ? '/' : '/'.$config_folder.'/').'"';
-		echo ' data-debugging="'.($debugging == false ? 'n' : 'y').'"';
-		echo '>';
+		<script type="text/javascript" src="<?php echo url('js/jquery.min.js'); ?>"></script>
+		<script type="text/javascript" src="<?php echo url('js/main'.($minified == true ? '.min.js' : '.js?'.time()), true); ?>"></script><?php
+		echo (!file_exists('js/pages/'.str_replace('.php', '', $filename).'.js') ? null : '<script type="text/javascript" src="'.url('js/pages'.($minified == true ? '/minified' : '').'/'.str_replace('.php', '', $filename) . ($minified == true ? '.min.js' : '.js?'.time()), true).'"></script>'); ?>
 
 
+		<link type="text/css" rel="stylesheet preload" as="style" href="<?php echo url((file_exists('css/desktop.min.css') ? 'css/desktop.min.css' : 'css/desktop.css?'.time())); ?>">
+		<?php echo (!file_exists('css/pages/'.str_replace('.php', '.css', $filename)) ? null : '<link type="text/css" rel="stylesheet preload" as="style" href="'.url((file_exists('css/pages/minified/'.str_replace('.php', '.css', $filename)) ? 'css/pages/minified/'.str_replace('.php', '.css', $filename) : 'css/pages/'.str_replace('.php', '.css', $filename).'?'.time())).'">');
+		?><link type="text/css" rel="stylesheet preload" as="style" href="<?php echo url((file_exists('css/portable.min.css') ? 'css/portable.min.css' : 'css/portable.css?'.time())); ?>">
+	</head>
 
-			echo '<section id="website">';
-				echo '<main>';
+	<body data-folder="<?php echo (empty($config_folder) ? '/' : '/'.$config_folder.'/'); ?>" data-debugging="<?php echo ($debugging == false ? 'n' : 'y'); ?>">
 
-?>
\ No newline at end of file
+		<section id="website">
+			<main>
