diff --git a/material/base.html b/material/base.html
index 8cc225e18..fffc06df5 100644
--- a/material/base.html
+++ b/material/base.html
@@ -81,10 +81,8 @@
     {% if not palette is mapping %}
       {% set palette = palette | first %}
     {% endif %}
-    {% set scheme  = palette.scheme | d("default", true) %}
-    {% set primary = palette.primary %}
-    {% set accent  = palette.accent %}
-    <body dir="{{ direction }}" data-md-color-scheme="{{ scheme | replace(' ', '-') }}" data-md-color-primary="{{ primary | replace(' ', '-') }}" data-md-color-accent="{{ accent | replace(' ', '-') }}">
+    {% set scheme = palette.scheme | d("default", true) %}
+    <body dir="{{ direction }}" data-md-color-scheme="{{ scheme | replace(' ', '-') }}" data-md-color-primary="{{ palette.primary | replace(' ', '-') }}" data-md-color-accent="{{ palette.accent | replace(' ', '-') }}">
   {% else %}
     <body dir="{{ direction }}">
   {% endif %}
diff --git a/material/partials/header.html b/material/partials/header.html
index b1408e081..66264c00e 100644
--- a/material/partials/header.html
+++ b/material/partials/header.html
@@ -34,10 +34,8 @@
     {% if not config.theme.palette is mapping %}
       <form class="md-header__option" data-md-component="palette">
         {% for option in config.theme.palette %}
-          {% set scheme  = option.scheme | d("default", true) %}
-          {% set primary = option.primary %}
-          {% set accent  = option.accent %}
-          <input class="md-option" data-md-color-media="{{ option.media }}" data-md-color-scheme="{{ scheme | replace(' ', '-') }}" data-md-color-primary="{{ primary | replace(' ', '-') }}" data-md-color-accent="{{ accent | replace(' ', '-') }}" {% if option.toggle %} aria-label="{{ option.toggle.name }}" {% else %} aria-hidden="true" {% endif %} type="radio" name="__palette" id="__palette_{{ loop.index }}">
+          {% set scheme = option.scheme | d("default", true) %}
+          <input class="md-option" data-md-color-media="{{ option.media }}" data-md-color-scheme="{{ scheme | replace(' ', '-') }}" data-md-color-primary="{{ option.primary | replace(' ', '-') }}" data-md-color-accent="{{ option.accent | replace(' ', '-') }}" {% if option.toggle %} aria-label="{{ option.toggle.name }}" {% else %} aria-hidden="true" {% endif %} type="radio" name="__palette" id="__palette_{{ loop.index }}">
           {% if option.toggle %}
             <label class="md-header__button md-icon" title="{{ option.toggle.name }}" for="__palette_{{ loop.index0 or loop.length }}" hidden>
               {% include ".icons/" ~ option.toggle.icon ~ ".svg" %}
diff --git a/src/base.html b/src/base.html
index ea5b57f5e..3454e9fc1 100644
--- a/src/base.html
+++ b/src/base.html
@@ -159,14 +159,12 @@
     {% if not palette is mapping %}
       {% set palette = palette | first %}
     {% endif %}
-    {% set scheme  = palette.scheme | d("default", true) %}
-    {% set primary = palette.primary %}
-    {% set accent  = palette.accent %}
+    {% set scheme = palette.scheme | d("default", true) %}
     <body
       dir="{{ direction }}"
       data-md-color-scheme="{{ scheme | replace(' ', '-') }}"
-      data-md-color-primary="{{ primary | replace(' ', '-') }}"
-      data-md-color-accent="{{ accent | replace(' ', '-') }}"
+      data-md-color-primary="{{ palette.primary | replace(' ', '-') }}"
+      data-md-color-accent="{{ palette.accent | replace(' ', '-') }}"
     >
   {% else %}
     <body dir="{{ direction }}">
diff --git a/src/partials/header.html b/src/partials/header.html
index 61c052aa2..c76b2d041 100644
--- a/src/partials/header.html
+++ b/src/partials/header.html
@@ -73,15 +73,13 @@
     {% if not config.theme.palette is mapping %}
       <form class="md-header__option" data-md-component="palette">
         {% for option in config.theme.palette %}
-          {% set scheme  = option.scheme | d("default", true) %}
-          {% set primary = option.primary %}
-          {% set accent  = option.accent %}
+          {% set scheme = option.scheme | d("default", true) %}
           <input
             class="md-option"
             data-md-color-media="{{ option.media }}"
             data-md-color-scheme="{{ scheme | replace(' ', '-') }}"
-            data-md-color-primary="{{ primary | replace(' ', '-') }}"
-            data-md-color-accent="{{ accent | replace(' ', '-') }}"
+            data-md-color-primary="{{ option.primary | replace(' ', '-') }}"
+            data-md-color-accent="{{ option.accent | replace(' ', '-') }}"
             {% if option.toggle %}
               aria-label="{{ option.toggle.name }}"
             {% else  %}
