diff --git a/src/MyWebLog/DotLiquidBespoke.fs b/src/MyWebLog/DotLiquidBespoke.fs
index cb43451..122ca0f 100644
--- a/src/MyWebLog/DotLiquidBespoke.fs
+++ b/src/MyWebLog/DotLiquidBespoke.fs
@@ -149,7 +149,13 @@ type TagLinkFilter () =
         | None        -> tag.Replace (" ", "+")
         |> function tagUrl -> WebLog.relativeUrl (webLog ctx) (Permalink $"tag/{tagUrl}/")
 
-            
+
+/// A filter to generate a link for theme asset (image, stylesheet, script, etc.)
+type ThemeAssetFilter () =
+    static member ThemeAsset (ctx : Context, asset : string) =
+        $"/themes/{(webLog ctx).themePath}/{asset}"
+
+
 /// Create links for a user to log on or off, and a dashboard link if they are logged off
 type UserLinksTag () =
     inherit Tag ()
diff --git a/src/MyWebLog/Program.fs b/src/MyWebLog/Program.fs
index 645c9b0..bf5c099 100644
--- a/src/MyWebLog/Program.fs
+++ b/src/MyWebLog/Program.fs
@@ -211,7 +211,8 @@ let main args =
     
     // Set up DotLiquid
     [ typeof<AbsoluteLinkFilter>; typeof<CategoryLinkFilter>; typeof<EditPageLinkFilter>; typeof<EditPostLinkFilter>
-      typeof<NavLinkFilter>;      typeof<RelativeLinkFilter>; typeof<TagLinkFilter>;      typeof<ValueFilter>
+      typeof<NavLinkFilter>;      typeof<RelativeLinkFilter>; typeof<TagLinkFilter>;      typeof<ThemeAssetFilter>
+      typeof<ValueFilter>
     ]
     |> List.iter Template.RegisterFilter
     
diff --git a/src/MyWebLog/themes/bit-badger/layout.liquid b/src/MyWebLog/themes/bit-badger/layout.liquid
index 5cf46a6..c802f3f 100644
--- a/src/MyWebLog/themes/bit-badger/layout.liquid
+++ b/src/MyWebLog/themes/bit-badger/layout.liquid
@@ -11,7 +11,7 @@
     <header class="site-header">
       <div class="header-logo">
         <a href="{{ "" | relative_link }}">
-          <img src="/themes/{{ web_log.theme_path }}/bitbadger.png"
+          <img src="{{ "bitbadger.png" | theme_asset }}"
                alt="A cartoon badger looking at a computer screen, with his paw on a mouse"
                title="Bit Badger Solutions">
         </a>
@@ -20,10 +20,10 @@
       <div class="header-spacer"> &nbsp; </div>
       <div class="header-social">
         <a href="https://twitter.com/Bit_Badger" title="Bit_Badger on Twitter" target="_blank">
-          <img src="/themes/{{ web_log.theme_path }}/twitter.png" alt="Twitter">
+          <img src="{{ "twitter.png" | theme_asset }}" alt="Twitter">
         </a> &nbsp;
         <a href="https://www.facebook.com/bitbadger.solutions" title="Bit Badger Solutions on Facebook" target="_blank">
-          <img src="/themes/{{ web_log.theme_path }}/facebook.png" alt="Facebook">
+          <img src="{{ "facebook.png" | theme_asset }}" alt="Facebook">
         </a>
       </div>
     </header>
diff --git a/src/MyWebLog/themes/bit-badger/solution-page.liquid b/src/MyWebLog/themes/bit-badger/solution-page.liquid
index dcbd48f..89b02df 100644
--- a/src/MyWebLog/themes/bit-badger/solution-page.liquid
+++ b/src/MyWebLog/themes/bit-badger/solution-page.liquid
@@ -18,8 +18,8 @@
 <div class="app-info">
   <article class="content">
     <aside>
-      <img src="/themes/{{ web_log.theme_path }}/screenshots/{{ page.permalink | split: "/" | last }}.png"
-           alt="Screen shot of {{ page.title | escape }}">
+      {%- capture screen_url %}screenshots/{{ page.permalink | split: "/" | last }}.png{% endcapture -%}
+      <img src="{{ screen_url | theme_asset }}" alt="Screen shot of {{ page.title | escape }}">
     </aside>
     {{ page.text }}
     {%- assign curr_tech  = page.metadata | where: "name", "tech" -%}
diff --git a/src/MyWebLog/themes/daniel-j-summers/layout.liquid b/src/MyWebLog/themes/daniel-j-summers/layout.liquid
index 0cb08c2..7b6bb02 100644
--- a/src/MyWebLog/themes/daniel-j-summers/layout.liquid
+++ b/src/MyWebLog/themes/daniel-j-summers/layout.liquid
@@ -13,9 +13,9 @@
     </title>
     <link rel="preload" href="https://fonts.googleapis.com/css?family=Quicksand|Oswald" as="style">
     <link rel="preload" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" as="style">
-    <link rel="preload" href="/themes/{{ web_log.theme_path }}/style.css" as="style">
+    <link rel="preload" href="{{ "style.css" | theme_asset }}" as="style">
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
-    <script src="/themes/{{ web_log.theme_path }}/djs.js"></script>
+    <script src="{{ "djs.js" | theme_asset }}"></script>
     {% page_head -%}
   </head>
   <body>
@@ -73,8 +73,8 @@
           <div class="football-panel">
             <span>
               <a href="https://utsports.com" style="background:none;padding:0;" target="_blank" rel="noopener">
-                <img src="/themes/{{ web_log.theme_path }}/tennessee.png" alt="T" title="Tennessee Sports"
-                     style="border:0;" width="75px">
+                <img src="{{ "tennessee.png" | theme_asset }}" alt="T" title="Tennessee Sports" style="border:0;"
+                     width="75px">
               </a>
             </span>
             <div>
@@ -92,7 +92,7 @@
           <div class="football-panel">
             <span>
               <a href="https://csurams.com" style="background:none;padding:0;" target="_blank" rel="noopener">
-                <img src="/themes/{{ web_log.theme_path }}/csurams.png" alt="CSU Rams Logo"
+                <img src="{{ "csurams.png" | theme_asset }}" alt="CSU Rams Logo"
                      title="Colorado State Sports" style="border:0;" height="75px" width="75px">
               </a>
             </span>
diff --git a/src/MyWebLog/themes/tech-blog/layout.liquid b/src/MyWebLog/themes/tech-blog/layout.liquid
index f1b4f50..81aaf0f 100644
--- a/src/MyWebLog/themes/tech-blog/layout.liquid
+++ b/src/MyWebLog/themes/tech-blog/layout.liquid
@@ -17,7 +17,7 @@
     <header class="site-header">
       <div class="header-logo">
         <a href="{{ "" | relative_link }}">
-          <img src="/themes/tech-blog/img/bitbadger.png"
+          <img src="{{ "img/bitbadger.png" | theme_asset }}"
                alt="A cartoon badger looking at a computer screen, with his paw on a mouse"
                title="Bit Badger Solutions">
         </a>
@@ -26,13 +26,13 @@
       <div class="header-spacer">&nbsp;</div>
       <div class="header-social">
         <a href="{{ "feed.xml" | relative_link }}" title="Subscribe to The Bit Badger Blog via RSS">
-          <img src="/themes/tech-blog/img/rss.png" alt="RSS">
+          <img src="{{ "img/rss.png" | theme_asset }}" alt="RSS">
         </a> &nbsp; &nbsp;
         <a href="https://twitter.com/Bit_Badger" title="Bit_Badger on Twitter">
-          <img src="/themes/tech-blog/img/twitter.png" alt="Twitter">
+          <img src="{{ "img/twitter.png" | theme_asset }}" alt="Twitter">
         </a> &nbsp; &nbsp;
         <a href="https://www.facebook.com/bitbadger.solutions" title="Bit Badger Solutions on Facebook">
-          <img src="/themes/tech-blog/img/facebook.png" alt="Facebook">
+          <img src="{{ "img/facebook.png" | theme_asset }}" alt="Facebook">
         </a>
       </div>
     </header>