diff --git a/theme/partials/header.html b/theme/partials/header.html
index 2382c3a2..24075c2f 100644
--- a/theme/partials/header.html
+++ b/theme/partials/header.html
@@ -1,9 +1,11 @@
 {% set class = "md-header" %}
 {% if "navigation.tabs.sticky" in features %}
-    {% set class = class ~ " md-header--lifted" %}
+  {% set class = class ~ " md-header--shadow md-header--lifted" %}
+{% elif "navigation.tabs" not in features %}
+  {% set class = class ~ " md-header--shadow" %}
 {% endif %}
 <header class="{{ class }}" data-md-component="header">
-    <nav class="md-header__inner md-grid" aria-label="{{ lang.t('header.title') }}">
+    <nav class="md-header__inner md-grid" aria-label="{{ lang.t('header') }}">
         <a href="{{ config.extra.homepage | d(nav.homepage.url, true) | url }}" title="{{ config.site_name | e }}" class="md-header__button md-logo" aria-label="{{ config.site_name }}" data-md-component="logo">
         {% include "partials/logo.html" %}
         </a>
@@ -19,7 +21,7 @@
             </div>
             <div class="md-header__topic" data-md-component="header-topic">
             <span class="md-ellipsis">
-                {% if page and page.meta and page.meta.title %}
+                {% if page.meta and page.meta.title %}
                 {{ page.meta.title }}
                 {% else %}
                 {{ page.title }}
@@ -43,7 +45,7 @@
         <div class="md-header__option">
             <div class="md-select">
             {% set icon = config.theme.icon.alternate or "material/translate" %}
-            <button class="md-header__button md-icon" aria-label="{{ lang.t('select.language.title') }}">
+            <button class="md-header__button md-icon" aria-label="{{ lang.t('select.language') }}">
                 {% include ".icons/" ~ icon ~ ".svg" %}
             </button>
             <div class="md-select__inner">
@@ -54,7 +56,7 @@
                         {{ alt.name }}
                     </a>
                     </li>
-                    {% endfor %}
+                {% endfor %}
                 </ul>
             </div>
             </div>
@@ -63,17 +65,19 @@
         {% if not config.theme.palette is mapping %}
         <form class="md-header__option" data-md-component="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 }}" {% 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.index0 }}">
             {% if option.toggle %}
-                <label class="md-header__button md-icon" title="{{ option.toggle.name }}" for="__palette_{{ loop.index0 or loop.length }}" hidden>
+                <label class="md-header__button md-icon" title="{{ option.toggle.name }}" for="__palette_{{ loop.index % loop.length }}" hidden>
                 {% include ".icons/" ~ option.toggle.icon ~ ".svg" %}
                 </label>
             {% endif %}
             {% endfor %}
         </form>
         {% endif %}
+        {% if not config.theme.palette is mapping %}
+        {% include "partials/javascripts/palette.html" %}
+        {% endif %}
     </nav>
     {% if "navigation.tabs.sticky" in features %}
         {% if "navigation.tabs" in features %}