diff --git a/_posts/2020-01-22-how-the-spn-compares-to-tor.md b/_posts/2020-01-22-how-the-spn-compares-to-tor.md
index cd7eb3b..4d318b6 100644
--- a/_posts/2020-01-22-how-the-spn-compares-to-tor.md
+++ b/_posts/2020-01-22-how-the-spn-compares-to-tor.md
@@ -2,6 +2,7 @@
 title: How the SPN compares to Tor
 date: 2020-01-22
 author: davegson
+custom_thumbnail_name: spn-tor
 ---
 
 ## Different Missions
diff --git a/assets/img/shapes/placeholder-lg.png b/assets/img/shapes/placeholder-lg.png
deleted file mode 100644
index f73825a..0000000
Binary files a/assets/img/shapes/placeholder-lg.png and /dev/null differ
diff --git a/assets/img/shapes/placeholder-md.png b/assets/img/shapes/placeholder-md.png
deleted file mode 100644
index 15c229b..0000000
Binary files a/assets/img/shapes/placeholder-md.png and /dev/null differ
diff --git a/assets/img/shapes/podcast_blank.png b/assets/img/thumbnails/blog/placeholder.png
similarity index 100%
rename from assets/img/shapes/podcast_blank.png
rename to assets/img/thumbnails/blog/placeholder.png
diff --git a/assets/img/blog/spn-tor1.png b/assets/img/thumbnails/blog/spn-tor-blue.png
similarity index 100%
rename from assets/img/blog/spn-tor1.png
rename to assets/img/thumbnails/blog/spn-tor-blue.png
diff --git a/assets/img/blog/spn-tor.png b/assets/img/thumbnails/blog/spn-tor-purple.png
similarity index 100%
rename from assets/img/blog/spn-tor.png
rename to assets/img/thumbnails/blog/spn-tor-purple.png
diff --git a/assets/img/blog/spn-tor2.png b/assets/img/thumbnails/blog/spn-tor.png
similarity index 100%
rename from assets/img/blog/spn-tor2.png
rename to assets/img/thumbnails/blog/spn-tor.png
diff --git a/assets/img/thumbnails/podcast/placeholder.png b/assets/img/thumbnails/podcast/placeholder.png
new file mode 100644
index 0000000..8fda381
Binary files /dev/null and b/assets/img/thumbnails/podcast/placeholder.png differ
diff --git a/assets/img/blog/pod-21.png b/assets/img/thumbnails/podcast/pod-21.png
similarity index 100%
rename from assets/img/blog/pod-21.png
rename to assets/img/thumbnails/podcast/pod-21.png
diff --git a/blog/index.html b/blog/index.html
index e38f70b..3bba8af 100644
--- a/blog/index.html
+++ b/blog/index.html
@@ -19,7 +19,11 @@ layout: page
                 <li>
                   <div class="block transform hover:scale-95 duration-150 ease-in-out">
                     <a href="{{ post.url }}">
-                      <img src="{{ site.img_url }}shapes/podcast_blank.png" alt="">
+                      {% if post.custom_thumbnail_name == null %}
+                        <img src="{{ site.img_url }}thumbnails/blog/placeholder.png">
+                      {% else %}
+                        <img src="{{ site.img_url }}thumbnails/blog/{{ post.custom_thumbnail_name }}.png">
+                      {% endif %}
                       <div class="pt-6">
                         <span class="opacity-25">{{ post.date | date: "%-d. %b %Y" }}</span>
                         <p>{{ post.title }}</p>
diff --git a/podcast/index.html b/podcast/index.html
index 7121283..d5b4b97 100644
--- a/podcast/index.html
+++ b/podcast/index.html
@@ -28,7 +28,11 @@ layout: page
                 <li class="mt-10 md:mt-0">
                   <div class="block transform hover:scale-95 duration-150 ease-in-out">
                     <a href="{{ episode.url }}">
-                      <img src="{{ site.img_url }}shapes/podcast_blank.png" alt="">
+                      {% if episode.custom_thumbnail_name == null %}
+                        <img src="{{ site.img_url }}thumbnails/podcast/placeholder.png">
+                      {% else %}
+                        <img src="{{ site.img_url }}thumbnails/podcast/{{ episode.custom_thumbnail_name }}.png">
+                      {% endif %}
                       <span style="font-size: 12rem; font-weight: 800; margin-top: -13.8rem; margin-left: -0.8rem;" class=" z-0 absolute bg-top">
                         <button type="button" style="background-color: #6188ff;" class="inline-flex items-center px-4 py-4 rounded-md border border-transparent text-xs leading-5 font-extrabold  text-white">
                           <svg class="h-8 w-auto lg:h-5 fill-current text-white" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 9.41 11">
diff --git a/video/index.html b/video/index.html
index 1062462..0be2b7d 100644
--- a/video/index.html
+++ b/video/index.html
@@ -29,11 +29,10 @@ layout: page
                   <div class="block transform hover:scale-95 duration-150 ease-in-out">
                     <a href="{{ video.url }}">
                       {% if video.custom_thumbnail_name == null %}.
-                        {% assign thumbnail_name = 'placeholder' %}
+                        <img src="{{ site.img_url }}thumbnails/video/placeholder.png" alt="">
                       {% else %}
-                        {% assign thumbnail_name = video.custom_thumbnail_name %}
+                        <img src="{{ site.img_url }}thumbnails/video/{{ video.custom_thumbnail_name }}.png" alt="">
                       {% endif %}
-                      <img src="{{ site.img_url }}thumbnails/video/{{ thumbnail_name }}.png" alt="">
                       <span style="font-size: 12rem; font-weight: 800; margin-top: -13.8rem; margin-left: -0.8rem;" class=" z-0 absolute bg-top">
                         <button type="button" style="background-color: #6188ff;" class="inline-flex items-center px-4 py-4 rounded-md border border-transparent text-xs leading-5 font-extrabold  text-white">
                           <svg class="h-8 w-auto lg:h-5 fill-current text-white" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 9.41 11">