diff --git a/www/templates/old_post_types/directory.html b/www/templates/old_post_types/directory.html
deleted file mode 100644
index e0babeb..0000000
--- a/www/templates/old_post_types/directory.html
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-{% extends "pathed_content.html" %}
-
-{% block extra_head %}
-	<link rel="stylesheet" href="/static/directorystyle.css">
-{%endblock%}
-
-{%block content_article%}
-	{% if subposts|length > 0 %}
-		<h3>Directory contents:</h3>
-		<table class="directory">
-			<tr>
-				<th></th>
-				<th class="hsmol_hide">Name</th>
-				<th>Title</th>
-				<th class="entry_update_time hsmol_hide">Modified</th>
-			</tr>
-			{% for subpost in subposts %}
-				<tr class="entry">
-					<td>
-						{{ fa[subpost.post_metadata.icon] | raw }}
-					</td>
-					<td class="hsmol_hide">
-						<a href={{subpost.post_path}}>{{subpost.post_basename}}</a>
-					</td>
-					<td class="entry_title">
-						<a href={{subpost.post_path}}>{{ subpost.post_metadata.title }}</a>
-					</td>
-					<td class="entry_update_time hsmol_hide">
-						{{ subpost.post_update_time }}
-					</td>
-				</tr>
-			{% endfor %}
-		</table>
-	{%else%}
-		<h4>This directory appears to be empty...</h4>
-		<span>This shouldn't happen, sorry!</span>
-	{% endif %}
-
-	{{ content_html|raw }}
-
-{%endblock%}
diff --git a/www/templates/old_post_types/gallery.html b/www/templates/old_post_types/gallery.html
deleted file mode 100644
index 4e96b3d..0000000
--- a/www/templates/old_post_types/gallery.html
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-{% extends "pathed_content.html" %}
-
-{% block extra_head %}
-	<link rel="stylesheet" href="/static/directorystyle.css">
-    <link rel="stylesheet" href="/static/gallerystyle.css">
-{%endblock%}
-
-{%block content_article%}
-    {% if subposts|length > 0 %}
-    <table class="directory">
-        <h3>Art Subfolders:</h3>
-        <tr>
-            <th></th>
-            <th class="hsmol_hide">Name</th>
-            <th>Title</th>
-            <th class="entry_update_time hsmol_hide">Modified</th>
-        </tr>
-        {% for subpost in subposts %}
-            <tr class="entry">
-                <td>
-                    {{ fa[subpost.post_metadata.icon] | raw }}
-                </td>
-                <td class="hsmol_hide">
-                    <a href={{subpost.post_path}}>{{subpost.post_basename}}</a>
-                </td>
-                <td class="entry_title">
-                    <a href={{subpost.post_path}}>{{ subpost.post_metadata.title }}</a>
-                </td>
-                <td class="entry_update_time hsmol_hide">
-                    {{ subpost.post_update_time }}
-                </td>
-            </tr>
-        {% endfor %}
-    </table>
-    {% endif %}
-
-    {{ content_html|raw }}
-
-	{% if gallery_images|length > 0 %}		
-        <ul class="gallery">
-			{% for post in gallery_images %}
-				<li class="entry">
-				    <a href={{post.post_path}}>
-                        <figure>
-                            <img src="{{post.post_metadata.media_file}}">
-                            <figcaption>
-                                {{ post.post_metadata.title }}
-                            </figcaption>
-                        </figure>
-                    </a>
-                </li>
-			{% endfor %}
-        </ul>
-	{%else%}
-		<h4>How sad. There are no images yet... What a real shame :c </h4>
-	{% endif %}
-{%endblock%}
diff --git a/www/templates/render_templates/directory.html b/www/templates/render_templates/directory.html
new file mode 100644
index 0000000..020b4cf
--- /dev/null
+++ b/www/templates/render_templates/directory.html
@@ -0,0 +1,13 @@
+
+
+{% extends "pathed_content.html" %}
+
+{% block extra_head %}
+	<link rel="stylesheet" href="/static/directorystyle.css">
+{%endblock%}
+
+{%block content_article%}
+	{{ include('fragments/directory/inline.html') }}
+
+	{{ content_html|raw }}
+{%endblock%}
diff --git a/www/templates/render_templates/gallery.html b/www/templates/render_templates/gallery.html
new file mode 100644
index 0000000..bb475d7
--- /dev/null
+++ b/www/templates/render_templates/gallery.html
@@ -0,0 +1,27 @@
+
+{% extends "pathed_content.html" %}
+
+{%block content_article%}
+    {{ include('fragments/directory/inline.html') }}
+
+    {{ content_html|raw }}
+
+	{% if search_results|length > 0 %}		
+        <ul class="gallery">
+			{% for post in search_results %}
+				<li class="entry">
+				    <a href={{post.path}}>
+                        <figure>
+                            <img src="{{post.media_preview_url}}">
+                            <figcaption>
+                                {{ post.title }}
+                            </figcaption>
+                        </figure>
+                    </a>
+                </li>
+			{% endfor %}
+        </ul>
+	{%else%}
+		<h4>How sad. There are no images yet... What a real shame :c </h4>
+	{% endif %}
+{%endblock%}
diff --git a/www/templates/old_post_types/image.html b/www/templates/render_templates/image.html
similarity index 66%
rename from www/templates/old_post_types/image.html
rename to www/templates/render_templates/image.html
index aff2115..4be0a6e 100644
--- a/www/templates/old_post_types/image.html
+++ b/www/templates/render_templates/image.html
@@ -1,5 +1,4 @@
 
-
 {% extends "pathed_content.html" %}
 
 {% block extra_head %}
@@ -14,12 +13,12 @@
 
 {%block content_article%}
 	<figure>
-		<a target="_blank" href="{{post.post_metadata.media_file}}"> 
-			<img id="gallery_image" src="{{post.post_metadata.media_file}}"></img> 
+		<a target="_blank" href="{{page.media_url}}"> 
+			<img id="gallery_image" src="{{page.media_url}}"></img> 
 		</a>
 
 		<figcaption>
-			{{ content_html|raw }}
+			{{ page.html|raw }}
 		</figcaption>
 	</figure>
 {%endblock%}
diff --git a/www/templates/old_post_types/markdown.html b/www/templates/render_templates/vanilla.html
similarity index 100%
rename from www/templates/old_post_types/markdown.html
rename to www/templates/render_templates/vanilla.html
diff --git a/www/templates/upload.html b/www/templates/upload.html
index bee8710..58bb952 100644
--- a/www/templates/upload.html
+++ b/www/templates/upload.html
@@ -8,10 +8,10 @@
 
 {%block main_content%}
 	<article>
-		<form method="post" enctype="multipart/form-data" action="/api/admin/upload">
-			<input type="text" id="post_path" name="post_path"/>
-			<input type="password" id="api_key" name="api_key"/>
-			<input type="file" id="post_data" name="post_data"/>
+		<form method="post" enctype="multipart/form-data" action="/api/upload">
+			<input type="text" id="path" name="path"/>
+			<input type="password" id="ACCESS_KEY" name="ACCESS_KEY"/>
+			<input type="file" id="file" name="file"/>
 
 			<button>Submit</button>
 		</form>