diff --git a/templates/post/flag.html b/templates/post/flag.html
new file mode 100644
index 00000000..61622368
--- /dev/null
+++ b/templates/post/flag.html
@@ -0,0 +1,18 @@
+{% 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 %}
diff --git a/templates/post/image.html b/templates/post/image.html
new file mode 100644
index 00000000..5020f782
--- /dev/null
+++ b/templates/post/image.html
@@ -0,0 +1,45 @@
+<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>
diff --git a/templates/post/image_identification.html b/templates/post/image_identification.html
new file mode 100644
index 00000000..3d3bd655
--- /dev/null
+++ b/templates/post/image_identification.html
@@ -0,0 +1,10 @@
+{% 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>
+	</span>
+{% endif %}