diff --git a/_includes/page__hero.html b/_includes/page__hero.html
index 6172250f99145d3523f7f74faa67b0178649b363..bd9083b732fd0077ba8b8c44e03491d618194251 100644
--- a/_includes/page__hero.html
+++ b/_includes/page__hero.html
@@ -12,7 +12,7 @@
 
 {% if page.header.overlay_image contains "://" %}
   {% capture overlay_img_path %}{{ page.header.overlay_image }}{% endcapture %}
-{% elsif page.overlay_image %}
+{% elsif page.header.overlay_image %}
   {% capture overlay_img_path %}{{ page.header.overlay_image | relative_url }}{% endcapture %}
 {% endif %}
 
@@ -44,8 +44,8 @@
 
 <div class="page__hero{% if page.header.type == 'overlay' %}--overlay{% endif %}"
   style="{% if page.header.type == 'overlay' %}
-          {% if page.header.overlay_color %}
-            background-color: {{ page.header.overlay_color | default: 'transparent' }};
+          {% if page.header.color %}
+            background-color: {{ page.header.color | default: 'transparent' }};
           {% endif %}
           {% if page.header.overlay_image %}
             background-image:
diff --git a/_layouts/single.html b/_layouts/single.html
index 1d174585ec22ce2901418e7ff0bcce5b78be6790..9158ce2e11fe971dbaa989fc2b9ffbb8238ca0cb 100644
--- a/_layouts/single.html
+++ b/_layouts/single.html
@@ -26,15 +26,13 @@ layout: default
     {% if page.last_modified_at %}<meta itemprop="dateModified" content="{{ page.last_modified_at | date: "%B %d, %Y" }}">{% endif %}
 
     <div class="page__inner-wrap">
-      {% unless page.header.overlay_color or page.overlay_image or author.banner %}
-        {% unless page.no_title %}
+      {% unless page.header.type == 'overlay' %}
         <header>
           {% if page.title %}<h1 id="page-title" class="page__title" itemprop="headline">{{ page.title | markdownify | remove: "<p>" | remove: "</p>" }}</h1>{% endif %}
           {% if page.read_time %}
             <p class="page__meta"><i class="far fa-clock" aria-hidden="true"></i> {% include read-time.html %}</p>
           {% endif %}
         </header>
-        {% endunless %}
       {% endunless %}
 
       <section class="page__content" itemprop="text">