diff --git a/.eleventy.js b/.eleventy.js
index beebcbb0b..db0d9f585 100644
--- a/.eleventy.js
+++ b/.eleventy.js
@@ -20,9 +20,7 @@ const { readableDate
       , teamPhoto
       , teamLink
       , markdownify
-      , weightedSort
-      , asRelativeUrl
-      , matchPosts } = require('./config/filters');
+      , weightedSort } = require('./config/filters');
 const { postsCollection, servicesCollection, tagsCollection } = require('./config/collections');
 const { headingLinks } = require('./config/headingLinks');
 const { contrastRatio, humanReadableContrastRatio } = require('./config/wcagColorContrast');
@@ -107,12 +105,11 @@ module.exports = function (config) { /* eslint-disable-line func-names */
   config.addFilter('team_photo', teamPhoto);
   // Add a link to an 18F team member's author page
   config.addFilter('team_link', teamLink);
-  config.addFilter('weighted_sort', weightedSort);
-  config.addFilter('relative_url', asRelativeUrl);
-  config.addFilter('match_posts', matchPosts);
   config.addFilter('limit', (arr, limit) => arr.slice(0, limit));
   config.addFilter('matching', (collection, author) => collection.filter((post) => post.data.authors.includes(author)));
   config.addFilter('markdownify', markdownify);
+  config.addFilter('relative_url', (url) => url);
+  config.addFilter('weighted_sort', weightedSort);
 
   // Color contrast checkers for the color matrix in the Brand guide
   config.addFilter('contrastRatio', contrastRatio);
@@ -188,7 +185,7 @@ module.exports = function (config) { /* eslint-disable-line func-names */
     // Check for external URLs. External means any site that is not a federal .gov url
     // This check can't detect state/local .gov domains. Those will need to be
     // manually adjusted
-    const baseURL = new URL('https://guides.18f.gov/');
+    const baseURL = new URL('https://18f.gsa.gov/');
     const hrefValue = token.attrGet('href');
 
     if (!(new URL(hrefValue, baseURL).hostname.endsWith('.gov'))) {
diff --git a/_includes/adjacent_page_links.html b/_includes/adjacent_page_links.html
new file mode 100644
index 000000000..e85deb8d4
--- /dev/null
+++ b/_includes/adjacent_page_links.html
@@ -0,0 +1,38 @@
+{% assign previous = collections.posts | getPreviousCollectionItem: page %}
+{% assign next = collections.posts | getNextCollectionItem: page %}
+{% if previous or next %}
+<section class="margin-top-6 post-pagination">
+  <div class="grid-container">
+    <hr class="hr-1-base-lighter">
+    <div class="grid-row grid-gap">
+      <div class="grid-col-6">
+        {% if previous %}
+        <a href="{{ previous.url | url }}"
+           class="text-no-underline post-pagination__link"
+        >
+          <h2 class="post-pagination__heading">
+            {% include "svg/icons/arrow-left.svg" %}
+            Previous Post
+          </h2>
+          <p class="measure-1 text-bold text-primary-darkest">{{ previous.data.title }}</p>
+        </a>
+        {% endif %}
+      </div>
+      <div class="grid-col-6 text-right">
+        {% if next %}
+        <a href="{{ next.url | url }}"
+           class="text-no-underline post-pagination__link"
+        >
+          <h2 class="post-pagination__heading">
+            Next Post
+            {% include "svg/icons/arrow-right.svg" %}
+          </h2>
+          <p class="measure-1 float-right text-bold text-primary-darkest text-right">{{ next.data.title }}</p>
+        </a>
+        {% endif %}
+      </div>
+    </div>
+    <hr class="hr-1-base-lighter">
+  </div>
+</section>
+{% endif %}
diff --git a/_includes/feature-image-small.html b/_includes/feature-image-small.html
new file mode 100644
index 000000000..5ab6bf1bb
--- /dev/null
+++ b/_includes/feature-image-small.html
@@ -0,0 +1,11 @@
+{% if image and image_feature_small %}
+  {% comment %}
+    The blog posts frontmatter has historically had the image paths set
+    with an absolute path, by including the leading slash.
+
+    The image shortcode needs the image URL without that slash,
+    hence the assign statement here removing the first one.
+  {% endcomment %}
+  {% assign rel_image_path = image | remove_first: "/" %}
+  {% image_with_class rel_image_path "image-feature-small" image_alt %}
+{% endif %}
diff --git a/_includes/feature-image.html b/_includes/feature-image.html
index 3d5cfa397..4368c0252 100644
--- a/_includes/feature-image.html
+++ b/_includes/feature-image.html
@@ -1,11 +1,16 @@
-{% assign include_image = image | default: page.image %}
-{% assign include_image_alt = image | default: page.image_alt | default: "" %}
-{% assign include_figcaption = image_figcaption | default: page.image_figcaption %}
-
-{% if page.hero %}
-<figure class="post-feature_image" role="img" title="{{ include_image_alt }}" style="background-image: url('{{ site.baseurl }}{{ include_image }}')">
-  {% if include_figcaption %}
-    <figcaption>{{- include_figcaption -}}</figcaption>
-  {% endif %}
-</figure>
+{% if image %}
+  {% comment %}
+    I'm wondering if there's a better way to do this, like setting up
+    a shortcode.
+  {% endcomment %}
+  <figure
+    class="post-feature_image"
+    role="img"
+    title="{{ image_alt }}"
+    style="background-image: url('{{ image | url }}')"
+    >
+    {% if image_figcaption %}
+      <figcaption>{{ image_figcaption }}</figcaption>
+    {% endif %}
+  </figure>
 {% endif %}
diff --git a/_includes/layouts/default.html b/_includes/layouts/default.html
index b15af64a8..2086240e9 100644
--- a/_includes/layouts/default.html
+++ b/_includes/layouts/default.html
@@ -11,25 +11,17 @@
       {% endif %}
     {% endcomment %}
           <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-  <body class="{{ layout.class }} {{ page.class }} {% if site.site_width %}site-{{ site.site_width }}{% endif %}">
-
+  <body class="{{ layout.class }} {{ page.class }}">
     {% include "skipnav.html" %}
     {% include "header.html" %}
 
-    {% if page.tagline and page.intro %}
-    <section class="grid-container usa-section">
-      <div class="grid-row grid-gap">
-        <div class="tablet:grid-col-4">
-          <h2 class="font-heading-xl margin-top-0 tablet:margin-bottom-0">{{ page.tagline }}</h2>
-        </div>
-        <div class="tablet:grid-col-8 usa-prose">
-          {{ page.intro | markdownify }}
-        </div>
-      </div>
-    </section>
-    {% endif %}
+    {% comment %}
+      code smell: Altering layouts based on the value of `layout`.
 
-    {% if page.layout == 'post' %}
+      We probably do this because every other layout needs the <main> tag,
+      while the post layout needs <article> without being wrapped in <main>.
+    {% endcomment %}
+    {% if layout == 'post' %}
       {{ content }}
     {% else %}
       <main id="main-content">
@@ -38,8 +30,6 @@ <h2 class="font-heading-xl margin-top-0 tablet:margin-bottom-0">{{ page.tagline
     {% endif %}
 
     {% include "footer.html" %}
-
     {% include "scripts.html" %}
-
   </body>
 </html>
diff --git a/_includes/layouts/guides.html b/_includes/layouts/guides.html
deleted file mode 100644
index cc7237eb0..000000000
--- a/_includes/layouts/guides.html
+++ /dev/null
@@ -1,26 +0,0 @@
----
-layout: default
-main:
-  class: 'primary-layout'
----
-
-{% assign page_title = subnav_title | default: title %}
-
-<section class="usa-section section-padding-sm">
-  <div class="grid-container">
-    <h1> {{ title }} </h1>
-    {% if lead %}
-      <p class="font-sans-xl line-height-sans-3"> {{ lead }} </p>
-    {% endif %}
-    {% if image %}
-      {% image_with_class image "margin-top-4" image_alt_text %}
-    {% endif %}
-  </div>
-</section>
-
- {{ content }}
-
-{% if banner_cta %}
-  {% include "banner-cta.html" %}
-{% endif %}
-
diff --git a/_includes/layouts/post.html b/_includes/layouts/post.html
index 8bfad9869..04a7c31c8 100644
--- a/_includes/layouts/post.html
+++ b/_includes/layouts/post.html
@@ -1,14 +1,7 @@
 ---
 layout: default
 ---
-{% comment %}
-Some of the `page.` references will need to be deleted — but I'm not yet sure which.
-{% endcomment %}
-
-{% if page.image %}
-  {% comment %}This include will probably need to pass in data explicitly.{% endcomment %}
-  {% include "feature-image.html" %}
-{% endif %}
+{% include "feature-image.html" %}
 
 <article id="main-content" class="post-article margin-top-6" itemscope itemtype="http://schema.org/BlogPosting">
   <div class="grid-container">
@@ -30,11 +23,11 @@ <h1 itemprop="name headline">{{ title }}</h1>
     <div class="grid-row grid-gap margin-top-8">
       <div class="tablet:grid-col-7">
         <div class="post-content" itemprop="articleBody">
-          {% if page.image and page.image_feature_small %}
-            {% image_with_class page.image "image-feature-small" page.image_accessibility %}
-          {% endif %}
+
+          {% include "feature-image-small.html" %}
 
           {{ content }}
+
         </div>
       </div>
       <aside class="tablet:grid-offset-1 tablet:grid-col-4">
@@ -44,49 +37,12 @@ <h1 itemprop="name headline">{{ title }}</h1>
   </div>
 </article>
 
-{% assign previous = collections.posts | getPreviousCollectionItem: page %}
-{% assign next = collections.posts | getNextCollectionItem: page %}
-{% if previous or next %}
-<section class="margin-top-6 post-pagination">
-  <div class="grid-container">
-    <hr class="hr-1-base-lighter">
-    <div class="grid-row grid-gap">
-      <div class="grid-col-6">
-        {% if previous %}
-        <a href="{{ previous.url | url }}"
-           class="text-no-underline post-pagination__link"
-        >
-          <h2 class="post-pagination__heading">
-            {% include "svg/icons/arrow-left.svg" %}
-            Previous Post
-          </h2>
-          <p class="measure-1 text-bold text-primary-darkest">{{ previous.data.title }}</p>
-        </a>
-        {% endif %}
-      </div>
-      <div class="grid-col-6 text-right">
-        {% if next %}
-        <a href="{{ next.url | url }}"
-           class="text-no-underline post-pagination__link"
-        >
-          <h2 class="post-pagination__heading">
-            Next Post
-            {% include "svg/icons/arrow-right.svg" %}
-          </h2>
-          <p class="measure-1 float-right text-bold text-primary-darkest text-right">{{ next.data.title }}</p>
-        </a>
-        {% endif %}
-      </div>
-    </div>
-    <hr class="hr-1-base-lighter">
-  </div>
-</section>
-{% endif %}
+{% include "adjacent_page_links.html" %}
 
 <section class="margin-top-3 margin-bottom-6">
   <div class="grid-container">
     {% comment %}
-      Replace the next line with the related posts generator.
+      TODO: Replace the next line with the related posts generator.
     {% endcomment %}
     {% assign related_posts = collections.posts | reverse | slice: 0, 3 %}
     {% include "featured-posts.html",
diff --git a/_includes/layouts/primary.html b/_includes/layouts/primary.html
index 2cb36f0ea..ce7204c96 100644
--- a/_includes/layouts/primary.html
+++ b/_includes/layouts/primary.html
@@ -3,24 +3,21 @@
 main:
   class: 'primary-layout'
 ---
-
-{% assign page_title = page.subnav_title | default: page.title %}
-
 <section class="usa-section section-padding-sm">
   <div class="grid-container">
-    <h1> {{ page.title }} </h1>
-    {% if page.lead %}
-      <p class="font-sans-xl line-height-sans-3">{{ page.lead }}</p>
+    <h1>{{ title }}</h1>
+    {% if lead %}
+      <p class="font-sans-xl line-height-sans-3">{{ lead }}</p>
     {% endif %}
-    {% if page.image %}
-      {% image_with_class page.image "margin-top-4" page.image_alt_text %}
+    {% if image %}
+      {% image_with_class image "margin-top-4" image_alt_text %}
     {% endif %}
   </div>
 </section>
 
- {{ content }}
+{{ content }}
 
-{% if page.banner_cta %}
+{% if banner_cta %}
   {% include "banner-cta.html" %}
 {% endif %}
 
diff --git a/_includes/meta.html b/_includes/meta.html
index ffaad60ff..712e7d6d3 100644
--- a/_includes/meta.html
+++ b/_includes/meta.html
@@ -24,15 +24,21 @@
   {% assign page_title = title | append: ' | 18F ' %}
 {% endif %}
 
+{% comment %}
+  Descriptions are escaped because some contain HTML content which,
+  left to its own devices, renders in a way that messes up <head>
+  and looks quite bad.
+{% endcomment %}
+
 <title>{{ page_title }}</title>
 <meta property="og:title" content="{{ page_title }}" />
-<meta name="description" content="{{ description }}" />
-<meta property="og:description" content="{{ description }}" />
+<meta name="description" content="{{ description | escape }}" />
+<meta property="og:description" content="{{ description | escape }}" />
 
 <meta name="twitter:card" content="summary" />
 <meta name="twitter:site" content="@{{ site.twitter }}" />
 <meta name="twitter:title" content="{{ title }}" />
-<meta name="twitter:description" content="{{ description }}" />
+<meta name="twitter:description" content="{{ description | escape }}" />
 
 <meta property="og:type" content="article" />
 <link rel="canonical" href="{{ page.url }}" />
diff --git a/config/filters.js b/config/filters.js
index c6980b559..ebeba89a6 100644
--- a/config/filters.js
+++ b/config/filters.js
@@ -89,12 +89,10 @@ const teamLink = (slug) => {
   return `<a href="/author/${slug.toLowerCase()}/">${name}</a>`
 }
 
-// TODO These all need implementation, they're just placeholders so the site builds at all
-// TODO remove the eslint-disable directive after implementation
+// TODO This needs implementation, it's just a placeholder for now.
+// TODO Remove the eslint-disable directive after implementation
 /* eslint-disable */
 const weightedSort = (array, weight_name, sort_name) => array
-const asRelativeUrl = (url) => url
-const matchPosts = (page, property='tags') => []
 /* eslint-enable */
 
 const md = markdownIt({ html: true });
@@ -111,6 +109,4 @@ module.exports = {
   teamLink,
   markdownify,
   weightedSort,
-  asRelativeUrl,
-  matchPosts,
 };
diff --git a/content/pages/about.md b/content/pages/about.md
index 18a4ce1f3..da14d35a6 100644
--- a/content/pages/about.md
+++ b/content/pages/about.md
@@ -3,7 +3,7 @@ title: About 18F
 permalink: /about/
 layout: styled-container
 lead: We help other government agencies build, buy, and share technology products. 18F is a team of designers, software engineers, strategists, and product managers within the General Services Administration. We collaborate with other agencies to fix technical problems, build products, and improve public service through technology.
-image: /assets/img/about/gsahq.jpg
+image: assets/img/about/gsahq.jpg
 image_alt_text: "General Services Administration headquarters"
 side_cta: true
 subnav_items:
diff --git a/content/pages/guides.html b/content/pages/guides.html
index d841bd899..830a7b4c1 100644
--- a/content/pages/guides.html
+++ b/content/pages/guides.html
@@ -1,7 +1,7 @@
 ---
 title: Guides
 permalink: /guides/
-layout: guides
+layout: primary
 lead: Principles and standards that shape our work
 hide_footer_rule: true
 ---
diff --git a/content/pages/projects/products/cloud-gov.md b/content/pages/projects/products/cloud-gov.md
index c0dfb57c6..0267f3778 100755
--- a/content/pages/projects/products/cloud-gov.md
+++ b/content/pages/projects/products/cloud-gov.md
@@ -4,8 +4,8 @@ title: Expedited path to the cloud
 subtitle: Reducing the compliance and labor burden of moving to the cloud
 permalink: /our-work/cloud-gov/
 excerpt: A government-customized hosting platform that takes care of technical infrastructure and security compliance requirements.
-image: /assets/img/projects/cg.png
-image_accessibility: "The cloud.gov logo of a white star over a black and blue hexagon"
+image: assets/img/projects/cg.png
+image_alt: "The cloud.gov logo of a white star over a black and blue hexagon"
 image_icon: folderwithclock.svg
 project_weight: 3
 tag: cloud.gov
diff --git a/content/pages/projects/products/eregs.md b/content/pages/projects/products/eregs.md
index 6de40f258..699bca2a4 100644
--- a/content/pages/projects/products/eregs.md
+++ b/content/pages/projects/products/eregs.md
@@ -5,8 +5,8 @@ subtitle: A shared service for user-friendly regulations
 permalink: /our-work/eregulations/
 redirect_from: /project/eregulations/
 excerpt: An open-source tool that makes government regulations easier to find, read, and understand.
-image: /assets/blog/eregs/regulations-atf-gov.png
-image_accessibility:
+image: assets/blog/eregs/regulations-atf-gov.png
+image_alt:
 image_icon:
 tag: eregulations
 expiration_date:
diff --git a/content/pages/projects/products/login-gov.md b/content/pages/projects/products/login-gov.md
index 8b5477c8e..a488f8a96 100644
--- a/content/pages/projects/products/login-gov.md
+++ b/content/pages/projects/products/login-gov.md
@@ -4,8 +4,8 @@ title: Secure access to services
 subtitle: A single sign-on for government
 permalink: /our-work/login-gov/
 excerpt: A single sign-on solution for government websites that enables the public to access services across select agencies with the same username and password.
-image: /assets/img/projects/login-gov.png
-image_accessibility: "The login.gov logo over a blue background with red and blue circlar lines surrounding the logo"
+image: assets/img/projects/login-gov.png
+image_alt: "The login.gov logo over a blue background with red and blue circlar lines surrounding the logo"
 image_icon:
 project_weight: 4
 tag: identity
diff --git a/content/pages/projects/products/micro-purchase-marketplace.md b/content/pages/projects/products/micro-purchase-marketplace.md
index a8142bd71..c0d0a70b6 100755
--- a/content/pages/projects/products/micro-purchase-marketplace.md
+++ b/content/pages/projects/products/micro-purchase-marketplace.md
@@ -5,7 +5,7 @@ subtitle: An marketplace for open source tasks
 permalink: /our-work/micro-purchase-marketplace/
 excerpt: A reverse auction house where agencies can work with 18F to post coding tasks and vendors can bid on how much they would be willing to be paid to complete the task.
 image:
-image_accessibility:
+image_alt:
 image_icon: folderwithclock.svg
 project_weight: 2
 tag: micro-purchase platforms
diff --git a/content/pages/projects/services/alaska-dhss.md b/content/pages/projects/services/alaska-dhss.md
index deb4e34be..f2d293c2b 100644
--- a/content/pages/projects/services/alaska-dhss.md
+++ b/content/pages/projects/services/alaska-dhss.md
@@ -5,8 +5,8 @@ subtitle:
 permalink: /our-work/alaska-dhss/
 redirect_from: /project/alaska-dhss/
 excerpt: Introducing modern digital methods to the State of Alaska’s eligibility system modernization project.
-image: /assets/img/projects/alaska-flag.png
-image_accessibility: Alaska state flag. The flag consists of eight gold stars, forming the Big Dipper and Polaris, on a dark blue field.
+image: assets/img/projects/alaska-flag.png
+image_alt: Alaska state flag. The flag consists of eight gold stars, forming the Big Dipper and Polaris, on a dark blue field.
 image_icon:
 project_weight: 3
 tag: alaska
diff --git a/content/pages/projects/services/c2.md b/content/pages/projects/services/c2.md
index b3d9cb043..2c79c286f 100644
--- a/content/pages/projects/services/c2.md
+++ b/content/pages/projects/services/c2.md
@@ -4,8 +4,8 @@ title: Simplifying P-card purchasing
 subtitle: Moving from manual tracking to a digital system
 permalink: /our-work/c2/
 excerpt: A tool that saves times and improves accuracy for how P-Card holders manage purchases and approvals.
-image: /assets/blog/communicart/c2_screenshot.png
-image_accessibility: Screen shot of the the communicart (C2) application
+image: assets/blog/communicart/c2_screenshot.png
+image_alt: Screen shot of the the communicart (C2) application
 image_icon:
 tag: c2
 expiration_date:
diff --git a/content/pages/projects/services/calc.md b/content/pages/projects/services/calc.md
index 112a6af09..c6d4858cb 100644
--- a/content/pages/projects/services/calc.md
+++ b/content/pages/projects/services/calc.md
@@ -4,8 +4,8 @@ title: Better tools for better research
 subtitle: 
 permalink: /our-work/calc/
 excerpt: Streamlining how contracting officers search past government contracts for fair hourly rates.
-image: /assets/img/projects/calc.png
-image_accessibility: Blue bar graph of various wage estimates
+image: assets/img/projects/calc.png
+image_alt: Blue bar graph of various wage estimates
 image_icon:
 tag: calc
 expiration_date:
diff --git a/content/pages/projects/services/dhs-myuscis.md b/content/pages/projects/services/dhs-myuscis.md
index 773d95cbc..ff46a55b6 100644
--- a/content/pages/projects/services/dhs-myuscis.md
+++ b/content/pages/projects/services/dhs-myuscis.md
@@ -5,8 +5,8 @@ subtitle: From a form-based process to a person-based one
 permalink: /our-work/myuscis/
 redirect_from: /project/dhs-myuscis/
 excerpt: Resources and guides for U.S. Citizenship and Immigration Services to make the process of applying for citizenship a little friendlier.
-image: /assets/img/home/hero-immigration.jpg
-image_accessibility: New citizens with their hands raised for the citizenship oath at a naturalization ceremony
+image: assets/img/home/hero-immigration.jpg
+image_alt: New citizens with their hands raised for the citizenship oath at a naturalization ceremony
 tag: uscis
 project_url: "[my.uscis.gov](https://my.uscis.gov/)"
 github_repo:
diff --git a/content/pages/projects/services/dod-military-onesource.md b/content/pages/projects/services/dod-military-onesource.md
index 2e378601d..99e97197d 100755
--- a/content/pages/projects/services/dod-military-onesource.md
+++ b/content/pages/projects/services/dod-military-onesource.md
@@ -5,7 +5,7 @@ subtitle: Supporting military personnel and their families
 permalink: /our-work/military-onesource/
 excerpt: A two-day agile acquisition workshop helped the Military Community and Family Policy group shape the strategy for hiring a private vendor to redesign Military OneSource.
 image:
-image_accessibility:
+image_alt:
 image_icon: monitor.svg
 project_weight: 2
 tag: military
diff --git a/content/pages/projects/services/doi-every-kid-in-a-park.md b/content/pages/projects/services/doi-every-kid-in-a-park.md
index 824208f44..dc004fdad 100644
--- a/content/pages/projects/services/doi-every-kid-in-a-park.md
+++ b/content/pages/projects/services/doi-every-kid-in-a-park.md
@@ -5,8 +5,8 @@ subtitle: Designing for every user
 permalink: /our-work/every-kid-in-a-park/
 redirect_from: /project/every-kid-in-a-park/
 excerpt: Using research to design a federal website for an audience that doesn’t know the word federal.
-image: /assets/img/home/hero-ekiap.jpg
-image_accessibility: Children proudly showing their national park badges
+image: assets/img/home/hero-ekiap.jpg
+image_alt: Children proudly showing their national park badges
 project_weight: 2
 tag: every kid in a park
 expiration_date:
diff --git a/content/pages/projects/services/doi-nrrd.md b/content/pages/projects/services/doi-nrrd.md
index a779222c7..0958fb359 100644
--- a/content/pages/projects/services/doi-nrrd.md
+++ b/content/pages/projects/services/doi-nrrd.md
@@ -5,8 +5,8 @@ subtitle: Opening up complex data
 permalink: /our-work/onrr-data-site/
 redirect_from: /project/onrr-data-site/
 excerpt: Natural Resources Revenue Data (NRRD) helps the public learn about extractive activities on public lands and waters.
-image: /assets/img/projects/nrrd-site.png
-image_accessibility: Screenshot of the revenuedata.doi.gov front page
+image: assets/img/projects/nrrd-site.png
+image_alt: Screenshot of the revenuedata.doi.gov front page
 project_weight: 12
 tag: nrrd
 github_repo: "[ONRR/doi-extractives-data](https://github.com/ONRR/doi-extractives-data)"
diff --git a/content/pages/projects/services/doj-crt-portal.md b/content/pages/projects/services/doj-crt-portal.md
index fcc311bc3..bf0dafdb2 100644
--- a/content/pages/projects/services/doj-crt-portal.md
+++ b/content/pages/projects/services/doj-crt-portal.md
@@ -5,8 +5,8 @@ subtitle:
 permalink: /our-work/doj-crt/
 redirect_from: /project/doj-crt/
 excerpt: Developing a user-friendly online submission experience for the civil rights complaint portal.
-image: /assets/blog/doj-crt-complaint-form.png
-image_accessibility: Screenshots of the new complaint portal interface
+image: assets/blog/doj-crt-complaint-form.png
+image_alt: Screenshots of the new complaint portal interface
 image_icon:
 project_weight: 12
 tag: civil rights
diff --git a/content/pages/projects/services/dol-wage-and-hour.md b/content/pages/projects/services/dol-wage-and-hour.md
index 103f7f7a7..e05f29fe5 100755
--- a/content/pages/projects/services/dol-wage-and-hour.md
+++ b/content/pages/projects/services/dol-wage-and-hour.md
@@ -4,8 +4,8 @@ title: Becoming a digital-first agency
 subtitle: Bringing technology to vital services
 permalink: /our-work/dol-wage-and-hour/
 excerpt: Success on a small project helped the Wage and Hour Division begin transforming into a digital-first agency.
-image: /assets/blog/labor-handbook/group-2.jpg
-image_accessibility: the team working out of the 18F common space. Developers on the left. Investigators (users) and product owners talking about needs on the right. Taped to the windows are the progress boards (Backlog, Current, Done).
+image: assets/blog/labor-handbook/group-2.jpg
+image_alt: the team working out of the 18F common space. Developers on the left. Investigators (users) and product owners talking about needs on the right. Taped to the windows are the progress boards (Backlog, Current, Done).
 image_icon: folderwithclock.svg
 project_weight: 3
 tag: department of labor
diff --git a/content/pages/projects/services/ed-college-scorecard.md b/content/pages/projects/services/ed-college-scorecard.md
index c990a9574..135d765a0 100644
--- a/content/pages/projects/services/ed-college-scorecard.md
+++ b/content/pages/projects/services/ed-college-scorecard.md
@@ -3,8 +3,8 @@ agency: Department of Education
 title: Turning data into informed choices
 subtitle: Reliable information for big decisions
 excerpt: A powerful data tool that allows students and their families to assess colleges and universities.
-image: /assets/blog/college-scorecard/college-scorecard-3.jpg
-image_accessibility: Grayscale photograph of eleven people meeting in small groups during a workshop
+image: assets/blog/college-scorecard/college-scorecard-3.jpg
+image_alt: Grayscale photograph of eleven people meeting in small groups during a workshop
 tag: college scorecard
 expiration_date:
 github_repo: "[College Scorecard code](https://github.com/RTICWDT/college-scorecard)"
diff --git a/content/pages/projects/services/fbi-crime-data-explorer.md b/content/pages/projects/services/fbi-crime-data-explorer.md
index 84707c373..e9cc9ae7e 100644
--- a/content/pages/projects/services/fbi-crime-data-explorer.md
+++ b/content/pages/projects/services/fbi-crime-data-explorer.md
@@ -4,8 +4,8 @@ title: Opening up crime data
 subtitle:
 permalink: /our-work/crime-data-explorer/
 excerpt: Moving critical crime data to a website with an open API to support transparency, access and awareness.
-image: /assets/blog/fbi-crime-data/fbi-hero.png
-image_accessibility: Crime data graphs laid over a map of the U.S.
+image: assets/blog/fbi-crime-data/fbi-hero.png
+image_alt: Crime data graphs laid over a map of the U.S.
 image_icon:
 project_weight: 10
 tag: fbi
diff --git a/content/pages/projects/services/fec-gov.md b/content/pages/projects/services/fec-gov.md
index d1bf50d5e..0c162cff7 100644
--- a/content/pages/projects/services/fec-gov.md
+++ b/content/pages/projects/services/fec-gov.md
@@ -6,8 +6,8 @@ permalink: /our-work/fec-gov/
 redirect_from: /project/fec-gov/
 excerpt: Rethinking how the Federal Election Commission provides data, instructions and legal resources to the public.
 mini_excerpt: Rethinking how the FEC provides data, instructions, and legal resources to the public.
-image: /assets/img/home/hero-fec.png
-image_accessibility: Screenshot of the FEC data explorer with stylized magnifying glass.
+image: assets/img/home/hero-fec.png
+image_alt: Screenshot of the FEC data explorer with stylized magnifying glass.
 project_weight: 12
 tag: fec.gov
 expiration_date:
diff --git a/content/pages/projects/services/forest-service.md b/content/pages/projects/services/forest-service.md
index 92790982e..f62dbd914 100644
--- a/content/pages/projects/services/forest-service.md
+++ b/content/pages/projects/services/forest-service.md
@@ -5,8 +5,8 @@ title: Make land permits available online
 subtitle: Easing access to public lands
 permalink: /our-work/forest-service/
 excerpt: Using prototypes and modular contracting to help the Forest Service buy and develop an online permitting system.
-image: /assets/blog/forrest-service/xmas-tree-permit.png
-image_accessibility: Screen shot of the Christmas tree permit website
+image: assets/blog/forrest-service/xmas-tree-permit.png
+image_alt: Screen shot of the Christmas tree permit website
 image_icon:
 project_weight: 8
 tag: forest service
diff --git a/content/pages/projects/services/hhs-states.md b/content/pages/projects/services/hhs-states.md
index f47a43ad6..863ce542c 100644
--- a/content/pages/projects/services/hhs-states.md
+++ b/content/pages/projects/services/hhs-states.md
@@ -5,8 +5,8 @@ subtitle: Extending impact to state and local governments
 permalink: /our-work/hhs-states/
 redirect_from: /project/hhs-states/
 excerpt: Working with Health and Human Services to help states implement best practices and upgrade legacy systems.
-image: /assets/img/projects/hero_stateandlocal.jpg
-image_accessibility: "Photograph of people meeting in small groups during a workshop"
+image: assets/img/projects/hero_stateandlocal.jpg
+image_alt: "Photograph of people meeting in small groups during a workshop"
 project_weight: 3
 tag: state and local practice
 expiration_date:
diff --git a/content/pages/projects/services/navy-reserve.md b/content/pages/projects/services/navy-reserve.md
index 8384c7253..8e950f7d1 100644
--- a/content/pages/projects/services/navy-reserve.md
+++ b/content/pages/projects/services/navy-reserve.md
@@ -4,8 +4,8 @@ title: Ready-2-Serve app prototype
 subtitle: Making it easier to serve
 permalink: /our-work/ready-2-serve/
 excerpt: Understanding the experience of Navy Reservists to help streamline the deployment process.
-image: /assets/img/projects/ready-2-serve-sailors.jpg
-image_accessibility: "Sailors standing on a ship"
+image: assets/img/projects/ready-2-serve-sailors.jpg
+image_alt: "Sailors standing on a ship"
 tag: navy reserve
 expiration_date:
 github_repo: https://github.com/18F/r2s
diff --git a/content/pages/projects/services/nsf-brand-principles-project-page.md b/content/pages/projects/services/nsf-brand-principles-project-page.md
index 6ab8a4bdf..8f9e28d11 100644
--- a/content/pages/projects/services/nsf-brand-principles-project-page.md
+++ b/content/pages/projects/services/nsf-brand-principles-project-page.md
@@ -5,8 +5,8 @@ subtitle: Providing valuable science information to the American public
 permalink: /our-work/nsf-brand-principles/
 redirect_from: /project/nsf-brand-principles/
 excerpt: The National Science Foundation shares it organizational values and research interests with the public.
-image: /assets/img/projects/nsf-brand-principles-site.png
-image_accessibility: Screenshot of a nsf site
+image: assets/img/projects/nsf-brand-principles-site.png
+image_alt: Screenshot of a nsf site
 project_weight: 12
 tag: nsf-brand-principles
 github_repo: "[Project management board](https://github.com/nsf-open/nsf/projects/2)"
diff --git a/content/pages/projects/services/nsf-seedfund.md b/content/pages/projects/services/nsf-seedfund.md
index 8d43a9d20..168e0db31 100644
--- a/content/pages/projects/services/nsf-seedfund.md
+++ b/content/pages/projects/services/nsf-seedfund.md
@@ -4,8 +4,8 @@ title: Designing to reach your audience
 subtitle: Communicating with tech entrepreneurs
 permalink: /our-work/seed-fund/
 excerpt: Rebranding with well-tested content and design to better communicate with tech entrepreneurs.
-image: /assets/blog/nsf/seedfund-nsf-gov.png
-image_accessibility: Screenshot of seedfund website
+image: assets/blog/nsf/seedfund-nsf-gov.png
+image_alt: Screenshot of seedfund website
 image_icon:
 project_weight: 6
 tag: national science foundation
diff --git a/content/pages/projects/services/state-uskpa.md b/content/pages/projects/services/state-uskpa.md
index 626675f3d..f9d0dc0a1 100644
--- a/content/pages/projects/services/state-uskpa.md
+++ b/content/pages/projects/services/state-uskpa.md
@@ -5,8 +5,8 @@ subtitle:
 permalink: /our-work/state-uskpa/
 redirect_from: /project/state-uskpa/
 excerpt: Combining our technical expertise with USKPA's program knowledge to improve the tracking of rough diamonds.
-image: /assets/img/projects/uskpa.png
-image_accessibility: Screenshot of the uskpa.org front page
+image: assets/img/projects/uskpa.png
+image_alt: Screenshot of the uskpa.org front page
 project_weight: 10
 tag: uskpa
 expiration_date:
diff --git a/content/pages/projects/services/tax-court.md b/content/pages/projects/services/tax-court.md
index 9c18d29db..0e988104f 100644
--- a/content/pages/projects/services/tax-court.md
+++ b/content/pages/projects/services/tax-court.md
@@ -5,8 +5,8 @@ subtitle:
 permalink: /our-work/tax-court/
 redirect_from: /project/tax-court/
 excerpt: Developing a new petition and document-filing experience for taxpayers without lawyers, and a better case management workflow for Tax Court employees.
-image: /assets/blog/ustc-header-image.png
-image_accessibility: Screenshot of the new interface
+image: assets/blog/ustc-header-image.png
+image_alt: Screenshot of the new interface
 project_weight: 12
 tag: tax court
 expiration_date:
diff --git a/content/pages/projects/services/treasury-data-act.md b/content/pages/projects/services/treasury-data-act.md
index 18a230dcf..eeb76f5c7 100644
--- a/content/pages/projects/services/treasury-data-act.md
+++ b/content/pages/projects/services/treasury-data-act.md
@@ -5,8 +5,8 @@ subtitle:
 permalink: /our-work/data-act/
 excerpt: Implementing the Digital Accountability and Transparency Act with one of the largest government-wide agile projects ever undertaken.
 mini_excerpt: Implementing the Digital Accountability and Transparency Act with the Department of the Treasury.
-image: /assets/img/projects/data-act-better-data.jpg
-image_accessibility: Data Act logo alongside the words Better Data
+image: assets/img/projects/data-act-better-data.jpg
+image_alt: Data Act logo alongside the words Better Data
 image_icon:
 project_weight: 11
 tag: data act
diff --git a/content/pages/projects/services/treasury-new-ten.md b/content/pages/projects/services/treasury-new-ten.md
index 8daa778d1..ee8c2ea07 100755
--- a/content/pages/projects/services/treasury-new-ten.md
+++ b/content/pages/projects/services/treasury-new-ten.md
@@ -4,8 +4,8 @@ title: The New Ten
 subtitle: Shaping the story of the New Ten
 permalink: /our-work/new-ten/
 excerpt: The Department of the Treasury and 18F worked together to shape the story around the new ten dollar bill.
-image: /assets/img/projects/money-10.png
-image_accessibility: "A graphic of the US ten dollar bill on a blue background"
+image: assets/img/projects/money-10.png
+image_alt: "A graphic of the US ten dollar bill on a blue background"
 image_icon: gavel.svg
 project_weight: 2
 tag: new ten
diff --git a/content/pages/projects/services/us-web-design-standards.md b/content/pages/projects/services/us-web-design-standards.md
index 5f3ee4611..d33b6f478 100755
--- a/content/pages/projects/services/us-web-design-standards.md
+++ b/content/pages/projects/services/us-web-design-standards.md
@@ -4,8 +4,8 @@ title: A design system for the federal government
 subtitle: Building trust through consistency
 permalink: /our-work/us-web-design-system/
 excerpt: A library of design components that can help developers quickly make trustworthy, accessible, and consistent digital government services.
-image: /assets/blog/web-design-standards/wds-home-new-2x.png
-image_accessibility: Image of designed typography and headers 
+image: assets/blog/web-design-standards/wds-home-new-2x.png
+image_alt: Image of designed typography and headers 
 image_icon:
 project_weight: 7
 tag: web design system
diff --git a/content/posts/2014-03-12-coming-soon.md b/content/posts/2014-03-12-coming-soon.md
index c3aa1348b..4d93e96af 100644
--- a/content/posts/2014-03-12-coming-soon.md
+++ b/content/posts/2014-03-12-coming-soon.md
@@ -4,7 +4,7 @@ tumblr_url: http://18fblog.tumblr.com/post/79359602658/coming-soon
 title: "Coming soon"
 description: Coming soon!
 excerpt: Coming soon!
-image: "/assets/img/logos/18F-Logo-M.png"
+image: /assets/img/logos/18F-Logo-M.png
 authors:
 - 18F
 
diff --git a/content/posts/2014-09-04-a-new-look-at-the-freedom-of-information-act.md b/content/posts/2014-09-04-a-new-look-at-the-freedom-of-information-act.md
index 1b9a7c350..6de6cd458 100644
--- a/content/posts/2014-09-04-a-new-look-at-the-freedom-of-information-act.md
+++ b/content/posts/2014-09-04-a-new-look-at-the-freedom-of-information-act.md
@@ -5,7 +5,7 @@ tumblr_url: http://18fblog.tumblr.com/post/96625804492/a-new-look-at-the-freedom
 
 title: "A new look at the Freedom of Information Act"
 
-image: assets/blog/foia/in-hand.jpg
+image: /assets/blog/foia/in-hand.jpg
 
 description: "As demand for information continues to grow, it is important to continue iterating the ways we refine the FOIA request process. Our effort is one of a number of commitments towards creating a more open, transparent government. We will explore how to supplement the work that has already been done by creating tools to improve the online FOIA requests process by designing for the user."
 excerpt: "As demand for information continues to grow, it is important to continue iterating the ways we refine the FOIA request process. Our effort is one of a number of commitments towards creating a more open, transparent government. We will explore how to supplement the work that has already been done by creating tools to improve the online FOIA requests process by designing for the user."
diff --git a/content/posts/2015-01-16-open-source-for-good-government.md b/content/posts/2015-01-16-open-source-for-good-government.md
index a46ffc78d..2c288f3b2 100644
--- a/content/posts/2015-01-16-open-source-for-good-government.md
+++ b/content/posts/2015-01-16-open-source-for-good-government.md
@@ -2,7 +2,7 @@
 title: Open source for good government
 date: '2015-01-16'
 layout: post
-image: assets/blog/join-us/18f_govuk.png
+image: /assets/blog/join-us/18f_govuk.png
 hero: false
 tags:
 - open source
diff --git a/content/posts/2015-07-15-openfec-api-update.md b/content/posts/2015-07-15-openfec-api-update.md
index cc54de6d6..efa039beb 100644
--- a/content/posts/2015-07-15-openfec-api-update.md
+++ b/content/posts/2015-07-15-openfec-api-update.md
@@ -15,7 +15,7 @@ tags:
 
 excerpt: "The OpenFEC API added a filings endpoint as well as itemized receipt and disbursement data. This is the first major update to the API: The records we’re adding today are the meat and potatoes of campaign finance. You can see in detail where a campaign’s money comes from and where they spend their money."
 image: /assets/blog/openfec-api/openfec-banner.jpg
-image_accessibility: "OpenFEC: Explore campaign finance data"
+image_alt: "OpenFEC: Explore campaign finance data"
 ---
 
 We’re so glad that people have been so excited about the [Federal Election Commission’s (FEC) first API](https://18f.gsa.gov/2015/07/08/openfec-api/). Now, there are millions of more records for you to explore! We’re looking forward to seeing what the public will build with its data.
diff --git a/content/posts/2015-12-17-plain-language-betafec-new-content-design.md b/content/posts/2015-12-17-plain-language-betafec-new-content-design.md
index a250a5ff1..757efca86 100644
--- a/content/posts/2015-12-17-plain-language-betafec-new-content-design.md
+++ b/content/posts/2015-12-17-plain-language-betafec-new-content-design.md
@@ -11,7 +11,7 @@ tags:
 excerpt: "The Federal Election Commission (FEC) has been working since the 1970s to clarify the rules for raising and spending money in federal elections, and today we’re thrilled to announce the first major content launch of betaFEC: a guide to registration and reporting that makes intricate information easier to understand."
 github: https://github.com/18F/blog-drafts/issues/267
 image: /assets/blog/fec/registration-reporting.jpg
-image_accessibility: Screenshot of the new registration and reporting page
+image_alt: Screenshot of the new registration and reporting page
 date: 2015-12-17 12:00:00 -5
 ---
 
diff --git a/content/posts/2016-06-07-building-better-by-building-together-with-the-federal-election-commission.md b/content/posts/2016-06-07-building-better-by-building-together-with-the-federal-election-commission.md
index a90907343..3bdba0857 100644
--- a/content/posts/2016-06-07-building-better-by-building-together-with-the-federal-election-commission.md
+++ b/content/posts/2016-06-07-building-better-by-building-together-with-the-federal-election-commission.md
@@ -11,7 +11,7 @@ tags:
 - collaboration tools
 excerpt: "How do you work iteratively and in the open in government? How do you transform an agency’s digital presence with agile and user-centered design? We’ve learned a lot about this as we’ve worked alongside our partners at the Federal Election Commission (FEC) on beta.fec.gov, and we want to share some of those lessons here."
 image: /assets/blog/fec/fec-meeting.jpg
-image_accessibility: A group of approximately 20 people sit and stand around white boards and notes on a wall.
+image_alt: A group of approximately 20 people sit and stand around white boards and notes on a wall.
 image_caption: The FEC and 18F teams meet to review user research and prioritize upcoming work.
 ---
 
diff --git a/lib/matching_posts.rb b/lib/matching_posts.rb
deleted file mode 100644
index 05b5a6a81..000000000
--- a/lib/matching_posts.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-module Jekyll
-  module MatchingPosts
-    # Helper method to match apost property with its equivalent
-    # page property
-    def map_post_to_page(property)
-      post_map = {
-        authors: "name",
-        tags: "tags"
-      }
-      post_map[property.to_sym]
-    end
-
-    # match_posts filter
-    #
-    # A liquid filter that takes a page object
-    #
-    # Example:
-    # ```
-    # {{ page | match_posts }}
-    # ```
-    #
-    # Will look for all the posts on the site
-    # and return a list of posts that have any tag
-    # that matches the list of `project_tags` defined
-    # in a given project's frontmatter
-    def match_posts(page, property = "tags")
-      matching_posts = []
-      page_property = map_post_to_page(property)
-      page_criteria = Array(page[page_property]) || []
-      Jekyll.sites[0].posts.docs.each do |sitepost|
-        sitepost_criteria = sitepost[property] || []
-        matching_post = sitepost_criteria & page_criteria
-        matching_posts << sitepost if matching_post.any?
-      end
-      matching_posts
-    end
-  end
-end
-
-Liquid::Template.register_filter(Jekyll::MatchingPosts)
diff --git a/spec/_posts/project_page.rb b/spec/_posts/project_page.rb
index 32d8effb4..63787dca7 100644
--- a/spec/_posts/project_page.rb
+++ b/spec/_posts/project_page.rb
@@ -20,7 +20,7 @@
         "title": "Health and Human Services",
         "subtitle": "Helping states update crucial systems",
         "image": "/assets/img/projects/hero_stateandlocal.jpg",
-        "image_accessibility": "Grayscale photograph of eleven people meeting in small groups during a workshop",
+        "image_alt": "Grayscale photograph of eleven people meeting in small groups during a workshop",
         "tags": [
           "state and local practice"
         ],
@@ -49,7 +49,7 @@
       "title": "The Federal Election Commission",
       "subtitle": "Making campaign data easier to use",
       "image": "/assets/img/home/hero-fec.png",
-      "image_accessibility": "Image of the FEC data explorer with stylized magnifying glass.",
+      "image_alt": "Image of the FEC data explorer with stylized magnifying glass.",
       "tags": [
         "fec.gov"
       ],
@@ -75,7 +75,7 @@
     "title": "Health and Human Services",
     "subtitle": "Helping states update crucial systems",
     "image": "/assets/img/projects/hero_stateandlocal.png",
-    "image_accessibility": "Grayscale photograph of eleven people meeting in small groups during a workshop",
+    "image_alt": "Grayscale photograph of eleven people meeting in small groups during a workshop",
     "tags": [
       "state and local practice"
     ],
@@ -104,7 +104,7 @@
   "title": "The Federal Election Commission",
   "subtitle": "Making campaign data easier to use",
   "image": "/assets/img/home/hero-fec.png",
-  "image_accessibility": "Image of the FEC data explorer with stylized magnifying glass.",
+  "image_alt": "Image of the FEC data explorer with stylized magnifying glass.",
   "tags": [
     "fec.gov"
   ],
diff --git a/tests/schema/products_projects.yml b/tests/schema/products_projects.yml
index 664b78464..6461f07e7 100644
--- a/tests/schema/products_projects.yml
+++ b/tests/schema/products_projects.yml
@@ -14,7 +14,7 @@ config:
   optional:
     - agency
     - image
-    - image_accessibility
+    - image_alt
     - expiration_date
     - start_date
     - github_repo
diff --git a/tests/schema/services_projects.yml b/tests/schema/services_projects.yml
index 497c53da0..9f5f1f8a6 100644
--- a/tests/schema/services_projects.yml
+++ b/tests/schema/services_projects.yml
@@ -14,7 +14,7 @@ config:
   optional:
     - agency
     - image
-    - image_accessibility
+    - image_alt
     - expiration_date
     - start_date
     - github_repo