11 files changed, 184 insertions, 118 deletions

diff --git a/src/app.c b/src/app.c
index ed2c71b4..b76c4aaa 100644
--- a/src/app.c
+++ b/src/app.c
@@ -185,9 +185,9 @@ static iString *serializePrefs_App_(const iApp *d) {
                 SDL_GetWindowPosition(d->window->win, &x, &y);
                 SDL_GetWindowSize(d->window->win, &w, &h);
                 appendFormat_String(
-                    str, "~window.setrect snap:%d width:%d height:%d coord:%d %d\n", 
+                    str, "~window.setrect snap:%d width:%d height:%d coord:%d %d\n",
                     snap_Window(d->window), w, h, x, y);
-            }          
+            }
         }
 #elif !defined (iPlatformApple)
         if (snap_Window(d->window) == maximized_WindowSnap) {
@@ -223,6 +223,7 @@ static iString *serializePrefs_App_(const iApp *d) {
     appendFormat_String(str, "quoteicon.set arg:%d\n", d->prefs.quoteIcon ? 1 : 0);
     appendFormat_String(str, "prefs.hoverlink.changed arg:%d\n", d->prefs.hoverLink);
     appendFormat_String(str, "theme.set arg:%d auto:1\n", d->prefs.theme);
+    appendFormat_String(str, "accent.set arg:%d\n", d->prefs.accent);
     appendFormat_String(str, "ostheme arg:%d\n", d->prefs.useSystemTheme);
     appendFormat_String(str, "doctheme.dark.set arg:%d\n", d->prefs.docThemeDark);
     appendFormat_String(str, "doctheme.light.set arg:%d\n", d->prefs.docThemeLight);
@@ -521,7 +522,7 @@ static void init_App_(iApp *d, int argc, char **argv) {
     postCommand_App("window.unfreeze");
     d->autoReloadTimer = SDL_AddTimer(60 * 1000, postAutoReloadCommand_App_, NULL);
     postCommand_App("document.autoreload");
-    d->isFinishedLaunching = iTrue;    
+    d->isFinishedLaunching = iTrue;
     /* Run any commands that were pending completion of launch. */ {
         iForEach(StringList, i, d->launchCommands) {
             postCommandString_App(i.value);
@@ -1040,6 +1041,11 @@ static void updatePrefsThemeButtons_(iWidget *d) {
                         selected_WidgetFlag,
                         colorTheme_App() == i);
     }
+    for (size_t i = 0; i < max_ColorAccent; i++) {
+        setFlags_Widget(findChild_Widget(d, format_CStr("prefs.accent.%u", i)),
+                        selected_WidgetFlag,
+                        prefs_App()->accent == i);
+    }
 }
 
 static void updateDropdownSelection_(iLabelWidget *dropButton, const char *selectedCommand) {
@@ -1290,7 +1296,7 @@ iBool handleCommand_App(const char *cmd) {
             setSnap_Window(d->window, maximized_WindowSnap);
         }
         else {
-            setSnap_Window(d->window, snap_Window(d->window) == maximized_WindowSnap ? 0 : 
+            setSnap_Window(d->window, snap_Window(d->window) == maximized_WindowSnap ? 0 :
                            maximized_WindowSnap);
         }
         return iTrue;
@@ -1359,6 +1365,12 @@ iBool handleCommand_App(const char *cmd) {
         postCommandf_App("theme.changed auto:%d", isAuto);
         return iTrue;
     }
+    else if (equal_Command(cmd, "accent.set")) {
+        d->prefs.accent = arg_Command(cmd);
+        setThemePalette_Color(d->prefs.theme);
+        postCommandf_App("theme.changed auto:1");
+        return iTrue;
+    }
     else if (equal_Command(cmd, "ostheme")) {
         d->prefs.useSystemTheme = arg_Command(cmd);
         return iTrue;
@@ -1590,7 +1602,7 @@ iBool handleCommand_App(const char *cmd) {
     }
     else if (equal_Command(cmd, "preferences")) {
         iWidget *dlg = makePreferences_Widget();
-        updatePrefsThemeButtons_(dlg);        
+        updatePrefsThemeButtons_(dlg);
         setText_InputWidget(findChild_Widget(dlg, "prefs.downloads"), &d->prefs.downloadDir);
         setToggle_Widget(findChild_Widget(dlg, "prefs.hoverlink"), d->prefs.hoverLink);
         setToggle_Widget(findChild_Widget(dlg, "prefs.smoothscroll"), d->prefs.smoothScrolling);
diff --git a/src/prefs.c b/src/prefs.c
index 056ae267..97ad7f48 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -26,6 +26,7 @@ void init_Prefs(iPrefs *d) {
     d->dialogTab         = 0;
     d->useSystemTheme    = iTrue;
     d->theme             = dark_ColorTheme;
+    d->accent            = cyan_ColorAccent;
     d->customFrame       = iFalse; /* needs some more work to be default */
     d->retainWindowSize  = iTrue;
     d->uiScale           = 1.0f; /* default set elsewhere */
diff --git a/src/prefs.h b/src/prefs.h
index 1889c338..4bbe3ad5 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -38,6 +38,7 @@ struct Impl_Prefs {
     /* Window */
     iBool            useSystemTheme;
     enum iColorTheme theme;
+    enum iColorAccent accent;
     iBool            customFrame; /* when LAGRANGE_CUSTOM_FRAME is defined */
     iBool            retainWindowSize;
     float            uiScale;
diff --git a/src/ui/color.c b/src/ui/color.c
index 5d3fbaf5..9f657088 100644
--- a/src/ui/color.c
+++ b/src/ui/color.c
@@ -21,6 +21,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #include "color.h"
+#include "app.h"
 
 #include <the_Foundation/string.h>
 
@@ -52,10 +53,10 @@ static const iColor lightPalette_[] = {
     { 235, 235, 235, 255 },
     { 255, 255, 255, 255 },
 
-    { 142, 100,  20,  255 },
-    { 215, 210, 200,  255 },
-    { 10,  85,  112, 255 },
-    { 150, 205, 220, 255 },
+    { 210, 120,  10, 255 },
+    { 235, 215, 200, 255 },
+    { 10,  110, 130, 255 },
+    { 170, 215, 220, 255 },
 
     { 255, 255, 32,  255 },
     { 255, 64,  64,  255 },
@@ -71,14 +72,19 @@ iLocalDef void copy_(enum iColorId dst, enum iColorId src) {
 }
 
 void setThemePalette_Color(enum iColorTheme theme) {
+    const iPrefs *prefs = prefs_App();
     memcpy(palette_, isDark_ColorTheme(theme) ? darkPalette_ : lightPalette_, sizeof(darkPalette_));
+    const int accentHi    = (prefs->accent == cyan_ColorAccent ? cyan_ColorId : orange_ColorId);
+    const int accentLo    = (prefs->accent == cyan_ColorAccent ? teal_ColorId : brown_ColorId);
+    const int altAccentHi = (prefs->accent == cyan_ColorAccent ? orange_ColorId : cyan_ColorId);
+    const int altAccentLo = (prefs->accent == cyan_ColorAccent ? brown_ColorId : teal_ColorId);
     switch (theme) {
-        case pureBlack_ColorTheme:
+        case pureBlack_ColorTheme: {
             copy_(uiBackground_ColorId, black_ColorId);
             copy_(uiBackgroundHover_ColorId, black_ColorId);
-            copy_(uiBackgroundPressed_ColorId, orange_ColorId);
-            copy_(uiBackgroundSelected_ColorId, teal_ColorId);
-            copy_(uiBackgroundFramelessHover_ColorId, teal_ColorId);
+            copy_(uiBackgroundPressed_ColorId, altAccentHi);
+            copy_(uiBackgroundSelected_ColorId, accentLo);
+            copy_(uiBackgroundFramelessHover_ColorId, accentLo);
             set_Color(uiBackgroundSidebar_ColorId,
                       mix_Color(get_Color(black_ColorId), get_Color(gray25_ColorId), 0.55f));
             copy_(uiText_ColorId, gray75_ColorId);
@@ -88,45 +94,46 @@ void setThemePalette_Color(enum iColorTheme theme) {
             copy_(uiTextSelected_ColorId, white_ColorId);
             copy_(uiTextFramelessHover_ColorId, white_ColorId);
             copy_(uiTextDisabled_ColorId, gray25_ColorId);
-            copy_(uiTextShortcut_ColorId, cyan_ColorId);
-            copy_(uiTextAction_ColorId, cyan_ColorId);
-            copy_(uiTextCaution_ColorId, orange_ColorId);
-            copy_(uiTextAppTitle_ColorId, cyan_ColorId);
+            copy_(uiTextShortcut_ColorId, accentHi);
+            copy_(uiTextAction_ColorId, accentHi);
+            copy_(uiTextCaution_ColorId, altAccentHi);
+            copy_(uiTextAppTitle_ColorId, accentHi);
             copy_(uiFrame_ColorId, black_ColorId);
             copy_(uiEmboss1_ColorId, gray25_ColorId);
             copy_(uiEmboss2_ColorId, black_ColorId);
-            copy_(uiEmbossHover1_ColorId, cyan_ColorId);
-            copy_(uiEmbossHover2_ColorId, teal_ColorId);
-            copy_(uiEmbossPressed1_ColorId, brown_ColorId);
+            copy_(uiEmbossHover1_ColorId, accentHi);
+            copy_(uiEmbossHover2_ColorId, accentLo);
+            copy_(uiEmbossPressed1_ColorId, altAccentLo);
             copy_(uiEmbossPressed2_ColorId, gray75_ColorId);
-            copy_(uiEmbossSelected1_ColorId, cyan_ColorId);
+            copy_(uiEmbossSelected1_ColorId, accentHi);
             copy_(uiEmbossSelected2_ColorId, black_ColorId);
             copy_(uiEmbossSelectedHover1_ColorId, white_ColorId);
-            copy_(uiEmbossSelectedHover2_ColorId, cyan_ColorId);
+            copy_(uiEmbossSelectedHover2_ColorId, accentHi);
             copy_(uiInputBackground_ColorId, black_ColorId);
             copy_(uiInputBackgroundFocused_ColorId, black_ColorId);
             copy_(uiInputText_ColorId, gray75_ColorId);
             copy_(uiInputTextFocused_ColorId, white_ColorId);
             copy_(uiInputFrame_ColorId, gray25_ColorId);
-            copy_(uiInputFrameHover_ColorId, cyan_ColorId);
-            copy_(uiInputFrameFocused_ColorId, orange_ColorId);
-            copy_(uiInputCursor_ColorId, orange_ColorId);
+            copy_(uiInputFrameHover_ColorId, accentHi);
+            copy_(uiInputFrameFocused_ColorId, altAccentHi);
+            copy_(uiInputCursor_ColorId, altAccentHi);
             copy_(uiInputCursorText_ColorId, black_ColorId);
-            copy_(uiHeading_ColorId, cyan_ColorId);
-            copy_(uiAnnotation_ColorId, teal_ColorId);
-            copy_(uiIcon_ColorId, cyan_ColorId);
-            copy_(uiIconHover_ColorId, cyan_ColorId);
+            copy_(uiHeading_ColorId, accentHi);
+            copy_(uiAnnotation_ColorId, accentLo);
+            copy_(uiIcon_ColorId, accentHi);
+            copy_(uiIconHover_ColorId, accentHi);
             copy_(uiSeparator_ColorId, gray25_ColorId);
-            copy_(uiMarked_ColorId, brown_ColorId);
-            copy_(uiMatching_ColorId, teal_ColorId);
+            copy_(uiMarked_ColorId, altAccentLo);
+            copy_(uiMatching_ColorId, accentLo);
             break;
+        }
         default:
-        case dark_ColorTheme:
+        case dark_ColorTheme: {
             copy_(uiBackground_ColorId, gray25_ColorId);
             copy_(uiBackgroundHover_ColorId, gray25_ColorId);
-            copy_(uiBackgroundPressed_ColorId, orange_ColorId);
-            copy_(uiBackgroundSelected_ColorId, teal_ColorId);
-            copy_(uiBackgroundFramelessHover_ColorId, teal_ColorId);
+            copy_(uiBackgroundPressed_ColorId, altAccentHi);
+            copy_(uiBackgroundSelected_ColorId, accentLo);
+            copy_(uiBackgroundFramelessHover_ColorId, accentLo);
             set_Color(uiBackgroundSidebar_ColorId,
                       mix_Color(get_Color(black_ColorId), get_Color(gray25_ColorId), 0.75f));
             copy_(uiText_ColorId, gray75_ColorId);
@@ -136,45 +143,46 @@ void setThemePalette_Color(enum iColorTheme theme) {
             copy_(uiTextSelected_ColorId, white_ColorId);
             copy_(uiTextDisabled_ColorId, gray50_ColorId);
             copy_(uiTextFramelessHover_ColorId, white_ColorId);
-            copy_(uiTextShortcut_ColorId, cyan_ColorId);
-            copy_(uiTextAction_ColorId, cyan_ColorId);
-            copy_(uiTextCaution_ColorId, orange_ColorId);
-            copy_(uiTextAppTitle_ColorId, cyan_ColorId);
+            copy_(uiTextShortcut_ColorId, accentHi);
+            copy_(uiTextAction_ColorId, accentHi);
+            copy_(uiTextCaution_ColorId, altAccentHi);
+            copy_(uiTextAppTitle_ColorId, accentHi);
             copy_(uiFrame_ColorId, gray25_ColorId);
             copy_(uiEmboss1_ColorId, gray50_ColorId);
             copy_(uiEmboss2_ColorId, black_ColorId);
-            copy_(uiEmbossHover1_ColorId, cyan_ColorId);
-            copy_(uiEmbossHover2_ColorId, teal_ColorId);
-            copy_(uiEmbossPressed1_ColorId, brown_ColorId);
+            copy_(uiEmbossHover1_ColorId, accentHi);
+            copy_(uiEmbossHover2_ColorId, accentLo);
+            copy_(uiEmbossPressed1_ColorId, altAccentLo);
             copy_(uiEmbossPressed2_ColorId, white_ColorId);
-            copy_(uiEmbossSelected1_ColorId, cyan_ColorId);
+            copy_(uiEmbossSelected1_ColorId, accentHi);
             copy_(uiEmbossSelected2_ColorId, black_ColorId);
             copy_(uiEmbossSelectedHover1_ColorId, white_ColorId);
-            copy_(uiEmbossSelectedHover2_ColorId, cyan_ColorId);
+            copy_(uiEmbossSelectedHover2_ColorId, accentHi);
             set_Color(uiInputBackground_ColorId,
                       mix_Color(get_Color(black_ColorId), get_Color(gray25_ColorId), 0.7f));
             copy_(uiInputBackgroundFocused_ColorId, black_ColorId);
             copy_(uiInputText_ColorId, gray75_ColorId);
             copy_(uiInputTextFocused_ColorId, white_ColorId);
             copy_(uiInputFrame_ColorId, uiInputBackground_ColorId);
-            copy_(uiInputFrameHover_ColorId, cyan_ColorId);
-            copy_(uiInputFrameFocused_ColorId, orange_ColorId);
-            copy_(uiInputCursor_ColorId, orange_ColorId);
+            copy_(uiInputFrameHover_ColorId, accentHi);
+            copy_(uiInputFrameFocused_ColorId, altAccentHi);
+            copy_(uiInputCursor_ColorId, altAccentHi);
             copy_(uiInputCursorText_ColorId, black_ColorId);
-            copy_(uiHeading_ColorId, cyan_ColorId);
-            copy_(uiAnnotation_ColorId, teal_ColorId);
-            copy_(uiIcon_ColorId, cyan_ColorId);
-            copy_(uiIconHover_ColorId, cyan_ColorId);
+            copy_(uiHeading_ColorId, accentHi);
+            copy_(uiAnnotation_ColorId, accentLo);
+            copy_(uiIcon_ColorId, accentHi);
+            copy_(uiIconHover_ColorId, accentHi);
             copy_(uiSeparator_ColorId, black_ColorId);
-            copy_(uiMarked_ColorId, brown_ColorId);
-            copy_(uiMatching_ColorId, teal_ColorId);
+            copy_(uiMarked_ColorId, altAccentLo);
+            copy_(uiMatching_ColorId, accentLo);
             break;
+        }
         case light_ColorTheme:
             copy_(uiBackground_ColorId, gray75_ColorId);
             copy_(uiBackgroundHover_ColorId, gray75_ColorId);
-            copy_(uiBackgroundSelected_ColorId, orange_ColorId);
-            copy_(uiBackgroundPressed_ColorId, cyan_ColorId);
-            copy_(uiBackgroundFramelessHover_ColorId, orange_ColorId);
+            copy_(uiBackgroundSelected_ColorId, accentHi);
+            copy_(uiBackgroundPressed_ColorId, altAccentHi);
+            copy_(uiBackgroundFramelessHover_ColorId, accentHi);
             set_Color(uiBackgroundSidebar_ColorId,
                       mix_Color(get_Color(white_ColorId), get_Color(gray75_ColorId), 0.5f));
             copy_(uiText_ColorId, black_ColorId);
@@ -184,10 +192,10 @@ void setThemePalette_Color(enum iColorTheme theme) {
             copy_(uiTextSelected_ColorId, black_ColorId);
             copy_(uiTextDisabled_ColorId, gray50_ColorId);
             copy_(uiTextFramelessHover_ColorId, black_ColorId);
-            copy_(uiTextShortcut_ColorId, brown_ColorId);
-            copy_(uiTextAction_ColorId, brown_ColorId);
-            copy_(uiTextCaution_ColorId, teal_ColorId);
-            copy_(uiTextAppTitle_ColorId, teal_ColorId);
+            copy_(uiTextShortcut_ColorId, accentLo);
+            copy_(uiTextAction_ColorId, accentLo);
+            copy_(uiTextCaution_ColorId, altAccentLo);
+            copy_(uiTextAppTitle_ColorId, altAccentLo);
             copy_(uiFrame_ColorId, gray50_ColorId);
             copy_(uiEmboss1_ColorId, white_ColorId);
             copy_(uiEmboss2_ColorId, gray50_ColorId);
@@ -196,34 +204,34 @@ void setThemePalette_Color(enum iColorTheme theme) {
             copy_(uiEmbossPressed1_ColorId, black_ColorId);
             copy_(uiEmbossPressed2_ColorId, white_ColorId);
             copy_(uiEmbossSelected1_ColorId, white_ColorId);
-            copy_(uiEmbossSelected2_ColorId, brown_ColorId);
-            copy_(uiEmbossSelectedHover1_ColorId, brown_ColorId);
-            copy_(uiEmbossSelectedHover2_ColorId, brown_ColorId);
+            copy_(uiEmbossSelected2_ColorId, accentLo);
+            copy_(uiEmbossSelectedHover1_ColorId, accentLo);
+            copy_(uiEmbossSelectedHover2_ColorId, accentLo);
             copy_(uiInputBackground_ColorId, white_ColorId);
             copy_(uiInputBackgroundFocused_ColorId, white_ColorId);
             copy_(uiInputText_ColorId, gray25_ColorId);
             copy_(uiInputTextFocused_ColorId, black_ColorId);
             set_Color(uiInputFrame_ColorId,
                       mix_Color(get_Color(gray50_ColorId), get_Color(gray75_ColorId), 0.5f));
-            copy_(uiInputFrameHover_ColorId, brown_ColorId);
-            copy_(uiInputFrameFocused_ColorId, teal_ColorId);
-            copy_(uiInputCursor_ColorId, teal_ColorId);
+            copy_(uiInputFrameHover_ColorId, accentLo);
+            copy_(uiInputFrameFocused_ColorId, altAccentLo);
+            copy_(uiInputCursor_ColorId, altAccentLo);
             copy_(uiInputCursorText_ColorId, white_ColorId);
-            copy_(uiHeading_ColorId, brown_ColorId);
+            copy_(uiHeading_ColorId, accentLo);
             copy_(uiAnnotation_ColorId, gray50_ColorId);
-            copy_(uiIcon_ColorId, brown_ColorId);
-            copy_(uiIconHover_ColorId, brown_ColorId);
+            copy_(uiIcon_ColorId, accentLo);
+            copy_(uiIconHover_ColorId, accentLo);
             set_Color(uiSeparator_ColorId,
                       mix_Color(get_Color(gray50_ColorId), get_Color(gray75_ColorId), 0.5f));
-            copy_(uiMarked_ColorId, cyan_ColorId);
-            copy_(uiMatching_ColorId, orange_ColorId);
+            copy_(uiMarked_ColorId, altAccentHi);
+            copy_(uiMatching_ColorId, accentHi);
             break;
         case pureWhite_ColorTheme:
             copy_(uiBackground_ColorId, white_ColorId);
             copy_(uiBackgroundHover_ColorId, gray75_ColorId);
-            copy_(uiBackgroundSelected_ColorId, orange_ColorId);
-            copy_(uiBackgroundPressed_ColorId, cyan_ColorId);
-            copy_(uiBackgroundFramelessHover_ColorId, orange_ColorId);
+            copy_(uiBackgroundSelected_ColorId, accentHi);
+            copy_(uiBackgroundPressed_ColorId, altAccentHi);
+            copy_(uiBackgroundFramelessHover_ColorId, accentHi);
             set_Color(uiBackgroundSidebar_ColorId,
                       mix_Color(get_Color(white_ColorId), get_Color(gray75_ColorId), 0.5f));
             set_Color(uiText_ColorId,
@@ -234,19 +242,19 @@ void setThemePalette_Color(enum iColorTheme theme) {
             copy_(uiTextDim_ColorId, gray25_ColorId);
             copy_(uiTextSelected_ColorId, black_ColorId);
             copy_(uiTextFramelessHover_ColorId, black_ColorId);
-            copy_(uiTextShortcut_ColorId, brown_ColorId);
-            copy_(uiTextAction_ColorId, brown_ColorId);
-            copy_(uiTextCaution_ColorId, teal_ColorId);
-            copy_(uiTextAppTitle_ColorId, teal_ColorId);
+            copy_(uiTextShortcut_ColorId, accentLo);
+            copy_(uiTextAction_ColorId, accentLo);
+            copy_(uiTextCaution_ColorId, altAccentLo);
+            copy_(uiTextAppTitle_ColorId, altAccentLo);
             copy_(uiFrame_ColorId, gray75_ColorId);
             copy_(uiEmboss1_ColorId, white_ColorId);
             copy_(uiEmboss2_ColorId, white_ColorId);
             copy_(uiEmbossHover1_ColorId, gray25_ColorId);
             copy_(uiEmbossHover2_ColorId, gray25_ColorId);
             copy_(uiEmbossPressed1_ColorId, black_ColorId);
-            copy_(uiEmbossPressed2_ColorId, teal_ColorId);
+            copy_(uiEmbossPressed2_ColorId, altAccentLo);
             copy_(uiEmbossSelected1_ColorId, white_ColorId);
-            copy_(uiEmbossSelected2_ColorId, brown_ColorId);
+            copy_(uiEmbossSelected2_ColorId, accentLo);
             copy_(uiEmbossSelectedHover1_ColorId, gray50_ColorId);
             copy_(uiEmbossSelectedHover2_ColorId, gray50_ColorId);
             copy_(uiInputBackground_ColorId, white_ColorId);
@@ -254,17 +262,18 @@ void setThemePalette_Color(enum iColorTheme theme) {
             copy_(uiInputText_ColorId, gray25_ColorId);
             copy_(uiInputTextFocused_ColorId, black_ColorId);
             copy_(uiInputFrame_ColorId, gray50_ColorId);
-            copy_(uiInputFrameHover_ColorId, brown_ColorId);
-            copy_(uiInputFrameFocused_ColorId, teal_ColorId);
-            copy_(uiInputCursor_ColorId, teal_ColorId);
+            copy_(uiInputFrameHover_ColorId, accentLo);
+            copy_(uiInputFrameFocused_ColorId, altAccentLo);
+            copy_(uiInputCursor_ColorId, altAccentLo);
             copy_(uiInputCursorText_ColorId, white_ColorId);
-            copy_(uiHeading_ColorId, brown_ColorId);
+            copy_(uiHeading_ColorId, accentLo);
             copy_(uiAnnotation_ColorId, gray50_ColorId);
-            copy_(uiIcon_ColorId, brown_ColorId);
-            copy_(uiIconHover_ColorId, brown_ColorId);
-            copy_(uiSeparator_ColorId, gray75_ColorId);
-            copy_(uiMarked_ColorId, cyan_ColorId);
-            copy_(uiMatching_ColorId, orange_ColorId);
+            copy_(uiIcon_ColorId, accentLo);
+            copy_(uiIconHover_ColorId, accentLo);
+            set_Color(uiSeparator_ColorId,
+                      mix_Color(get_Color(gray50_ColorId), get_Color(gray75_ColorId), 0.67f));
+            copy_(uiMarked_ColorId, altAccentHi);
+            copy_(uiMatching_ColorId, accentHi);
             break;
     }
     set_Color(uiSubheading_ColorId,
@@ -274,7 +283,7 @@ void setThemePalette_Color(enum iColorTheme theme) {
     set_Color(uiBackgroundUnfocusedSelection_ColorId,
               mix_Color(get_Color(uiBackground_ColorId),
                         get_Color(uiBackgroundSelected_ColorId),
-                        isDark_ColorTheme(theme) ? 0.25f : 0.66f));
+                        theme == pureBlack_ColorTheme ? 0.5f : isDark_ColorTheme(theme) ? 0.25f : 0.66f));
     setHsl_Color(uiBackgroundFolder_ColorId,
                  addSatLum_HSLColor(get_HSLColor(uiBackgroundSidebar_ColorId),
                                     0,
diff --git a/src/ui/color.h b/src/ui/color.h
index f65600d2..8556cd72 100644
--- a/src/ui/color.h
+++ b/src/ui/color.h
@@ -33,6 +33,12 @@ enum iColorTheme {
     max_ColorTheme
 };
 
+enum iColorAccent {
+    cyan_ColorAccent,
+    orange_ColorAccent,
+    max_ColorAccent
+};
+
 iLocalDef iBool isDark_ColorTheme(enum iColorTheme d) {
     return d == pureBlack_ColorTheme || d == dark_ColorTheme;
 }
diff --git a/src/ui/documentwidget.h b/src/ui/documentwidget.h
index 91337a24..f922e7ea 100644
--- a/src/ui/documentwidget.h
+++ b/src/ui/documentwidget.h
@@ -43,6 +43,7 @@ const iBlock *      sourceContent_DocumentWidget    (const iDocumentWidget *);
 const iGmDocument * document_DocumentWidget         (const iDocumentWidget *);
 const iString *     bookmarkTitle_DocumentWidget    (const iDocumentWidget *);
 const iString *     feedTitle_DocumentWidget        (const iDocumentWidget *);
+int                 documentWidth_DocumentWidget    (const iDocumentWidget *);
 
 void    setUrl_DocumentWidget           (iDocumentWidget *, const iString *url);
 void    setUrlFromCache_DocumentWidget  (iDocumentWidget *, const iString *url, iBool isFromCache);
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index 1b16a028..8cba2d00 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -227,7 +227,8 @@ static void draw_LabelWidget_(const iLabelWidget *d) {
                 bottomRight_Rect(frameRect), bottomLeft_Rect(frameRect)
             };
             drawLines_Paint(&p, points + 2, 3, frame2);
-            drawLines_Paint(&p, points, 3, frame);
+            drawLines_Paint(
+                &p, points, !isHover_Widget(w) && flags & noTopFrame_WidgetFlag ? 2 : 3, frame);
         }
     }
     setClip_Paint(&p, rect);
diff --git a/src/ui/util.c b/src/ui/util.c
index 5cdac391..3e57c2b5 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -472,8 +472,12 @@ iWidget *makeMenu_Widget(iWidget *parent, const iMenuItem *items, size_t n) {
                 iClob(newKeyMods_LabelWidget(item->label, item->key, item->kmods, item->command)),
                 frameless_WidgetFlag | alignLeft_WidgetFlag | drawKey_WidgetFlag);
             updateSize_LabelWidget(label); /* drawKey was set */
-            if (deviceType_App() != desktop_AppDeviceType) {
-                setFont_LabelWidget(label, uiContent_FontId);
+            const iBool isCaution = startsWith_CStr(item->label, uiTextCaution_ColorEscape);
+            if (deviceType_App() == tablet_AppDeviceType) {
+                setFont_LabelWidget(label, isCaution ? uiContentBold_FontId : uiContent_FontId);
+            }
+            else if (deviceType_App() == desktop_AppDeviceType) {
+                setFont_LabelWidget(label, isCaution ? uiLabelBold_FontId : uiLabel_FontId);
             }
         }
     }
@@ -669,7 +673,8 @@ static void addTabPage_Widget_(iWidget *tabs, enum iWidgetAddPos addPos, iWidget
         addPos);
     setFlags_Widget(buttons, hidden_WidgetFlag, iFalse);
     setFlags_Widget(button, selected_WidgetFlag, isSel);
-    setFlags_Widget(button, commandOnClick_WidgetFlag | expand_WidgetFlag, iTrue);
+    setFlags_Widget(
+        button, noTopFrame_WidgetFlag | commandOnClick_WidgetFlag | expand_WidgetFlag, iTrue);
     addChildPos_Widget(pages, page, addPos);
     setFlags_Widget(page, hidden_WidgetFlag | disabled_WidgetFlag, !isSel);
 }
@@ -1025,7 +1030,7 @@ void updateValueInput_Widget(iWidget *d, const char *title, const char *prompt)
 
 static iBool messageHandler_(iWidget *msg, const char *cmd) {
     /* Almost any command dismisses the sheet. */
-    if (!(equal_Command(cmd, "media.updated") ||          
+    if (!(equal_Command(cmd, "media.updated") ||
           equal_Command(cmd, "media.player.update") ||
           equal_Command(cmd, "bookmarks.request.finished") ||
           equal_Command(cmd, "document.autoreload") ||
@@ -1197,6 +1202,13 @@ iWidget *makePreferences_Widget(void) {
             setId_Widget(addChild_Widget(themes, iClob(new_LabelWidget("Pure White", "theme.set arg:3"))), "prefs.theme.3");
         }
         addChildFlags_Widget(values, iClob(themes), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
+        /* Accents. */
+        iWidget *accent = new_Widget(); {
+            setId_Widget(addChild_Widget(accent, iClob(new_LabelWidget("Teal", "accent.set arg:0"))), "prefs.accent.0");
+            setId_Widget(addChild_Widget(accent, iClob(new_LabelWidget("Orange", "accent.set arg:1"))), "prefs.accent.1");
+        }
+        addChild_Widget(headings, iClob(makeHeading_Widget("Accent color:")));
+        addChildFlags_Widget(values, iClob(accent), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
 #if defined (LAGRANGE_CUSTOM_FRAME)
         addChild_Widget(headings, iClob(makeHeading_Widget("Custom window frame:")));
         addChild_Widget(values, iClob(makeToggle_Widget("prefs.customframe")));
@@ -1327,7 +1339,7 @@ iWidget *makePreferences_Widget(void) {
                     iClob(makeDialogButtons_(
                         (iMenuItem[]){ { "Dismiss", SDLK_ESCAPE, 0, "prefs.dismiss" } }, 1)));
     addChild_Widget(get_Window()->root, iClob(dlg));
-    centerSheet_Widget(dlg);    
+    centerSheet_Widget(dlg);
     return dlg;
 }
 
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 2bdda691..386ba6d6 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -334,7 +334,7 @@ void arrange_Widget(iWidget *d) {
             iWidget *child = as_Widget(c.object);
             if (isCollapsed_Widget_(child)) {
                 if (d->flags & arrangeHorizontal_WidgetFlag) {
-                    setWidth_Widget_(child, 0);                    
+                    setWidth_Widget_(child, 0);
                 }
                 if (d->flags & arrangeVertical_WidgetFlag) {
                     setHeight_Widget_(child, 0);
@@ -682,7 +682,7 @@ void drawBackground_Widget(const iWidget *d) {
         iPaint p;
         init_Paint(&p);
         if (d->flags & mouseModal_WidgetFlag) {
-            p.alpha = 128;
+            p.alpha = 0x60;
             SDL_SetRenderDrawBlendMode(renderer_Window(get_Window()), SDL_BLENDMODE_BLEND);
             int fadeColor;
             switch (colorTheme_App()) {
diff --git a/src/ui/widget.h b/src/ui/widget.h
index 52833f86..c5a1a360 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -99,6 +99,7 @@ enum iWidgetFlag {
 #define drawBackgroundToVerticalSafeArea_WidgetFlag     iBit64(44)
 #define visualOffset_WidgetFlag             iBit64(45)
 #define parentCannotResize_WidgetFlag       iBit64(46)
+#define noTopFrame_WidgetFlag               iBit64(47)
 
 enum iWidgetAddPos {
     back_WidgetAddPos,
diff --git a/src/ui/window.c b/src/ui/window.c
index bc19fd09..89b3d9ef 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -433,8 +433,8 @@ static uint32_t updateReloadAnimation_Window_(uint32_t interval, void *window) {
 }
 
 static void setReloadLabel_Window_(iWindow *d, iBool animating) {
-    updateTextCStr_LabelWidget(findChild_Widget(d->root, "reload"),
-                               animating ? loadAnimationCStr_() : reloadCStr_);
+    iLabelWidget *label = findChild_Widget(d->root, "reload");
+    updateTextCStr_LabelWidget(label, animating ? loadAnimationCStr_() : reloadCStr_);
 }
 
 static void checkLoadAnimation_Window_(iWindow *d) {
@@ -495,10 +495,30 @@ static void showSearchQueryIndicator_(iBool show) {
         (iInputWidget *) parent_Widget(indicator), -1, show ? width_Widget(indicator) : 0);
 }
 
+static int navBarAvailableSpace_(iWidget *navBar) {
+    int avail = width_Rect(innerBounds_Widget(navBar));
+    iConstForEach(ObjectList, i, children_Widget(navBar)) {
+        const iWidget *child = i.object;
+        if (~flags_Widget(child) & expand_WidgetFlag &&
+            isVisible_Widget(child) &&
+            cmp_String(id_Widget(child), "url")) {
+            avail -= width_Widget(child);
+        }
+    }
+    return avail;
+}
+
 static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
     if (equal_Command(cmd, "window.resized")) {
         const iBool isPhone = deviceType_App() == phone_AppDeviceType;
         const iBool isNarrow = !isPhone && width_Rect(bounds_Widget(navBar)) / gap_UI < 140;
+        /* Adjust navbar padding. */ {
+            int hPad = isPhone || isNarrow ? gap_UI / 2 : gap_UI * 3 / 2;
+            int vPad = gap_UI * 3 / 2;
+            int topPad = !findWidget_App("winbar") ? gap_UI / 2 : 0;
+            setPadding_Widget(navBar, hPad, vPad / 2 + topPad, hPad, vPad / 2);
+        }
+        /* Button sizing. */
         if (isNarrow ^ ((flags_Widget(navBar) & tight_WidgetFlag) != 0)) {
             setFlags_Widget(navBar, tight_WidgetFlag, isNarrow);
             iForEach(ObjectList, i, navBar->children) {
@@ -531,7 +551,9 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
             }
             arrange_Widget(get_Window()->root);
         }
-        else {
+        /* Resize the URL input field. */ {
+            iWidget *urlBar = findChild_Widget(navBar, "url");
+            urlBar->rect.size.x = iMini(navBarAvailableSpace_(navBar), 167 * gap_UI);
             arrange_Widget(navBar);
         }
         refresh_Widget(navBar);
@@ -795,9 +817,9 @@ static void setupUserInterface_Window(iWindow *d) {
     iWidget *div = makeVDiv_Widget();
     setId_Widget(div, "navdiv");
     addChild_Widget(d->root, iClob(div));
-    
+
 #if defined (LAGRANGE_CUSTOM_FRAME)
-    /* Window title bar. */ 
+    /* Window title bar. */
     if (prefs_App()->customFrame) {
         setPadding1_Widget(div, 1);
         iWidget *winBar = new_Widget();
@@ -852,8 +874,6 @@ static void setupUserInterface_Window(iWindow *d) {
     /* Navigation bar. */ {
         iWidget *navBar = new_Widget();
         setId_Widget(navBar, "navbar");
-        int topPad = !findChild_Widget(div, "winbar") ? gap_UI / 2 : 0;
-        setPadding_Widget(navBar, gap_UI, topPad, gap_UI, gap_UI / 2);
         setFlags_Widget(navBar,
                         arrangeHeight_WidgetFlag |
                         resizeChildren_WidgetFlag |
@@ -866,6 +886,7 @@ static void setupUserInterface_Window(iWindow *d) {
         setCommandHandler_Widget(navBar, handleNavBarCommands_);
         setId_Widget(addChildFlags_Widget(navBar, iClob(newIcon_LabelWidget("\U0001f870", 0, 0, "navigate.back")), collapse_WidgetFlag), "navbar.back");
         setId_Widget(addChildFlags_Widget(navBar, iClob(newIcon_LabelWidget("\U0001f872", 0, 0, "navigate.forward")), collapse_WidgetFlag), "navbar.forward");
+        addChildFlags_Widget(navBar, iClob(new_Widget()), expand_WidgetFlag);
         iLabelWidget *idMenu = makeMenuButton_LabelWidget(
             "\U0001f464", identityButtonMenuItems_, iElemCount(identityButtonMenuItems_));
         setAlignVisually_LabelWidget(idMenu, iTrue);
@@ -877,7 +898,7 @@ static void setupUserInterface_Window(iWindow *d) {
             setUrlContent_InputWidget(url, iTrue);
             setNotifyEdits_InputWidget(url, iTrue);
             setTextCStr_InputWidget(url, "gemini://");
-            addChildFlags_Widget(navBar, iClob(url), expand_WidgetFlag);
+            addChildFlags_Widget(navBar, iClob(url), 0);
             setPadding_Widget(as_Widget(url), 0, 0, gap_UI, 0);
             /* Page information/certificate warning. */ {
                 iLabelWidget *lock =
@@ -928,7 +949,7 @@ static void setupUserInterface_Window(iWindow *d) {
         setId_Widget(addChild_Widget(
                          navBar, iClob(newIcon_LabelWidget(reloadCStr_, 0, 0, "navigate.reload"))),
                      "reload");
-        
+        addChildFlags_Widget(navBar, iClob(new_Widget()), expand_WidgetFlag);
         setId_Widget(addChildFlags_Widget(navBar,
                         iClob(newIcon_LabelWidget(
                             "\U0001f3e0", SDLK_h, KMOD_PRIMARY | KMOD_SHIFT, "navigate.home")),
@@ -1137,7 +1158,7 @@ static SDL_HitTestResult hitTest_Window_(SDL_Window *win, const SDL_Point *pos,
     const int snap = snap_Window(d);
     int w, h;
     SDL_GetWindowSize(win, &w, &h);
-    /* TODO: Check if inside the caption label widget. */    
+    /* TODO: Check if inside the caption label widget. */
     const iBool isLeft   = pos->x < gap_UI;
     const iBool isRight  = pos->x >= w - gap_UI;
     const iBool isTop    = pos->y < gap_UI && snap != yMaximized_WindowSnap;
@@ -1306,7 +1327,7 @@ void init_Window(iWindow *d, iRect rect) {
     updateRootSize_Window_(d, iFalse);
     d->appIcon = NULL;
 #if defined (LAGRANGE_CUSTOM_FRAME)
-    /* Load the app icon for drawing in the title bar. */ 
+    /* Load the app icon for drawing in the title bar. */
     if (prefs_App()->customFrame) {
         SDL_Surface *surf = loadAppIconSurface_(appIconSize_());
         SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "0");
@@ -1416,7 +1437,7 @@ static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
 #endif
             return iFalse;
         case SDL_WINDOWEVENT_MOVED: {
-            if (d->isMinimized) { 
+            if (d->isMinimized) {
                 return iFalse;
             }
             const iInt2 newPos = init_I2(ev->data1, ev->data2);
@@ -1426,7 +1447,7 @@ static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
                 return iFalse;
             }
 #if defined (LAGRANGE_CUSTOM_FRAME)
-            /* Set the snap position depending on where the mouse cursor is. */ 
+            /* Set the snap position depending on where the mouse cursor is. */
             if (prefs_App()->customFrame) {
                 SDL_Rect usable;
                 iInt2 mouse = cursor_Win32(); /* SDL is unaware of the current cursor pos */
@@ -1473,7 +1494,7 @@ static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
         }
         case SDL_WINDOWEVENT_RESIZED:
             updatePadding_Window_(d);
-            if (d->isMinimized) { 
+            if (d->isMinimized) {
                 updateRootSize_Window_(d, iTrue);
                 return iTrue;
             }
@@ -1485,16 +1506,16 @@ static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
                 //printf("normal rect set (resize)\n"); fflush(stdout);
             }
             updateRootSize_Window_(d, iTrue /* we were already redrawing during the resize */);
+            postRefresh_App();
             return iTrue;
         case SDL_WINDOWEVENT_RESTORED:
-            //updateRootSize_Window_(d, iTrue);
+            updateRootSize_Window_(d, iTrue);
             invalidate_Window_(d);
             d->isMinimized = iFalse;
             postRefresh_App();
             return iTrue;
         case SDL_WINDOWEVENT_MINIMIZED:
             d->isMinimized = iTrue;
-            //printf("minimized\n"); fflush(stdout);
             return iTrue;
         case SDL_WINDOWEVENT_LEAVE:
             unhover_Widget();
@@ -1507,6 +1528,7 @@ static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
             return iTrue;
         case SDL_WINDOWEVENT_TAKE_FOCUS:
             SDL_SetWindowInputFocus(d->win);
+            postRefresh_App();
             return iTrue;
         case SDL_WINDOWEVENT_FOCUS_GAINED:
             d->focusGainedAt = SDL_GetTicks();
@@ -1532,13 +1554,13 @@ iBool processEvent_Window(iWindow *d, const SDL_Event *ev) {
     switch (ev->type) {
 #if defined (LAGRANGE_CUSTOM_FRAME)
         case SDL_SYSWMEVENT: {
-            /* We observe native Win32 messages for better user interaction with the 
-               window frame. Mouse clicks especially will not generate normal SDL 
+            /* We observe native Win32 messages for better user interaction with the
+               window frame. Mouse clicks especially will not generate normal SDL
                events if they happen on the custom hit-tested regions. These events
                are processed only there; the UI widgets do not get involved. */
             processNativeEvent_Win32(ev->syswm.msg, d);
             break;
-        }       
+        }
 #endif
         case SDL_WINDOWEVENT: {
             return handleWindowEvent_Window_(d, &ev->window);
@@ -1778,7 +1800,7 @@ void setSnap_Window(iWindow *d, int snapMode) {
         return;
     }
     const int snapDist = gap_UI * 4;
-    iRect newRect = zero_Rect();   
+    iRect newRect = zero_Rect();
     SDL_Rect usable;
     SDL_GetDisplayUsableBounds(SDL_GetWindowDisplayIndex(d->win), &usable);
     if (d->place.snap == fullscreen_WindowSnap) {