diff --git a/templates/shortcodes/image.html b/templates/shortcodes/image.html
index a37312c..e5a6dbe 100644
--- a/templates/shortcodes/image.html
+++ b/templates/shortcodes/image.html
@@ -1,10 +1,8 @@
-<a href="{{url}}">
-	<img class="
-			{% if full %}full{% endif %}
-			{% if pixels %}pixels{% endif %}
-			{% if transparent %}transparent{% endif %}
-			{% if no_hover %}no-hover{% endif %}
-		"
-		{% if alt %}alt="{{alt}}"{% endif %}
-		src="{% if url_min %}{{url_min}}{% else %}{{url}}{% endif %}" />
-</a>
+<img class="
+		{% if full %}full{% endif %}
+		{% if pixels %}pixels{% endif %}
+		{% if transparent %}transparent{% endif %}
+		{% if no_hover %}no-hover{% endif %}
+	"
+	{% if alt %}alt="{{alt}}"{% endif %}
+	src="{% if url_min %}{{url_min}}{% else %}{{url}}{% endif %}" />
diff --git a/templates/shortcodes/video.html b/templates/shortcodes/video.html
index 45f23eb..46ce8da 100644
--- a/templates/shortcodes/video.html
+++ b/templates/shortcodes/video.html
@@ -1,9 +1,7 @@
-<video
-	class="
+<video class="
 		{% if full %}full{% endif %}
 		{% if pixels %}pixels{% endif %}
 		{% if transparent %}transparent{% endif %}
   	"
 	{% if alt %}alt="{{alt}}"{% endif %}
-	controls src="{{url}}">
-</video>
+	controls src="{{url}}"></video>