diff --git a/templates/page.html b/templates/page.html
index 6e7a8a18..07eea62e 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -1,8 +1,8 @@
 <!doctype html>
 <html>
 <head>
-	{% include 'header.html' %}
 	<meta charset="utf-8">
+	{% include 'header.html' %}
 	<title>{{ title }}</title>
 </head>
 <body>
diff --git a/templates/thread.html b/templates/thread.html
index 0997f668..4e2a95a1 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -2,34 +2,8 @@
 <html>
 <head>
 	<meta charset="utf-8">
-	<link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}">
-	{% if config.url_favicon %}<link rel="shortcut icon" href="{{ config.url_favicon }}">{% endif %}
+	{% include 'header.html' %}
 	<title>{{ board.url }} - {{ board.name }}</title>
-	<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=yes">
-	{% if config.meta_keywords %}<meta name="keywords" content="{{ config.meta_keywords }}">{% endif %}
-	{% if config.default_stylesheet.1 != '' %}<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}">{% endif %}
-	<script type="text/javascript">var configRoot="{{ config.root }}";</script>
-	{% if not nojavascript %}
-		<script type="text/javascript" src="{{ config.url_javascript }}"></script>
-		{% if not config.additional_javascript_compile %}
-		{% for javascript in config.additional_javascript %}<script type="text/javascript" src="{{ config.additional_javascript_url }}{{ javascript }}"></script>{% endfor %}
-		{% endif %}
-	{% endif %}
-	{% if config.recaptcha %}<style type="text/css">{% raw %}
-		.recaptcha_image_cell {
-			background: none !important;
-		}
-		table.recaptchatable {
-			border: none !important;
-		}
-		#recaptcha_logo, #recaptcha_tagline {
-			display: none;
-			float: right;
-		}
-		.recaptchatable a {
-			display: block;
-		}
-	{% endraw %}</style>{% endif %}
 </head>
 <body>
 	{{ boardlist.top }}
