11 files changed, 293 insertions, 187 deletions

diff --git a/src/ui/color.c b/src/ui/color.c
index 0f7d4368..adbe444b 100644
--- a/src/ui/color.c
+++ b/src/ui/color.c
@@ -785,8 +785,14 @@ static const iColor ansi8BitColors_[256] = {
     { 255, 255, 255, 255 }
 };
 
-iColor ansiForeground_Color(iRangecc escapeSequence, int fallback) {
-    iColor clr = get_Color(fallback);
+void ansiColors_Color(iRangecc escapeSequence, int fgDefault, int bgDefault,
+                      iColor *fg_out, iColor *bg_out) {
+    if (!fg_out && !bg_out) {
+        return;
+    }
+    iColor fg, bg;
+    iZap(fg);
+    iZap(bg);
     for (const char *ch = escapeSequence.start; ch < escapeSequence.end; ch++) {
         char *endPtr;
         unsigned long arg = strtoul(ch, &endPtr, 10);
@@ -802,19 +808,37 @@ iColor ansiForeground_Color(iRangecc escapeSequence, int fallback) {
             case 35:
             case 36:
             case 37:
-                clr = ansi8BitColors_[arg - 30];
+                fg = ansi8BitColors_[arg - 30];
                 break;
-            case 38: {
+            case 38:
+            case 48: {
+                iColor *dst = (arg == 38 ? &fg : &bg);
                 /* Extended foreground color. */
                 arg = strtoul(ch + 1, &endPtr, 10);
                 ch  = endPtr;
                 if (arg == 5) /* 8-bit palette */ {
                     arg = strtoul(ch + 1, &endPtr, 10);
                     ch  = endPtr;
-                    clr = ansi8BitColors_[iClamp(arg, 0, 255)];
+                    *dst = ansi8BitColors_[iClamp(arg, 0, 255)];
                 }
                 break;
             }
+            case 39:
+                fg = get_Color(fgDefault);
+                break;
+            case 40:
+            case 41:
+            case 42:
+            case 43:
+            case 44:
+            case 45:
+            case 46:
+            case 47:
+                bg = ansi8BitColors_[arg - 40];
+                break;
+            case 49:
+                bg = get_Color(bgDefault);
+                break;
             case 90:
             case 91:
             case 92:
@@ -823,17 +847,36 @@ iColor ansiForeground_Color(iRangecc escapeSequence, int fallback) {
             case 95:
             case 96:
             case 97:
-                clr = ansi8BitColors_[8 + arg - 90];
+                fg = ansi8BitColors_[8 + arg - 90];
                 break;
         }
     }
-    /* On light backgrounds, darken the colors to make them more legible. */
-    if (get_HSLColor(tmBackground_ColorId).lum > 0.5f) {
-        clr.r /= 2;
-        clr.g /= 2;
-        clr.b /= 2;
+    /* Ensure legibility if only one of the colors is set. */
+    /* TODO: Force darkening of the background color, unless it is also specified. */
+#if 0
+    if (bg.a == 0 && !equal_Color(fg, get_Color(fgDefault))) {
+        if (delta_Color(fg, get_Color(tmBackground_ColorId)) < 64) {
+            const iHSLColor fgHsl = hsl_Color(fg);
+            iHSLColor legibleBg = get_HSLColor(tmBackground_ColorId);
+            if ()
+            bg = rgb_HSLColor(bgHsl);
+        }            
+        }
+    }
+#endif
+    /*
+    if (!bg_out || get_HSLColor(tmBackground_ColorId).lum > 0.5f) {
+        fg.r /= 2;
+        fg.g /= 2;
+        fg.b /= 2;
+    }
+    */
+    if (fg.a && fg_out) {
+        *fg_out = fg;
+    }
+    if (bg.a && bg_out) {
+        *bg_out = bg;
     }
-    return clr;
 }
 
 iBool loadPalette_Color(const char *path) {
diff --git a/src/ui/color.h b/src/ui/color.h
index 03172fcb..6602b226 100644
--- a/src/ui/color.h
+++ b/src/ui/color.h
@@ -255,7 +255,8 @@ iLocalDef void setHsl_Color(int color, iHSLColor hsl) {
 iBool           loadPalette_Color       (const char *path);
 void            setThemePalette_Color   (enum iColorTheme theme);
 
-iColor          ansiForeground_Color    (iRangecc escapeSequence, int fallback);
+void            ansiColors_Color        (iRangecc escapeSequence, int fgDefault, int bgDefault,
+                                         iColor *fg_out, iColor *bg_out); /* can be NULL */
 const char *    escape_Color            (int color);
 enum iColorId   parseEscape_Color       (const char *cstr, const char **endp);
 
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index f2553632..0f0aeae8 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -3012,7 +3012,9 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
     }
     else if (equal_Command(cmd, "document.input.submit") && document_Command(cmd) == d) {
         postCommandf_Root(w->root,
-                          "open url:%s",
+                          /* use the `redirect:1` argument to cause the input query URL to be
+                             replaced in History; we don't want to navigate onto it */
+                          "open redirect:1 url:%s",
                           cstrCollect_String(makeQueryUrl_DocumentWidget_
                                              (d, collect_String(suffix_Command(cmd, "value")))));
         return iTrue;
@@ -3066,7 +3068,11 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         iReleasePtr(&d->request);
         updateVisible_DocumentWidget_(d);
         d->drawBufs->flags |= updateSideBuf_DrawBufsFlag;
-        postCommandf_Root(w->root, "document.changed doc:%p url:%s", d, cstr_String(d->mod.url));
+        postCommandf_Root(w->root,
+                          "document.changed doc:%p status:%d url:%s",
+                          d,
+                          d->sourceStatus,
+                          cstr_String(d->mod.url));
         /* Check for a pending goto. */
         if (!isEmpty_String(&d->pendingGotoHeading)) {
             scrollToHeading_DocumentWidget_(d, cstr_String(&d->pendingGotoHeading));
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index daca05d1..46bdc890 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -421,7 +421,7 @@ static void draw_LabelWidget_(const iLabelWidget *d) {
     else {
         drawCenteredOutline_Text(
             d->font,
-            adjusted_Rect(bounds, add_I2(zero_I2(), init_I2(iconPad, 0)), neg_I2(zero_I2())),
+            adjusted_Rect(bounds, init_I2(iconPad * 1.5f, 0), init_I2(-iconPad, 0)),
             d->flags.alignVisual,
             d->flags.drawAsOutline ? fg : none_ColorId,
             d->flags.drawAsOutline ? d->widget.bgColor : fg,
diff --git a/src/ui/root.c b/src/ui/root.c
index 95126654..5bfae857 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -27,7 +27,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "command.h"
 #include "defs.h"
 #include "documentwidget.h"
-#include "embedded.h"
+#include "resources.h"
 #include "inputwidget.h"
 #include "keys.h"
 #include "labelwidget.h"
@@ -78,6 +78,9 @@ static const iMenuItem navMenuItems_[] = {
     { gear_Icon " ${menu.preferences}", SDLK_COMMA, KMOD_PRIMARY, "preferences" },
     { "${menu.help}", SDLK_F1, 0, "!open url:about:help" },
     { "${menu.releasenotes}", 0, 0, "!open url:about:version" },
+ #if defined (LAGRANGE_ENABLE_WINSPARKLE)
+    { "${menu.update}", 0, 0, "updater.check" },
+ #endif
     { "---" },
     { "${menu.quit}", 'q', KMOD_PRIMARY, "quit" }
 };
@@ -757,9 +760,17 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
             if (equal_Command(cmd, "document.changed")) {
                 iInputWidget *url = findWidget_Root("url");
                 const iString *urlStr = collect_String(suffix_Command(cmd, "url"));
+                const enum iGmStatusCode statusCode = argLabel_Command(cmd, "status");
                 trimCache_App();
                 trimMemory_App();
-                visitUrl_Visited(visited_App(), urlStr, 0);
+                visitUrl_Visited(visited_App(),
+                                 urlStr,
+                                 /* The transient flag modifies history navigation behavior on
+                                    special responses like input queries. */
+                                 category_GmStatusCode(statusCode) == categoryInput_GmStatusCode ||
+                                 category_GmStatusCode(statusCode) == categoryRedirect_GmStatusCode
+                                     ? transient_VisitedUrlFlag
+                                     : 0);
                 postCommand_App("visited.changed"); /* sidebar will update */
                 setText_InputWidget(url, urlStr);
                 checkLoadAnimation_Root_(get_Root());
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 4b6fde3c..581a7bb2 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -346,10 +346,24 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
                 }
             }
             /* Actions. */ {
-                addActionButton_SidebarWidget_(d, "${sidebar.action.feeds.showall}", "feeds.mode arg:0",
-                                               d->feedsMode == all_FeedsMode ? selected_WidgetFlag : 0);
-                addActionButton_SidebarWidget_(d, "${sidebar.action.feeds.showunread}", "feeds.mode arg:1",
-                                               d->feedsMode == unread_FeedsMode ? selected_WidgetFlag : 0);
+                addActionButton_SidebarWidget_(
+                    d, check_Icon " ${feeds.markallread}", "feeds.markallread", expand_WidgetFlag);
+                addChild_Widget(d->actions, iClob(new_LabelWidget("${sidebar.action.show}", NULL)));
+                const iMenuItem items[] = {
+                    { "${sidebar.action.feeds.showall}",    SDLK_u, KMOD_SHIFT, "feeds.mode arg:0" },
+                    { "${sidebar.action.feeds.showunread}", SDLK_u, 0, "feeds.mode arg:1" },
+                };
+                iWidget *dropButton = addChild_Widget(
+                    d->actions,
+                    iClob(makeMenuButton_LabelWidget(items[d->feedsMode].label, items, 2)));
+                setFixedSize_Widget(
+                    dropButton,
+                    init_I2(measure_Text(
+                                default_FontId,
+                                translateCStr_Lang(items[findWidestLabel_MenuItem(items, 2)].label))
+                                    .advance.x +
+                                6 * gap_UI,
+                            -1));
             }
             d->menu = makeMenu_Widget(
                 as_Widget(d),
@@ -893,6 +907,7 @@ static void itemClicked_SidebarWidget_(iSidebarWidget *d, iSidebarItem *item, si
             if (isEmpty_String(&item->url)) /* a folder */ {
                 if (contains_IntSet(d->closedFolders, item->id)) {
                     remove_IntSet(d->closedFolders, item->id);
+                    setRecentFolder_Bookmarks(bookmarks_App(), item->id);
                 }
                 else {
                     insert_IntSet(d->closedFolders, item->id);
@@ -990,7 +1005,11 @@ void setWidth_SidebarWidget(iSidebarWidget *d, float widthAsGaps) {
 }
 
 iBool handleBookmarkEditorCommands_SidebarWidget_(iWidget *editor, const char *cmd) {
-    if (equal_Command(cmd, "bmed.accept") || equal_Command(cmd, "cancel")) {
+    if (equal_Command(cmd, "dlg.bookmark.setfolder")) {
+        setBookmarkEditorFolder_Widget(editor, arg_Command(cmd));
+        return iTrue;
+    }
+    if (equal_Command(cmd, "bmed.accept") || equal_Command(cmd, "bmed.cancel")) {
         iAssert(startsWith_String(id_Widget(editor), "bmed."));
         iSidebarWidget *d = findWidget_App(cstr_String(id_Widget(editor)) + 5); /* bmed.sidebar */
         if (equal_Command(cmd, "bmed.accept")) {
@@ -1020,7 +1039,11 @@ iBool handleBookmarkEditorCommands_SidebarWidget_(iWidget *editor, const char *c
                                         isSelected_Widget(findChild_Widget(editor, "bmed.tag.remote")));
                 addOrRemoveTag_Bookmark(bm, linkSplit_BookmarkTag,
                                         isSelected_Widget(findChild_Widget(editor, "bmed.tag.linksplit")));
-            }            
+            }
+            const iBookmark *folder = userData_Object(findChild_Widget(editor, "bmed.folder"));
+            if (!folder || !hasParent_Bookmark(folder, id_Bookmark(bm))) {
+                bm->parentId = folder ? id_Bookmark(folder) : 0;
+            }
             postCommand_App("bookmarks.changed");
         }
         setupSheetTransition_Mobile(editor, iFalse);
@@ -1327,6 +1350,7 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                         setFlags_Widget(notNeeded[i], disabled_WidgetFlag, iTrue);
                     }
                 }
+                setBookmarkEditorFolder_Widget(dlg, bm ? bm->parentId : 0);
                 setCommandHandler_Widget(dlg, handleBookmarkEditorCommands_SidebarWidget_);
                 setFocus_Widget(findChild_Widget(dlg, "bmed.title"));
             }
@@ -2019,7 +2043,7 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
                       add_I2(topLeft_Rect(itemRect),
                              init_I2(3 * gap_UI, (itemHeight - lineHeight_Text(font)) / 2)),
                       fg,
-                      "%s%s%s%s%s%s",
+                      "%s%s%s%s%s%s%s%s",
                       isGemini ? "" : cstr_Rangecc(parts.scheme),
                       isGemini ? "" : isAbout ? ":" : "://",
                       escape_Color(isHover ? (isPressing ? uiTextPressed_ColorId
@@ -2027,7 +2051,9 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
                                            : uiTextStrong_ColorId),
                       cstr_Rangecc(parts.host),
                       escape_Color(fg),
-                      cstr_Rangecc(parts.path));
+                      cstr_Rangecc(parts.path),
+                      !isEmpty_Range(&parts.query) ? escape_Color(uiAnnotation_ColorId) : "",
+                      !isEmpty_Range(&parts.query) ? cstr_Rangecc(parts.query) : "");
         }
         iEndCollect();
     }
diff --git a/src/ui/text.c b/src/ui/text.c
index abe8640c..91ff137a 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -23,7 +23,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "text.h"
 #include "color.h"
 #include "metrics.h"
-#include "embedded.h"
+#include "resources.h"
 #include "window.h"
 #include "paint.h"
 #include "app.h"
@@ -180,21 +180,21 @@ static void init_Font(iFont *d, const iFontSpec *fontSpec, const iFontFile *font
     d->data = NULL;
     d->family = undefined_TextFont;
     /* Note: We only use `family` currently for applying a kerning fix to Nunito. */
-    if (data == &fontNunitoRegular_Embedded ||
-        data == &fontNunitoBold_Embedded ||
-        data == &fontNunitoExtraBold_Embedded ||
-        //data == &fontNunitoLightItalic_Embedded ||
-        data == &fontNunitoExtraLight_Embedded) {
+    if (data == &fontNunitoRegular_Resources ||
+        data == &fontNunitoBold_Resources ||
+        data == &fontNunitoExtraBold_Resources ||
+        //data == &fontNunitoLightItalic_Resources ||
+        data == &fontNunitoExtraLight_Resources) {
         d->family = nunito_TextFont;
     }
-    else if (//data == &fontScheherazadeNewRegular_Embedded) {
-             data == &fontNotoSansArabicUIRegular_Embedded) {
+    else if (//data == &fontScheherazadeNewRegular_Resources) {
+             data == &fontNotoSansArabicUIRegular_Resources) {
         d->family = arabic_TextFont;
     }
-    else if (data == &fontNotoSansSymbolsRegular_Embedded ||
-             data == &fontNotoSansSymbols2Regular_Embedded ||
-             data == &fontNotoEmojiRegular_Embedded ||
-             data == &fontSmolEmojiRegular_Embedded) {
+    else if (data == &fontNotoSansSymbolsRegular_Resources ||
+             data == &fontNotoSansSymbols2Regular_Resources ||
+             data == &fontNotoEmojiRegular_Resources ||
+             data == &fontSmolEmojiRegular_Resources) {
         d->family = emojiAndSymbols_TextFont;
     }
 #endif
@@ -263,7 +263,7 @@ struct Impl_Text {
     iRegExp *      ansiEscape;
     int            ansiFlags;
     int            baseFontId; /* base attributes (for restoring via escapes) */
-    int            baseColorId;
+    int            baseFgColorId;
     iBool          missingGlyphs; /* true if a glyph couldn't be found */
 };
 
@@ -390,35 +390,14 @@ static void deinitCache_Text_(iText *d) {
     SDL_DestroyTexture(d->cache);
 }
 
-#if 0
-void loadUserFonts_Text(void) {
-    if (userFont_) {
-        delete_Block(userFont_);
-        userFont_ = NULL;
-    }
-    /* Load the system font. */
-    const iPrefs *prefs = prefs_App();
-    if (!isEmpty_String(&prefs->symbolFontPath)) {
-        iFile *f = new_File(&prefs->symbolFontPath);
-        if (open_File(f, readOnly_FileMode)) {
-            userFont_ = readAll_File(f);
-        }
-        else {
-            fprintf(stderr, "[Text] failed to open: %s\n", cstr_String(&prefs->symbolFontPath));
-        }
-        iRelease(f);
-    }
-}
-#endif
-
 void init_Text(iText *d, SDL_Renderer *render) {
     iText *oldActive = activeText_;
     activeText_ = d;
     init_Array(&d->fonts, sizeof(iFont));
     d->contentFontSize = contentScale_Text_;
-    d->ansiEscape      = new_RegExp("[[()]([0-9;AB]*?)m", 0);
+    d->ansiEscape      = new_RegExp("[[()][?]?([0-9;AB]*?)([ABCDEFGHJKSTfhilmn])", 0);
     d->baseFontId      = -1;
-    d->baseColorId     = -1;
+    d->baseFgColorId   = -1;
     d->render          = render;
     /* A grayscale palette for rasterized glyphs. */ {
         SDL_Color colors[256];
@@ -459,9 +438,10 @@ void setOpacity_Text(float opacity) {
     SDL_SetTextureAlphaMod(activeText_->cache, iClamp(opacity, 0.0f, 1.0f) * 255 + 0.5f);
 }
 
-void setBaseAttributes_Text(int fontId, int colorId) {
-    activeText_->baseFontId  = fontId;
-    activeText_->baseColorId = colorId;
+void setBaseAttributes_Text(int fontId, int fgColorId) {
+    iText *d = activeText_;
+    d->baseFontId    = fontId;
+    d->baseFgColorId = fgColorId;
 }
 
 void setAnsiFlags_Text(int ansiFlags) {
@@ -574,16 +554,6 @@ iLocalDef iFont *characterFont_Font_(iFont *d, iChar ch, uint32_t *glyphIndex) {
             return overrideFont;
         }
     }
-#if 0
-    /* TODO: Put arrows in Smol Emoji. */
-    /* Manual exceptions. */ {
-        if (ch >= 0x2190 && ch <= 0x2193 /* arrows */) {
-            d = font_Text_(iosevka_FontId + d->sizeId);
-            *glyphIndex = glyphIndex_Font_(d, ch);
-            return d;
-        }
-    }
-#endif
     /* The font's own version of the glyph. */
     if ((*glyphIndex = glyphIndex_Font_(d, ch)) != 0) {
         return d;
@@ -609,69 +579,6 @@ iLocalDef iFont *characterFont_Font_(iFont *d, iChar ch, uint32_t *glyphIndex) {
             }
         }
     }
-#if 0
-    const int fallbacks[] = {
-        notoEmoji_FontId,
-        symbols2_FontId,
-        symbols_FontId
-    };
-    /* First fallback is Smol Emoji. */
-    if (ch != 0x20) {
-        iForIndices(i, fallbacks) {
-            iFont *fallback = font_Text_(fallbacks[i] + d->sizeId);
-            if (fallback != d && (*glyphIndex = glyphIndex_Font_(fallback, ch)) != 0) {
-                return fallback;
-            }
-        }
-    }
-    /* Try Simplified Chinese. */
-    if (ch >= 0x2e80) {
-        iFont *sc = font_Text_(chineseSimplified_FontId + d->sizeId);
-        if (sc != d && (*glyphIndex = glyphIndex_Font_(sc, ch)) != 0) {
-            return sc;
-        }
-    }
-    /* Could be Korean. */
-    if (ch >= 0x3000) {
-        iFont *korean = font_Text_(korean_FontId + d->sizeId);
-        if (korean != d && (*glyphIndex = glyphIndex_Font_(korean, ch)) != 0) {
-            return korean;
-        }
-    }
-    /* Japanese perhaps? */
-    if (ch > 0x3040) {
-        iFont *japanese = font_Text_(japanese_FontId + d->sizeId);
-        if (japanese != d && (*glyphIndex = glyphIndex_Font_(japanese, ch)) != 0) {
-            return japanese;
-        }
-    }
-    /* Maybe Arabic. */
-    if (ch >= 0x600) {
-        iFont *arabic = font_Text_(arabic_FontId + d->sizeId);
-        if (arabic != d && (*glyphIndex = glyphIndex_Font_(arabic, ch)) != 0) {
-            return arabic;
-        }
-    }
-#if defined (iPlatformApple)
-    /* White up arrow is used for the Shift key on macOS. Symbola's glyph is not a great
-       match to the other text, so use the UI font instead. */
-    if ((ch == 0x2318 || ch == 0x21e7) && d == font_Text_(regular_FontId)) {
-        *glyphIndex = glyphIndex_Font_(d = font_Text_(defaultContentRegular_FontId), ch);
-        return d;
-    }
-#endif
-    /* User's symbols font. */ {
-        iFont *sys = font_Text_(userSymbols_FontId + d->sizeId);
-        if (sys != d && (*glyphIndex = glyphIndex_Font_(sys, ch)) != 0) {
-            return sys;
-        }
-    }
-    /* Final fallback. */
-    iFont *font = font_Text_(iosevka_FontId + d->sizeId);
-    if (d != font) {
-        *glyphIndex = glyphIndex_Font_(font, ch);
-    }
-#endif // 0
     if (!*glyphIndex) {
         activeText_->missingGlyphs = iTrue;
         fprintf(stderr, "failed to find %08x (%lc)\n", ch, (int)ch); fflush(stderr);
@@ -680,7 +587,9 @@ iLocalDef iFont *characterFont_Font_(iFont *d, iChar ch, uint32_t *glyphIndex) {
 }
 
 static iGlyph *glyphByIndex_Font_(iFont *d, uint32_t glyphIndex) {
-    iAssert(d->table);
+    if (!d->table) {
+        d->table = new_GlyphTable();
+    }   
     iGlyph* glyph = NULL;
     void *  node = value_Hash(&d->table->glyphs, glyphIndex);
     if (node) {
@@ -739,6 +648,7 @@ struct Impl_AttributedRun {
     iTextAttrib attrib;
     iFont      *font;
     iColor      fgColor_; /* any RGB color; A > 0 */
+    iColor      bgColor_; /* any RGB color; A > 0 */
     struct {
         uint8_t isLineBreak : 1;
 //        uint8_t isRTL : 1;
@@ -750,29 +660,45 @@ static iColor fgColor_AttributedRun_(const iAttributedRun *d) {
     if (d->fgColor_.a) {
         return d->fgColor_;
     }
-    if (d->attrib.colorId == none_ColorId) {
+    if (d->attrib.fgColorId == none_ColorId) {
         return (iColor){ 255, 255, 255, 255 };
     }
-    return get_Color(d->attrib.colorId);
+    return get_Color(d->attrib.fgColorId);
+}
+
+static iColor bgColor_AttributedRun_(const iAttributedRun *d) {
+    if (d->bgColor_.a) {
+        return d->bgColor_;
+    }
+    return (iColor){ 255, 255, 255, 0 };
+    if (d->attrib.bgColorId == none_ColorId) {
+        return (iColor){ 255, 255, 255, 0 };
+    }
+    return get_Color(d->attrib.bgColorId);
 }
 
 static void setFgColor_AttributedRun_(iAttributedRun *d, int colorId) {
-    d->attrib.colorId = colorId;
+    d->attrib.fgColorId = colorId;
     d->fgColor_.a = 0;
 }
 
+static void setBgColor_AttributedRun_(iAttributedRun *d, int colorId) {
+    d->attrib.bgColorId = colorId;
+    d->bgColor_.a = 0;
+}
+
 iDeclareType(AttributedText)
 iDeclareTypeConstructionArgs(AttributedText, iRangecc text, size_t maxLen, iFont *font,
-                             int colorId, int baseDir, iFont *baseFont, int baseColorId,
+                             int colorId, int baseDir, iFont *baseFont, int baseFgColorId,
                              iChar overrideChar)
 
 struct Impl_AttributedText {
     iRangecc source; /* original source text */
     size_t   maxLen;
     iFont *  font;
-    int      colorId;
+    int      fgColorId;
     iFont *  baseFont;
-    int      baseColorId;
+    int      baseFgColorId;
     iBool    isBaseRTL;
     iArray   runs;
     iArray   logical;         /* UTF-32 text in logical order (mixed directions; matches source) */
@@ -785,9 +711,9 @@ struct Impl_AttributedText {
 
 iDefineTypeConstructionArgs(AttributedText,
                             (iRangecc text, size_t maxLen, iFont *font, int colorId,
-                             int baseDir, iFont *baseFont, int baseColorId,
+                             int baseDir, iFont *baseFont, int baseFgColorId,
                              iChar overrideChar),
-                            text, maxLen, font, colorId, baseDir, baseFont, baseColorId,
+                            text, maxLen, font, colorId, baseDir, baseFont, baseFgColorId,
                             overrideChar)
 
 static const char *sourcePtr_AttributedText_(const iAttributedText *d, int logicalPos) {
@@ -897,7 +823,8 @@ static void prepare_AttributedText_(iAttributedText *d, int overrideBaseDir, iCh
     }
     iAttributedRun run = {
         .logical = { 0, length },
-        .attrib  = { .colorId = d->colorId, .isBaseRTL = d->isBaseRTL },
+        .attrib  = { .fgColorId = d->fgColorId, .bgColorId = none_ColorId,
+                     .isBaseRTL = d->isBaseRTL },
         .font    = d->font,
     };
     const int     *logToSource = constData_Array(&d->logicalToSourceOffset);
@@ -935,12 +862,13 @@ static void prepare_AttributedText_(iAttributedText *d, int overrideBaseDir, iCh
             if (match_RegExp(activeText_->ansiEscape, srcPos, d->source.end - srcPos, &m)) {
                 finishRun_AttributedText_(d, &run, pos - 1);
                 const int ansi = activeText_->ansiFlags;
-                if (ansi) {
+                if (ansi && capturedRange_RegExpMatch(&m, 2).start[0] ==
+                                'm' /* Select Graphic Rendition */) {
                     const iRangecc sequence = capturedRange_RegExpMatch(&m, 1);
                     /* Note: This styling is hardcoded to match `typesetOneLine_RunTypesetter_()`. */
                     if (ansi & allowFontStyle_AnsiFlag && equal_Rangecc(sequence, "1")) {
                         run.attrib.bold = iTrue;
-                        if (d->baseColorId == tmParagraph_ColorId) {
+                        if (d->baseFgColorId == tmParagraph_ColorId) {
                             setFgColor_AttributedRun_(&run, tmFirstParagraph_ColorId);
                         }
                         attribFont = font_Text_(fontWithStyle_Text(fontId_Text_(d->baseFont),
@@ -962,10 +890,13 @@ static void prepare_AttributedText_(iAttributedText *d, int overrideBaseDir, iCh
                         run.attrib.italic = iFalse;
                         run.attrib.monospace = iFalse;
                         attribFont = run.font = d->baseFont;
-                        setFgColor_AttributedRun_(&run, d->baseColorId);
+                        setFgColor_AttributedRun_(&run, d->baseFgColorId);
+                        setBgColor_AttributedRun_(&run, none_ColorId);
                     }
-                    else if (ansi & allowFg_AnsiFlag) {
-                        run.fgColor_ = ansiForeground_Color(sequence, tmParagraph_ColorId);
+                    else {
+                        ansiColors_Color(sequence, d->baseFgColorId, none_ColorId,
+                                         ansi & allowFg_AnsiFlag ? &run.fgColor_ : NULL,
+                                         ansi & allowBg_AnsiFlag ? &run.bgColor_ : NULL);
                     }
                 }
                 pos += length_Rangecc(capturedRange_RegExpMatch(&m, 0));
@@ -988,7 +919,7 @@ static void prepare_AttributedText_(iAttributedText *d, int overrideBaseDir, iCh
                 colorNum = esc - asciiBase_ColorEscape;
             }
             run.logical.start = pos + 1;
-            setFgColor_AttributedRun_(&run, colorNum >= 0 ? colorNum : d->colorId);
+            setFgColor_AttributedRun_(&run, colorNum >= 0 ? colorNum : d->fgColorId);
             continue;
         }
         if (ch == '\n') {
@@ -1051,14 +982,15 @@ static void prepare_AttributedText_(iAttributedText *d, int overrideBaseDir, iCh
 }
 
 void init_AttributedText(iAttributedText *d, iRangecc text, size_t maxLen, iFont *font, int colorId,
-                         int baseDir, iFont *baseFont, int baseColorId, iChar overrideChar) {
-    d->source      = text;
-    d->maxLen      = maxLen ? maxLen : iInvalidSize;
-    d->font        = font;
-    d->colorId     = colorId;
-    d->baseFont    = baseFont;
-    d->baseColorId = baseColorId;
-    d->isBaseRTL   = iFalse;
+                         int baseDir, iFont *baseFont, int baseFgColorId, 
+                         iChar overrideChar) {
+    d->source        = text;
+    d->maxLen        = maxLen ? maxLen : iInvalidSize;
+    d->font          = font;
+    d->fgColorId     = colorId;
+    d->baseFont      = baseFont;
+    d->baseFgColorId = baseFgColorId;
+    d->isBaseRTL     = iFalse;
     init_Array(&d->runs, sizeof(iAttributedRun));
     init_Array(&d->logical, sizeof(iChar));
     init_Array(&d->visual, sizeof(iChar));
@@ -1412,7 +1344,7 @@ static iRect run_Font_(iFont *d, const iRunArgs *args) {
     init_AttributedText(&attrText, args->text, args->maxLen, d, args->color,
                         args->baseDir,
                         activeText_->baseFontId >= 0 ? font_Text_(activeText_->baseFontId) : d,
-                        activeText_->baseColorId,
+                        activeText_->baseFgColorId, 
                         wrap ? wrap->overrideChar : 0);
     if (wrap) {
         wrap->baseDir = attrText.isBaseRTL ? -1 : +1;
@@ -1464,7 +1396,9 @@ static iRect run_Font_(iFont *d, const iRunArgs *args) {
     iRangei      wrapPosRange       = { 0, textLen };
     int          wrapResumePos      = textLen;  /* logical position where next line resumes */
     size_t       wrapResumeRunIndex = runCount; /* index of run where next line resumes */
-    iTextAttrib  attrib             = { .colorId = args->color, .isBaseRTL = attrText.isBaseRTL };
+    iTextAttrib  attrib             = { .fgColorId = args->color,
+                                        .bgColorId = none_ColorId,
+                                        .isBaseRTL = attrText.isBaseRTL };
     iTextAttrib  wrapAttrib         = attrib;
     iTextAttrib  lastAttrib         = attrib;
     const int    layoutBound        = (wrap ? wrap->maxWidth : 0);
@@ -1712,6 +1646,12 @@ static iRect run_Font_(iFont *d, const iRunArgs *args) {
                 yCursor += d->height;
                 continue;
             }
+            const iColor fgClr = fgColor_AttributedRun_(run);
+            const iColor bgClr = bgColor_AttributedRun_(run);
+            iBool isBgFilled = iFalse;
+            if (~mode & permanentColorFlag_RunMode) {
+                isBgFilled = (bgClr.a != 0) || (mode & fillBackground_RunMode);
+            }
             iGlyphBuffer *buf = at_Array(&buffers, runIndex);
             shape_GlyphBuffer_(buf);
             iAssert(run->font == buf->font);
@@ -1772,34 +1712,46 @@ static iRect run_Font_(iFont *d, const iRunArgs *args) {
                     bounds.size.x = iMax(bounds.size.x, dst.x + dst.w - orig.x);
                     bounds.size.y = iMax(bounds.size.y, yCursor + glyph->font->height);
                 }
-                if (mode & draw_RunMode && logicalText[logPos] > 0x20) {
+                const iBool isSpace = (logicalText[logPos] == 0x20);
+                if (mode & draw_RunMode && (isBgFilled || !isSpace)) {
                     /* Draw the glyph. */
-                    if (!isRasterized_Glyph_(glyph, hoff)) {
+                    if (!isSpace && !isRasterized_Glyph_(glyph, hoff)) {
                         cacheSingleGlyph_Font_(run->font, glyphId); /* may cause cache reset */
                         glyph = glyphByIndex_Font_(run->font, glyphId);
                         iAssert(isRasterized_Glyph_(glyph, hoff));
                     }
                     if (~mode & permanentColorFlag_RunMode) {
-                        const iColor clr = fgColor_AttributedRun_(run);
-                        SDL_SetTextureColorMod(activeText_->cache, clr.r, clr.g, clr.b);
-                        if (args->mode & fillBackground_RunMode) {
-                            SDL_SetRenderDrawColor(activeText_->render, clr.r, clr.g, clr.b, 0);
-                        }
+                        SDL_SetTextureColorMod(activeText_->cache, fgClr.r, fgClr.g, fgClr.b);
                     }
-                    SDL_Rect src;
-                    memcpy(&src, &glyph->rect[hoff], sizeof(SDL_Rect));
                     dst.x += origin_Paint.x;
                     dst.y += origin_Paint.y;
-                    if (args->mode & fillBackground_RunMode) {
-                        /* Alpha blending looks much better if the RGB components don't change in
-                           the partially transparent pixels. */
+                    if (isBgFilled) {
                         /* TODO: Backgrounds of all glyphs should be cleared before drawing anything else. */
-                        SDL_RenderFillRect(activeText_->render, &dst);
+                        if (bgClr.a) {
+                            SDL_SetRenderDrawColor(activeText_->render, bgClr.r, bgClr.g, bgClr.b, 255);
+                            const SDL_Rect bgRect = {
+                                origin_Paint.x + orig.x + xCursor,
+                                origin_Paint.y + orig.y + yCursor,
+                                xAdvance,
+                                d->height,
+                            };
+                            SDL_RenderFillRect(activeText_->render, &bgRect);
+                        }
+                        else if (args->mode & fillBackground_RunMode) {
+                            /* Alpha blending looks much better if the RGB components don't change
+                               in the partially transparent pixels. */
+                            SDL_SetRenderDrawColor(activeText_->render, fgClr.r, fgClr.g, fgClr.b, 0);
+                            SDL_RenderFillRect(activeText_->render, &dst);
+                        }
+                    }
+                    if (!isSpace) {
+                        SDL_Rect src;
+                        memcpy(&src, &glyph->rect[hoff], sizeof(SDL_Rect));
+                        SDL_RenderCopy(activeText_->render, activeText_->cache, &src, &dst);
                     }
-                    SDL_RenderCopy(activeText_->render, activeText_->cache, &src, &dst);
 #if 0
                     /* Show spaces and direction. */
-                    if (logicalText[logPos] == 0x20) {
+                    if (isSpace) {
                         const iColor debug = get_Color(run->flags.isRTL ? yellow_ColorId : red_ColorId);
                         SDL_SetRenderDrawColor(text_.render, debug.r, debug.g, debug.b, 255);
                         dst.w = xAdvance;
diff --git a/src/ui/text.h b/src/ui/text.h
index 13a636d4..de76ed09 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -157,7 +157,7 @@ enum iAnsiFlag {
 };
 
 void    setOpacity_Text         (float opacity);
-void    setBaseAttributes_Text  (int fontId, int colorId); /* current "normal" text attributes */
+void    setBaseAttributes_Text  (int fontId, int fgColorId); /* current "normal" text attributes */
 void    setAnsiFlags_Text       (int ansiFlags);
 
 void    cache_Text              (int fontId, iRangecc text); /* pre-render glyphs */
@@ -187,7 +187,8 @@ iDeclareType(TextAttrib)
 /* Initial attributes at the start of a text string. These may be modified by control
    sequences inside a text run. */
 struct Impl_TextAttrib {
-    int16_t colorId;
+    int16_t fgColorId;
+    int16_t bgColorId;
     struct {
         uint16_t bold      : 1;
         uint16_t italic    : 1;
diff --git a/src/ui/util.c b/src/ui/util.c
index 0a9dde0c..e718631d 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -2181,6 +2181,14 @@ size_t findWidestLabel_MenuItem(const iMenuItem *items, size_t num) {
     return widestPos;
 }
 
+const char *widestLabel_MenuItemArray(const iArray *items) {
+    size_t index = findWidestLabel_MenuItem(constData_Array(items), size_Array(items));
+    if (index == iInvalidPos) {
+        return "";
+    }
+    return constValue_Array(items, index, iMenuItem).label;
+}
+
 iChar removeIconPrefix_String(iString *d) {
     if (isEmpty_String(d)) {
         return 0;
@@ -2772,9 +2780,38 @@ iWidget *makePreferences_Widget(void) {
     return dlg;
 }
 
+static iBool isBookmarkFolder_(void *context, const iBookmark *bm) {
+    iUnused(context);
+    return isFolder_Bookmark(bm);
+}
+
+static const iArray *makeBookmarkFolderItems_(void) {
+    iArray *folders = new_Array(sizeof(iMenuItem));
+    pushBack_Array(folders, &(iMenuItem){ "\u2014", 0, 0, "dlg.bookmark.setfolder arg:0" });
+    iConstForEach(
+        PtrArray,
+        i,
+        list_Bookmarks(bookmarks_App(), cmpTree_Bookmark, isBookmarkFolder_, NULL)) {
+        const iBookmark *bm = i.ptr;
+        iString *title = collect_String(copy_String(&bm->title));
+        for (const iBookmark *j = bm; j && j->parentId; ) {
+            j = get_Bookmarks(bookmarks_App(), j->parentId);
+            prependCStr_String(title, " > ");
+            prepend_String(title, &j->title);
+        }
+        pushBack_Array(
+            folders,
+            &(iMenuItem){ cstr_String(title),
+                          0,
+                          0,
+                          format_CStr("dlg.bookmark.setfolder arg:%u", id_Bookmark(bm)) });
+    }
+    return collect_Array(folders); 
+}
+
 iWidget *makeBookmarkEditor_Widget(void) {
     const iMenuItem actions[] = {
-        { "${cancel}" },
+        { "${cancel}", 0, 0, "bmed.cancel" },
         { uiTextCaution_ColorEscape "${dlg.bookmark.save}", SDLK_RETURN, KMOD_PRIMARY, "bmed.accept" }
     };
     if (isUsingPanelLayout_Mobile()) {
@@ -2808,6 +2845,19 @@ iWidget *makeBookmarkEditor_Widget(void) {
     addDialogInputWithHeading_(headings, values, "${dlg.bookmark.title}", "bmed.title", iClob(inputs[0] = new_InputWidget(0)));
     addDialogInputWithHeading_(headings, values, "${dlg.bookmark.url}",   "bmed.url",   iClob(inputs[1] = new_InputWidget(0)));
     setUrlContent_InputWidget(inputs[1], iTrue);
+    /* Folder to add to. */ {
+        addChild_Widget(headings, iClob(makeHeading_Widget("${dlg.bookmark.folder}")));
+        const iArray *folderItems = makeBookmarkFolderItems_();
+        iLabelWidget *folderButton;
+        setId_Widget(addChildFlags_Widget(values,
+                                     iClob(folderButton = makeMenuButton_LabelWidget(
+                                               widestLabel_MenuItemArray(folderItems),
+                                               constData_Array(folderItems),
+                                               size_Array(folderItems))), alignLeft_WidgetFlag),
+                     "bmed.folder");
+        updateDropdownSelection_LabelWidget(
+            folderButton, format_CStr(" arg:%u", recentFolder_Bookmarks(bookmarks_App())));        
+    }
     addDialogInputWithHeading_(headings, values, "${dlg.bookmark.tags}",  "bmed.tags",  iClob(inputs[2] = new_InputWidget(0)));
     addDialogInputWithHeading_(headings, values, "${dlg.bookmark.icon}",  "bmed.icon",  iClob(inputs[3] = new_InputWidget(1)));
     /* Buttons for special tags. */
@@ -2830,12 +2880,23 @@ iWidget *makeBookmarkEditor_Widget(void) {
     return dlg;
 }
 
+void setBookmarkEditorFolder_Widget(iWidget *editor, uint32_t folderId) {
+    iLabelWidget *button = findChild_Widget(editor, "bmed.folder");
+    updateDropdownSelection_LabelWidget(button, format_CStr(" arg:%u", folderId));
+    setUserData_Object(button, get_Bookmarks(bookmarks_App(), folderId));    
+}
+
 static iBool handleBookmarkCreationCommands_SidebarWidget_(iWidget *editor, const char *cmd) {
-    if (equal_Command(cmd, "bmed.accept") || equal_Command(cmd, "cancel")) {
+    if (equal_Command(cmd, "dlg.bookmark.setfolder")) {
+        setBookmarkEditorFolder_Widget(editor, arg_Command(cmd));
+        return iTrue;
+    }
+    if (equal_Command(cmd, "bmed.accept") || equal_Command(cmd, "bmed.cancel")) {
         if (equal_Command(cmd, "bmed.accept")) {
             const iString *title = text_InputWidget(findChild_Widget(editor, "bmed.title"));
             const iString *url   = text_InputWidget(findChild_Widget(editor, "bmed.url"));
             const iString *tags  = text_InputWidget(findChild_Widget(editor, "bmed.tags"));
+            const iBookmark *folder = userData_Object(findChild_Widget(editor, "bmed.folder"));
             const iString *icon  = collect_String(trimmed_String(text_InputWidget(findChild_Widget(editor, "bmed.icon"))));
             const uint32_t id    = add_Bookmarks(bookmarks_App(), url, title, tags, first_String(icon));
             iBookmark *    bm    = get_Bookmarks(bookmarks_App(), id);
@@ -2851,6 +2912,10 @@ static iBool handleBookmarkCreationCommands_SidebarWidget_(iWidget *editor, cons
             if (isSelected_Widget(findChild_Widget(editor, "bmed.tag.linksplit"))) {
                 addTag_Bookmark(bm, linkSplit_BookmarkTag);
             }
+            bm->parentId = folder ? id_Bookmark(folder) : 0;
+            if (bm->parentId) {
+                setRecentFolder_Bookmarks(bookmarks_App(), bm->parentId);
+            }
             postCommandf_App("bookmarks.changed added:%zu", id);
         }
         setupSheetTransition_Mobile(editor, iFalse);
diff --git a/src/ui/util.h b/src/ui/util.h
index 52b3a692..81fb1cbd 100644
--- a/src/ui/util.h
+++ b/src/ui/util.h
@@ -311,6 +311,7 @@ iWidget *   makePreferences_Widget          (void);
 void        updatePreferencesLayout_Widget  (iWidget *prefs);
 
 iWidget *   makeBookmarkEditor_Widget   (void);
+void        setBookmarkEditorFolder_Widget(iWidget *editor, uint32_t folderId);
 iWidget *   makeBookmarkCreation_Widget (const iString *url, const iString *title, iChar icon);
 iWidget *   makeIdentityCreation_Widget (void);
 iWidget *   makeFeedSettings_Widget     (uint32_t bookmarkId);
diff --git a/src/ui/window.c b/src/ui/window.c
index fa364cff..2f6fe430 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -26,7 +26,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "bookmarks.h"
 #include "command.h"
 #include "defs.h"
-#include "embedded.h"
+#include "resources.h"
 #include "keys.h"
 #include "labelwidget.h"
 #include "documentwidget.h"
@@ -583,7 +583,7 @@ void init_MainWindow(iMainWindow *d, iRect rect) {
 #if defined (iPlatformLinux)
     SDL_SetWindowMinimumSize(d->base.win, minSize.x * d->base.pixelRatio, minSize.y * d->base.pixelRatio);
     /* Load the window icon. */ {
-        SDL_Surface *surf = loadImage_(&imageLagrange64_Embedded, 0);
+        SDL_Surface *surf = loadImage_(&imageLagrange64_Resources, 0);
         SDL_SetWindowIcon(d->base.win, surf);
         free(surf->pixels);
         SDL_FreeSurface(surf);
@@ -597,7 +597,7 @@ void init_MainWindow(iMainWindow *d, iRect rect) {
     setupUserInterface_MainWindow(d);
     postCommand_App("~bindings.changed"); /* update from bindings */
     /* Load the border shadow texture. */ {
-        SDL_Surface *surf = loadImage_(&imageShadow_Embedded, 0);
+        SDL_Surface *surf = loadImage_(&imageShadow_Resources, 0);
         d->base.borderShadow = SDL_CreateTextureFromSurface(d->base.render, surf);
         SDL_SetTextureBlendMode(d->base.borderShadow, SDL_BLENDMODE_BLEND);
         free(surf->pixels);
@@ -607,7 +607,7 @@ void init_MainWindow(iMainWindow *d, iRect rect) {
 #if defined (LAGRANGE_ENABLE_CUSTOM_FRAME)
     /* Load the app icon for drawing in the title bar. */
     if (prefs_App()->customFrame) {
-        SDL_Surface *surf = loadImage_(&imageLagrange64_Embedded, appIconSize_Root());
+        SDL_Surface *surf = loadImage_(&imageLagrange64_Resources, appIconSize_Root());
         SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "0");
         d->appIcon = SDL_CreateTextureFromSurface(d->base.render, surf);
         free(surf->pixels);