26 files changed, 372 insertions, 212 deletions

diff --git a/src/app.c b/src/app.c
index 2b1ca1b6..1820905b 100644
--- a/src/app.c
+++ b/src/app.c
@@ -124,7 +124,7 @@ struct Impl_App {
     iMimeHooks * mimehooks;
     iGmCerts *   certs;
     iVisited *   visited;
-    iBookmarks * bookmarks;    
+    iBookmarks * bookmarks;
     iMainWindow *window;
     iPtrArray    popupWindows;
     iSortedArray tickers; /* per-frame callbacks, used for animations */
@@ -333,7 +333,9 @@ static const char *dataDir_App_(void) {
 
 static const char *downloadDir_App_(void) {
 #if defined (iPlatformAndroidMobile)
-    return concatPath_CStr(SDL_AndroidGetInternalStoragePath(), "Downloads");
+    const char *dir = concatPath_CStr(SDL_AndroidGetExternalStoragePath(), "Downloads");
+    makeDirs_Path(collectNewCStr_String(dir));
+    return dir;
 #endif
 #if defined (iPlatformLinux) || defined (iPlatformOther)
     /* Parse user-dirs.dirs using the `xdg-user-dir` tool. */
@@ -759,7 +761,7 @@ static void init_App_(iApp *d, int argc, char **argv) {
     d->isSuspended = iFalse;
     d->tempFilesPendingDeletion = new_StringSet();
     init_CommandLine(&d->args, argc, argv);
-    /* Where was the app started from? We ask SDL first because the command line alone 
+    /* Where was the app started from? We ask SDL first because the command line alone
        cannot be relied on (behavior differs depending on OS). */ {
         char *exec = SDL_GetBasePath();
         if (exec) {
@@ -1289,9 +1291,10 @@ void processEvents_App(enum iAppEventMode eventMode) {
     iRoot *oldCurrentRoot = current_Root(); /* restored afterwards */
     SDL_Event ev;
     iBool gotEvents = iFalse;
+    iBool gotRefresh = iFalse;
     iPtrArray windows;
     init_PtrArray(&windows);
-    while (nextEvent_App_(d, eventMode, &ev)) {
+    while (nextEvent_App_(d, gotRefresh ? postedEventsOnly_AppEventMode : eventMode, &ev)) {
 #if defined (iPlatformAppleMobile)
         if (processEvent_iOS(&ev)) {
             continue;
@@ -1314,9 +1317,9 @@ void processEvents_App(enum iAppEventMode eventMode) {
                 d->isSuspended = iFalse;
                 break;
             case SDL_APP_DIDENTERFOREGROUND:
-                gotEvents = iTrue;
                 d->warmupFrames = 5;
 #if defined (LAGRANGE_ENABLE_IDLE_SLEEP)
+                gotEvents = iTrue;
                 d->isIdling = iFalse;
                 d->lastEventTime = SDL_GetTicks();
 #endif
@@ -1366,6 +1369,10 @@ void processEvents_App(enum iAppEventMode eventMode) {
                     iRelease(ev.user.data1);
                     continue;
                 }
+                if (ev.type == SDL_USEREVENT && ev.user.code == refresh_UserEventCode) {
+                    gotRefresh = iTrue;
+                    continue;
+                }
 #if defined (LAGRANGE_ENABLE_IDLE_SLEEP)
                 if (ev.type == SDL_USEREVENT && ev.user.code == asleep_UserEventCode) {
                     if (SDL_GetTicks() - d->lastEventTime > idleThreshold_App_ &&
@@ -1384,8 +1391,8 @@ void processEvents_App(enum iAppEventMode eventMode) {
 //                    fflush(stdout);
                 }
                 d->isIdling = iFalse;
-#endif
                 gotEvents = iTrue;
+#endif
                 /* Keyboard modifier mapping. */
                 if (ev.type == SDL_KEYDOWN || ev.type == SDL_KEYUP) {
                     /* Track Caps Lock state as a modifier. */
@@ -1395,6 +1402,16 @@ void processEvents_App(enum iAppEventMode eventMode) {
                     ev.key.keysym.mod = mapMods_Keys(ev.key.keysym.mod & ~KMOD_CAPS);
                 }
 #if defined (iPlatformAndroidMobile)
+                /* Use the system Back button to close panels, if they're open. */
+                if (ev.type == SDL_KEYDOWN && ev.key.keysym.sym == SDLK_AC_BACK) {
+                    SDL_UserEvent panelBackCmd = { .type = SDL_USEREVENT,
+                                                   .code = command_UserEventCode,
+                                                   .data1 = iDupStr("panel.close"),
+                                                   .data2 = d->window->base.keyRoot };
+                    if (dispatchEvent_Window(&d->window->base, (SDL_Event *) &panelBackCmd)) {
+                        continue; /* Was handled by someone. */
+                    }
+                }
                 /* Ignore all mouse events; just use touch. */
                 if (ev.type == SDL_MOUSEBUTTONDOWN ||
                     ev.type == SDL_MOUSEBUTTONUP ||
@@ -2078,7 +2095,6 @@ iDocumentWidget *document_Command(const char *cmd) {
 }
 
 iDocumentWidget *newTab_App(const iDocumentWidget *duplicateOf, iBool switchToNew) {
-    //iApp *d = &app_;
     iWidget *tabs = findWidget_Root("doctabs");
     setFlags_Widget(tabs, hidden_WidgetFlag, iFalse);
     iWidget *newTabButton = findChild_Widget(tabs, "newtab");
@@ -2094,6 +2110,7 @@ iDocumentWidget *newTab_App(const iDocumentWidget *duplicateOf, iBool switchToNe
     iRelease(doc); /* now owned by the tabs */
     addTabCloseButton_Widget(tabs, as_Widget(doc), "tabs.close");
     addChild_Widget(findChild_Widget(tabs, "tabs.buttons"), iClob(newTabButton));
+    showOrHideNewTabButton_Root(tabs->root);
     if (switchToNew) {
         postCommandf_App("tabs.switch page:%p", doc);
     }
@@ -2876,6 +2893,7 @@ iBool handleCommand_App(const char *cmd) {
             return iTrue;
         }
         iDocumentWidget *doc = document_Command(cmd);
+        iAssert(doc);
         iDocumentWidget *origin = doc;
         if (hasLabel_Command(cmd, "origin")) {
             iDocumentWidget *cmdOrig = findWidget_App(cstr_Command(cmd, "origin"));
diff --git a/src/feeds.c b/src/feeds.c
index a8cbf47a..7b679dc1 100644
--- a/src/feeds.c
+++ b/src/feeds.c
@@ -275,7 +275,8 @@ static void save_Feeds_(iFeeds *d) {
     if (open_File(f, write_FileMode | text_FileMode)) {
         lock_Mutex(d->mtx);
         iString *str = new_String();
-        format_String(str, "%llu\n# Feeds\n", integralSeconds_Time(&d->lastRefreshedAt));
+        format_String(str, "%llu\n# Feeds\n", (unsigned long long)
+                      integralSeconds_Time(&d->lastRefreshedAt));
         write_File(f, utf8_String(str));
         /* Index of feeds for IDs. */ {
             iConstForEach(PtrArray, i, listSubscriptions_()) {
@@ -296,8 +297,8 @@ static void save_Feeds_(iFeeds *d) {
             }
             format_String(str, "%x\n%llu\n%llu\n%s\n%s\n",
                           entry->bookmarkId,
-                          integralSeconds_Time(&entry->posted),
-                          integralSeconds_Time(&entry->discovered),
+                          (unsigned long long) integralSeconds_Time(&entry->posted),
+                          (unsigned long long) integralSeconds_Time(&entry->discovered),
                           cstr_String(&entry->url),
                           cstr_String(&entry->title));
             write_File(f, utf8_String(str));
diff --git a/src/gmdocument.c b/src/gmdocument.c
index 19230392..b5e71e21 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -547,9 +547,11 @@ static void clear_RunTypesetter_(iRunTypesetter *d) {
     clear_Array(&d->layout);
 }
 
-static void commit_RunTypesetter_(iRunTypesetter *d, iGmDocument *doc) {
+static size_t commit_RunTypesetter_(iRunTypesetter *d, iGmDocument *doc) {
+    const size_t n = size_Array(&d->layout);
     pushBackN_Array(&doc->layout, constData_Array(&d->layout), size_Array(&d->layout));
     clear_RunTypesetter_(d);
+    return n;
 }
 
 static const int maxLedeLines_ = 10;
@@ -611,6 +613,10 @@ static iBool typesetOneLine_RunTypesetter_(iWrapText *wrap, iRangecc wrapRange,
 }
 
 static void doLayout_GmDocument_(iGmDocument *d) {
+    static iRegExp *ansiPattern_;
+    if (!ansiPattern_) {
+        ansiPattern_ = makeAnsiEscapePattern_Text(iTrue /* with ESC */);
+    }
     const iPrefs *prefs             = prefs_App();
     const iBool   isMono            = isForcedMonospace_GmDocument_(d);
     const iBool   isGopher          = isGopher_GmDocument_(d);
@@ -618,8 +624,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
     const iBool   isVeryNarrow      = d->size.x <= 70 * gap_Text;
     const iBool   isExtremelyNarrow = d->size.x <= 60 * gap_Text;
     const iBool   isFullWidthImages = (d->outsideMargin < 5 * gap_UI);
-//    const iBool   isDarkBg          = isDark_GmDocumentTheme(
-//        isDark_ColorTheme(colorTheme_App()) ? prefs->docThemeDark : prefs->docThemeLight);
+    
     initTheme_GmDocument_(d);
     d->isLayoutInvalidated = iFalse;
     /* TODO: Collect these parameters into a GmTheme. */
@@ -657,7 +662,6 @@ static void doLayout_GmDocument_(iGmDocument *d) {
     const iArray *oldPreMeta = collect_Array(copy_Array(&d->preMeta)); /* remember fold states */
     clear_Array(&d->preMeta);
     clear_String(&d->title);
-//    clear_String(&d->bannerText);
     if (d->size.x <= 0 || isEmpty_String(&d->source)) {
         return;
     }
@@ -671,7 +675,6 @@ static void doLayout_GmDocument_(iGmDocument *d) {
     int              preFont       = preformatted_FontId;
     uint16_t         preId         = 0;
     iBool            enableIndents = iFalse;
-//    iBool            addSiteBanner = d->bannerType != none_GmDocumentBanner;
     const iBool      isNormalized  = isNormalized_GmDocument_(d);
     enum iGmLineType prevType      = text_GmLineType;
     enum iGmLineType prevNonBlankType = text_GmLineType;
@@ -755,7 +758,6 @@ static void doLayout_GmDocument_(iGmDocument *d) {
             if (d->format == gemini_SourceFormat &&
                 startsWithSc_Rangecc(line, "```", &iCaseSensitive)) {
                 isPreformat = iFalse;
-//                addSiteBanner = iFalse; /* overrides the banner */
                 continue;
             }
             run.mediaType = max_MediaType; /* preformatted block */
@@ -763,28 +765,6 @@ static void doLayout_GmDocument_(iGmDocument *d) {
             run.font = (d->format == plainText_SourceFormat ? plainText_FontId : preFont);
             indent = indents[type];
         }
-#if 0
-        if (addSiteBanner) {
-            addSiteBanner = iFalse;
-            const iRangecc bannerText = urlHost_String(&d->url);
-            if (!isEmpty_Range(&bannerText)) {
-                setRange_String(&d->bannerText, bannerText);
-                iGmRun banner    = { .flags = decoration_GmRunFlag | siteBanner_GmRunFlag };
-                banner.bounds    = zero_Rect();
-                banner.visBounds = init_Rect(0, 0, d->size.x, lineHeight_Text(banner_FontId) * 2);
-                if (d->bannerType == certificateWarning_GmDocumentBanner) {
-                    banner.visBounds.size.y += iMaxi(6000 * lineHeight_Text(uiLabel_FontId) /
-                                                         d->size.x, lineHeight_Text(uiLabel_FontId) * 5);
-                }
-                banner.text  = bannerText;
-                banner.font  = banner_FontId;
-                banner.color = tmBannerTitle_ColorId;
-                pushBack_Array(&d->layout, &banner);
-                pos.y += height_Rect(banner.visBounds) +
-                         1.5f * lineHeight_Text(paragraph_FontId) * prefs->lineSpacing;
-            }
-        }
-#endif
         /* Empty lines don't produce text runs. */
         if (isEmpty_Range(&line)) {
             if (type == quote_GmLineType && !prefs->quoteIcon) {
@@ -865,6 +845,8 @@ static void doLayout_GmDocument_(iGmDocument *d) {
         if ((type == heading1_GmLineType || type == heading2_GmLineType) &&
             isEmpty_String(&d->title)) {
             setRange_String(&d->title, line);
+            /* Get rid of ANSI escapes. */
+            replaceRegExp_String(&d->title, ansiPattern_, "", NULL, NULL);
         }
         /* List bullet. */
         if (type == bullet_GmLineType) {
@@ -964,6 +946,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
             }
         }
         iAssert(!isEmpty_Range(&line)); /* must have something at this point */
+        size_t numRunsAdded = 0;
         /* Typeset the paragraph. */ {
             iRunTypesetter rts;
             init_RunTypesetter_(&rts);
@@ -1036,7 +1019,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
                                                                                             : 1.0f);
                         }
                     }
-                    commit_RunTypesetter_(&rts, d);
+                    numRunsAdded = commit_RunTypesetter_(&rts, d);
                     break;
                 }
                 /* Try again... */
@@ -1050,6 +1033,11 @@ static void doLayout_GmDocument_(iGmDocument *d) {
             deinit_RunTypesetter_(&rts);
         }
         /* Flag the end of line, too. */
+        if (numRunsAdded == 0) {
+            pos.y += lineHeight_Text(run.font) * prefs->lineSpacing;
+            followsBlank = iTrue;
+            continue;
+        }
         iGmRun *lastRun = back_Array(&d->layout);
         lastRun->flags |= endOfLine_GmRunFlag;
         if (lastRun->linkId && lastRun->flags & startOfLine_GmRunFlag) {
@@ -1301,7 +1289,7 @@ void setThemeSeed_GmDocument(iGmDocument *d, const iBlock *seed) {
         0x203b,  0x2042,  0x205c,  0x2182,  0x25ed,  0x2600,  0x2601,  0x2604,  0x2605,  0x2606,
         0x265c,  0x265e,  0x2690,  0x2691,  0x2693,  0x2698,  0x2699,  0x26f0,  0x270e,  0x2728,
         0x272a,  0x272f,  0x2731,  0x2738,  0x273a,  0x273e,  0x2740,  0x2742,  0x2744,  0x2748,
-        0x274a,  0x2751,  0x2756,  0x2766,  0x27bd,  0x27c1,  0x27d0,  0x2b19,  0x1f300, 0x1f303,
+        0x274a,  0x2318,  0x2756,  0x2766,  0x27bd,  0x27c1,  0x27d0,  0x2b19,  0x1f300, 0x1f303,
         0x1f306, 0x1f308, 0x1f30a, 0x1f319, 0x1f31f, 0x1f320, 0x1f340, 0x1f4cd, 0x1f4e1, 0x1f531,
         0x1f533, 0x1f657, 0x1f659, 0x1f665, 0x1f668, 0x1f66b, 0x1f78b, 0x1f796, 0x1f79c,
     };
@@ -1951,44 +1939,6 @@ void setUrl_GmDocument(iGmDocument *d, const iString *url) {
     }
 }
 
-int replaceRegExp_String(iString *d, const iRegExp *regexp, const char *replacement,
-                         void (*matchHandler)(void *, const iRegExpMatch *),
-                         void *context) {
-    iRegExpMatch m;
-    iString      result;
-    int          numMatches = 0;
-    const char  *pos        = constBegin_String(d);
-    init_RegExpMatch(&m);
-    init_String(&result);
-    while (matchString_RegExp(regexp, d, &m)) {
-        appendRange_String(&result, (iRangecc){ pos, begin_RegExpMatch(&m) });
-        /* Replace any capture group back-references. */
-        for (const char *ch = replacement; *ch; ch++) {
-            if (*ch == '\\') {
-                ch++;
-                if (*ch == '\\') {
-                    appendCStr_String(&result, "\\");
-                }
-                else if (*ch >= '0' && *ch <= '9') {
-                    appendRange_String(&result, capturedRange_RegExpMatch(&m, *ch - '0'));
-                }
-            }
-            else {
-                appendData_Block(&result.chars, ch, 1);
-            }
-        }
-        if (matchHandler) {
-            matchHandler(context, &m);
-        }
-        pos = end_RegExpMatch(&m);
-        numMatches++;
-    }
-    appendRange_String(&result, (iRangecc){ pos, constEnd_String(d) });
-    set_String(d, &result);
-    deinit_String(&result);
-    return numMatches;
-}
-
 iDeclareType(PendingLink)
 struct Impl_PendingLink {
     iString *url;
diff --git a/src/gmrequest.c b/src/gmrequest.c
index 3d5a4aef..82c232e1 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -358,6 +358,12 @@ static const iBlock *aboutPageSource_(iRangecc path, iRangecc query) {
     if (equalCase_Rangecc(path, "version")) {
         return &blobVersion_Resources;
     }
+    if (equalCase_Rangecc(path, "version-1.5")) {
+        return &blobVersion_1_5_Resources;
+    }
+    if (equalCase_Rangecc(path, "version-0.13")) {
+        return &blobVersion_0_13_Resources;
+    }
     if (equalCase_Rangecc(path, "debug")) {
         return utf8_String(debugInfo_App());
     }
diff --git a/src/gmutil.c b/src/gmutil.c
index 98e4d4d6..e59e6649 100644
--- a/src/gmutil.c
+++ b/src/gmutil.c
@@ -131,6 +131,16 @@ static iRangecc prevPathSeg_(const char *end, const char *start) {
     return seg;
 }
 
+void stripUrlPort_String(iString *d) {
+    iUrl parts;
+    init_Url(&parts, d);
+    if (!isEmpty_Range(&parts.port)) {
+        /* Always preceded by a colon. */
+        remove_Block(&d->chars, parts.port.start - 1 - constBegin_String(d),
+                     size_Range(&parts.port) + 1);
+    }
+}
+
 void stripDefaultUrlPort_String(iString *d) {
     iUrl parts;
     init_Url(&parts, d);
@@ -248,6 +258,9 @@ iRangecc urlRoot_String(const iString *d) {
     else {
         iUrl parts;
         init_Url(&parts, d);
+        if (equalCase_Rangecc(parts.scheme, "about")) {
+            return (iRangecc){ constBegin_String(d), parts.path.start };
+        }
         rootEnd = parts.path.start;
     }
     return (iRangecc){ constBegin_String(d), rootEnd };
@@ -681,6 +694,17 @@ const iString *withSpacesEncoded_String(const iString *d) {
     return d;
 }
 
+const iString *withScheme_String(const iString *d, const char *scheme) {
+    iUrl parts;
+    init_Url(&parts, d);
+    if (!equalCase_Rangecc(parts.scheme, scheme)) {
+        iString *repl = collectNewCStr_String(scheme);
+        appendRange_String(repl, (iRangecc){ parts.scheme.end, constEnd_String(d) });
+        return repl;
+    }
+    return d;
+}
+
 const iString *canonicalUrl_String(const iString *d) {
     /* The "canonical" form, used for internal storage and comparisons, is:
        - all non-reserved characters decoded (i.e., it's an IRI)
@@ -880,3 +904,41 @@ const iGmError *get_GmError(enum iGmStatusCode code) {
     iAssert(errors_[0].code == unknownStatusCode_GmStatusCode);
     return &errors_[0].err; /* unknown */
 }
+
+int replaceRegExp_String(iString *d, const iRegExp *regexp, const char *replacement,
+                         void (*matchHandler)(void *, const iRegExpMatch *),
+                         void *context) {
+    iRegExpMatch m;
+    iString      result;
+    int          numMatches = 0;
+    const char  *pos        = constBegin_String(d);
+    init_RegExpMatch(&m);
+    init_String(&result);
+    while (matchString_RegExp(regexp, d, &m)) {
+        appendRange_String(&result, (iRangecc){ pos, begin_RegExpMatch(&m) });
+        /* Replace any capture group back-references. */
+        for (const char *ch = replacement; *ch; ch++) {
+            if (*ch == '\\') {
+                ch++;
+                if (*ch == '\\') {
+                    appendCStr_String(&result, "\\");
+                }
+                else if (*ch >= '0' && *ch <= '9') {
+                    appendRange_String(&result, capturedRange_RegExpMatch(&m, *ch - '0'));
+                }
+            }
+            else {
+                appendData_Block(&result.chars, ch, 1);
+            }
+        }
+        if (matchHandler) {
+            matchHandler(context, &m);
+        }
+        pos = end_RegExpMatch(&m);
+        numMatches++;
+    }
+    appendRange_String(&result, (iRangecc){ pos, constEnd_String(d) });
+    set_String(d, &result);
+    deinit_String(&result);
+    return numMatches;
+}
diff --git a/src/gmutil.h b/src/gmutil.h
index 15bb7b2e..1594afc4 100644
--- a/src/gmutil.h
+++ b/src/gmutil.h
@@ -127,6 +127,7 @@ iBool           isKnownScheme_Rangecc   (iRangecc scheme); /* any URI scheme */
 iBool           isKnownUrlScheme_Rangecc(iRangecc scheme); /* URL schemes only */
 void            punyEncodeDomain_Rangecc(iRangecc domain, iString *encoded_out);
 void            punyEncodeUrlHost_String(iString *absoluteUrl);
+void            stripUrlPort_String     (iString *);
 void            stripDefaultUrlPort_String(iString *);
 const iString * urlFragmentStripped_String(const iString *);
 const iString * urlQueryStripped_String (const iString *);
@@ -138,6 +139,7 @@ const char *    makeFileUrl_CStr        (const char *localFilePath);
 iString *       localFilePathFromUrl_String(const iString *);
 void            urlEncodeSpaces_String  (iString *);
 const iString * withSpacesEncoded_String(const iString *);
+const iString * withScheme_String       (const iString *, const char *scheme); /* replace URI scheme */
 const iString * canonicalUrl_String     (const iString *);
 
 const char *    mediaType_Path                      (const iString *path);
diff --git a/src/gopher.c b/src/gopher.c
index 008a7743..0e34fe6a 100644
--- a/src/gopher.c
+++ b/src/gopher.c
@@ -299,3 +299,13 @@ iBool processResponse_Gopher(iGopher *d, const iBlock *data) {
     }
     return changed;
 }
+
+void setUrlItemType_Gopher(iString *url, char itemType) {
+    iUrl parts;
+    init_Url(&parts, url);
+    if (equalCase_Rangecc(parts.scheme, "gopher")) {
+        if (parts.path.start && size_Range(&parts.path) >= 2) {
+            ((char *) parts.path.start)[1] = itemType;
+        }
+    }   
+}
diff --git a/src/gopher.h b/src/gopher.h
index 3ad7e374..3cad0c21 100644
--- a/src/gopher.h
+++ b/src/gopher.h
@@ -44,3 +44,5 @@ iDeclareTypeConstruction(Gopher)
 void    open_Gopher             (iGopher *, const iString *url);
 iBool   processResponse_Gopher  (iGopher *, const iBlock *data);
 void    cancel_Gopher           (iGopher *);
+
+void    setUrlItemType_Gopher   (iString *url, char itemType);
diff --git a/src/ios.m b/src/ios.m
index 82596ffd..68c03827 100644
--- a/src/ios.m
+++ b/src/ios.m
@@ -163,7 +163,8 @@ API_AVAILABLE(ios(13.0))
 
 /*----------------------------------------------------------------------------------------------*/
 
-@interface AppState : NSObject<UIDocumentPickerDelegate, UITextFieldDelegate, UITextViewDelegate> {
+@interface AppState : NSObject<UIDocumentPickerDelegate, UITextFieldDelegate, UITextViewDelegate,
+                               UIScrollViewDelegate> {
     iString *fileBeingSaved;
     iString *pickFileCommand;
     iSystemTextInput *sysCtrl;
@@ -173,6 +174,7 @@ API_AVAILABLE(ios(13.0))
 @end
 
 static AppState *appState_;
+static UIScrollView *statusBarTapper_; /* dummy scroll view just for getting notified of taps */
 
 @implementation AppState
 
@@ -310,8 +312,15 @@ replacementString:(NSString *)string {
     notifyChange_SystemTextInput_(sysCtrl);
 }
 
+- (BOOL)scrollViewShouldScrollToTop:(UIScrollView *)scrollView {
+    postCommand_App("scroll.top smooth:1");
+    return NO;
+}
+
 @end
 
+/*----------------------------------------------------------------------------------------------*/
+
 static void enableMouse_(iBool yes) {
     SDL_EventState(SDL_MOUSEBUTTONDOWN, yes);
     SDL_EventState(SDL_MOUSEMOTION, yes);
@@ -426,6 +435,19 @@ void setupWindow_iOS(iWindow *window) {
     UIViewController *ctl = viewController_(window);
     isSystemDarkMode_ = isDarkMode_(window);
     postCommandf_App("~os.theme.changed dark:%d contrast:1", isSystemDarkMode_ ? 1 : 0);
+    /* A hack to get notified on status bar taps. We create a thin dummy UIScrollView
+       that occupies the top of the screen where the status bar is located. */ {
+        CGRect statusBarFrame = [UIApplication sharedApplication].statusBarFrame;
+        statusBarTapper_ = [[UIScrollView alloc] initWithFrame:statusBarFrame];
+//        [statusBarTapper_ setBackgroundColor:[UIColor greenColor]]; /* to see where it is */
+        [statusBarTapper_ setShowsVerticalScrollIndicator:NO];
+        [statusBarTapper_ setShowsHorizontalScrollIndicator:NO];
+        [statusBarTapper_ setContentSize:(CGSize){ 10000, 10000 }];
+        [statusBarTapper_ setContentOffset:(CGPoint){ 0, 1000 }];
+        [statusBarTapper_ setScrollsToTop:YES];
+        [statusBarTapper_ setDelegate:appState_];
+        [ctl.view addSubview:statusBarTapper_];
+    }
 }
 
 void playHapticEffect_iOS(enum iHapticEffect effect) {
@@ -443,6 +465,14 @@ void playHapticEffect_iOS(enum iHapticEffect effect) {
 }
 
 iBool processEvent_iOS(const SDL_Event *ev) {
+    if (ev->type == SDL_DISPLAYEVENT) {
+        if (deviceType_App() == phone_AppDeviceType) {
+            [statusBarTapper_ setHidden:(ev->display.data1 == SDL_ORIENTATION_LANDSCAPE ||
+                                     ev->display.data1 == SDL_ORIENTATION_LANDSCAPE_FLIPPED)];
+        }
+        [statusBarTapper_ setFrame:[UIApplication sharedApplication].statusBarFrame];
+        return iFalse;
+    }
     if (ev->type == SDL_WINDOWEVENT) {
         if (ev->window.event == SDL_WINDOWEVENT_RESTORED) {
             const iBool isDark = isDarkMode_(get_Window());
diff --git a/src/macos.m b/src/macos.m
index 4ad267c1..191842f6 100644
--- a/src/macos.m
+++ b/src/macos.m
@@ -72,10 +72,10 @@ static NSString *currentSystemAppearance_(void) {
 }
 
 iBool shouldDefaultToMetalRenderer_MacOS(void) {
-    /* TODO: Test if SDL 2.0.16 works better (no stutters with Metal?). */
-    return iFalse; /*
     const iInt2 ver = macVer_();
-    return ver.x > 10 || ver.y > 13;*/
+    SDL_DisplayMode dispMode;
+    SDL_GetDesktopDisplayMode(0, &dispMode);
+    return dispMode.refresh_rate > 60 && (ver.x > 10 || ver.y > 13);
 }
 
 static void ignoreImmediateKeyDownEvents_(void) {
@@ -436,6 +436,10 @@ static iBool processScrollWheelEvent_(NSEvent *event) {
     const iBool isInertia  = (event.momentumPhase & (NSEventPhaseBegan | NSEventPhaseChanged)) != 0;
     const iBool isEnded    = event.scrollingDeltaX == 0.0f && event.scrollingDeltaY == 0.0f && !isInertia;
     const iWindow *win     = &get_MainWindow()->base;
+    if (event.window != nsWindow_(win->win)) {
+        /* Not the main window. */
+        return iFalse;
+    }
     if (isPerPixel) {
         /* On macOS 12.1, stopping ongoing inertia scroll with a tap seems to sometimes produce
            spurious large scroll events. */
@@ -525,7 +529,6 @@ static iBool processScrollWheelEvent_(NSEvent *event) {
             ev.wheel.y = iSign(ev.wheel.y);
         }
 #endif
-    
     return iTrue;        
 }
 
@@ -734,7 +737,7 @@ enum iColorId removeColorEscapes_String(iString *d) {
 static NSString *cleanString_(const iString *ansiEscapedText) {
     iString mod;
     initCopy_String(&mod, ansiEscapedText);
-    iRegExp *ansi = makeAnsiEscapePattern_Text();
+    iRegExp *ansi = makeAnsiEscapePattern_Text(iTrue /* with ESC */);
     replaceRegExp_String(&mod, ansi, "", NULL, NULL);
     iRelease(ansi);
     NSString *clean = [NSString stringWithUTF8String:cstr_String(&mod)];    
diff --git a/src/prefs.c b/src/prefs.c
index 6164ca25..13a1dab7 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include <the_Foundation/fileinfo.h>
 #include <assert.h>
 
-static_assert(offsetof(iPrefs, plainTextWrap) == offsetof(iPrefs, bools[plainTextWrap_PrefsBool]),
-              "memory layout mismatch (needs struct packing?)");
+_Static_assert(offsetof(iPrefs, plainTextWrap) == offsetof(iPrefs, bools[plainTextWrap_PrefsBool]),
+               "memory layout mismatch (needs struct packing?)");
 
 void init_Prefs(iPrefs *d) {
     iForIndices(i, d->strings) {
diff --git a/src/resources.c b/src/resources.c
index ae85463a..fa7485ce 100644
--- a/src/resources.c
+++ b/src/resources.c
@@ -33,6 +33,8 @@ iBlock blobAbout_Resources;
 iBlock blobHelp_Resources;
 iBlock blobLagrange_Resources;
 iBlock blobLicense_Resources;
+iBlock blobVersion_0_13_Resources;
+iBlock blobVersion_1_5_Resources;
 iBlock blobVersion_Resources;
 iBlock blobArghelp_Resources;
 iBlock blobCs_Resources;
@@ -76,6 +78,8 @@ static struct {
     { &blobVersion_Resources, "about/android-version.gmi" },
 #else
     { &blobHelp_Resources, "about/help.gmi" },
+    { &blobVersion_0_13_Resources, "about/version-0.13.gmi" },
+    { &blobVersion_1_5_Resources, "about/version-1.5.gmi" },
     { &blobVersion_Resources, "about/version.gmi" },
 #endif
     { &blobArghelp_Resources, "arg-help.txt" },
diff --git a/src/resources.h b/src/resources.h
index 3852cc3e..e440fda3 100644
--- a/src/resources.h
+++ b/src/resources.h
@@ -35,6 +35,8 @@ extern iBlock blobAbout_Resources;
 extern iBlock blobHelp_Resources;
 extern iBlock blobLagrange_Resources;
 extern iBlock blobLicense_Resources;
+extern iBlock blobVersion_0_13_Resources;
+extern iBlock blobVersion_1_5_Resources;
 extern iBlock blobVersion_Resources;
 extern iBlock blobArghelp_Resources;
 extern iBlock blobCs_Resources;
diff --git a/src/ui/color.c b/src/ui/color.c
index 3c2f0339..824342ae 100644
--- a/src/ui/color.c
+++ b/src/ui/color.c
@@ -868,23 +868,16 @@ void ansiColors_Color(iRangecc escapeSequence, int fgDefault, int bgDefault,
             case 97:
                 fg = ansi8BitColors_[8 + arg - 90];
                 break;
-        }
-    }
-    /* Ensure legibility if only the foreground color is set. */
-    if (fg.a) {
-        const iHSLColor themeBg = get_HSLColor(tmBackground_ColorId);
-        const float bgLuminance = luma_Color(get_Color(tmBackground_ColorId));
-        if (bgLuminance > 0.4f) {
-            float dim = (bgLuminance - 0.4f);
-            fg.r *= 0.5f * dim;
-            fg.g *= 0.5f * dim;
-            fg.b *= 0.5f * dim;
-        }
-        if (themeBg.sat > 0.15f && themeBg.lum >= 0.5f) {
-            iHSLColor fgHsl = hsl_Color(fg);
-            fgHsl.hue = themeBg.hue;
-            fgHsl.lum = themeBg.lum * 0.5f;
-            fg = rgb_HSLColor(fgHsl);
+            case 100:
+            case 101:
+            case 102:
+            case 103:
+            case 104:
+            case 105:
+            case 106:
+            case 107:
+                bg = ansi8BitColors_[8 + arg - 100];
+                break;
         }
     }
     if (fg.a && fg_out) {
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 03119ca2..97ecb4ba 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -36,6 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "gmdocument.h"
 #include "gmrequest.h"
 #include "gmutil.h"
+#include "gopher.h"
 #include "history.h"
 #include "indicatorwidget.h"
 #include "inputwidget.h"
@@ -921,6 +922,7 @@ static void documentRunsInvalidated_DocumentView_(iDocumentView *d) {
     d->hoverPre    = NULL;
     d->hoverAltPre = NULL;
     d->hoverLink   = NULL;
+    clear_PtrArray(&d->visibleMedia);
     iZap(d->visibleRuns);
     iZap(d->renderRuns);
 }
@@ -2900,10 +2902,14 @@ static void addBannerWarnings_DocumentWidget_(iDocumentWidget *d) {
         add_Banner(d->banner, warning_BannerType, none_GmStatusCode, title, str);
     }
     /* Warnings related to page contents. */
-    const int dismissed =
+    int dismissed =
         value_SiteSpec(collectNewRange_String(urlRoot_String(d->mod.url)),
                        dismissWarnings_SiteSpecKey) |
         (!prefs_App()->warnAboutMissingGlyphs ? missingGlyphs_GmDocumentWarning : 0);
+    /* File pages don't allow dismissing warnings, so skip it. */
+    if (equalCase_Rangecc(urlScheme_String(d->mod.url), "file")) {
+        dismissed |= ansiEscapes_GmDocumentWarning;
+    }
     const int warnings = warnings_GmDocument(d->view.doc) & ~dismissed;
     if (warnings & missingGlyphs_GmDocumentWarning) {
         add_Banner(d->banner, warning_BannerType, missingGlyphs_GmStatusCode, NULL, NULL);
@@ -4069,14 +4075,12 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         return iTrue;
     }
     else if (equal_Command(cmd, "valueinput.cancelled") &&
-             equal_Rangecc(range_Command(cmd, "id"), "document.input.submit") && document_App() == d) {
+             equal_Rangecc(range_Command(cmd, "id"), "!document.input.submit") && document_App() == d) {
         postCommand_Root(get_Root(), "navigate.back");
         return iTrue;
     }
     else if (equalWidget_Command(cmd, w, "document.request.updated") &&
              id_GmRequest(d->request) == argU32Label_Command(cmd, "reqid")) {
-//        set_Block(&d->sourceContent, &lockResponse_GmRequest(d->request)->body);
-//        unlockResponse_GmRequest(d->request);
         if (document_App() == d) {
             updateFetchProgress_DocumentWidget_(d);
         }
@@ -4302,6 +4306,9 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
     else if (equal_Command(cmd, "navigate.parent") && document_App() == d) {
         iUrl parts;
         init_Url(&parts, d->mod.url);
+        if (endsWith_Rangecc(parts.path, "/index.gmi")) {
+            parts.path.end -= 9; /* This is the default index page. */
+        }
         /* Remove the last path segment. */
         if (size_Range(&parts.path) > 1) {
             if (parts.path.end[-1] == '/') {
@@ -4311,14 +4318,42 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
                 if (parts.path.end[-1] == '/') break;
                 parts.path.end--;
             }
-            postCommandf_Root(w->root,
-                "open url:%s",
-                cstr_Rangecc((iRangecc){ constBegin_String(d->mod.url), parts.path.end }));
+            iString *parentUrl = collectNewRange_String((iRangecc){ constBegin_String(d->mod.url),
+                                                                    parts.path.end });
+            /* Always go to a gophermap. */
+            setUrlItemType_Gopher(parentUrl, '1');
+            /* Hierarchical navigation doesn't make sense with Titan. */
+            if (startsWith_String(parentUrl, "titan://")) {
+                /* We have no way of knowing if the corresponding URL is valid for Gemini,
+                   but let's try anyway. */                
+                set_String(parentUrl, withScheme_String(parentUrl, "gemini"));
+                stripUrlPort_String(parentUrl);
+            }
+            if (!cmpCase_String(parentUrl, "about:")) {
+                setCStr_String(parentUrl, "about:about");
+            }
+            postCommandf_Root(w->root, "open url:%s", cstr_String(parentUrl));
         }
         return iTrue;
     }
     else if (equal_Command(cmd, "navigate.root") && document_App() == d) {
-        postCommandf_Root(w->root, "open url:%s/", cstr_Rangecc(urlRoot_String(d->mod.url)));
+        iString *rootUrl = collectNewRange_String(urlRoot_String(d->mod.url));
+        /* Always go to a gophermap. */
+        setUrlItemType_Gopher(rootUrl, '1');
+        /* Hierarchical navigation doesn't make sense with Titan. */
+        if (startsWith_String(rootUrl, "titan://")) {
+            /* We have no way of knowing if the corresponding URL is valid for Gemini,
+               but let's try anyway. */                
+            set_String(rootUrl, withScheme_String(rootUrl, "gemini"));
+            stripUrlPort_String(rootUrl);
+        }
+        if (!cmpCase_String(rootUrl, "about:")) {
+            setCStr_String(rootUrl, "about:about");
+        }
+        else {
+            appendCStr_String(rootUrl, "/");
+        }
+        postCommandf_Root(w->root, "open url:%s", cstr_String(rootUrl));
         return iTrue;
     }
     else if (equalWidget_Command(cmd, w, "scroll.moved")) {
@@ -4341,6 +4376,12 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         return iTrue;
     }
     else if (equal_Command(cmd, "scroll.top") && document_App() == d) {
+        if (argLabel_Command(cmd, "smooth")) {
+            stopWidgetMomentum_Touch(w);
+            smoothScroll_DocumentView_(&d->view, -pos_SmoothScroll(&d->view.scrollY), 500);
+            d->view.scrollY.flags |= muchSofter_AnimFlag;
+            return iTrue;
+        }
         init_Anim(&d->view.scrollY.pos, 0);
         invalidate_VisBuf(d->view.visBuf);
         clampScroll_DocumentView_(&d->view);
diff --git a/src/ui/indicatorwidget.c b/src/ui/indicatorwidget.c
index bc0bd0fa..e16550ff 100644
--- a/src/ui/indicatorwidget.c
+++ b/src/ui/indicatorwidget.c
@@ -28,32 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #include <SDL_timer.h>
 
-static int timerId_;   /* common timer for all indicators */
-static int animCount_; /* number of animating indicators */
-
-static uint32_t postRefresh_(uint32_t interval, void *context) {
-    iUnused(context);
-    postRefresh_App();
-    return interval;
-}
-
-static void startTimer_(void) {
-    animCount_++;
-    if (!timerId_) {
-        timerId_ = SDL_AddTimer(1000 / 60, postRefresh_, NULL);
-    }
-}
-
-static void stopTimer_(void) {
-    iAssert(animCount_ > 0);
-    if (--animCount_ == 0) {
-        iAssert(timerId_);
-        SDL_RemoveTimer(timerId_);
-        timerId_ = 0;
-    }
-}
-
-struct Impl_IndicatorWidget{
+struct Impl_IndicatorWidget {
     iWidget widget;
     iAnim   pos;
 };
@@ -64,6 +39,14 @@ iLocalDef iBool isActive_IndicatorWidget_(const iIndicatorWidget *d) {
     return isSelected_Widget(d);
 }
 
+static void animate_IndicatorWidget_(void *ptr) {
+    iIndicatorWidget *d = ptr;
+    if (!isFinished_Anim(&d->pos)) {
+        addTickerRoot_App(animate_IndicatorWidget_, d->widget.root, ptr);
+    }
+    postRefresh_App();
+}
+
 static void setActive_IndicatorWidget_(iIndicatorWidget *d, iBool set) {
     setFlags_Widget(as_Widget(d), selected_WidgetFlag, set);
 }
@@ -75,22 +58,8 @@ void init_IndicatorWidget(iIndicatorWidget *d) {
     setFlags_Widget(w, unhittable_WidgetFlag, iTrue);
 }
 
-static void startTimer_IndicatorWidget_(iIndicatorWidget *d) {
-    if (!isActive_IndicatorWidget_(d)) {
-        startTimer_();
-        setActive_IndicatorWidget_(d, iTrue);
-    }
-}
-
-static void stopTimer_IndicatorWidget_(iIndicatorWidget *d) {
-    if (isActive_IndicatorWidget_(d)) {
-        stopTimer_();
-        setActive_IndicatorWidget_(d, iFalse);
-    }
-}
-
 void deinit_IndicatorWidget(iIndicatorWidget *d) {
-    stopTimer_IndicatorWidget_(d);
+    removeTicker_App(animate_IndicatorWidget_, d);
 }
 
 static iBool isCompleted_IndicatorWidget_(const iIndicatorWidget *d) {
@@ -116,12 +85,7 @@ void draw_IndicatorWidget_(const iIndicatorWidget *d) {
 
 iBool processEvent_IndicatorWidget_(iIndicatorWidget *d, const SDL_Event *ev) {
     iWidget *w = &d->widget;
-    if (ev->type == SDL_USEREVENT && ev->user.code == refresh_UserEventCode) {
-        if (isFinished_Anim(&d->pos)) {
-            stopTimer_IndicatorWidget_(d);
-        }
-    }
-    else if (isCommand_SDLEvent(ev)) {
+    if (isCommand_SDLEvent(ev)) {
         const char *cmd = command_UserEvent(ev);
         if (startsWith_CStr(cmd, "document.request.")) {
             if (pointerLabel_Command(cmd, "doc") == parent_Widget(w)) {
@@ -130,23 +94,23 @@ iBool processEvent_IndicatorWidget_(iIndicatorWidget *d, const SDL_Event *ev) {
                     setValue_Anim(&d->pos, 0, 0);
                     setValue_Anim(&d->pos, 0.75f, 4000);
                     setFlags_Anim(&d->pos, easeOut_AnimFlag, iTrue);
-                    startTimer_IndicatorWidget_(d);
+                    animate_IndicatorWidget_(d);
                 }
                 else if (equal_Command(cmd, "finished")) {
                     if (value_Anim(&d->pos) > 0.01f) {
                         setValue_Anim(&d->pos, 1.0f, 250);
                         setFlags_Anim(&d->pos, easeOut_AnimFlag, iFalse);
-                        startTimer_IndicatorWidget_(d);
+                        animate_IndicatorWidget_(d);
                     }
                     else {
                         setValue_Anim(&d->pos, 0, 0);
-                        stopTimer_IndicatorWidget_(d);
+                        animate_IndicatorWidget_(d);
                         refresh_Widget(d);
                     }
                 }
                 else if (equal_Command(cmd, "cancelled")) {
                     setValue_Anim(&d->pos, 0, 0);
-                    stopTimer_IndicatorWidget_(d);
+                    animate_IndicatorWidget_(d);
                     refresh_Widget(d);
                 }
             }
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index 9261da0c..aa55f3f0 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -742,15 +742,17 @@ static void startOrStopCursorTimer_InputWidget_(iInputWidget *d, int doStart) {
 #else /* using a system-provided text control */
 
 static void updateAllLinesAndResizeHeight_InputWidget_(iInputWidget *d) {
-    /* Rewrap the buffered text and resize accordingly. */
-    iWrapText wt = wrap_InputWidget_(d, 0);
-    /* TODO: Set max lines limit for WrapText. */
-    const int height = measure_WrapText(&wt, d->font).bounds.size.y;
-    /* We use this to store the number wrapped lines for determining widget height. */
-    d->visWrapLines.start = 0;
-    d->visWrapLines.end = iMax(d->minWrapLines,
-                               iMin(d->maxWrapLines, height / lineHeight_Text(d->font)));
-    updateMetrics_InputWidget_(d);
+    if (width_Widget(d) >= minWidth_InputWidget_) {
+        /* Rewrap the buffered text and resize accordingly. */
+        iWrapText wt = wrap_InputWidget_(d, 0);
+        /* TODO: Set max lines limit for WrapText. */
+        const int height = measure_WrapText(&wt, d->font).bounds.size.y;
+        /* We use this to store the number wrapped lines for determining widget height. */
+        d->visWrapLines.start = 0;
+        d->visWrapLines.end = iMax(d->minWrapLines,
+                                   iMin(d->maxWrapLines, height / lineHeight_Text(d->font)));
+        updateMetrics_InputWidget_(d);
+    }
 }
 
 #endif
diff --git a/src/ui/mobile.c b/src/ui/mobile.c
index cf955423..aefeebc6 100644
--- a/src/ui/mobile.c
+++ b/src/ui/mobile.c
@@ -43,7 +43,7 @@ const iToolbarActionSpec toolbarActions_Mobile[max_ToolbarAction] = {
     { home_Icon, "${menu.home}", "navigate.home" },
     { upArrow_Icon, "${menu.parent}", "navigate.parent" },
     { reload_Icon, "${menu.reload}", "navigate.reload" },
-    { openTab_Icon, "${menu.newtab}", "tabs.new" },
+    { add_Icon, "${menu.newtab}", "tabs.new" },
     { close_Icon, "${menu.closetab}", "tabs.close" },
     { bookmark_Icon, "${menu.page.bookmark}", "bookmark.add" },
     { globe_Icon, "${menu.page.translate}", "document.translate" },
@@ -940,7 +940,7 @@ void setupMenuTransition_Mobile(iWidget *sheet, iBool isIncoming) {
     }
     const int maxOffset = isHorizPanel            ? width_Widget(sheet)
                           : isPortraitPhone_App() ? height_Widget(sheet)
-                                                  : (12 * gap_UI);
+                                                  : (6 * gap_UI);
     if (isIncoming) {
         setVisualOffset_Widget(sheet, maxOffset, 0, 0);
         setVisualOffset_Widget(sheet, 0, 330, easeOut_AnimFlag | softer_AnimFlag);
diff --git a/src/ui/paint.c b/src/ui/paint.c
index 5e66f521..67b509fb 100644
--- a/src/ui/paint.c
+++ b/src/ui/paint.c
@@ -71,9 +71,6 @@ void endTarget_Paint(iPaint *d) {
 
 void setClip_Paint(iPaint *d, iRect rect) {
     addv_I2(&rect.pos, origin_Paint);
-    if (isEmpty_Rect(rect)) {
-        rect = init_Rect(0, 0, 1, 1);
-    }
     iRect targetRect = zero_Rect();
     SDL_Texture *target = SDL_GetRenderTarget(renderer_Paint_(d));
     if (target) {
@@ -83,6 +80,9 @@ void setClip_Paint(iPaint *d, iRect rect) {
     else {
         rect = intersect_Rect(rect, rect_Root(get_Root()));
     }
+    if (isEmpty_Rect(rect)) {
+        rect = init_Rect(0, 0, 1, 1);
+    }
     SDL_RenderSetClipRect(renderer_Paint_(d), (const SDL_Rect *) &rect);
 }
 
diff --git a/src/ui/root.c b/src/ui/root.c
index 5c4296cf..6e187313 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -703,6 +703,20 @@ void updateToolbarColors_Root(iRoot *d) {
 #endif
 }
 
+void showOrHideNewTabButton_Root(iRoot *d) {
+    iWidget *tabs = findChild_Widget(d->widget, "doctabs");
+    iWidget *newTabButton = findChild_Widget(tabs, "newtab");
+    iBool hide = iFalse;
+    iForIndices(i, prefs_App()->navbarActions) {
+        if (prefs_App()->navbarActions[i] == newTab_ToolbarAction) {
+            hide = iTrue;
+            break;
+        }
+    }
+    setFlags_Widget(newTabButton, hidden_WidgetFlag, hide);
+    arrange_Widget(findChild_Widget(tabs, "tabs.buttons"));
+}
+
 void notifyVisualOffsetChange_Root(iRoot *d) {
     if (d && (d->didAnimateVisualOffsets || d->didChangeArrangement)) {
         iNotifyAudience(d, visualOffsetsChanged, RootVisualOffsetsChanged);
@@ -848,6 +862,7 @@ static void updateNavBarActions_(iWidget *navBar) {
         }
         iEndCollect();
     }
+    showOrHideNewTabButton_Root(navBar->root);
 }
 
 static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
@@ -1312,8 +1327,7 @@ void createUserInterface_Root(iRoot *d) {
 #if defined (iPlatformApple)
         addUnsplitButton_(navBar);
 #endif
-        iWidget *navBack;
-        setId_Widget(navBack = addChildFlags_Widget(navBar, iClob(newIcon_LabelWidget(backArrow_Icon, 0, 0, "navigate.back")), collapse_WidgetFlag), "navbar.action1");
+        setId_Widget(addChildFlags_Widget(navBar, iClob(newIcon_LabelWidget(backArrow_Icon, 0, 0, "navigate.back")), collapse_WidgetFlag), "navbar.action1");
         setId_Widget(addChildFlags_Widget(navBar, iClob(newIcon_LabelWidget(forwardArrow_Icon, 0, 0, "navigate.forward")), collapse_WidgetFlag), "navbar.action2");
         /* Button for toggling the left sidebar. */
         setId_Widget(addChildFlags_Widget(
@@ -1497,6 +1511,16 @@ void createUserInterface_Root(iRoot *d) {
         /* On PC platforms, the close buttons are generally on the top right. */
         addUnsplitButton_(navBar);
 #endif
+        if (deviceType_App() == tablet_AppDeviceType) {
+            /* Ensure that all navbar buttons match the height of the input field.
+               This is required because touch input fields are given extra padding,
+               making them taller than buttons by default. */
+            iForEach(ObjectList, i, children_Widget(navBar)) {
+                if (isInstance_Object(i.object, &Class_LabelWidget)) {
+                    as_Widget(i.object)->sizeRef = as_Widget(url);
+                }
+            }
+        }
     }
     /* Tab bar. */ {
         iWidget *mainStack = new_Widget();
@@ -1517,7 +1541,7 @@ void createUserInterface_Root(iRoot *d) {
         }
         setId_Widget(
             addChildFlags_Widget(buttons, iClob(newIcon_LabelWidget(add_Icon, 0, 0, "tabs.new")),
-                                 moveToParentRightEdge_WidgetFlag),
+                                 moveToParentRightEdge_WidgetFlag | collapse_WidgetFlag),
             "newtab");
     }
     /* Sidebars. */ {
@@ -1528,6 +1552,7 @@ void createUserInterface_Root(iRoot *d) {
             addChildPos_Widget(content, iClob(sidebar1), front_WidgetAddPos);
             iSidebarWidget *sidebar2 = new_SidebarWidget(right_SidebarSide);
             addChildPos_Widget(content, iClob(sidebar2), back_WidgetAddPos);
+            setFlags_Widget(as_Widget(sidebar2), disabledWhenHidden_WidgetFlag, iTrue);
         }
         else {
             /* Sidebar is a slide-over sheet. */
diff --git a/src/ui/root.h b/src/ui/root.h
index 7e831be3..a81ebdf7 100644
--- a/src/ui/root.h
+++ b/src/ui/root.h
@@ -43,6 +43,8 @@ void        updatePadding_Root                  (iRoot *); /* TODO: is part of m
 void        dismissPortraitPhoneSidebars_Root   (iRoot *);
 void        showToolbar_Root                    (iRoot *, iBool show);
 void        updateToolbarColors_Root            (iRoot *);
+void        showOrHideNewTabButton_Root         (iRoot *);
+
 void        notifyVisualOffsetChange_Root       (iRoot *);
 
 iInt2       size_Root                           (const iRoot *);
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 16677f9e..da0ec22c 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -1181,39 +1181,43 @@ static iBool handleSidebarCommand_SidebarWidget_(iSidebarWidget *d, const char *
                                  argLabel_Command(cmd, "noanim") == 0 &&
                                  (d->side == left_SidebarSide || deviceType_App() != phone_AppDeviceType);
         int visX = 0;
-        int visY = 0;
+//        int visY = 0;
         if (isVisible_Widget(w)) {
             visX = left_Rect(bounds_Widget(w)) - left_Rect(w->root->widget->rect);
-            visY = top_Rect(bounds_Widget(w)) - top_Rect(w->root->widget->rect);
+//            visY = top_Rect(bounds_Widget(w)) - top_Rect(w->root->widget->rect);
         }
         const iBool isHiding = isVisible_Widget(w);
         setFlags_Widget(w, hidden_WidgetFlag, isHiding);
         /* Safe area inset for mobile. */
-        const int safePad = (d->side == left_SidebarSide ? left_Rect(safeRect_Root(w->root)) : 0);
+        const int safePad =
+            deviceType_App() == desktop_AppDeviceType
+                ? 0
+                : (d->side == left_SidebarSide ? left_Rect(safeRect_Root(w->root)) : 0);
         const int animFlags = easeOut_AnimFlag | softer_AnimFlag;
         if (!isPortraitPhone_App()) {
             if (!isHiding) {
-            setFlags_Widget(w, keepOnTop_WidgetFlag, iFalse);
-            w->rect.size.x = d->widthAsGaps * gap_UI;
-            invalidate_ListWidget(d->list);
-            if (isAnimated) {
-                setFlags_Widget(w, horizontalOffset_WidgetFlag, iTrue);
-                setVisualOffset_Widget(
-                    w, (d->side == left_SidebarSide ? -1 : 1) * (w->rect.size.x + safePad), 0, 0);
+                setFlags_Widget(w, keepOnTop_WidgetFlag, iFalse);
+                w->rect.size.x = d->widthAsGaps * gap_UI;
+                invalidate_ListWidget(d->list);
+                if (isAnimated) {
+                    setFlags_Widget(w, horizontalOffset_WidgetFlag, iTrue);
+                    setVisualOffset_Widget(w,
+                                           (d->side == left_SidebarSide ? -1 : 1) *
+                                               (w->rect.size.x + safePad),
+                                           0,
+                                           0);
                     setVisualOffset_Widget(w, 0, 300, animFlags);
+                }
             }
-        }
-        else if (isAnimated) {
-            setFlags_Widget(w, horizontalOffset_WidgetFlag, iTrue);
-            if (d->side == right_SidebarSide) {
-                setVisualOffset_Widget(w, visX, 0, 0);
-                setVisualOffset_Widget(
-                        w, visX + w->rect.size.x + safePad, 300, animFlags);
-            }
-            else {
-                setFlags_Widget(w, keepOnTop_WidgetFlag, iTrue);
-                setVisualOffset_Widget(
-                        w, -w->rect.size.x - safePad, 300, animFlags);
+            else if (isAnimated) {
+                setFlags_Widget(w, horizontalOffset_WidgetFlag, iTrue);
+                if (d->side == right_SidebarSide) {
+                    setVisualOffset_Widget(w, visX, 0, 0);
+                    setVisualOffset_Widget(w, visX + w->rect.size.x + safePad, 300, animFlags);
+                }
+                else {
+                    setFlags_Widget(w, keepOnTop_WidgetFlag, iTrue);
+                    setVisualOffset_Widget(w, -w->rect.size.x - safePad, 300, animFlags);
                 }
             }
             setScrollMode_ListWidget(d->list, normal_ScrollMode);
@@ -1226,15 +1230,16 @@ static iBool handleSidebarCommand_SidebarWidget_(iSidebarWidget *d, const char *
                 w->rect.pos.y = height_Rect(safeRect_Root(w->root)) - d->midHeight;
                 setVisualOffset_Widget(w, bottom_Rect(rect_Root(w->root)) - w->rect.pos.y, 0, 0);
                 setVisualOffset_Widget(w, 0, 300, animFlags);
-                //animateSlidingSheetHeight_SidebarWidget_(d);
+                // animateSlidingSheetHeight_SidebarWidget_(d);
                 setScrollMode_ListWidget(d->list, disabledAtTopBothDirections_ScrollMode);
             }
             else {
-                setVisualOffset_Widget(w, bottom_Rect(rect_Root(w->root)) - w->rect.pos.y, 300, animFlags);
+                setVisualOffset_Widget(
+                    w, bottom_Rect(rect_Root(w->root)) - w->rect.pos.y, 300, animFlags);
                 if (d->isEditing) {
                     setMobileEditMode_SidebarWidget_(d, iFalse);
+                }
             }
-        }
             showToolbar_Root(w->root, isHiding);
         }
         updateToolbarColors_Root(w->root);
@@ -1242,7 +1247,7 @@ static iBool handleSidebarCommand_SidebarWidget_(iSidebarWidget *d, const char *
         /* BUG: Rearranging because the arrange above didn't fully resolve the height. */
         arrange_Widget(w);
         if (!isPortraitPhone_App()) {
-        updateSize_DocumentWidget(document_App());
+            updateSize_DocumentWidget(document_App());
         }
         if (isVisible_Widget(w)) {
             updateItems_SidebarWidget_(d);
diff --git a/src/ui/text.c b/src/ui/text.c
index 86ac709b..ab2af2b2 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -391,8 +391,12 @@ static void deinitCache_Text_(iText *d) {
     SDL_DestroyTexture(d->cache);
 }
 
-iRegExp *makeAnsiEscapePattern_Text(void) {
-    return new_RegExp("[[()][?]?([0-9;AB]*?)([ABCDEFGHJKSTfhilmn])", 0);
+iRegExp *makeAnsiEscapePattern_Text(iBool includeEscChar) {
+    const char *pattern = "\x1b[[()][?]?([0-9;AB]*?)([ABCDEFGHJKSTfhilmn])";
+    if (!includeEscChar) {
+        pattern++;
+    }
+    return new_RegExp(pattern, 0);
 }
 
 void init_Text(iText *d, SDL_Renderer *render) {
@@ -400,7 +404,7 @@ void init_Text(iText *d, SDL_Renderer *render) {
     activeText_ = d;
     init_Array(&d->fonts, sizeof(iFont));
     d->contentFontSize = contentScale_Text_;
-    d->ansiEscape      = makeAnsiEscapePattern_Text();
+    d->ansiEscape      = makeAnsiEscapePattern_Text(iFalse /* no ESC */);
     d->baseFontId      = -1;
     d->baseFgColorId   = -1;
     d->missingGlyphs   = iFalse;
@@ -714,6 +718,34 @@ struct Impl_AttributedRun {
 
 static iColor fgColor_AttributedRun_(const iAttributedRun *d) {
     if (d->fgColor_.a) {
+        /* Ensure legibility if only the foreground color is set. */
+        if (!d->bgColor_.a) {
+            iColor fg = d->fgColor_;
+            const iHSLColor themeBg = get_HSLColor(tmBackground_ColorId);
+            const float bgLuminance = luma_Color(get_Color(tmBackground_ColorId));
+            /* TODO: Actually this should check if the FG is too close to the BG, and
+               either darken or brighten the FG. Now it only accounts for nearly black/white
+               backgrounds. */
+            if (bgLuminance < 0.1f) {
+                /* Background is dark. Lighten the foreground. */
+                iHSLColor fgHsl = hsl_Color(fg);
+                fgHsl.lum = iMax(0.2f, fgHsl.lum);
+                return rgb_HSLColor(fgHsl);
+            }
+            if (bgLuminance > 0.4f) {
+                float dim = (bgLuminance - 0.4f);
+                fg.r *= 1.0f * dim;
+                fg.g *= 1.0f * dim;
+                fg.b *= 1.0f * dim;
+            }
+            if (themeBg.sat > 0.15f && themeBg.lum >= 0.5f) {
+                iHSLColor fgHsl = hsl_Color(fg);
+                fgHsl.hue = themeBg.hue;
+                fgHsl.lum = themeBg.lum * 0.5f;
+                fg = rgb_HSLColor(fgHsl);
+            }
+            return fg;
+        }        
         return d->fgColor_;
     }
     if (d->attrib.fgColorId == none_ColorId) {
@@ -1576,7 +1608,7 @@ static iRect run_Font_(iFont *d, const iRunArgs *args) {
                     iAssert(xAdvance >= 0);
                     if (wrapMode == word_WrapTextMode) {
                         /* When word wrapping, only consider certain places breakable. */
-                        if ((prevCh == '-' || prevCh == '/') && !isPunct_Char(ch)) {
+                        if ((prevCh == '-' || prevCh == '/' || prevCh == '\\') && !isPunct_Char(ch)) {
                             safeBreakPos = logPos;
                             breakAdvance = wrapAdvance;
                             breakRunIndex = runIndex;
@@ -1977,6 +2009,7 @@ static iBool cbAdvanceOneLine_(iWrapText *d, iRangecc range, iTextAttrib attrib,
 }
 
 iInt2 tryAdvance_Text(int fontId, iRangecc text, int width, const char **endPos) {
+    *endPos = text.end;
     iWrapText wrap = { .mode     = word_WrapTextMode,
                        .text     = text,
                        .maxWidth = width,
@@ -1991,6 +2024,7 @@ iInt2 tryAdvanceNoWrap_Text(int fontId, iRangecc text, int width, const char **e
         *endPos = text.start;
         return zero_I2();
     }
+    *endPos = text.end;
     /* "NoWrap" means words aren't wrapped; the line is broken at nearest character. */
     iWrapText wrap = { .mode     = anyCharacter_WrapTextMode,
                        .text     = text,
diff --git a/src/ui/text.h b/src/ui/text.h
index a34cc9bd..e741880d 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -237,7 +237,7 @@ enum iTextBlockMode { quadrants_TextBlockMode, shading_TextBlockMode };
 iString *   renderBlockChars_Text   (const iBlock *fontData, int height, enum iTextBlockMode,
                                      const iString *text);
 
-iRegExp *   makeAnsiEscapePattern_Text  (void);
+iRegExp *   makeAnsiEscapePattern_Text  (iBool includeEscChar);
 
 /*-----------------------------------------------------------------------------------------------*/
 
diff --git a/src/ui/touch.c b/src/ui/touch.c
index 20ccf7b8..a178a913 100644
--- a/src/ui/touch.c
+++ b/src/ui/touch.c
@@ -638,11 +638,14 @@ iBool processEvent_Touch(const SDL_Event *ev) {
                 pixels.x = 0;
             }
 #if 0
-            printf("%p (%s) py: %i wy: %f acc: %f edge: %d\n",
+            static uint32_t lastTime = 0;
+            printf("%u :: %p (%s) py: %i wy: %f acc: %f edge: %d\n",
+                   nowTime - lastTime,
                    touch->affinity,
                    class_Widget(touch->affinity)->name,
                    pixels.y, y_F3(amount), y_F3(touch->accum),
                    touch->edge);
+            lastTime = nowTime;
 #endif
             if (pixels.x || pixels.y) {
                 //setFocus_Widget(NULL);
diff --git a/src/ui/window.c b/src/ui/window.c
index af36bb22..13abc5fa 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -1001,10 +1001,11 @@ iBool processEvent_Window(iWindow *d, const SDL_Event *ev) {
         default: {
             SDL_Event event = *ev;
             if (event.type == SDL_USEREVENT && isCommand_UserEvent(ev, "window.unfreeze") && mw) {
-                mw->isDrawFrozen = iFalse;
                 if (SDL_GetWindowFlags(d->win) & SDL_WINDOW_HIDDEN) {
+                    mw->isDrawFrozen = iTrue; /* don't trigger a redraw now */
                     SDL_ShowWindow(d->win);
                 }
+                mw->isDrawFrozen = iFalse;
                 draw_MainWindow(mw); /* don't show a frame of placeholder content */
                 postCommand_App("media.player.update"); /* in case a player needs updating */
                 return iTrue;