diff --git a/templates/post_reply.html b/templates/post_reply.html
index bdac289d..530d2626 100644
--- a/templates/post_reply.html
+++ b/templates/post_reply.html
@@ -28,21 +28,7 @@
 		{% if post.mod and post.mod|hasPermission(config.mod.show_ip, board.uri) %}
 			 [<a class="ip-link" style="margin:0;" href="?/IP/{{ post.ip }}">{{ post.ip }}</a>]
 		{% endif %}
-		{% if config.display_flags and post.modifiers.flag %}
-			 <img 
-				{% if config.country_flags_condensed %}
-					 class="flag flag-{{ post.modifiers.flag }}" src="{{ config.image_blank }}"
-				{% else %}
-					 class="flag" src="{{ config.uri_flags|sprintf(post.modifiers.flag) }}"
-				{% endif %}
-			 	 style="{% if post.modifiers['flag style'] %}
-					{{ post.modifiers['flag style'] }}
-				{% else %}
-					{{ config.flag_style }}
-				{% endif %}"
-			{% if post.modifiers['flag alt'] %} alt="{{ post.modifiers['flag alt'] | e('html_attr') }}"
-				 title="{{ post.modifiers['flag alt'] | e('html_attr') }}"{% endif %}>
-		{% endif %}
+		{% include 'post/flag.html' %}
 		 <time datetime="{{ post.time|date('%Y-%m-%dT%H:%M:%S') }}{{ timezone() }}">{{ post.time|date(config.post_date) }}</time>
 	</label>
 	{% if config.poster_ids %}
@@ -61,7 +47,7 @@
 		<p class="fileinfo">File: <a href="{{ config.uri_img }}{{ post.file }}">{{ post.file }}</a> <span class="unimportant">
 		(
 			{% if post.thumb == 'spoiler' %}
-				Spoiler Image, 
+				{% trans %}Spoiler Image{% endtrans %}, 
 			{% endif %}
 			{{ post.filesize|filesize }}
 			{% if post.filewidth and post.fileheight %}
@@ -78,51 +64,10 @@
 					<span class="postfilename">{{ post.filename|e|bidi_cleanup }}</span>
 				{% endif %}
 			{% endif %}
-			{% if post.thumb != 'file' and config.image_identification %}
-				,
-				<span class='image_id'>
-				 <a href="http://imgops.com/{{ config.domain }}{{ config.uri_img }}{{ post.file }}">io</a>
-				{% if post.file|extension == 'jpg' %}
-					 <a href="http://regex.info/exif.cgi?url={{ config.domain }}{{ config.uri_img }}{{ post.file }}">e</a>
-				{% endif %}
-				 <a href="http://www.google.com/searchbyimage?image_url={{ config.domain }}{{ config.uri_img }}{{ post.file }}">g</a>
-				 <a href="http://www.tineye.com/search?url={{ config.domain }}{{ config.uri_img }}{{ post.file }}">t</a>
-				</span>
-			{% endif %}
-
+			{% include "post/image_identification.html" %}
 		)
-		</span>
-</p>
-	<a href="
-		{% if post.file|extension == 'webm' %}
-			{{ config.root }}player.php?v={{ config.uri_img }}{{ post.file }}&amp;t={{ post.filename|e('url') }}&amp;loop=1
-		{% else %}
-			{{ config.uri_img }}{{ post.file }}
-		{% endif %}" target="_blank"{% if post.thumb == 'file' or post.modifiers['is_file'] == '1' or post.filename|extension == 'webm' %} class="file"{% endif %}>
-	{% if post.thumb|extension == 'webm' %}
-		<video autoplay class="post-image" src="{{ config.uri_thumb }}{{ post.thumb }}" poster="
-			{{ config.root }}
-			{% if config.file_icons[post.filename|extension] %}
-				{{ config.file_thumb|sprintf(config.file_icons[post.filename|extension]) }}
-			{% else %}
-				{{ config.file_thumb|sprintf(config.file_icons.default) }}
-			{% endif %}" style="width:{{ post.thumbwidth }}px;height:{{ post.thumbheight }}px"></video>
-	{% else %}
-		<img class="post-image" src="
-			{% if post.thumb == 'file' %}
-				{{ config.root }}
-				{% if config.file_icons[post.filename|extension] %}
-					{{ config.file_thumb|sprintf(config.file_icons[post.filename|extension]) }}
-				{% else %}
-					{{ config.file_thumb|sprintf(config.file_icons.default) }}
-				{% endif %}
-			{% elseif post.thumb == 'spoiler' %}
-				{{ config.root }}{{ config.spoiler_image }}
-			{% else %}
-				{{ config.uri_thumb }}{{ post.thumb }}
-			{% endif %}" style="width:{{ post.thumbwidth }}px;height:{{ post.thumbheight }}px" alt="" />
-	{% endif %}
-	</a>
+		</span></p>
+	{% include "post/image.html" %}
 	{% endif %}
 	{{ post.postControls }}
 	<div class="body">
diff --git a/templates/post_thread.html b/templates/post_thread.html
index fdf6369a..acacd602 100644
--- a/templates/post_thread.html
+++ b/templates/post_thread.html
@@ -28,49 +28,10 @@
 				<span class="postfilename">{{ post.filename|e|bidi_cleanup }}</span>
 			{% endif %}
 		{% endif %}
-		{% if post.thumb != 'file' and config.image_identification %}
-			, 
-			<span class='image_id'>
-			 <a href="http://imgops.com/{{ config.domain }}{{ config.uri_img }}{{ post.file }}">io</a>
-			{% if post.file|extension == 'jpg' %}
-				 <a href="http://regex.info/exif.cgi?url={{ config.domain }}{{ config.uri_img }}{{ post.file }}">e</a>
-			{% endif %}
-			 <a href="http://www.google.com/searchbyimage?image_url={{ config.domain }}{{ config.uri_img }}{{ post.file }}">g</a>
-			 <a href="http://www.tineye.com/search?url={{ config.domain }}{{ config.uri_img }}{{ post.file }}">t</a>
-			</span>
-		{% endif %}
+		{% include "post/image_identification.html" %}
 	)
 	</span></p>
-<a href="
-	{% if post.file|extension == 'webm' %}
-		{{ config.root }}player.php?v={{ config.uri_img }}{{ post.file }}&amp;t={{ post.filename|e('url') }}&amp;loop=1
-	{% else %}
-		{{ config.uri_img }}{{ post.file }}
-	{% endif %}" target="_blank"{% if post.thumb == 'file' or post.modifiers['is_file'] == '1' or post.filename|extension == 'webm' %} class="file"{% endif %}>
-	{% if post.thumb|extension == 'webm' %}
-		<video autoplay class="post-image" src="{{ config.uri_thumb }}{{ post.thumb }}" poster="
-			{{ config.root }}
-			{% if config.file_icons[post.filename|extension] %}
-				{{ config.file_thumb|sprintf(config.file_icons[post.filename|extension]) }}
-			{% else %}
-				{{ config.file_thumb|sprintf(config.file_icons.default) }}
-			{% endif %}" style="width:{{ post.thumbwidth }}px;height:{{ post.thumbheight }}px"></video>
-	{% else %}
-		<img class="post-image" src="
-			{% if post.thumb == 'file' %}
-				{{ config.root }}
-				{% if config.file_icons[post.filename|extension] %}
-					{{ config.file_thumb|sprintf(config.file_icons[post.filename|extension]) }}
-				{% else %}
-					{{ config.file_thumb|sprintf(config.file_icons.default) }}
-				{% endif %}
-			{% elseif post.thumb == 'spoiler' %}
-				{{ config.root }}{{ config.spoiler_image }}
-			{% else %}
-				{{ config.uri_thumb }}{{ post.thumb }}
-			{% endif %}" style="width:{{ post.thumbwidth }}px;height:{{ post.thumbheight }}px" alt="" />
-	{% endif %}
-	</a>
+	{% include "post/image.html" %}
 {% endif %}
 <div class="post op"><p class="intro"{% if not index %} id="{{ post.id }}"{% endif %}>
 	<input type="checkbox" class="delete" name="delete_{{ post.id }}" id="delete_{{ post.id }}" />
@@ -98,21 +59,7 @@
 		{% if post.mod and post.mod|hasPermission(config.mod.show_ip, board.uri) %}
 			 [<a class="ip-link" style="margin:0;" href="?/IP/{{ post.ip }}">{{ post.ip }}</a>]
 		{% endif %}
-		{% if config.display_flags and post.modifiers.flag %}
-			 <img
-				{% if config.country_flags_condensed %}
-					 class="flag flag-{{ post.modifiers.flag }}" src="{{ config.image_blank }}"
-				{% else %}
-					 class="flag" src="{{ config.uri_flags|sprintf(post.modifiers.flag) }}"
-				{% endif %}
-					 style="{% if post.modifiers['flag style'] %}
-					{{ post.modifiers['flag style'] }}
-				{% else %}
-					{{ config.flag_style }}
-				{% endif %}"
-				{% if post.modifiers['flag alt'] %} alt="{{ post.modifiers['flag alt'] | e('html_attr') }}"
-				 title="{{ post.modifiers['flag alt'] | e('html_attr') }}"{% endif %}>
-		{% endif %}
+		{% include 'post/flag.html' %}
 		 <time datetime="{{ post.time|date('%Y-%m-%dT%H:%M:%S') }}{{ timezone() }}">{{ post.time|date(config.post_date) }}</time>
 	</label>
 	{% if config.poster_ids %}