diff --git a/_includes/gallery b/_includes/gallery
new file mode 100644
index 00000000..e33b7307
--- /dev/null
+++ b/_includes/gallery
@@ -0,0 +1,50 @@
+{% include absolute-url.liquid %}
+
+{% if include.id %}
+  {% assign gallery = page.[include.id] %}
+{% else %}
+  {% assign gallery = page.gallery %}
+{% endif %}
+
+{% capture gallery-size %}{{ gallery | size }}{% endcapture %}
+
+{% if gallery-size == '2' %}
+  {% assign gallery-layout = 'half' %}
+{% elsif gallery-size >= '3' %}
+  {% assign gallery-layout = 'third' %}
+{% else %}
+  {% assign gallery-layout = '' %}
+{% endif %}
+
+<figure class="{{ gallery-layout }}">
+  {% for img in gallery %}
+    {% if img.large %}
+      <a href=
+        {% if img.large contains "http" %}
+          "{{ img.large }}"
+        {% else %}
+          "{{ img.large | prepend: "/images/" | prepend: absurl }}"
+        {% endif %}
+      >
+        <img src=
+          {% if img.thumb contains "http" %}
+            "{{ img.thumb }}"
+          {% else %}
+            "{{ img.thumb | prepend: "/images/" | prepend: absurl }}"
+          {% endif %}
+        alt="{% if img.alt %}{{ img.alt }}{% endif %}">
+      </a>
+    {% else %}
+      <img src=
+        {% if img.thumb contains "http" %}
+          "{{ img.thumb }}"
+        {% else %}
+          "{{ img.thumb | prepend: "/images/" | prepend: absurl }}"
+        {% endif %}
+      alt="{% if img.alt %}{{ img.alt }}{% endif %}">
+    {% endif %}
+  {% endfor %}
+  {% if include.caption %}
+    <figcaption>{{ include.caption | markdownify | remove: "<p>" | remove: "</p>" }}</figcaption>
+  {% endif %}
+</figure>
\ No newline at end of file
diff --git a/_posts/2010-09-09-post-format-gallery-tiled.md b/_posts/2010-09-09-post-format-gallery-tiled.md
deleted file mode 100644
index ee66299d..00000000
--- a/_posts/2010-09-09-post-format-gallery-tiled.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-title: "Post Format: Gallery (Tiled)"
-date: 2010-09-09T17:23:27+00:00
-categories:
-  - Post Formats
-tags:
-  - gallery
-  - Post Formats
-  - tiled
-format: gallery
----
-This is a test for a tiled gallery of images.
-
-This is some text after the Tiled Gallery just to make sure that everything spaces nicely.
\ No newline at end of file
diff --git a/_posts/2010-09-09-post-format-gallery.md b/_posts/2010-09-09-post-format-gallery.md
new file mode 100644
index 00000000..2e6b014e
--- /dev/null
+++ b/_posts/2010-09-09-post-format-gallery.md
@@ -0,0 +1,92 @@
+---
+title: "Post Format: Gallery"
+date: 2010-09-09T17:23:27+00:00
+categories:
+  - Post Formats
+tags:
+  - gallery
+  - Post Formats
+  - tiled
+format: gallery
+gallery:
+  - large: unsplash-gallery-image-1.jpg
+    thumb: unsplash-gallery-image-1-th.jpg
+    alt: "placeholder image 1"
+  - large: unsplash-gallery-image-2.jpg
+    thumb: unsplash-gallery-image-2-th.jpg
+    alt: "placeholder image 2"
+  - large: unsplash-gallery-image-3.jpg
+    thumb: unsplash-gallery-image-3-th.jpg
+    alt: "placeholder image 3"
+gallery2:
+  - large: https://flic.kr/p/8a6Ven
+    thumb: https://farm2.staticflickr.com/1272/4697500467_8294dac099_q.jpg
+    alt: "Black and grays with a hint of green"
+  - large: https://flic.kr/p/8a738X
+    thumb: https://farm5.staticflickr.com/4029/4697523701_249e93ba23_q.jpg
+    alt: "Made for open text placement"
+  - large: https://flic.kr/p/8a6VXP
+    thumb: https://farm5.staticflickr.com/4046/4697502929_72c612c636_q.jpg
+    alt: "Fog in the trees"
+gallery3:
+  - thumb: unsplash-gallery-image-2-th.jpg
+    alt: "placeholder image 2"
+  - thumb: unsplash-gallery-image-4-th.jpg
+    alt: "placeholder image 4"
+---
+These are gallery tests for image wrapped in `<figure>` elements.
+
+To place a gallery add the necessary YAML Front Matter:
+
+```yaml
+gallery:
+  - large: unsplash-gallery-image-1.jpg
+    thumb: unsplash-gallery-image-1-th.jpg
+    alt: "placeholder image 1"
+  - large: unsplash-gallery-image-2.jpg
+    thumb: unsplash-gallery-image-2-th.jpg
+    alt: "placeholder image 2"
+  - large: unsplash-gallery-image-3.jpg
+    thumb: unsplash-gallery-image-3-th.jpg
+    alt: "placeholder image 3"
+  - large: unsplash-gallery-image-4.jpg
+    thumb: unsplash-gallery-image-4-th.jpg
+    alt: "placeholder image 4"
+```
+
+And then drop-in the gallery include --- gallery `caption` is optional.
+
+```liquid
+{% raw %}{% include gallery caption="This is a sample gallery with **Markdown support**." %}{% endraw %}
+```
+
+{% include gallery caption="This is a sample gallery with **Markdown support**." %}
+
+This is some text after the gallery just to make sure that everything aligns properly.
+
+Here comes another gallery, this time set the `id` to match 2nd gallery hash in YAML Front Matter.
+
+```yaml
+gallery2:
+  - large: https://flic.kr/p/8a6Ven
+    thumb: https://farm2.staticflickr.com/1272/4697500467_8294dac099_q.jpg
+    alt: "Black and grays with a hint of green"
+  - large: https://flic.kr/p/8a738X
+    thumb: https://farm5.staticflickr.com/4029/4697523701_249e93ba23_q.jpg
+    alt: "Made for open text placement"
+  - large: https://flic.kr/p/8a6VXP
+    thumb: https://farm5.staticflickr.com/4046/4697502929_72c612c636_q.jpg
+    alt: "Fog in the trees"
+```
+
+And place it like so: 
+
+```liquid
+{% raw %}{% include gallery id="gallery2" caption="This is a second gallery example with images hosted externally." %}{% endraw %}
+```
+
+{% include gallery id="gallery2" caption="This is a second gallery example with images hosted externally." %}
+
+And for giggles one more gallery just to make sure this works.
+
+{% include gallery id="gallery3" caption="This is a third gallery example with two images." %}
\ No newline at end of file
diff --git a/images/unsplash-gallery-image-1-th.jpg b/images/unsplash-gallery-image-1-th.jpg
new file mode 100644
index 00000000..b8fcb16f
Binary files /dev/null and b/images/unsplash-gallery-image-1-th.jpg differ
diff --git a/images/unsplash-gallery-image-1.jpg b/images/unsplash-gallery-image-1.jpg
new file mode 100644
index 00000000..d0479110
Binary files /dev/null and b/images/unsplash-gallery-image-1.jpg differ
diff --git a/images/unsplash-gallery-image-2-th.jpg b/images/unsplash-gallery-image-2-th.jpg
new file mode 100644
index 00000000..24e4b4ad
Binary files /dev/null and b/images/unsplash-gallery-image-2-th.jpg differ
diff --git a/images/unsplash-gallery-image-2.jpg b/images/unsplash-gallery-image-2.jpg
new file mode 100644
index 00000000..ec9d0e7c
Binary files /dev/null and b/images/unsplash-gallery-image-2.jpg differ
diff --git a/images/unsplash-gallery-image-3-th.jpg b/images/unsplash-gallery-image-3-th.jpg
new file mode 100644
index 00000000..a39e1d5a
Binary files /dev/null and b/images/unsplash-gallery-image-3-th.jpg differ
diff --git a/images/unsplash-gallery-image-3.jpg b/images/unsplash-gallery-image-3.jpg
new file mode 100644
index 00000000..f155f7e4
Binary files /dev/null and b/images/unsplash-gallery-image-3.jpg differ
diff --git a/images/unsplash-gallery-image-4-th.jpg b/images/unsplash-gallery-image-4-th.jpg
new file mode 100644
index 00000000..e42dc294
Binary files /dev/null and b/images/unsplash-gallery-image-4-th.jpg differ
diff --git a/images/unsplash-gallery-image-4.jpg b/images/unsplash-gallery-image-4.jpg
new file mode 100644
index 00000000..bb12a285
Binary files /dev/null and b/images/unsplash-gallery-image-4.jpg differ