diff --git a/index.php b/index.php
index 8f1aef1..9d5723f 100644
--- a/index.php
+++ b/index.php
@@ -1,40 +1,6 @@
-<!DOCTYPE HTML>
-<!--
-	Aerial by HTML5 UP
-	html5up.net | @ajlkn
-	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
--->
-<html lang="<?php echo Theme::lang() ?>">
-	<head>
-		<meta charset="utf-8" />
-		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
+<!-- Header -->
+<?php include(THEME_DIR_PHP.'header.php'); ?>
 
-		<!-- meta description -->
-		<?php echo Theme::metaTagDescription(); ?>
-
-		<!-- Dynamic title tag -->
-		<?php echo Theme::metaTagTitle(); ?>
-
-		<!-- Include the CSS Files -->
-		<?php echo Theme::css('assets/css/main.css') ?>		
-
-		<!-- Load Bludit Plugins: Site head -->
-		<?php Theme::plugins('siteHead'); ?>
-	
-	</head>
-
-
-	<body class="is-preload">
-
-	<!-- Load Bludit Plugins: Site Body Begin -->
-	<?php Theme::plugins('siteBodyBegin'); ?>
-
-		<div id="wrapper">
-			<div id="bg"></div>
-			<div id="overlay"></div>
-			<div id="main">
-
-				<!-- Header -->
 					<header id="header">
 
 					<?php foreach($content as $page): ?>
@@ -54,17 +20,4 @@
 					</header>
 
 				<!-- Footer -->
-					<footer id="footer">
-						<?php echo $site->footer(); ?><a href="http://html5up.net">HTML5 UP</a>
-					</footer>
-
-			</div>
-		</div>
-		<script>
-			window.onload = function() { document.body.classList.remove('is-preload'); }
-			window.ontouchmove = function() { return false; }
-			window.onorientationchange = function() { document.body.scrollTop = 0; }
-		</script>
-
-	</body>
-</html>
\ No newline at end of file
+<?php include(THEME_DIR_PHP.'footer.php'); ?>
\ No newline at end of file
diff --git a/php/footer.php b/php/footer.php
index 8d1c8b6..68ba9f1 100644
--- a/php/footer.php
+++ b/php/footer.php
@@ -1 +1,14 @@
- 
+<footer id="footer">
+ 	<?php echo $site->footer(); ?><a href="http://html5up.net"> HTML5 UP</a>
+</footer>
+
+	</div>
+		</div>
+		<script>
+			window.onload = function() { document.body.classList.remove('is-preload'); }
+			window.ontouchmove = function() { return false; }
+			window.onorientationchange = function() { document.body.scrollTop = 0; }
+		</script>
+
+	</body>
+</html> 
diff --git a/php/header.php b/php/header.php
index 8d1c8b6..ba1e710 100644
--- a/php/header.php
+++ b/php/header.php
@@ -1 +1,35 @@
- 
+<!DOCTYPE HTML>
+<!--
+	Aerial by HTML5 UP
+	html5up.net | @ajlkn
+	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
+-->
+<html lang="<?php echo Theme::lang() ?>">
+	<head>
+		<meta charset="utf-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
+
+		<!-- meta description -->
+		<?php echo Theme::metaTagDescription(); ?>
+
+		<!-- Dynamic title tag -->
+		<?php echo Theme::metaTagTitle(); ?>
+
+		<!-- Include the CSS Files -->
+		<?php echo Theme::css('assets/css/main.css') ?>		
+
+		<!-- Load Bludit Plugins: Site head -->
+		<?php Theme::plugins('siteHead'); ?>
+	
+	</head>
+
+
+	<body class="is-preload">
+
+	<!-- Load Bludit Plugins: Site Body Begin -->
+	<?php Theme::plugins('siteBodyBegin'); ?>
+
+		<div id="wrapper">
+			<div id="bg"></div>
+			<div id="overlay"></div>
+			<div id="main"> 
