4 files changed, 18 insertions, 3 deletions

diff --git a/src/gmdocument.c b/src/gmdocument.c
index 79deb861..a85e4b71 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -491,8 +491,7 @@ static iBool isNormalized_GmDocument_(const iGmDocument *d) {
 }
 
 static enum iGmDocumentTheme currentTheme_(void) {
-    return (isDark_ColorTheme(colorTheme_App()) ? prefs_App()->docThemeDark
-                                                : prefs_App()->docThemeLight);
+    return docTheme_Prefs(prefs_App());
 }
 
 static void alignDecoration_GmRun_(iGmRun *run, iBool isCentered) {
diff --git a/src/prefs.h b/src/prefs.h
index 59c36a16..d988399e 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -193,3 +193,7 @@ iLocalDef float scrollSpeedFactor_Prefs(const iPrefs *d, enum iScrollType type)
     iAssert(type >= 0 && type < max_ScrollType);
     return 10.0f / iMax(1, d->smoothScrollSpeed[type]) * (type == mouse_ScrollType ? 0.5f : 1.0f);
 }
+
+iLocalDef enum iGmDocumentTheme docTheme_Prefs(const iPrefs *d) {
+    return isDark_ColorTheme(d->theme) ? d->docThemeDark : d->docThemeLight;
+}
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index 3454014a..75cbbf3a 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -231,7 +231,17 @@ static void getColors_LabelWidget_(const iLabelWidget *d, int *bg, int *fg, int
                 *bg = uiBackgroundUnfocusedSelection_ColorId;
             }
             else {
-                *bg = uiBackgroundSelected_ColorId;
+                const enum iGmDocumentTheme docTheme = docTheme_Prefs(prefs_App());
+                if ((docTheme == colorfulLight_GmDocumentTheme || docTheme == sepia_GmDocumentTheme) &&
+                    !cmp_String(&d->widget.parent->id, "tabs.buttons")) {
+                    *bg = (docTheme == sepia_GmDocumentTheme &&
+                                   colorTheme_App() == pureWhite_ColorTheme
+                               ? tmBackground_ColorId
+                               : tmBannerBackground_ColorId);
+                }
+                else {
+                    *bg = uiBackgroundSelected_ColorId;
+                }
             }
             if (!isKeyRoot) {
                 *bg = isDark_ColorTheme(colorTheme_App()) ? uiBackgroundUnfocusedSelection_ColorId
diff --git a/src/ui/root.c b/src/ui/root.c
index 6e187313..eeb5956f 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -1059,6 +1059,8 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
             updateNavBarIdentity_(navBar);
         }
         setFocus_Widget(NULL);
+        makePaletteGlobal_GmDocument(document_DocumentWidget(doc));
+        refresh_Widget(findWidget_Root("doctabs"));
     }
     else if (equal_Command(cmd, "mouse.clicked") && arg_Command(cmd)) {
         iWidget *widget = pointer_Command(cmd);