14 files changed, 338 insertions, 53 deletions

diff --git a/res/about/help.gmi b/res/about/help.gmi
index ca5e164f..1059dd68 100644
--- a/res/about/help.gmi
+++ b/res/about/help.gmi
@@ -132,7 +132,19 @@ In addition to a title, bookmarks can have tags. Some tags have a special meanin
 
 Gemini uses TLS client certificates for manual user/session identification purposes. This is analogous to logging into a web site, except you are in full control of the information. The term "Identity" is used in Lagrange to refer to client certificates.
 
-Lagrange can easily create a new identity. The shortcut for this is ${SHIFT+}${CTRL+}N. Consider any information you enter in the certificate as public; only the Common Name is required and will appear as the issuer and subject of the certificate.
+The Identities sidebar tab shows all identities known to Lagrange. Press ${CTRL+}3 to show it. This includes identities created in Lagrange and any identities based on imported X.509 certificates.
+
+### Creating a new identity
+
+Click on the 👤 button in the navigation bar and select "New Identity...". The shortcut for this is ${SHIFT+}${CTRL+}N.
+
+Consider any information you enter in the certificate as public; only the Common Name is required and will appear as the issuer and subject of the certificate.
+
+### Using an identity
+
+You'll need to select an identity when you encounter this error message:
+
+...
 
 Clicking on an identity in the sidebar will toggle it on/off for the currently open URL. On subsequent page loads, the certificate will then be sent to the server when the URL or any URL under it is fetched. You can click on the 👤 button in the navigation bar to see which identity is being used for the current page.
 
diff --git a/res/about/version.gmi b/res/about/version.gmi
index 94ddae60..2df2f9b4 100644
--- a/res/about/version.gmi
+++ b/res/about/version.gmi
@@ -7,8 +7,12 @@
 # Release notes
 
 ## 0.3
-* Added "Open Link in Background Tab" to link context menu.
+* Added preferences for font and page layout.
+* Added preference for color saturation.
 * Added tabs in Preferences for better grouping.
+* Page outline appears when mouse is hovering over the scrollbar.
+* Site icon appears on the left when the window is wide enough.
+* Added "Open Link in Background Tab" to link context menu.
 * Slightly smaller first paragraph font size.
 * Improved text selection behavior when starting on empty space.
 * Fixed: Centered popups do not remain centered when window is resized.
diff --git a/src/app.c b/src/app.c
index 27ddbb26..81fe67af 100644
--- a/src/app.c
+++ b/src/app.c
@@ -165,6 +165,7 @@ static iString *serializePrefs_App_(const iApp *d) {
     }
     appendFormat_String(str, "sidebar.mode arg:%d\n", mode_SidebarWidget(sidebar));
     appendFormat_String(str, "uiscale arg:%f\n", uiScale_Window(d->window));
+    appendFormat_String(str, "font.set arg:%d\n", d->prefs.font);
     appendFormat_String(str, "zoom.set arg:%d\n", d->prefs.zoomPercent);
     appendFormat_String(str, "linewidth.set arg:%d\n", d->prefs.lineWidth);
     appendFormat_String(str, "prefs.biglede.changed arg:%d\n", d->prefs.bigFirstParagraph);
@@ -810,6 +811,14 @@ iBool handleCommand_App(const char *cmd) {
         SDL_MaximizeWindow(d->window->win);
         return iTrue;
     }
+    else if (equal_Command(cmd, "font.set")) {
+        setFreezeDraw_Window(get_Window(), iTrue);
+        d->prefs.font = arg_Command(cmd);
+        setContentFont_Text(d->prefs.font);
+        postCommand_App("font.changed");
+        postCommand_App("window.unfreeze");
+        return iTrue;
+    }
     else if (equal_Command(cmd, "zoom.set")) {
         setFreezeDraw_Window(get_Window(), iTrue); /* no intermediate draws before docs updated */
         d->prefs.zoomPercent = arg_Command(cmd);
@@ -977,6 +986,9 @@ iBool handleCommand_App(const char *cmd) {
         setToggle_Widget(findChild_Widget(dlg, "prefs.retainwindow"), d->prefs.retainWindowSize);
         setText_InputWidget(findChild_Widget(dlg, "prefs.uiscale"),
                             collectNewFormat_String("%g", uiScale_Window(d->window)));
+        setFlags_Widget(findChild_Widget(dlg, format_CStr("prefs.font.%d", d->prefs.font)),
+                        selected_WidgetFlag,
+                        iTrue);
         setFlags_Widget(
             findChild_Widget(dlg, format_CStr("prefs.linewidth.%d", d->prefs.lineWidth)),
             selected_WidgetFlag,
diff --git a/src/gmdocument.h b/src/gmdocument.h
index ec47258a..891ac6f2 100644
--- a/src/gmdocument.h
+++ b/src/gmdocument.h
@@ -118,7 +118,7 @@ iInt2           size_GmDocument             (const iGmDocument *);
 const iGmRun *  siteBanner_GmDocument       (const iGmDocument *);
 iBool           hasSiteBanner_GmDocument    (const iGmDocument *);
 const iString * bannerText_GmDocument       (const iGmDocument *);
-const iArray *  headings_GmDocument         (const iGmDocument *);
+const iArray *  headings_GmDocument         (const iGmDocument *); /* array of GmHeadings */
 const iString * source_GmDocument           (const iGmDocument *);
 
 iRangecc        findText_GmDocument         (const iGmDocument *, const iString *text, const char *start);
diff --git a/src/prefs.c b/src/prefs.c
index d773acbd..9b77b4f2 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -6,6 +6,7 @@ void init_Prefs(iPrefs *d) {
     d->retainWindowSize  = iTrue;
     d->zoomPercent       = 100;
     d->forceLineWrap     = iFalse;
+    d->font              = nunito_TextFont;
     d->lineWidth         = 40;
     d->bigFirstParagraph = iTrue;
     d->docThemeDark      = colorfulDark_GmDocumentTheme;
diff --git a/src/prefs.h b/src/prefs.h
index d4e300ec..42ccff85 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -1,8 +1,9 @@
 #pragma once
 #include <the_Foundation/string.h>
 
-#include "ui/color.h"
 #include "gmdocument.h"
+#include "ui/color.h"
+#include "ui/text.h"
 
 /* User preferences */
 
@@ -10,7 +11,7 @@ iDeclareType(Prefs)
 
 struct Impl_Prefs {
     iBool retainWindowSize;
-    float uiScale;
+    float uiScale;    
     int zoomPercent;
     iBool useSystemTheme;
     enum iColorTheme theme;
@@ -18,6 +19,7 @@ struct Impl_Prefs {
     iString httpProxy;
     iString downloadDir;
     /* Content */
+    enum iTextFont font;
     int lineWidth;
     iBool bigFirstParagraph;
     iBool forceLineWrap;
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 351d1e62..0079465f 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -127,6 +127,18 @@ iDefineTypeConstruction(Model)
 
 /*----------------------------------------------------------------------------------------------*/
 
+iDeclareType(OutlineItem)
+
+struct Impl_OutlineItem {
+    iRangecc text;
+    int      font;
+    iRect    rect;
+    int      seenColor;
+    int      sepColor;
+};
+
+/*----------------------------------------------------------------------------------------------*/
+
 static const int smoothSpeed_DocumentWidget_ = 120; /* unit: gap_Text per second */
 
 enum iRequestState {
@@ -161,6 +173,7 @@ struct Impl_DocumentWidget {
     const iGmRun * contextLink;
     iBool          noHoverWhileScrolling;
     iBool          showLinkNumbers;
+    const iGmRun * lastVisibleRun;
     iClick         click;
     float          initNormScrollY;
     int            scrollY;
@@ -170,6 +183,8 @@ struct Impl_DocumentWidget {
     int            smoothLastOffset;
     iBool          smoothContinue;
     iAnim          sideOpacity;
+    iAnim          outlineOpacity;
+    iArray         outline;
     iWidget *      menu;
     iVisBuf *      visBuf;
     iPtrSet *      invalidRuns;
@@ -207,8 +222,10 @@ void init_DocumentWidget(iDocumentWidget *d) {
     d->contextLink      = NULL;
     d->noHoverWhileScrolling = iFalse;
     d->showLinkNumbers  = iFalse;
+    d->lastVisibleRun   = NULL;
     d->visBuf           = new_VisBuf();
     d->invalidRuns      = new_PtrSet();
+    init_Array(&d->outline, sizeof(iOutlineItem));
     init_Anim(&d->sideOpacity, 0);
     init_String(&d->sourceMime);
     init_Block(&d->sourceContent, 0);
@@ -227,6 +244,7 @@ void init_DocumentWidget(iDocumentWidget *d) {
 void deinit_DocumentWidget(iDocumentWidget *d) {
     delete_VisBuf(d->visBuf);
     delete_PtrSet(d->invalidRuns);
+    deinit_Array(&d->outline);
     iRelease(d->media);
     iRelease(d->request);
     deinit_Block(&d->sourceContent);
@@ -314,6 +332,7 @@ static iRangei visibleRange_DocumentWidget_(const iDocumentWidget *d) {
 
 static void addVisibleLink_DocumentWidget_(void *context, const iGmRun *run) {
     iDocumentWidget *d = context;
+    d->lastVisibleRun = run;
     if (run->linkId && linkFlags_GmDocument(d->doc, run->linkId) & supportedProtocol_GmLinkFlag) {
         pushBack_PtrArray(&d->visibleLinks, run);
     }
@@ -379,7 +398,7 @@ static void updateHover_DocumentWidget_(iDocumentWidget *d, iInt2 mouse) {
 
 static void animate_DocumentWidget_(void *ticker) {
     iDocumentWidget *d = ticker;
-    if (!isFinished_Anim(&d->sideOpacity)) {
+    if (!isFinished_Anim(&d->sideOpacity) || !isFinished_Anim(&d->outlineOpacity)) {
         addTicker_App(animate_DocumentWidget_, d);
     }
 }
@@ -390,7 +409,20 @@ static void updateSideOpacity_DocumentWidget_(iDocumentWidget *d) {
     if (banner && bottom_Rect(banner->visBounds) < d->scrollY) {
         opacity = 1.0f;
     }
-    setValue_Anim(&d->sideOpacity, opacity, opacity < 0.5f ? 166 : 333);
+    setValue_Anim(&d->sideOpacity, opacity, opacity < 0.5f ? 100 : 200);
+    animate_DocumentWidget_(d);
+}
+
+static void updateOutlineOpacity_DocumentWidget_(iDocumentWidget *d) {
+    float opacity = 0.0f;
+    if (isEmpty_Array(&d->outline)) {
+        setValue_Anim(&d->outlineOpacity, 0.0f, 0);
+        return;
+    }
+    if (contains_Widget(constAs_Widget(d->scroll), mouseCoord_Window(get_Window()))) {
+        opacity = 1.0f;
+    }
+    setValue_Anim(&d->outlineOpacity, opacity, opacity > 0.5f? 166 : 333);
     animate_DocumentWidget_(d);
 }
 
@@ -506,16 +538,77 @@ static void invalidate_DocumentWidget_(iDocumentWidget *d) {
     clear_PtrSet(d->invalidRuns);
 }
 
+static const int outlineMinWidth_DocumentWdiget_ = 45; /* times gap_UI */
+static const int outlineMaxWidth_DocumentWidget_ = 65; /* times gap_UI */
+static const int outlinePadding_DocumentWidget_  = 3;  /* times gap_UI */
+
+static int outlineWidth_DocumentWidget_(const iDocumentWidget *d) {
+    const iWidget *w         = constAs_Widget(d);
+    const iRect    bounds    = bounds_Widget(w);
+    const int      docWidth  = documentWidth_DocumentWidget_(d);
+    int            width =
+        (width_Rect(bounds) - docWidth) / 2 - gap_Text * d->pageMargin - gap_UI * d->pageMargin
+        - 2 * outlinePadding_DocumentWidget_ * gap_UI;
+    if (width < outlineMinWidth_DocumentWdiget_ * gap_UI) {
+        return outlineMinWidth_DocumentWdiget_ * gap_UI;
+    }
+    return iMin(width, outlineMaxWidth_DocumentWidget_ * gap_UI);
+}
+
+static iRangecc bannerText_DocumentWidget_(const iDocumentWidget *d) {
+    return isEmpty_String(d->titleUser) ? range_String(bannerText_GmDocument(d->doc))
+                                        : range_String(d->titleUser);
+}
+
+static void updateOutline_DocumentWidget_(iDocumentWidget *d) {
+    iWidget *w = as_Widget(d);
+    int outWidth = outlineWidth_DocumentWidget_(d);
+    clear_Array(&d->outline);
+    if (outWidth == 0 || d->state != ready_RequestState) {
+        return;
+    }
+    if (size_GmDocument(d->doc).y < height_Rect(bounds_Widget(w)) * 2) {
+        return; /* Too short */
+    }
+    iInt2 pos  = zero_I2();
+//    const iRangecc topText = urlHost_String(d->mod.url);
+//    iInt2 size = advanceWrapRange_Text(uiContent_FontId, outWidth, topText);
+//    pushBack_Array(&d->outline, &(iOutlineItem){ topText, uiContent_FontId, (iRect){ pos, size },
+//                                                 tmBannerTitle_ColorId, none_ColorId });
+//    pos.y += size.y;
+    iInt2 size;
+    iConstForEach(Array, i, headings_GmDocument(d->doc)) {
+        const iGmHeading *head = i.value;
+        const int indent = head->level * 5 * gap_UI;
+        size = advanceWrapRange_Text(uiLabel_FontId, outWidth - indent, head->text);
+        if (head->level == 0) {
+            pos.y += gap_UI * 1.5f;
+        }
+        pushBack_Array(&d->outline,
+                       &(iOutlineItem){ head->text,
+                                        uiLabel_FontId,
+                                        (iRect){ addX_I2(pos, indent), size },
+                                        head->level == 0 ? tmHeading1_ColorId
+                                                         : head->level == 1 ? tmHeading2_ColorId
+                                                                            : tmHeading3_ColorId,
+                                        head->level == 0 ? tmQuoteIcon_ColorId : none_ColorId });
+        pos.y += size.y;
+    }
+}
+
 static void setSource_DocumentWidget_(iDocumentWidget *d, const iString *source) {
     setUrl_GmDocument(d->doc, d->mod.url);
     setSource_GmDocument(
         d->doc, source, documentWidth_DocumentWidget_(d), forceBreakWidth_DocumentWidget_(d));
-    d->foundMark   = iNullRange;
-    d->selectMark  = iNullRange;
-    d->hoverLink   = NULL;
-    d->contextLink = NULL;
+    d->foundMark      = iNullRange;
+    d->selectMark     = iNullRange;
+    d->hoverLink      = NULL;
+    d->contextLink    = NULL;
+    d->lastVisibleRun = NULL;
+    setValue_Anim(&d->outlineOpacity, 0.0f, 0);
     updateWindowTitle_DocumentWidget_(d);
     updateVisible_DocumentWidget_(d);
+    updateOutline_DocumentWidget_(d);
     invalidate_DocumentWidget_(d);
     refresh_Widget(as_Widget(d));
 }
@@ -751,6 +844,7 @@ static iBool updateFromHistory_DocumentWidget_(iDocumentWidget *d) {
         updateDocument_DocumentWidget_(d, resp);
         d->scrollY = d->initNormScrollY * size_GmDocument(d->doc).y;
         d->state = ready_RequestState;
+        updateOutline_DocumentWidget_(d);
         updateVisible_DocumentWidget_(d);
         postCommandf_App("document.changed doc:%p url:%s", d, cstr_String(d->mod.url));
         return iTrue;
@@ -1069,6 +1163,7 @@ static void allocVisBuffer_DocumentWidget_(const iDocumentWidget *d) {
 void updateSize_DocumentWidget(iDocumentWidget *d) {
     setWidth_GmDocument(
         d->doc, documentWidth_DocumentWidget_(d), forceBreakWidth_DocumentWidget_(d));
+    updateOutline_DocumentWidget_(d);
     updateVisible_DocumentWidget_(d);
     invalidate_DocumentWidget_(d);
 }
@@ -1087,6 +1182,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
                 scrollTo_DocumentWidget_(d, mid_Rect(mid->bounds).y, iTrue);
             }
         }
+        updateOutline_DocumentWidget_(d);
         invalidate_DocumentWidget_(d);
         dealloc_VisBuf(d->visBuf);
         refresh_Widget(w);
@@ -1109,6 +1205,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
             updateSize_DocumentWidget(d);
             updateFetchProgress_DocumentWidget_(d);
         }
+        updateOutlineOpacity_DocumentWidget_(d);
         updateWindowTitle_DocumentWidget_(d);
         allocVisBuffer_DocumentWidget_(d);
         return iFalse;
@@ -1213,6 +1310,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         }
         iReleasePtr(&d->request);
         updateVisible_DocumentWidget_(d);
+        updateOutline_DocumentWidget_(d);
         postCommandf_App("document.changed url:%s", cstr_String(d->mod.url));
         return iFalse;
     }
@@ -1559,6 +1657,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
         else {
             updateHover_DocumentWidget_(d, init_I2(ev->motion.x, ev->motion.y));
         }
+        updateOutlineOpacity_DocumentWidget_(d);
     }
     if (ev->type == SDL_MOUSEBUTTONDOWN) {
         if (ev->button.button == SDL_BUTTON_X1) {
@@ -1728,11 +1827,6 @@ struct Impl_DrawContext {
     iBool showLinkNumbers;
 };
 
-static iRangecc bannerText_DocumentWidget_(const iDocumentWidget *d) {
-    return isEmpty_String(d->titleUser) ? range_String(bannerText_GmDocument(d->doc))
-                                        : range_String(d->titleUser);
-}
-
 static void fillRange_DrawContext_(iDrawContext *d, const iGmRun *run, enum iColorId color,
                                    iRangecc mark, iBool *isInside) {
     if (mark.start > mark.end) {
@@ -1964,6 +2058,15 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
 //    drawRect_Paint(&d->paint, (iRect){ visPos, run->visBounds.size }, red_ColorId);
 }
 
+static void drawSideRect_(iPaint *p, iRect rect, int thickness) {
+    if (equal_Color(get_Color(tmBannerBackground_ColorId), get_Color(tmBackground_ColorId))) {
+        drawRectThickness_Paint(p, rect, thickness, tmBannerIcon_ColorId);
+    }
+    else {
+        fillRect_Paint(p, rect, tmBannerBackground_ColorId);
+    }
+}
+
 static void drawSideElements_DocumentWidget_(const iDocumentWidget *d) {
     const iWidget *w         = constAs_Widget(d);
     const iRect    bounds    = bounds_Widget(w);
@@ -1973,17 +2076,19 @@ static void drawSideElements_DocumentWidget_(const iDocumentWidget *d) {
     float          opacity   = value_Anim(&d->sideOpacity);
     const int      minBannerSize = lineHeight_Text(banner_FontId) * 2;
     const int      avail         = left_Rect(docBounds) - left_Rect(bounds) - 2 * margin;
+    iPaint      p;
+    init_Paint(&p);
+    setClip_Paint(&p, bounds);
     if (avail > minBannerSize) {
         if (banner && opacity > 0) {
             setOpacity_Text(opacity);
             SDL_SetRenderDrawBlendMode(renderer_Window(get_Window()), SDL_BLENDMODE_BLEND);
             const iChar icon = siteIcon_GmDocument(d->doc);
             iRect       rect = { add_I2(topLeft_Rect(bounds), init1_I2(margin)), init1_I2(minBannerSize) };
-            iPaint      p;
-            init_Paint(&p);
             p.alpha = opacity * 255;
-            int offset = iMax(0, bottom_Rect(banner->visBounds) - d->scrollY);
-            rect.pos.y += offset;
+            //int offset = iMax(0, bottom_Rect(banner->visBounds) - d->scrollY);
+            rect.pos.y += height_Rect(bounds) / 2 - rect.size.y / 2 - (banner ? banner->visBounds.size.y / 2 : 0); // offset;
+            drawSideRect_(&p, rect, gap_UI / 2);
             if (equal_Color(get_Color(tmBannerBackground_ColorId), get_Color(tmBackground_ColorId))) {
                 drawRectThickness_Paint(&p, rect, gap_UI / 2, tmBannerIcon_ColorId);
             }
@@ -1993,28 +2098,103 @@ static void drawSideElements_DocumentWidget_(const iDocumentWidget *d) {
             iString str;
             initUnicodeN_String(&str, &icon, 1);
             drawCentered_Text(banner_FontId, rect, iTrue, tmBannerIcon_ColorId, "%s", cstr_String(&str));
+#if 0
             if (avail >= minBannerSize * 2) {
                 const char *endp;
                 iRangecc    text = bannerText_DocumentWidget_(d);
                 iInt2       pos  = addY_I2(bottomLeft_Rect(rect), gap_Text);
-                const int   font = banner_FontId;
+                const int   font = heading3_FontId;
                 while (!isEmpty_Range(&text)) {
                     tryAdvance_Text(font, text, avail - 2 * margin, &endp);
-                    drawRange_Text(font, pos, tmBannerSideTitle_ColorId, (iRangecc){ text.start, endp });
+                    drawRange_Text(
+                        font, pos, tmBannerTitle_ColorId, (iRangecc){ text.start, endp });
+//                    drawRange_Text(font,
+//                                   add_I2(pos, init1_I2(-gap_UI / 4)),
+//                                   tmBackground_ColorId,
+//                                   (iRangecc){ text.start, endp });
                     text.start = endp;
                     pos.y += lineHeight_Text(font);
                 }
             }
+#endif
             setOpacity_Text(1.0f);
             SDL_SetRenderDrawBlendMode(renderer_Window(get_Window()), SDL_BLENDMODE_NONE);
         }
-        /* Update date. */
-        drawString_Text(default_FontId,
-                        add_I2(bottomLeft_Rect(bounds),
-                               init_I2(margin, -margin + -2 * lineHeight_Text(default_FontId))),
-                        tmQuoteIcon_ColorId,
-                        collect_String(format_Time(&d->sourceTime, "Received\n%H:%M %b %d, %Y")));
     }
+    /* Reception timestamp. */
+    if (isValid_Time(&d->sourceTime)) {
+        const int font = uiLabel_FontId;
+        const iString *recv =
+            collect_String(format_Time(&d->sourceTime, "Received at %I:%M %p\non %b %d, %Y"));
+        const iInt2 size = advanceRange_Text(font, range_String(recv));
+        if (size.x <= avail) {
+            drawString_Text(font,
+                            add_I2(bottomLeft_Rect(bounds),
+                                   init_I2(margin,
+                                           -margin + -size.y +
+                                               iMax(0, scrollMax_DocumentWidget_(d) - d->scrollY))),
+                            tmQuoteIcon_ColorId,
+                            recv);
+        }
+    }
+    /* Outline on the right side. */
+    const float outlineOpacity = value_Anim(&d->outlineOpacity);
+    if (!isEmpty_Array(&d->outline) && outlineOpacity > 0.0f) {
+//        const int font = uiLabel_FontId;
+        //iRect outlineRect = initCorners_Rect(topRight_Rect(docBounds), bottomRight_Rect(bounds));
+        //const int excess = width_Rect(outlineRect) - 75 * gap_UI;
+//        if (excess > 0) {
+//            adjustEdges_Rect(&outlineRect, 0, 0, 0, excess);
+//        }
+//        const int margin = gap_UI * d->pageMargin;
+        const int innerWidth = outlineWidth_DocumentWidget_(d);
+        const int outWidth  = innerWidth + 2 * outlinePadding_DocumentWidget_ * gap_UI;
+        const int topMargin = 0;//d->pageMargin * gap_UI; // + (banner ? banner->visBounds.size.y : 0);
+        const int bottomMargin = 3 * gap_UI; //d->pageMargin * gap_UI;
+        iInt2 pos = add_I2(topRight_Rect(bounds), init_I2(-outWidth - width_Widget(d->scroll), topMargin));
+//        const int lineWidth = avail - margin;
+//        pos.y = drawRangeWrap_Text(uiContent_FontId, pos, lineWidth, tmBannerIcon_ColorId,
+//                                   bannerText_DocumentWidget_(d));
+//        pos.y += gap_UI;
+        const int scrollMax = scrollMax_DocumentWidget_(d);
+        const int outHeight = bottom_Rect(((const iOutlineItem *) constBack_Array(&d->outline))->rect);
+        const int oversize  = outHeight - height_Rect(bounds) + topMargin + bottomMargin;
+        const int scroll =
+            (oversize > 0 && scrollMax > 0 ? oversize * d->scrollY / scrollMax_DocumentWidget_(d)
+                                           : 0);
+        /* Center short outlines vertically. */
+        if (oversize < 0) {
+            pos.y -= oversize / 2;// + (banner ? banner->visBounds.size.y / 2 : 0);
+        }
+        pos.y -= scroll;
+        setOpacity_Text(outlineOpacity);
+        SDL_SetRenderDrawBlendMode(renderer_Window(get_Window()), SDL_BLENDMODE_BLEND);
+        p.alpha = outlineOpacity * 255;
+        drawSideRect_(
+            &p,
+            (iRect){ addY_I2(pos, -outlinePadding_DocumentWidget_ * gap_UI / 2),
+                     init_I2(outWidth, outHeight + outlinePadding_DocumentWidget_ * gap_UI * 1.5f) },
+            1);
+        iConstForEach(Array, i, &d->outline) {
+            const iOutlineItem *item = i.value;
+            iInt2 visPos = addX_I2(add_I2(pos, item->rect.pos), outlinePadding_DocumentWidget_ * gap_UI);
+//            visPos.y -= scroll;
+//            if (item->sepColor != none_ColorId) {
+//                drawHLine_Paint(&p, addY_I2(visPos, -gap_UI), outWidth, item->sepColor);
+//            }
+//            drawRect_Paint(&p, (iRect){ visPos, item->rect.size }, red_ColorId);
+            const iBool isVisible = d->lastVisibleRun && d->lastVisibleRun->text.start >= item->text.start;
+            drawWrapRange_Text(item->font,
+                               visPos,
+                               innerWidth - left_Rect(item->rect),
+                               index_ArrayConstIterator(&i) == 0 || isVisible ? item->seenColor
+                                                                 : tmQuoteIcon_ColorId,
+                               item->text);
+        }
+        setOpacity_Text(1.0f);
+        SDL_SetRenderDrawBlendMode(renderer_Window(get_Window()), SDL_BLENDMODE_NONE);
+    }
+    unsetClip_Paint(&p);
 }
 
 static void draw_DocumentWidget_(const iDocumentWidget *d) {
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index 2d6d84dd..d29548f1 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -204,6 +204,11 @@ static uint32_t cursorTimer_(uint32_t interval, void *w) {
     return interval;
 }
 
+void selectAll_InputWidget(iInputWidget *d) {
+    d->mark = (iRanges){ 0, size_Array(&d->text) };
+    refresh_Widget(as_Widget(d));
+}
+
 void begin_InputWidget(iInputWidget *d) {
     iWidget *w = as_Widget(d);
     if (flags_Widget(w) & selected_WidgetFlag) {
diff --git a/src/ui/inputwidget.h b/src/ui/inputwidget.h
index ced7f968..f146ea00 100644
--- a/src/ui/inputwidget.h
+++ b/src/ui/inputwidget.h
@@ -43,6 +43,7 @@ void    setSelectAllOnFocus_InputWidget (iInputWidget *, iBool selectAllOnFocus)
 void    setNotifyEdits_InputWidget      (iInputWidget *, iBool notifyEdits);
 void    begin_InputWidget       (iInputWidget *);
 void    end_InputWidget         (iInputWidget *, iBool accept);
+void    selectAll_InputWidget   (iInputWidget *);
 
 const iString * text_InputWidget    (const iInputWidget *);
 
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 1cd8cae9..8bf64b5c 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -116,7 +116,7 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
                 iSidebarItem *item = new_SidebarItem();
                 item->id = index_ArrayConstIterator(&i);
                 setRange_String(&item->label, head->text);
-                item->indent = head->level * 4 * gap_UI;
+                item->indent = head->level * 5 * gap_UI;
                 addItem_ListWidget(d->list, item);
                 iRelease(item);
             }
diff --git a/src/ui/text.c b/src/ui/text.c
index b2110bb6..23524808 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -142,16 +142,17 @@ struct Impl_CacheRow {
 };
 
 struct Impl_Text {
-    float         contentFontSize;
-    iFont         fonts[max_FontId];
-    SDL_Renderer *render;
-    SDL_Texture * cache;
-    iInt2         cacheSize;
-    int           cacheRowAllocStep;
-    int           cacheBottom;
-    iArray        cacheRows;
-    SDL_Palette * grayscale;
-    iRegExp *     ansiEscape;
+    enum iTextFont contentFont;
+    float          contentFontSize;
+    iFont          fonts[max_FontId];
+    SDL_Renderer * render;
+    SDL_Texture *  cache;
+    iInt2          cacheSize;
+    int            cacheRowAllocStep;
+    int            cacheBottom;
+    iArray         cacheRows;
+    SDL_Palette *  grayscale;
+    iRegExp *      ansiEscape;
 };
 
 static iText text_;
@@ -159,6 +160,16 @@ static iText text_;
 static void initFonts_Text_(iText *d) {
     const float textSize = fontSize_UI * d->contentFontSize;
     const float monoSize = fontSize_UI * d->contentFontSize / contentScale_Text_ * 0.866f;
+    const iBlock *regularFont = &fontNunitoRegular_Embedded;
+    const iBlock *italicFont  = &fontNunitoLightItalic_Embedded;
+    const iBlock *boldFont    = &fontNunitoExtraBold_Embedded;
+    const iBlock *lightFont   = &fontNunitoExtraLight_Embedded;
+    if (d->contentFont == firaSans_TextFont) {
+        regularFont = &fontFiraSansRegular_Embedded;
+        italicFont  = &fontFiraSansItalic_Embedded;
+        boldFont    = &fontFiraSansBold_Embedded;
+        lightFont   = &fontFiraSansLight_Embedded;
+    }
     const struct {
         const iBlock *ttf;
         int size;
@@ -168,17 +179,17 @@ static void initFonts_Text_(iText *d) {
         { &fontSourceSansProRegular_Embedded, fontSize_UI * 1.125f, defaultMediumSymbols_FontId },
         { &fontFiraMonoRegular_Embedded,      fontSize_UI * 0.866f, defaultSymbols_FontId },
         /* content fonts */
-        { &fontNunitoRegular_Embedded,        textSize,             symbols_FontId },
+        { regularFont,                        textSize,             symbols_FontId },
         { &fontFiraMonoRegular_Embedded,      monoSize,             monospaceSymbols_FontId },
         { &fontFiraMonoRegular_Embedded,      monoSize * 0.750f,    monospaceSmallSymbols_FontId },
-        { &fontNunitoRegular_Embedded,        textSize * 1.200f,    mediumSymbols_FontId },
-        { &fontNunitoRegular_Embedded,        textSize * 1.333f,    bigSymbols_FontId },
-        { &fontNunitoLightItalic_Embedded,    textSize,             symbols_FontId },
-        { &fontNunitoExtraBold_Embedded,      textSize,             symbols_FontId },
-        { &fontNunitoExtraBold_Embedded,      textSize * 1.333f,    mediumSymbols_FontId },
-        { &fontNunitoExtraBold_Embedded,      textSize * 1.666f,    largeSymbols_FontId },
-        { &fontNunitoExtraBold_Embedded,      textSize * 2.000f,    hugeSymbols_FontId },
-        { &fontNunitoExtraLight_Embedded,     textSize * 1.666f,    largeSymbols_FontId },
+        { regularFont,                        textSize * 1.200f,    mediumSymbols_FontId },
+        { regularFont,                        textSize * 1.333f,    bigSymbols_FontId },
+        { italicFont,                         textSize,             symbols_FontId },
+        { boldFont,                           textSize,             symbols_FontId },
+        { boldFont,                           textSize * 1.333f,    mediumSymbols_FontId },
+        { boldFont,                           textSize * 1.666f,    largeSymbols_FontId },
+        { boldFont,                           textSize * 2.000f,    hugeSymbols_FontId },
+        { lightFont,                          textSize * 1.666f,    largeSymbols_FontId },
         /* symbol fonts */
         { &fontSymbola_Embedded,              fontSize_UI,          defaultSymbols_FontId },
         { &fontSymbola_Embedded,              fontSize_UI * 1.125f, defaultMediumSymbols_FontId },
@@ -278,6 +289,7 @@ static void deinitCache_Text_(iText *d) {
 
 void init_Text(SDL_Renderer *render) {
     iText *d = &text_;
+    d->contentFont     = nunito_TextFont;
     d->contentFontSize = contentScale_Text_;
     d->ansiEscape      = new_RegExp("\\[([0-9;]+)m", 0);
     d->render          = render;
@@ -306,6 +318,13 @@ void setOpacity_Text(float opacity) {
     SDL_SetTextureAlphaMod(text_.cache, iClamp(opacity, 0.0f, 1.0f) * 255 + 0.5f);
 }
 
+void setContentFont_Text(enum iTextFont font) {
+    if (text_.contentFont != font) {
+        text_.contentFont = font;
+        resetFonts_Text();
+    }
+}
+
 void setContentFontSize_Text(float fontSizeFactor) {
     fontSizeFactor *= contentScale_Text_;
     iAssert(fontSizeFactor > 0);
@@ -766,6 +785,29 @@ void drawRange_Text(int fontId, iInt2 pos, int color, iRangecc text) {
     draw_Text_(fontId, pos, color, text);
 }
 
+iInt2 advanceWrapRange_Text(int fontId, int maxWidth, iRangecc text) {
+    iInt2 size = zero_I2();
+    const char *endp;
+    while (!isEmpty_Range(&text)) {
+        iInt2 line = tryAdvance_Text(fontId, text, maxWidth, &endp);
+        text.start = endp;
+        size.x = iMax(size.x, line.x);
+        size.y += line.y;
+    }
+    return size;
+}
+
+int drawWrapRange_Text(int fontId, iInt2 pos, int maxWidth, int color, iRangecc text) {
+    const char *endp;
+    while (!isEmpty_Range(&text)) {
+        tryAdvance_Text(fontId, text, maxWidth, &endp);
+        drawRange_Text(fontId, pos, color, (iRangecc){ text.start, endp });
+        text.start = endp;
+        pos.y += lineHeight_Text(fontId);
+    }
+    return pos.y;
+}
+
 void drawCentered_Text(int fontId, iRect rect, iBool alignVisual, int color, const char *format, ...) {
     iBlock chars;
     init_Block(&chars, 0); {
diff --git a/src/ui/text.h b/src/ui/text.h
index 71c2ba43..fa7b9402 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -105,13 +105,19 @@ iLocalDef iBool isVariationSelector_Char(iChar ch) {
 
 #define variationSelectorEmoji_Char     ((iChar) 0xfe0f)
 
+enum iTextFont {
+    nunito_TextFont,
+    firaSans_TextFont,
+};
+
 extern int gap_Text; /* affected by content font size */
 
 void    init_Text           (SDL_Renderer *);
 void    deinit_Text         (void);
 
+void    setContentFont_Text     (enum iTextFont font);
 void    setContentFontSize_Text (float fontSizeFactor); /* affects all except `default*` fonts */
-void    resetFonts_Text     (void);
+void    resetFonts_Text         (void);
 
 int     lineHeight_Text     (int fontId);
 iInt2   measure_Text        (int fontId, const char *text);
@@ -120,6 +126,7 @@ iRect   visualBounds_Text   (int fontId, iRangecc text);
 iInt2   advance_Text        (int fontId, const char *text);
 iInt2   advanceN_Text       (int fontId, const char *text, size_t n); /* `n` in characters */
 iInt2   advanceRange_Text   (int fontId, iRangecc text);
+iInt2   advanceWrapRange_Text   (int fontId, int maxWidth, iRangecc text);
 
 iInt2   tryAdvance_Text         (int fontId, iRangecc text, int width, const char **endPos);
 iInt2   tryAdvanceNoWrap_Text   (int fontId, iRangecc text, int width, const char **endPos);
@@ -137,6 +144,7 @@ void    drawAlign_Text      (int fontId, iInt2 pos, int color, enum iAlignment a
 void    drawCentered_Text   (int fontId, iRect rect, iBool alignVisual, int color, const char *text, ...);
 void    drawString_Text     (int fontId, iInt2 pos, int color, const iString *text);
 void    drawRange_Text      (int fontId, iInt2 pos, int color, iRangecc text);
+int     drawWrapRange_Text  (int fontId, iInt2 pos, int maxWidth, int color, iRangecc text); /* returns new Y */
 
 SDL_Texture *   glyphCache_Text     (void);
 
diff --git a/src/ui/util.c b/src/ui/util.c
index 5d283742..27bac834 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -36,6 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #include <the_Foundation/math.h>
 #include <the_Foundation/path.h>
+#include <SDL_timer.h>
 
 iBool isCommand_SDLEvent(const SDL_Event *d) {
     return d->type == SDL_USEREVENT && d->user.code == command_UserEventCode;
@@ -140,7 +141,7 @@ void init_Anim(iAnim *d, float value) {
 
 void setValue_Anim(iAnim *d, float to, uint32_t span) {
     if (fabsf(to - d->to) > 0.00001f) {
-        const uint32_t now = frameTime_Window(get_Window());
+        const uint32_t now = SDL_GetTicks();
         d->from = value_Anim(d);
         d->to   = to;
         d->when = now;
@@ -918,6 +919,13 @@ iWidget *makePreferences_Widget(void) {
     }
     /* Layout. */ {
         appendTwoColumnPage_(tabs, "Layout", '2', &headings, &values);
+        addChild_Widget(headings, iClob(makeHeading_Widget("Font:")));
+        iWidget *fonts = new_Widget();
+        /* Fonts. */ {
+            addRadioButton_(fonts, "prefs.font.0", "Nunito", "font.set arg:0");
+            addRadioButton_(fonts, "prefs.font.1", "Fira Sans", "font.set arg:1");
+        }
+        addChildFlags_Widget(values, iClob(fonts), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
         addChild_Widget(headings, iClob(makeHeading_Widget("Line width:")));
         iWidget *widths = new_Widget();
         /* Line widths. */ {
diff --git a/src/ui/window.c b/src/ui/window.c
index 19432691..b1fd3a07 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -94,7 +94,7 @@ static iBool handleRootCommands_(iWidget *root, const char *cmd) {
 /* TODO: Submenus wouldn't hurt here. */
 static const iMenuItem navMenuItems[] = {
     { "New Tab", 't', KMOD_PRIMARY, "tabs.new" },
-    { "Open Location...", SDLK_l, KMOD_PRIMARY, "focus.set id:url" },
+    { "Open Location...", SDLK_l, KMOD_PRIMARY, "navigate.focus" },
     { "---", 0, 0, NULL },
     { "Save to Downloads", SDLK_s, KMOD_PRIMARY, "document.save" },
     { "---", 0, 0, NULL },
@@ -118,7 +118,7 @@ static const iMenuItem navMenuItems[] = {
 /* Using native menus. */
 static const iMenuItem fileMenuItems[] = {
     { "New Tab", SDLK_t, KMOD_PRIMARY, "tabs.new" },
-    { "Open Location...", SDLK_l, KMOD_PRIMARY, "focus.set id:url" },
+    { "Open Location...", SDLK_l, KMOD_PRIMARY, "navigate.focus" },
     { "---", 0, 0, NULL },
     { "Save to Downloads", SDLK_s, KMOD_PRIMARY, "document.save" },
 };
@@ -212,6 +212,16 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
         postCommand_Widget(navBar, "layout.changed id:navbar");
         return iFalse;
     }
+    else if (equal_Command(cmd, "navigate.focus")) {
+        iWidget *url = findChild_Widget(navBar, "url");
+        if (focus_Widget() != url) {
+            setFocus_Widget(findChild_Widget(navBar, "url"));
+        }
+        else {
+            selectAll_InputWidget((iInputWidget *) url);
+        }
+        return iTrue;
+    }
     else if (equal_Command(cmd, "input.edited")) {
         iAnyObject *url = findChild_Widget(navBar, "url");
         if (pointer_Command(cmd) == url) {
@@ -459,7 +469,7 @@ static void setupUserInterface_Window(iWindow *d) {
         addAction_Widget(d->root, prevTab_KeyShortcut, "tabs.prev");
         addAction_Widget(d->root, nextTab_KeyShortcut, "tabs.next");
 #if !defined (iHaveNativeMenus)
-        addAction_Widget(d->root, 'l', KMOD_PRIMARY, "focus.set id:url");
+        addAction_Widget(d->root, 'l', KMOD_PRIMARY, "navigate.focus");
         addAction_Widget(d->root, 'f', KMOD_PRIMARY, "focus.set id:find.input");
         addAction_Widget(d->root, '1', KMOD_PRIMARY, "sidebar.mode arg:0 toggle:1");
         addAction_Widget(d->root, '2', KMOD_PRIMARY, "sidebar.mode arg:1 toggle:1");