diff --git a/material/partials/header.html b/material/partials/header.html
index 343d2660a..02f9b8a68 100644
--- a/material/partials/header.html
+++ b/material/partials/header.html
@@ -27,10 +27,9 @@
         </div>
       </div>
     </div>
-    {% set palette = config.theme.palette %}
-    {% if palette and not palette is mapping %}
+    {% if not config.theme.palette is mapping %}
       <form class="md-header__option" data-md-component="palette">
-        {% for option in palette %}
+        {% for option in config.theme.palette %}
           {% set primary = option.primary | replace(" ", "-") | lower %}
           {% set accent  = option.accent  | replace(" ", "-") | lower %}
           <input class="md-option" data-md-color-media="{{ option.media }}" data-md-color-scheme="{{ option.scheme }}" data-md-color-primary="{{ primary }}" data-md-color-accent="{{ accent }}" type="radio" name="__palette" id="__palette_{{ loop.index }}">
diff --git a/src/base.html b/src/base.html
index 7f066c38a..41e468a00 100644
--- a/src/base.html
+++ b/src/base.html
@@ -152,7 +152,7 @@
     {% block extrahead %}{% endblock %}
   </head>
 
-  <!-- Text direction and color palette, if defined -->
+  <!-- Set text direction and color palette, if defined -->
   {% set direction = config.theme.direction or lang.t('direction') %}
   {% if config.theme.palette %}
     {% set palette = config.theme.palette %}
diff --git a/src/partials/header.html b/src/partials/header.html
index e543bd053..cd8718f1b 100644
--- a/src/partials/header.html
+++ b/src/partials/header.html
@@ -64,10 +64,9 @@
     </div>
 
     <!-- Color palette -->
-    {% set palette = config.theme.palette %}
-    {% if palette and not palette is mapping %}
+    {% if not config.theme.palette is mapping %}
       <form class="md-header__option" data-md-component="palette">
-        {% for option in palette %}
+        {% for option in config.theme.palette %}
           {% set primary = option.primary | replace(" ", "-") | lower %}
           {% set accent  = option.accent  | replace(" ", "-") | lower %}
           <input