Merge pull request #1 from skyjake/dev

bring up to date

22 files changed, 562 insertions, 189 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c200e21..1033772e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@
 cmake_minimum_required (VERSION 3.9)
 
 project (Lagrange
-    VERSION 0.12.0
+    VERSION 0.12.2
     DESCRIPTION "A Beautiful Gemini Client"
     LANGUAGES C
 )
@@ -30,6 +30,7 @@ option (ENABLE_X11_SWRENDER     "Use software rendering under X11" OFF)
 option (ENABLE_KERNING          "Enable kerning in font renderer (slower)" ON)
 option (ENABLE_RESOURCE_EMBED   "Embed resources inside the executable" OFF)
 option (ENABLE_WINDOWPOS_FIX    "Set position after showing window (workaround for SDL bug)" OFF)
+option (ENABLE_IDLE_SLEEP       "While idle, sleep in the main thread instead of waiting for events" ON)
 
 include (BuildType.cmake)
 include (res/Embed.cmake)
@@ -219,6 +220,9 @@ if (ENABLE_MPG123 AND MPG123_FOUND)
     target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_MPG123=1)
     target_link_libraries (app PUBLIC PkgConfig::MPG123)
 endif ()
+if (ENABLE_IDLE_SLEEP)
+    target_compile_definitions (app PUBLIC LAGRANGE_IDLE_SLEEP=1)
+endif ()
 target_link_libraries (app PUBLIC the_Foundation::the_Foundation)
 target_link_libraries (app PUBLIC ${SDL2_LDFLAGS})
 if (APPLE)
diff --git a/debian/rules b/debian/rules
index f4578eea..9e306b0b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=-format
         dh $@  
 
 override_dh_auto_configure:
-        cmake .. -DENABLE_WINDOWPOS_FIX=YES -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$(pwd)/../usr
+        cmake .. -DCMAKE_BUILD_TYPE=Release -DENABLE_WINDOWPOS_FIX=YES -DTFDN_ENABLE_SSE41=NO -DCMAKE_INSTALL_PREFIX=$(pwd)/../usr
 
 override_dh_build_configure:
         cmake --build .
diff --git a/lib/the_Foundation b/lib/the_Foundation
-Subproject 17fd22771266a562eecd861519d1587885b26c2
+Subproject 4514a181458dfa02d73aafd6498e101b63eaa47
diff --git a/res/MacOSXBundleInfo.plist.in b/res/MacOSXBundleInfo.plist.in
index 79cf7627..daa71574 100644
--- a/res/MacOSXBundleInfo.plist.in
+++ b/res/MacOSXBundleInfo.plist.in
@@ -54,16 +54,16 @@
                         <false/>
                 </dict>
         </array>
-                <key>CFBundleURLTypes</key>
-                <array>
-                        <dict>
-                                <key>CFBundleURLName</key>
-                                <string>Gemini</string>
-                                <key>CFBundleURLSchemes</key>
-                                <array>
-                                        <string>gemini</string>
-                                </array>
-                        </dict>
-                </array>
+        <key>CFBundleURLTypes</key>
+        <array>
+                <dict>
+                        <key>CFBundleURLName</key>
+                        <string>Gemini</string>
+                        <key>CFBundleURLSchemes</key>
+                        <array>
+                                <string>gemini</string>
+                        </array>
+                </dict>
+        </array>
 </dict>
 </plist>
diff --git a/res/about/help.gmi b/res/about/help.gmi
index 3f21adb8..f71f5164 100644
--- a/res/about/help.gmi
+++ b/res/about/help.gmi
@@ -63,7 +63,7 @@ Lagrange's user interface is modeled after web browsers:
 
 * There is a navigation bar at the top with Back and Forward buttons.
 * There is a tab bar for switching tabs. The tab bar is hidden if there is only one tab open.
-* There is a sidebar for managing bookmarks and TLS identities, and viewing history and the page outline. The sidebar is hidden by default.
+* There is a sidebar for managing bookmarks and TLS identities, and viewing history and the page outline. Sidebars are hidden by default.
 * There is a search bar that appears at the bottom when searching text on the page.
 
 Tip: Try pressing ${CTRL+}5 now to see the page outline.
@@ -126,17 +126,17 @@ Press ${CTRL+}T to open a new tab, and ${CTRL+}W to close the current tab. Right
 
 The set of open tabs is restored when you launch Lagrange.
 
-## Sidebar
+## Sidebars
 
-The sidebar can be toggled via menus or by pressing ${SHIFT+}${CTRL+}L. It has five tabs:
+The sidebars can be toggled via menus or by pressing ${SHIFT+}${CTRL+}L or ${SHIFT+}${CTRL+}P (for the left/right sidebar, respectively). Both sidebars have five tabs:
 
 * Bookmarks: List of bookmarks that you've created. These appear first in search results for quick and easy access.
-* Feeds: Entries found on subscribed feed index pages.
+* Feeds: Entries found on subscribed pages.
 * History: Chronological list of visited URLs. This is not a full history of all the URLs you've accessed over time — only unique URLs are shown at the latest access time.
 * Identities: TLS client certificates.
 * Outline: List of the headings in the currently open tab. Useful when reading longer documents.
 
-${CTRL+}1 through ${CTRL+}5 switch between the sidebar tabs, or hide the sidebar if the current tab's key is pressed. You can also press Escape to dismiss the sidebar.
+${CTRL+}1 through ${CTRL+}5 switch between the left sidebar tabs, or hide the sidebar if the current tab's key is pressed. You can also press Escape to dismiss sidebars.
 
 ## Bookmarks
 
@@ -150,10 +150,11 @@ In addition to a title, bookmarks can have tags. Some tags have a special meanin
 
 * Set a "homepage" tag on a bookmark to make it one of the pages that will be opened when pressing the 🏠 button. If multiple bookmarks are tagged as homepages, a random one is selected.
 * A "subscribed" tag means that Lagrange will periodically fetch the bookmarked page and look for Gemini feed links. All the found links that match the required style ("YYYY-MM-DD Entry title") will appear in the Feeds sidebar tab.
+* "headings" can be used together with "subscribed" to subscribe to new headings instead of Gemini feed links.
 
 ## Feeds
 
-You may be familiar with RSS and Atom XML feeds from the web. Lagrange does _not_ support RSS/Atom, only Gemini feeds. A Gemini feed is simply a regular 'text/gemini' page that contains one or more links whose labels are formatted in a particular way.
+You may be familiar with RSS and Atom XML feeds from the web. Lagrange does _not_ support RSS or Atom, only Gemini feeds. A Gemini feed is simply a regular 'text/gemini' page that contains one or more links whose labels are formatted in a particular way.
 
 => gemini://gemini.circumlunar.space/docs/companion/subscription.gmi  See "Subscribing to Gemini pages" for more information.
 
@@ -213,8 +214,6 @@ You can find a number of settings in Preferences to customize the user interface
 
 ### Browsing behavior
 
-The "Outline on scrollbar" option shows the page outline when the mouse cursor is moved over the scrollbar, allowing one to better navigate long documents. The outline will disappear after the mouse cursor is moved away. If you need a persistent outline, one is always available in the sidebar.
-
 One important characteristic of Gemini is that you remain in control of what gets loaded and when. The browser will not suddenly fetch a ton of images, autoplay videos, or make surreptitious connections to any tracking servers — each network request is purposeful and manually triggered. With this in mind, the "Load image on scroll" option is provided to assist keyboard-only browsing and to facilitate a focused reading experience. When enabled, if there is an image link visible on the page and you press Space or ↓, it will be loaded and shown inline _instead_ of the view scrolling down. This allows you to read and see all the content of the page while only tapping on a single key on the keyboard.
 
 ### Window and UI options
@@ -315,12 +314,99 @@ Other Unix : ~/.config/lagrange/
 
 * bindings.txt
 * bookmarks.txt
+* feeds.txt
 * idents.binary and idents/
+* mimehooks.txt
 * prefs.cfg
 * state.binary
 * trusted.txt
 * visited.txt
 
+# MIME hooks
+
+MIME hooks enable piping Gemini responses through external programs for arbitrary processing. This allows leveraging scripting languages and binary executables to perform format conversions, content transformation, and data analysis.
+
+Hooks are configured using the file "mimehooks.txt" in Lagrange's config directory. Each hook has a regexp that is matched against the response MIME type and parameters, and each matching hook is offered the response body via stdin. The called external programs are free to rewrite the entire response, including the MIME type. If one of the hooks returns a valid response, it is used as the final response of the Gemini request.
+
+Example use cases:
+* Parsing an Atom XML feed and generating a Gemini feed index page
+* Rendering a MIDI file using Timidity as PCM WAV
+* Generate a graph PNG based on values in a CSV
+* Converting HTML or Markdown to 'text/gemini'
+* Language translations
+
+## Interface
+
+When a hook is called, it is given the MIME type and parameters via command line arguments. The response body is provided via stdin. The request's URL is available in the REQUEST_URL environment variable.
+
+The MIME type and parameters are split at semicolons, so "text/gemini; lang=ja" would be called as:
+```
+hookprogram text/gemini lang=ja 
+```
+
+Output from the program (via stdout) must be a valid "20" Gemini response that includes the new MIME type:
+```
+20 text/gemini; lang=en\r\n
+{...body...}
+```
+
+Any output that does not follow this format is considered to mean that the hook refused to process the contents. The next hook will be offered the response instead.
+
+## mimehooks.txt syntax
+
+Like other Lagrange configuration lines, mimehooks.txt has a simple line-oriented syntax. Lagrange must be restarted for changes to the configuration file to take effect.
+
+Each hook is specified as three lines:
+* A human-readable label (for reporting to the user)
+* MIME type/parameter regular expression
+* Command to execute, plus additional arguments each separated with semicolons
+
+For example:
+```
+Convert Atom to Gemini feed
+application/xml
+/usr/bin/python3;/home/jaakko/atomconv.py
+```
+
+The hook program is executed directly without involving the shell. This means scripts must be invoked via the interpreter executable.
+
+## Example: Converting from Atom to Gemini
+
+The following simple Python script demonstrates how a MIME hook could be used to parse an Atom XML document using Python 3 and output a Gemini feed index page based on the parsed entries. This is just a simple example; a more robust script could include more content from the Atom feed and handle errors, too.
+```
+import sys
+import xml.etree.ElementTree as ET
+
+def atomtag(n):
+    return '{http://www.w3.org/2005/Atom}' + n
+
+root = ET.fromstring(sys.stdin.read())
+if root.tag != atomtag('feed'): 
+    sys.exit(0)
+feed_title = ''
+feed_author = ''
+feed_entries = []
+for child in root:
+    if child.tag == atomtag('title'):
+        feed_title = child.text
+    elif child.tag == atomtag('entry'):
+        feed_entries.append(child)        
+print("20 text/gemini\r")
+print(f'# {feed_title}')
+for entry in feed_entries:   
+    entry_date = ''
+    entry_title = ''
+    entry_link = ''
+    for child in entry:        
+        if child.tag == atomtag('updated'): 
+            entry_date = child.text[:10]
+        elif child.tag == atomtag('title'):
+            entry_title = child.text
+        elif child.tag == atomtag('link'): 
+            entry_link = child.attrib['href']
+    print(f'=> {entry_link} {entry_date} {entry_title}')
+```
+
 # Open source licenses
 
 => about:license
diff --git a/res/about/version.gmi b/res/about/version.gmi
index 85490dc7..2020b46c 100644
--- a/res/about/version.gmi
+++ b/res/about/version.gmi
@@ -6,8 +6,35 @@
 ```
 # Release notes
 
+## 0.12.2
+
+## 0.12.1
+* 'text/*' content falls back to plain text.
+* Minimized visual artifacts in Unicode box-drawing characters (overlapping/gaps) by fine-tuning glyph scaling.
+* Fixed truncated tab titles when opening tabs in background.
+* Fixed possible exit if hook program not found (SIGPIPE).
+* REQUEST_URL is set in the environment when running MIME hooks.
+* "about:debug" lists the configured MIME hooks.
+* macOS: Fixed excessive CPU usage while idling.
+
 ## 0.12
-* Subscribe to new headings on pages.
+* Added MIME hooks: pipe Gemini responses through external programs for arbitrary processing. (See "about:help" for usage.)
+* Added a right-hand sidebar; have a sidebar on the right or on both sides at once.
+* Added a clear warning banner when there is an issue with the server's TLS certificate.
+* Follow Weiph/pikkulogs — subscribe to new headings on pages.
+* Added UI for subscribing: feed name, entry type (Gemini feed or new headings).
+* Added keyboard shortcut ${SHIFT+}${CTRL+}D for subscribing to page.
+* Feeds sidebar is capped to 100 entries. "about:feeds" shows all known entries.
+* Network connections have a timeout in case server doesn't respond at all.
+* Adjusted spacing before/after links to reflect use of empty lines in the source.
+* Clicking on page area unfocuses URL input field.
+* Added keybindings for switching tabs.
+* Gopher: Query links have a 🔍 icon.
+* Fixed handling of "file:///" URIs on Windows.
+* Fixed misaligned Unicode box-drawing characters.
+* Fixed missing error page if status code is unknown (torture test 34).
+* Fixed detection of invalid headers (torture test 39).
+* Fixed rendering of soft hyphens (torture test 50).
 
 ## 0.11
 * Added feed subscriptions. A subscription is any bookmark with the "subscribed" tag. Subscribed feeds are refreshed in the background while Lagrange is running.
diff --git a/src/app.c b/src/app.c
index b799b627..8a6b2a66 100644
--- a/src/app.c
+++ b/src/app.c
@@ -89,6 +89,8 @@ static const char *prefsFileName_App_ = "prefs.cfg";
 static const char *stateFileName_App_ = "state.binary";
 static const char *downloadDir_App_   = "~/Downloads";
 
+static const int idleThreshold_App_ = 1000; /* ms */
+
 struct Impl_App {
     iCommandLine args;
     iString *    execPath;
@@ -100,7 +102,12 @@ struct Impl_App {
     iSortedArray tickers;
     uint32_t     lastTickerTime;
     uint32_t     elapsedSinceLastTicker;
-    iBool        running;
+    iBool        isRunning;
+#if defined (LAGRANGE_IDLE_SLEEP)
+    iBool        isIdling;
+    uint32_t     lastEventTime;
+    int          sleepTimer;
+#endif
     iAtomicInt   pendingRefresh;
     int          tabEnum;
     iStringList *launchCommands;
@@ -139,7 +146,8 @@ const iString *dateStr_(const iDate *date) {
 
 static iString *serializePrefs_App_(const iApp *d) {
     iString *str = new_String();
-    const iSidebarWidget *sidebar = findWidget_App("sidebar");
+    const iSidebarWidget *sidebar  = findWidget_App("sidebar");
+    const iSidebarWidget *sidebar2 = findWidget_App("sidebar2");
     appendFormat_String(str, "window.retain arg:%d\n", d->prefs.retainWindowSize);
     if (d->prefs.retainWindowSize) {
         const iBool isMaximized = (SDL_GetWindowFlags(d->window->win) & SDL_WINDOW_MAXIMIZED) != 0;
@@ -150,6 +158,7 @@ static iString *serializePrefs_App_(const iApp *d) {
         h = d->window->lastRect.size.y;
         appendFormat_String(str, "window.setrect width:%d height:%d coord:%d %d\n", w, h, x, y);
         appendFormat_String(str, "sidebar.width arg:%d\n", width_SidebarWidget(sidebar));
+        appendFormat_String(str, "sidebar2.width arg:%d\n", width_SidebarWidget(sidebar2));
         /* On macOS, maximization should be applied at creation time or the window will take
            a moment to animate to its maximized size. */
 #if !defined (iPlatformApple)
@@ -160,10 +169,16 @@ static iString *serializePrefs_App_(const iApp *d) {
         iUnused(isMaximized);
 #endif
     }
-    if (isVisible_Widget(sidebar)) {
-        appendCStr_String(str, "sidebar.toggle\n");
+    /* Sidebars. */ {
+        if (isVisible_Widget(sidebar)) {
+            appendCStr_String(str, "sidebar.toggle\n");
+        }
+        appendFormat_String(str, "sidebar.mode arg:%d\n", mode_SidebarWidget(sidebar));
+        if (isVisible_Widget(sidebar2)) {
+            appendCStr_String(str, "sidebar2.toggle\n");
+        }
+        appendFormat_String(str, "sidebar2.mode arg:%d\n", mode_SidebarWidget(sidebar2));
     }
-    appendFormat_String(str, "sidebar.mode arg:%d\n", mode_SidebarWidget(sidebar));
     appendFormat_String(str, "uiscale arg:%f\n", uiScale_Window(d->window));
     appendFormat_String(str, "prefs.dialogtab arg:%d\n", d->prefs.dialogTab);
     appendFormat_String(str, "font.set arg:%d\n", d->prefs.font);
@@ -312,6 +327,16 @@ static void saveState_App_(const iApp *d) {
     iRelease(f);
 }
 
+#if defined (LAGRANGE_IDLE_SLEEP)
+static uint32_t checkAsleep_App_(uint32_t interval, void *param) {
+    iApp *d = param;
+    SDL_Event ev = { .type = SDL_USEREVENT };
+    ev.user.code = asleep_UserEventCode;
+    SDL_PushEvent(&ev);
+    return interval;
+}
+#endif
+
 static void init_App_(iApp *d, int argc, char **argv) {
     const iBool isFirstRun = !fileExistsCStr_FileInfo(cleanedPath_CStr(dataDir_App_));
     d->isFinishedLaunching = iFalse;
@@ -341,7 +366,7 @@ static void init_App_(iApp *d, int argc, char **argv) {
 #endif
     init_Prefs(&d->prefs);
     setCStr_String(&d->prefs.downloadDir, downloadDir_App_);
-    d->running           = iFalse;
+    d->isRunning         = iFalse;
     d->window            = NULL;
     set_Atomic(&d->pendingRefresh, iFalse);
     d->mimehooks         = new_MimeHooks();
@@ -350,6 +375,11 @@ static void init_App_(iApp *d, int argc, char **argv) {
     d->bookmarks         = new_Bookmarks();
     d->tabEnum           = 0; /* generates unique IDs for tab pages */
     setThemePalette_Color(d->prefs.theme);
+#if defined (LAGRANGE_IDLE_SLEEP)
+    d->isIdling      = iFalse;
+    d->lastEventTime = 0;
+    d->sleepTimer    = SDL_AddTimer(1000, checkAsleep_App_, d);
+#endif
 #if defined (iPlatformApple)
     setupApplication_MacOS();
 #endif
@@ -472,23 +502,31 @@ const iString *debugInfo_App(void) {
     iConstForEach(StringList, j, d->launchCommands) {
         appendFormat_String(msg, "%s\n", cstr_String(j.value));
     }
+    appendFormat_String(msg, "## MIME hooks\n");
+    append_String(msg, debugInfo_MimeHooks(d->mimehooks));
     return msg;
 }
 
 iLocalDef iBool isWaitingAllowed_App_(iApp *d) {
+#if defined (LAGRANGE_IDLE_SLEEP)
+    if (d->isIdling) {
+        return iFalse;
+    }
+#endif
     return !value_Atomic(&d->pendingRefresh) && isEmpty_SortedArray(&d->tickers);
 }
 
 void processEvents_App(enum iAppEventMode eventMode) {
     iApp *d = &app_;
     SDL_Event ev;
+    iBool gotEvents = iFalse;
     while ((isWaitingAllowed_App_(d) && eventMode == waitForNewEvents_AppEventMode &&
             SDL_WaitEvent(&ev)) ||
            ((!isWaitingAllowed_App_(d) || eventMode == postedEventsOnly_AppEventMode) &&
             SDL_PollEvent(&ev))) {
         switch (ev.type) {
             case SDL_QUIT:
-                d->running = iFalse;
+                d->isRunning = iFalse;
                 goto backToMainLoop;
             case SDL_DROPFILE: {
                 iBool newTab = iFalse;
@@ -508,6 +546,25 @@ void processEvents_App(enum iAppEventMode eventMode) {
                 break;
             }
             default: {
+#if defined (LAGRANGE_IDLE_SLEEP)
+                if (ev.type == SDL_USEREVENT && ev.user.code == asleep_UserEventCode) {
+                    if (SDL_GetTicks() - d->lastEventTime > idleThreshold_App_) {
+                        if (!d->isIdling) {
+//                            printf("[App] idling...\n");
+                            fflush(stdout);
+                        }
+                        d->isIdling = iTrue;
+                    }
+                    continue;
+                }
+                d->lastEventTime = SDL_GetTicks();
+                if (d->isIdling) {
+//                    printf("[App] ...woke up\n");
+                    fflush(stdout);
+                }
+                d->isIdling = iFalse;
+#endif
+                gotEvents = iTrue;
                 iBool wasUsed = processEvent_Window(d->window, &ev);
                 if (!wasUsed) {
                     /* There may be a key bindings for this. */
@@ -531,6 +588,14 @@ void processEvents_App(enum iAppEventMode eventMode) {
             }
         }
     }
+#if defined (LAGRANGE_IDLE_SLEEP)
+    if (d->isIdling && !gotEvents) {
+        /* This is where we spend most of our time when idle. 60 Hz still quite a lot but we
+           can't wait too long after the user tries to interact again with the app. In any
+           case, on macOS SDL_WaitEvent() seems to use 10x more CPU time than sleeping. */
+        SDL_Delay(1000 / 60);
+    }
+#endif
 backToMainLoop:;
 }
 
@@ -578,10 +643,10 @@ static int resizeWatcher_(void *user, SDL_Event *event) {
 
 static int run_App_(iApp *d) {
     arrange_Widget(findWidget_App("root"));
-    d->running = iTrue;
+    d->isRunning = iTrue;
     SDL_EventState(SDL_DROPFILE, SDL_ENABLE); /* open files via drag'n'drop */
     SDL_AddEventWatch(resizeWatcher_, d);
-    while (d->running) {
+    while (d->isRunning) {
         processEvents_App(waitForNewEvents_AppEventMode);
         runTickers_App_(d);
         refresh_App();
@@ -592,6 +657,9 @@ static int run_App_(iApp *d) {
 
 void refresh_App(void) {
     iApp *d = &app_;
+#if defined (LAGRANGE_IDLE_SLEEP)
+    if (d->isIdling) return;
+#endif
     destroyPending_Widget();
     draw_Window(d->window);
     set_Atomic(&d->pendingRefresh, iFalse);
@@ -649,6 +717,9 @@ int run_App(int argc, char **argv) {
 
 void postRefresh_App(void) {
     iApp *d = &app_;
+#if defined (LAGRANGE_IDLE_SLEEP)
+    d->isIdling = iFalse;
+#endif
     const iBool wasPending = exchange_Atomic(&d->pendingRefresh, iTrue);
     if (!wasPending) {
         SDL_Event ev;
@@ -844,6 +915,7 @@ iDocumentWidget *newTab_App(const iDocumentWidget *duplicateOf, iBool switchToNe
     }
     arrange_Widget(tabs);
     refresh_Widget(tabs);
+    postCommandf_App("tab.created id:%s", cstr_String(id_Widget(as_Widget(doc))));
     return doc;
 }
 
@@ -964,7 +1036,13 @@ iBool willUseProxy_App(const iRangecc scheme) {
 
 iBool handleCommand_App(const char *cmd) {
     iApp *d = &app_;
-    if (equal_Command(cmd, "prefs.dialogtab")) {
+    if (equal_Command(cmd, "config.error")) {
+        makeMessage_Widget(uiTextCaution_ColorEscape "CONFIG ERROR",
+                           format_CStr("Error in config file: %s\nSee \"about:debug\" for details.",
+                                       suffixPtr_Command(cmd, "where")));
+        return iTrue;
+    }
+    else if (equal_Command(cmd, "prefs.dialogtab")) {
         d->prefs.dialogTab = arg_Command(cmd);
         return iTrue;
     }
@@ -1076,12 +1154,12 @@ iBool handleCommand_App(const char *cmd) {
     }
     else if (equal_Command(cmd, "prefs.sideicon.changed")) {
         d->prefs.sideIcon = arg_Command(cmd) != 0;
-        refresh_App();
+        postRefresh_App();
         return iTrue;
     }
     else if (equal_Command(cmd, "prefs.hoveroutline.changed")) {
         d->prefs.hoverOutline = arg_Command(cmd) != 0;
-        refresh_App();
+        postRefresh_App();
         return iTrue;
     }
     else if (equal_Command(cmd, "saturation.set")) {
@@ -1364,13 +1442,13 @@ iBool handleCommand_App(const char *cmd) {
     }
     else if (equal_Command(cmd, "feeds.update.started")) {
         setFlags_Widget(findWidget_App("feeds.progress"), hidden_WidgetFlag, iFalse);
-        refresh_App();
+        postRefresh_App();
         return iFalse;
     }
     else if (equal_Command(cmd, "feeds.update.finished")) {
         setFlags_Widget(findWidget_App("feeds.progress"), hidden_WidgetFlag, iTrue);
         refreshFinished_Feeds();
-        refresh_App();
+        postRefresh_App();
         return iFalse;
     }
     else if (equal_Command(cmd, "visited.changed")) {
diff --git a/src/app.h b/src/app.h
index bc086dfe..743484a5 100644
--- a/src/app.h
+++ b/src/app.h
@@ -46,6 +46,7 @@ enum iAppEventMode {
 enum iUserEventCode {
     command_UserEventCode = 1,
     refresh_UserEventCode = 2,
+    asleep_UserEventCode = 3,
 };
 
 const iString *execPath_App     (void);
diff --git a/src/gmrequest.c b/src/gmrequest.c
index a1284078..884486b3 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -262,8 +262,9 @@ static void requestFinished_GmRequest_(iGmRequest *d, iTlsRequest *req) {
     checkServerCertificate_GmRequest_(d);
     unlock_Mutex(d->mtx);
     /* Check for mimehooks. */
-    if (d->isRespFiltered && d->state == finished_GmRequestState) {       
-        iBlock *xbody = tryFilter_MimeHooks(mimeHooks_App(), &d->resp->meta, &d->resp->body);
+    if (d->isRespFiltered && d->state == finished_GmRequestState) {
+        iBlock *xbody =
+            tryFilter_MimeHooks(mimeHooks_App(), &d->resp->meta, &d->resp->body, &d->url);
         if (xbody) {
             lock_Mutex(d->mtx);
             clear_String(&d->resp->meta);
@@ -526,6 +527,12 @@ void submit_GmRequest(iGmRequest *d) {
     }
     else if (equalCase_Rangecc(url.scheme, "file")) {
         iString *path = collect_String(urlDecode_String(collect_String(newRange_String(url.path))));
+#if defined (iPlatformMsys)
+        /* Remove the extra slash from the beginning. */
+        if (startsWith_String(path, "/")) {
+            remove_Block(&path->chars, 0, 1);
+        }
+#endif
         iFile *  f    = new_File(path);
         if (open_File(f, readOnly_FileMode)) {
             /* TODO: Check supported file types: images, audio */
@@ -555,6 +562,9 @@ void submit_GmRequest(iGmRequest *d) {
             else if (endsWithCase_String(path, ".mp3")) {
                 setCStr_String(&resp->meta, "audio/mpeg");
             }
+            else if (endsWithCase_String(path, ".mid")) {
+                setCStr_String(&resp->meta, "audio/midi");
+            }
             else {
                 setCStr_String(&resp->meta, "application/octet-stream");
             }
diff --git a/src/gmutil.c b/src/gmutil.c
index 557a82f8..94f00ce1 100644
--- a/src/gmutil.c
+++ b/src/gmutil.c
@@ -192,7 +192,10 @@ const iString *absoluteUrl_String(const iString *d, const iString *urlMaybeRelat
 iString *makeFileUrl_String(const iString *localFilePath) {
     iString *url = cleaned_Path(localFilePath);
     replace_Block(&url->chars, '\\', '/'); /* in case it's a Windows path */
-    set_String(url, collect_String(urlEncodeExclude_String(url, "/")));
+    set_String(url, collect_String(urlEncodeExclude_String(url, "/:")));
+#if defined (iPlatformMsys)
+    prependChar_String(url, '/'); /* three slashes */
+#endif
     prependCStr_String(url, "file://");
     return url;
 }
diff --git a/src/mimehooks.c b/src/mimehooks.c
index 8bb838ef..f4ec6bf4 100644
--- a/src/mimehooks.c
+++ b/src/mimehooks.c
@@ -1,6 +1,8 @@
 #include "mimehooks.h"
+#include "app.h"
 
 #include <the_Foundation/file.h>
+#include <the_Foundation/fileinfo.h>
 #include <the_Foundation/path.h>
 #include <the_Foundation/process.h>
 #include <the_Foundation/stringlist.h>
@@ -23,6 +25,7 @@ void deinit_FilterHook(iFilterHook *d) {
 
 void setMimePattern_FilterHook(iFilterHook *d, const iString *pattern) {
     iReleasePtr(&d->mimeRegex);
+    set_String(&d->mimePattern, pattern);
     d->mimeRegex = new_RegExp(cstr_String(pattern), caseInsensitive_RegExpOption);
 }
 
@@ -30,7 +33,8 @@ void setCommand_FilterHook(iFilterHook *d, const iString *command) {
     set_String(&d->command, command);
 }
 
-iBlock *run_FilterHook_(const iFilterHook *d, const iString *mime, const iBlock *body) {
+iBlock *run_FilterHook_(const iFilterHook *d, const iString *mime, const iBlock *body,
+                        const iString *requestUrl) {
     iProcess *   proc = new_Process();
     iStringList *args = new_StringList();
     iRangecc     seg  = iNullRange;
@@ -43,13 +47,21 @@ iBlock *run_FilterHook_(const iFilterHook *d, const iString *mime, const iBlock
     }
     setArguments_Process(proc, args);
     iRelease(args);
-    start_Process(proc);
-    writeInput_Process(proc, body);
-    iBlock *output = readOutputUntilClosed_Process(proc);
-    if (!startsWith_Rangecc(range_Block(output), "20")) {
-        /* Didn't produce valid output. */
-        delete_Block(output);
-        output = NULL;
+    if (!isEmpty_String(requestUrl)) {
+        setEnvironment_Process(
+            proc,
+            iClob(newStrings_StringList(
+                collectNewFormat_String("REQUEST_URL=%s", cstr_String(requestUrl)), NULL)));
+    }
+    iBlock *output = NULL;
+    if (start_Process(proc)) {
+        writeInput_Process(proc, body);
+        output = readOutputUntilClosed_Process(proc);
+        if (!startsWith_Rangecc(range_Block(output), "20")) {
+            /* Didn't produce valid output. */
+            delete_Block(output);
+            output = NULL;
+        }
     }
     iRelease(proc);
     return output;
@@ -87,13 +99,14 @@ iBool willTryFilter_MimeHooks(const iMimeHooks *d, const iString *mime) {
     return iFalse;
 }
 
-iBlock *tryFilter_MimeHooks(const iMimeHooks *d, const iString *mime, const iBlock *body) {
+iBlock *tryFilter_MimeHooks(const iMimeHooks *d, const iString *mime, const iBlock *body,
+                            const iString *requestUrl) {
     iRegExpMatch m;
     iConstForEach(PtrArray, i, &d->filters) {
         const iFilterHook *xc = i.ptr;
         init_RegExpMatch(&m);
         if (matchString_RegExp(xc->mimeRegex, mime, &m)) {
-            iBlock *result = run_FilterHook_(xc, mime, body);
+            iBlock *result = run_FilterHook_(xc, mime, body, requestUrl);
             if (result) {
                 return result;
             }
@@ -105,6 +118,7 @@ iBlock *tryFilter_MimeHooks(const iMimeHooks *d, const iString *mime, const iBlo
 static const char *mimeHooksFilename_MimeHooks_ = "mimehooks.txt";
 
 void load_MimeHooks(iMimeHooks *d, const char *saveDir) {
+    iBool reportError = iFalse;
     iFile *f = newCStr_File(concatPath_CStr(saveDir, mimeHooksFilename_MimeHooks_));
     if (open_File(f, read_FileMode | text_FileMode)) {
         iBlock * src     = readAll_File(f);
@@ -124,6 +138,15 @@ void load_MimeHooks(iMimeHooks *d, const char *saveDir) {
                 setRange_String(&hook->label, lines[0]);
                 setMimePattern_FilterHook(hook, collect_String(newRange_String(lines[1])));
                 setCommand_FilterHook(hook, collect_String(newRange_String(lines[2])));
+                /* Check if commmand is valid. */ {
+                    iRangecc seg = iNullRange;
+                    while (nextSplit_Rangecc(range_String(&hook->command), ";", &seg)) {
+                        if (!fileExistsCStr_FileInfo(cstr_Rangecc(seg))) {
+                            reportError = iTrue;
+                        }
+                        break;
+                    }
+                }
                 pushBack_PtrArray(&d->filters, hook);
                 pos = 0;
             }
@@ -131,9 +154,37 @@ void load_MimeHooks(iMimeHooks *d, const char *saveDir) {
         delete_Block(src);
     }
     iRelease(f);
+    if (reportError) {
+        postCommand_App("~config.error where:mimehooks.txt");
+    }
 }
 
 void save_MimeHooks(const iMimeHooks *d) {
     iUnused(d);
 }
 
+const iString *debugInfo_MimeHooks(const iMimeHooks *d) {
+    iString *str = collectNew_String();
+    size_t index = 0;
+    iConstForEach(PtrArray, i, &d->filters) {
+        const iFilterHook *filter = i.ptr;
+        appendFormat_String(str, "### %d: %s\n", index, cstr_String(&filter->label));
+        appendFormat_String(str, "MIME regex:\n```\n%s\n```\n", cstr_String(&filter->mimePattern));
+        iStringList *args = iClob(split_String(&filter->command, ";"));
+        if (isEmpty_StringList(args)) {
+            appendFormat_String(str, "\u26a0 Command not specified!\n");
+            continue;
+        }
+        const iString *exec = constAt_StringList(args, 0);
+        if (isEmpty_String(exec)) {
+            appendFormat_String(str, "\u26a0 Command not specified!\n");
+        }
+        else {
+            appendFormat_String(str, "Executable: %s\n```\n%s\n```\n",
+                                fileExists_FileInfo(exec) ? "" : "\u26a0 FILE NOT FOUND",
+                                cstr_String(exec));
+        }
+        index++;
+    }
+    return str;
+}
diff --git a/src/mimehooks.h b/src/mimehooks.h
index c78a3c86..6da14fdf 100644
--- a/src/mimehooks.h
+++ b/src/mimehooks.h
@@ -25,7 +25,9 @@ iDeclareTypeConstruction(MimeHooks)
 
 iBool       willTryFilter_MimeHooks (const iMimeHooks *, const iString *mime);
 iBlock *    tryFilter_MimeHooks     (const iMimeHooks *, const iString *mime,
-                                     const iBlock *body);
+                                     const iBlock *body, const iString *requestUrl);
 
 void        load_MimeHooks          (iMimeHooks *, const char *saveDir);
 void        save_MimeHooks          (const iMimeHooks *);
+
+const iString *debugInfo_MimeHooks  (const iMimeHooks *);
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index a6cc8187..7a297aa7 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -302,7 +302,7 @@ static int documentWidth_DocumentWidget_(const iDocumentWidget *d) {
     const iWidget *w      = constAs_Widget(d);
     const iRect    bounds = bounds_Widget(w);
     const iPrefs * prefs  = prefs_App();
-    return iMini(bounds.size.x - gap_UI * d->pageMargin * 2,
+    return iMini(iMax(50 * gap_UI, bounds.size.x - gap_UI * d->pageMargin * 2),
                  fontSize_UI * prefs->lineWidth * prefs->zoomPercent / 100);
 }
 
@@ -859,12 +859,13 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d, const iGmResponse
             while (nextSplit_Rangecc(mime, ";", &seg)) {
                 iRangecc param = seg;
                 trim_Rangecc(&param);
-                if (equal_Rangecc(param, "text/plain")) {
-                    docFormat = plainText_GmDocumentFormat;
+                if (equal_Rangecc(param, "text/gemini")) {
+                    docFormat = gemini_GmDocumentFormat;
                     setRange_String(&d->sourceMime, param);
                 }
-                else if (equal_Rangecc(param, "text/gemini")) {
-                    docFormat = gemini_GmDocumentFormat;
+                else if (startsWith_Rangecc(param, "text/") ||
+                         equal_Rangecc(param, "application/json")) {
+                    docFormat = plainText_GmDocumentFormat;
                     setRange_String(&d->sourceMime, param);
                 }
                 else if (startsWith_Rangecc(param, "image/") ||
@@ -1528,6 +1529,11 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         animatePlayers_DocumentWidget_(d);
         return iFalse;
     }
+    else if (equal_Command(cmd, "tab.created")) {
+        /* Space for tab buttons has changed. */
+        updateWindowTitle_DocumentWidget_(d);
+        return iFalse;
+    }
     else if (equal_Command(cmd, "server.showcert") && d == document_App()) {
         const char *unchecked      = red_ColorEscape "\u2610";
         const char *checked        = green_ColorEscape "\u2611";
@@ -2227,6 +2233,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                 if (d->menu) {
                     destroy_Widget(d->menu);
                 }
+                setFocus_Widget(NULL);
                 iArray items;
                 init_Array(&items, sizeof(iMenuItem));
                 if (d->contextLink) {
@@ -2909,6 +2916,7 @@ static void drawSideElements_DocumentWidget_(const iDocumentWidget *d) {
                             iMax(0, scrollMax_DocumentWidget_(d) - value_Anim(&d->scrollY)))),
             tmQuoteIcon_ColorId);
     }
+#if 0
     /* Outline on the right side. */
     const float outlineOpacity = value_Anim(&d->outlineOpacity);
     if (prefs_App()->hoverOutline && !isEmpty_Array(&d->outline) && outlineOpacity > 0.0f) {
@@ -2964,8 +2972,9 @@ static void drawSideElements_DocumentWidget_(const iDocumentWidget *d) {
         setOpacity_Text(1.0f);
         SDL_SetRenderDrawBlendMode(renderer_Window(get_Window()), SDL_BLENDMODE_NONE);
     }
+#endif
     unsetClip_Paint(&p);
-    }
+}
 
 static void drawPlayers_DocumentWidget_(const iDocumentWidget *d, iPaint *p) {
     iConstForEach(PtrArray, i, &d->visiblePlayers) {
@@ -2982,6 +2991,9 @@ static void draw_DocumentWidget_(const iDocumentWidget *d) {
     const iWidget *w        = constAs_Widget(d);
     const iRect    bounds   = bounds_Widget(w);
     iVisBuf *      visBuf   = d->visBuf; /* will be updated now */
+    if (width_Rect(bounds) <= 0) {
+        return;
+    }
     draw_Widget(w);
     allocVisBuffer_DocumentWidget_(d);
     const iRect ctxWidgetBounds = init_Rect(
diff --git a/src/ui/keys.h b/src/ui/keys.h
index cc56f8d1..8bcd4f53 100644
--- a/src/ui/keys.h
+++ b/src/ui/keys.h
@@ -36,6 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #   define navigateRoot_KeyShortcut     SDLK_UP,            KMOD_SHIFT | KMOD_PRIMARY
 #   define byWord_KeyModifier           KMOD_ALT
 #   define byLine_KeyModifier           KMOD_PRIMARY
+#   define rightSidebar_KeyModifier     KMOD_CTRL
 #   define subscribeToPage_KeyModifier  SDLK_d,             KMOD_SHIFT | KMOD_PRIMARY
 #else
 #   define reload_KeyShortcut           SDLK_r,             KMOD_PRIMARY
@@ -47,6 +48,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #   define navigateRoot_KeyShortcut     SDLK_UP,            KMOD_SHIFT | KMOD_ALT
 #   define byWord_KeyModifier           KMOD_CTRL
 #   define byLine_KeyModifier           0
+#   define rightSidebar_KeyModifier     KMOD_SHIFT | KMOD_CTRL
 #   define subscribeToPage_KeyModifier  SDLK_d,             KMOD_SHIFT | KMOD_PRIMARY
 #endif
 
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 5baa08f7..e6144744 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -84,7 +84,9 @@ iDefineObjectConstruction(SidebarItem)
 
 struct Impl_SidebarWidget {
     iWidget           widget;
+    enum iSidebarSide side;
     enum iSidebarMode mode;
+    iString           cmdPrefix;
     iWidget *         blank;
     iListWidget *     list;
     int               modeScroll[max_SidebarMode];
@@ -92,12 +94,11 @@ struct Impl_SidebarWidget {
     int               maxButtonLabelWidth;
     int               width;
     iWidget *         resizer;
-    SDL_Cursor *      resizeCursor;
     iWidget *         menu;
     iSidebarItem *    contextItem; /* list item accessed in the context menu */
 };
 
-iDefineObjectConstruction(SidebarWidget)
+iDefineObjectConstructionArgs(SidebarWidget, (enum iSidebarSide side), side)
 
 static iBool isResizing_SidebarWidget_(const iSidebarWidget *d) {
     return (flags_Widget(d->resizer) & pressed_WidgetFlag) != 0;
@@ -408,16 +409,19 @@ static const char *tightModeLabels_[max_SidebarMode] = {
     "\U0001f5b9",
 };
 
-void init_SidebarWidget(iSidebarWidget *d) {
+void init_SidebarWidget(iSidebarWidget *d, enum iSidebarSide side) {
     iWidget *w = as_Widget(d);
     init_Widget(w);
-    setId_Widget(w, "sidebar");
+    setId_Widget(w, side == left_SideBarSide ? "sidebar" : "sidebar2");
+    initCopy_String(&d->cmdPrefix, id_Widget(w));
+    appendChar_String(&d->cmdPrefix, '.');
     setBackgroundColor_Widget(w, none_ColorId);
     setFlags_Widget(w,
                     collapse_WidgetFlag | hidden_WidgetFlag | arrangeHorizontal_WidgetFlag |
                         resizeWidthOfChildren_WidgetFlag,
                     iTrue);
     iZap(d->modeScroll);
+    d->side = side;
     d->mode  = -1;
     d->width = 60 * gap_UI;
     setFlags_Widget(w, fixedWidth_WidgetFlag, iTrue);
@@ -428,8 +432,9 @@ void init_SidebarWidget(iSidebarWidget *d) {
     for (int i = 0; i < max_SidebarMode; i++) {
         d->modeButtons[i] = addChildFlags_Widget(
             buttons,
-            iClob(
-                new_LabelWidget(tightModeLabels_[i], format_CStr("sidebar.mode arg:%d", i))),
+            iClob(new_LabelWidget(
+                tightModeLabels_[i],
+                format_CStr("%s.mode arg:%d", cstr_String(id_Widget(w)), i))),
             frameless_WidgetFlag);
         d->maxButtonLabelWidth =
             iMaxi(d->maxButtonLabelWidth,
@@ -448,21 +453,22 @@ void init_SidebarWidget(iSidebarWidget *d) {
     addChildFlags_Widget(content, iClob(d->blank), resizeChildren_WidgetFlag);
     addChildFlags_Widget(vdiv, iClob(content), expand_WidgetFlag);
     setMode_SidebarWidget(d, bookmarks_SidebarMode);
-    d->resizer = addChildFlags_Widget(
-        w,
-        iClob(new_Widget()),
-        hover_WidgetFlag | commandOnClick_WidgetFlag | fixedWidth_WidgetFlag |
-            resizeToParentHeight_WidgetFlag | moveToParentRightEdge_WidgetFlag);
-    setId_Widget(d->resizer, "sidebar.grab");
+    d->resizer =
+        addChildFlags_Widget(w,
+                             iClob(new_Widget()),
+                             hover_WidgetFlag | commandOnClick_WidgetFlag | fixedWidth_WidgetFlag |
+                                 resizeToParentHeight_WidgetFlag |
+                                 (side == left_SideBarSide ? moveToParentRightEdge_WidgetFlag
+                                                           : moveToParentLeftEdge_WidgetFlag));
+    setId_Widget(d->resizer, side == left_SideBarSide ? "sidebar.grab" : "sidebar2.grab");
     d->resizer->rect.size.x = gap_UI;
     setBackgroundColor_Widget(d->resizer, none_ColorId);
-    d->resizeCursor = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZEWE);
     d->menu = NULL;
     addAction_Widget(w, SDLK_r, KMOD_PRIMARY | KMOD_SHIFT, "feeds.refresh");
 }
 
 void deinit_SidebarWidget(iSidebarWidget *d) {
-    SDL_FreeCursor(d->resizeCursor);
+    deinit_String(&d->cmdPrefix);
 }
 
 static const iGmIdentity *constHoverIdentity_SidebarWidget_(const iSidebarWidget *d) {
@@ -558,8 +564,11 @@ static void checkModeButtonLayout_SidebarWidget_(iSidebarWidget *d) {
 }
 
 void setWidth_SidebarWidget(iSidebarWidget *d, int width) {
-    iWidget *w = as_Widget(d);
-    width = iClamp(width, 30 * gap_UI, rootSize_Window(get_Window()).x - 50 * gap_UI);
+    iWidget * w = as_Widget(d);
+    /* Even less space if the other sidebar is visible, too. */
+    const int otherWidth =
+        width_Widget(findWidget_App(d->side == left_SideBarSide ? "sidebar2" : "sidebar"));
+    width = iClamp(width, 30 * gap_UI, rootSize_Window(get_Window()).x - 50 * gap_UI - otherWidth);
     d->width = width;
     if (isVisible_Widget(w)) {
         w->rect.size.x = width;
@@ -574,7 +583,8 @@ void setWidth_SidebarWidget(iSidebarWidget *d, int width) {
 
 iBool handleBookmarkEditorCommands_SidebarWidget_(iWidget *editor, const char *cmd) {
     if (equal_Command(cmd, "bmed.accept") || equal_Command(cmd, "cancel")) {
-        iSidebarWidget *d = findWidget_App("sidebar");
+        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")) {
             const iString *title = text_InputWidget(findChild_Widget(editor, "bmed.title"));
             const iString *url   = text_InputWidget(findChild_Widget(editor, "bmed.url"));
@@ -594,6 +604,43 @@ iBool handleBookmarkEditorCommands_SidebarWidget_(iWidget *editor, const char *c
     return iFalse;
 }
 
+static iBool handleSidebarCommand_SidebarWidget_(iSidebarWidget *d, const char *cmd) {
+    iWidget *w = as_Widget(d);
+    if (equal_Command(cmd, "width")) {
+        setWidth_SidebarWidget(d, arg_Command(cmd));
+        return iTrue;
+    }
+    else if (equal_Command(cmd, "mode")) {
+        const iBool wasChanged = setMode_SidebarWidget(d, arg_Command(cmd));
+        updateItems_SidebarWidget_(d);
+        if ((argLabel_Command(cmd, "show") && !isVisible_Widget(w)) ||
+            (argLabel_Command(cmd, "toggle") && (!isVisible_Widget(w) || !wasChanged))) {
+            postCommandf_App("%s.toggle", cstr_String(id_Widget(w)));
+        }
+        scrollOffset_ListWidget(d->list, 0);
+        return iTrue;
+    }
+    else if (equal_Command(cmd, "toggle")) {
+        if (arg_Command(cmd) && isVisible_Widget(w)) {
+            return iTrue;
+        }
+        setFlags_Widget(w, hidden_WidgetFlag, isVisible_Widget(w));
+        if (isVisible_Widget(w)) {
+            w->rect.size.x = d->width;
+            invalidate_ListWidget(d->list);
+        }
+        arrange_Widget(w->parent);
+        updateSize_DocumentWidget(document_App());
+        if (isVisible_Widget(w)) {
+            updateItems_SidebarWidget_(d);
+            scrollOffset_ListWidget(d->list, 0);
+        }
+        refresh_Widget(w->parent);
+        return iTrue;
+    }
+    return iFalse;
+}
+
 static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev) {
     iWidget *w = as_Widget(d);
     /* Handle commands. */
@@ -602,7 +649,27 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
     }
     else if (ev->type == SDL_USEREVENT && ev->user.code == command_UserEventCode) {
         const char *cmd = command_UserEvent(ev);
-        if (isCommand_Widget(w, ev, "mouse.clicked")) {
+        if (equal_Command(cmd, "tabs.changed") || equal_Command(cmd, "document.changed")) {
+            updateItems_SidebarWidget_(d);
+            scrollOffset_ListWidget(d->list, 0);
+        }
+        else if (equal_Command(cmd, "visited.changed") &&
+                 (d->mode == history_SidebarMode || d->mode == feeds_SidebarMode)) {
+            updateItems_SidebarWidget_(d);
+        }
+        else if (equal_Command(cmd, "bookmarks.changed") && (d->mode == bookmarks_SidebarMode ||
+                                                             d->mode == feeds_SidebarMode)) {
+            updateItems_SidebarWidget_(d);
+        }
+        else if (equal_Command(cmd, "idents.changed") && d->mode == identities_SidebarMode) {
+            updateItems_SidebarWidget_(d);
+        }
+        else if (startsWith_CStr(cmd, cstr_String(&d->cmdPrefix))) {
+            if (handleSidebarCommand_SidebarWidget_(d, cmd + size_String(&d->cmdPrefix))) {
+                return iTrue;
+            }
+        }
+        else if (isCommand_Widget(w, ev, "mouse.clicked")) {
             if (argLabel_Command(cmd, "button") == SDL_BUTTON_LEFT) {
                 if (arg_Command(cmd)) {
                     setFlags_Widget(d->resizer, pressed_WidgetFlag, iTrue);
@@ -624,7 +691,13 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
         else if (isCommand_Widget(w, ev, "mouse.moved")) {
             if (isResizing_SidebarWidget_(d)) {
                 const iInt2 local = localCoord_Widget(w, coord_Command(cmd));
-                setWidth_SidebarWidget(d, local.x + d->resizer->rect.size.x / 2);
+                const int resMid = d->resizer->rect.size.x / 2;
+                setWidth_SidebarWidget(
+                    d,
+                    (d->side == left_SideBarSide
+                         ? local.x
+                         : (rootSize_Window(get_Window()).x - coord_Command(cmd).x)) +
+                        resMid);
             }
             return iTrue;
         }
@@ -638,54 +711,19 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
         else if (isCommand_Widget(w, ev, "menu.closed")) {
             setFlags_Widget(as_Widget(d->list), disabled_WidgetFlag, iFalse);
         }
-        else if (equal_Command(cmd, "sidebar.width")) {
-            setWidth_SidebarWidget(d, arg_Command(cmd));
-            return iTrue;
-        }
-        else if (equal_Command(cmd, "sidebar.mode")) {
-            const iBool wasChanged = setMode_SidebarWidget(d, arg_Command(cmd));
-            updateItems_SidebarWidget_(d);
-            if ((argLabel_Command(cmd, "show") && !isVisible_Widget(w)) ||
-                (argLabel_Command(cmd, "toggle") && (!isVisible_Widget(w) || !wasChanged))) {
-                postCommand_App("sidebar.toggle");
-            }
-            scrollOffset_ListWidget(d->list, 0);
-            return iTrue;
-        }
-        else if (equal_Command(cmd, "sidebar.toggle")) {
-            if (arg_Command(cmd) && isVisible_Widget(w)) {
-                return iTrue;
-            }
-            setFlags_Widget(w, hidden_WidgetFlag, isVisible_Widget(w));
-            if (isVisible_Widget(w)) {
-                w->rect.size.x = d->width;
-                invalidate_ListWidget(d->list);
-            }
-            arrange_Widget(w->parent);
-            updateSize_DocumentWidget(document_App());
-            if (isVisible_Widget(w)) {
-                updateItems_SidebarWidget_(d);
-                scrollOffset_ListWidget(d->list, 0);
-            }
-            refresh_Widget(w->parent);
-            return iTrue;
-        }
-        else if (equal_Command(cmd, "tabs.changed") || equal_Command(cmd, "document.changed")) {
-            updateItems_SidebarWidget_(d);
-            scrollOffset_ListWidget(d->list, 0);
-        }
-        else if (equal_Command(cmd, "bookmark.copy")) {
+        else if (isCommand_Widget(w, ev, "bookmark.copy")) {
             const iSidebarItem *item = d->contextItem;
             if (d->mode == bookmarks_SidebarMode && item) {
                 SDL_SetClipboardText(cstr_String(&item->url));
             }
             return iTrue;
         }
-        else if (equal_Command(cmd, "bookmark.edit")) {
+        else if (isCommand_Widget(w, ev, "bookmark.edit")) {
             const iSidebarItem *item = d->contextItem;
             if (d->mode == bookmarks_SidebarMode && item) {
                 setFlags_Widget(w, disabled_WidgetFlag, iTrue);
                 iWidget *dlg = makeBookmarkEditor_Widget();
+                setId_Widget(dlg, format_CStr("bmed.%s", cstr_String(id_Widget(w))));
                 iBookmark *bm = get_Bookmarks(bookmarks_App(), item->id);
                 setText_InputWidget(findChild_Widget(dlg, "bmed.title"), &bm->title);
                 setText_InputWidget(findChild_Widget(dlg, "bmed.url"), &bm->url);
@@ -695,7 +733,7 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
             }
             return iTrue;
         }
-        else if (equal_Command(cmd, "bookmark.tag")) {
+        else if (isCommand_Widget(w, ev, "bookmark.tag")) {
             const iSidebarItem *item = d->contextItem;
             if (d->mode == bookmarks_SidebarMode && item) {
                 const char *tag = cstr_String(string_Command(cmd, "tag"));
@@ -713,7 +751,7 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
             }
             return iTrue;
         }
-        else if (equal_Command(cmd, "bookmark.delete")) {
+        else if (isCommand_Widget(w, ev, "bookmark.delete")) {
             const iSidebarItem *item = d->contextItem;
             if (d->mode == bookmarks_SidebarMode && item && remove_Bookmarks(bookmarks_App(), item->id)) {
                 removeEntries_Feeds(item->id);
@@ -721,10 +759,6 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
             }
             return iTrue;
         }
-        else if (equal_Command(cmd, "visited.changed") &&
-                 (d->mode == history_SidebarMode || d->mode == feeds_SidebarMode)) {
-            updateItems_SidebarWidget_(d);
-        }
         else if (equal_Command(cmd, "feeds.update.finished") && d->mode == feeds_SidebarMode) {
             updateItems_SidebarWidget_(d);
         }
@@ -742,11 +776,11 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
         else if (startsWith_CStr(cmd, "feed.entry.") && d->mode == feeds_SidebarMode) {
             const iSidebarItem *item = d->contextItem;
             if (item) {
-                if (equal_Command(cmd, "feed.entry.opentab")) {
+                if (isCommand_Widget(w, ev, "feed.entry.opentab")) {
                     postCommandf_App("open newtab:1 url:%s", cstr_String(&item->url));
                     return iTrue;
                 }
-                if (equal_Command(cmd, "feed.entry.toggleread")) {
+                if (isCommand_Widget(w, ev, "feed.entry.toggleread")) {
                     iVisited *vis = visited_App();
                     if (containsUrl_Visited(vis, &item->url)) {
                         removeUrl_Visited(vis, &item->url);
@@ -757,20 +791,21 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                     postCommand_App("visited.changed");
                     return iTrue;
                 }
-                if (equal_Command(cmd, "feed.entry.bookmark")) {
+                if (isCommand_Widget(w, ev, "feed.entry.bookmark")) {
                     makeBookmarkCreation_Widget(&item->url, &item->label, item->icon);
                     postCommand_App("focus.set id:bmed.title");
                     return iTrue;
                 }
                 iBookmark *feedBookmark = get_Bookmarks(bookmarks_App(), item->id);
                 if (feedBookmark) {
-                    if (equal_Command(cmd, "feed.entry.openfeed")) {
+                    if (isCommand_Widget(w, ev, "feed.entry.openfeed")) {
                         postCommandf_App("open url:%s", cstr_String(&feedBookmark->url));
                         return iTrue;
                     }
-                    if (equal_Command(cmd, "feed.entry.edit")) {
+                    if (isCommand_Widget(w, ev, "feed.entry.edit")) {
                         setFlags_Widget(w, disabled_WidgetFlag, iTrue);
                         iWidget *dlg = makeBookmarkEditor_Widget();
+                        setId_Widget(dlg, format_CStr("bmed.%s", cstr_String(id_Widget(w))));
                         setText_InputWidget(findChild_Widget(dlg, "bmed.title"), &feedBookmark->title);
                         setText_InputWidget(findChild_Widget(dlg, "bmed.url"), &feedBookmark->url);
                         setText_InputWidget(findChild_Widget(dlg, "bmed.tags"), &feedBookmark->tags);
@@ -778,7 +813,7 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                         setFocus_Widget(findChild_Widget(dlg, "bmed.title"));
                         return iTrue;
                     }
-                    if (equal_Command(cmd, "feed.entry.unsubscribe")) {
+                    if (isCommand_Widget(w, ev, "feed.entry.unsubscribe")) {
                         if (arg_Command(cmd)) {
                             removeTag_Bookmark(feedBookmark, "subscribed");
                             removeEntries_Feeds(id_Bookmark(feedBookmark));
@@ -791,7 +826,9 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                                             cstr_String(&feedBookmark->title)),
                                 (const char *[]){ "Cancel",
                                                   uiTextCaution_ColorEscape "Unsubscribe" },
-                                (const char *[]){ "cancel", "feed.entry.unsubscribe arg:1" },
+                                (const char *[]){
+                                    "cancel",
+                                    format_CStr("!feed.entry.unsubscribe arg:1 ptr:%p", d) },
                                 2);
                         }
                         return iTrue;
@@ -799,13 +836,6 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                 }
             }
         }
-        else if (equal_Command(cmd, "bookmarks.changed") && (d->mode == bookmarks_SidebarMode ||
-                                                             d->mode == feeds_SidebarMode)) {
-            updateItems_SidebarWidget_(d);
-        }
-        else if (equal_Command(cmd, "idents.changed") && d->mode == identities_SidebarMode) {
-            updateItems_SidebarWidget_(d);
-        }
         else if (isCommand_Widget(w, ev, "ident.use")) {
             iGmIdentity *  ident  = menuIdentity_SidebarWidget_(d);
             const iString *tabUrl = url_DocumentWidget(document_App());
@@ -843,7 +873,7 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
             }
             return iTrue;
         }
-        else if (equal_Command(cmd, "ident.setnotes")) {
+        else if (isCommand_Widget(w, ev, "ident.setnotes")) {
             iGmIdentity *ident = pointerLabel_Command(cmd, "ident");
             if (ident) {
                 setCStr_String(&ident->notes, suffixPtr_Command(cmd, "value"));
@@ -864,27 +894,27 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
             }
             return iTrue;
         }
-        else if (equal_Command(cmd, "ident.delete")) {
+        else if (isCommand_Widget(w, ev, "ident.delete")) {
             iSidebarItem *item = d->contextItem;
             if (argLabel_Command(cmd, "confirm")) {
-                makeQuestion_Widget(uiTextCaution_ColorEscape "DELETE IDENTITY",
-                                    format_CStr("Do you really want to delete the identity\n"
-                                                uiTextAction_ColorEscape "%s\n"
-                                                uiText_ColorEscape
-                                                "including its certificate and private key files?",
-                                                cstr_String(&item->label)),
-                                    (const char *[]){ "Cancel",
-                                                      uiTextCaution_ColorEscape
-                                                      "Delete Identity and Files" },
-                                    (const char *[]){ "cancel", "ident.delete confirm:0" },
-                                    2);
+                makeQuestion_Widget(
+                    uiTextCaution_ColorEscape "DELETE IDENTITY",
+                    format_CStr(
+                        "Do you really want to delete the identity\n" uiTextAction_ColorEscape
+                        "%s\n" uiText_ColorEscape
+                        "including its certificate and private key files?",
+                        cstr_String(&item->label)),
+                    (const char *[]){ "Cancel",
+                                      uiTextCaution_ColorEscape "Delete Identity and Files" },
+                    (const char *[]){ "cancel", format_CStr("!ident.delete confirm:0 ptr:%p", d) },
+                    2);
                 return iTrue;
             }
             deleteIdentity_GmCerts(certs_App(), hoverIdentity_SidebarWidget_(d));
-            updateItems_SidebarWidget_(d);
+            postCommand_App("idents.changed");
             return iTrue;
         }
-        else if (equal_Command(cmd, "history.delete")) {
+        else if (isCommand_Widget(w, ev, "history.delete")) {
             if (d->contextItem && !isEmpty_String(&d->contextItem->url)) {
                 removeUrl_Visited(visited_App(), &d->contextItem->url);
                 updateItems_SidebarWidget_(d);
@@ -892,14 +922,14 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
             }
             return iTrue;
         }
-        else if (equal_Command(cmd, "history.copy")) {
+        else if (isCommand_Widget(w, ev, "history.copy")) {
             const iSidebarItem *item = d->contextItem;
             if (item && !isEmpty_String(&item->url)) {
                 SDL_SetClipboardText(cstr_String(&item->url));
             }
             return iTrue;
         }
-        else if (equal_Command(cmd, "history.addbookmark")) {
+        else if (isCommand_Widget(w, ev, "history.addbookmark")) {
             const iSidebarItem *item = d->contextItem;
             if (!isEmpty_String(&item->url)) {
                 makeBookmarkCreation_Widget(
diff --git a/src/ui/sidebarwidget.h b/src/ui/sidebarwidget.h
index 0d4ed9c8..fa74e049 100644
--- a/src/ui/sidebarwidget.h
+++ b/src/ui/sidebarwidget.h
@@ -33,8 +33,13 @@ enum iSidebarMode {
     max_SidebarMode
 };
 
+enum iSidebarSide {
+    left_SideBarSide,
+    right_SideBarSide,
+};
+
 iDeclareWidgetClass(SidebarWidget)
-iDeclareObjectConstruction(SidebarWidget)
+iDeclareObjectConstructionArgs(SidebarWidget, enum iSidebarSide side)
 
 iBool               setMode_SidebarWidget   (iSidebarWidget *, enum iSidebarMode mode);
 
diff --git a/src/ui/text.c b/src/ui/text.c
index 686927b1..ae4b1714 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -85,7 +85,7 @@ iDefineTypeConstructionArgs(Glyph, (iChar ch), ch)
 struct Impl_Font {
     iBlock *       data;
     stbtt_fontinfo font;
-    float          scale;
+    float          xScale, yScale;
     int            vertOffset; /* offset due to scaling */
     int            height;
     int            baseline;
@@ -100,21 +100,33 @@ struct Impl_Font {
 
 static iFont *font_Text_(enum iFontId id);
 
-static void init_Font(iFont *d, const iBlock *data, int height, float scale, enum iFontId symbolsFont) {
+static void init_Font(iFont *d, const iBlock *data, int height, float scale,
+                      enum iFontId symbolsFont, iBool isMonospaced) {
     init_Hash(&d->glyphs);
     d->data = NULL;
+    d->isMonospaced = isMonospaced;
     d->height = height;
     iZap(d->font);
     stbtt_InitFont(&d->font, constData_Block(data), 0);
-    d->scale = stbtt_ScaleForPixelHeight(&d->font, height) * scale;
+    d->xScale = d->yScale = stbtt_ScaleForPixelHeight(&d->font, height) * scale;
+    if (d->isMonospaced) {
+        /* It is important that monospaced fonts align 1:1 with the pixel grid so that
+           box-drawing characters don't have partially occupied edge pixels, leading to seams
+           between adjacent glyphs. */
+        int adv;
+        stbtt_GetCodepointHMetrics(&d->font, 'M', &adv, NULL);
+        const float advance = (float) adv * d->xScale;
+        if (advance > 4) { /* not too tiny */
+            d->xScale *= floorf(advance) / advance;
+        }
+    }
     d->vertOffset = height * (1.0f - scale) / 2;
     int ascent;
     stbtt_GetFontVMetrics(&d->font, &ascent, NULL, NULL);
-    d->baseline     = (int) ascent * d->scale;
+    d->baseline     = ceil(ascent * d->yScale);
     d->symbolsFont  = symbolsFont;
     d->japaneseFont = regularJapanese_FontId;
     d->koreanFont   = regularKorean_FontId;
-    d->isMonospaced = iFalse;
     memset(d->indexTable, 0xff, sizeof(d->indexTable));
 }
 
@@ -271,11 +283,12 @@ static void initFonts_Text_(iText *d) {
     };
     iForIndices(i, fontData) {
         iFont *font = &d->fonts[i];
-        init_Font(
-            font, fontData[i].ttf, fontData[i].size, fontData[i].scaling, fontData[i].symbolsFont);
-        if (fontData[i].ttf == &fontFiraMonoRegular_Embedded) {
-            font->isMonospaced = iTrue;
-        }
+        init_Font(font,
+                  fontData[i].ttf,
+                  fontData[i].size,
+                  fontData[i].scaling,
+                  fontData[i].symbolsFont,
+                  fontData[i].ttf == &fontFiraMonoRegular_Embedded);
         if (i == default_FontId || i == defaultMedium_FontId) {
             font->manualKernOnly = iTrue;
         }
@@ -423,7 +436,7 @@ static void freeBmp_(void *ptr) {
 static SDL_Surface *rasterizeGlyph_Font_(const iFont *d, uint32_t glyphIndex, float xShift) {
     int w, h;
     uint8_t *bmp = stbtt_GetGlyphBitmapSubpixel(
-        &d->font, d->scale, d->scale, xShift, 0.0f, glyphIndex, &w, &h, 0, 0);
+        &d->font, d->xScale, d->yScale, xShift, 0.0f, glyphIndex, &w, &h, 0, 0);
     collect_Garbage(bmp, freeBmp_); /* `bmp` must be freed afterwards. */
     SDL_Surface *surface8 =
         SDL_CreateRGBSurfaceWithFormatFrom(bmp, w, h, 8, w, SDL_PIXELFORMAT_INDEX8);
@@ -478,12 +491,12 @@ static void cache_Font_(iFont *d, iGlyph *glyph, int hoff) {
             int adv;
             const uint32_t gIndex = glyph->glyphIndex;
             stbtt_GetGlyphHMetrics(&d->font, gIndex, &adv, NULL);
-            glyph->advance = d->scale * adv;
+            glyph->advance = d->xScale * adv;
         }
         stbtt_GetGlyphBitmapBoxSubpixel(&d->font,
                                         glyph->glyphIndex,
-                                        d->scale,
-                                        d->scale,
+                                        d->xScale,
+                                        d->yScale,
                                         hoff * 0.5f,
                                         0.0f,
                                         &glyph->d[hoff].x,
@@ -652,6 +665,17 @@ static iRect run_Font_(iFont *d, enum iRunMode mode, iRangecc text, size_t maxLe
             }
         }
         iChar ch = nextChar_(&chPos, text.end);
+        if (ch == 0x200d) { /* zero-width joiner */
+            /* We don't have the composited Emojis. */
+            if (isEmoji_Char(prevCh)) {
+                /* skip */
+                ch = nextChar_(&chPos, text.end);
+                ch = nextChar_(&chPos, text.end);
+            }
+            else {
+                printf("it's %x\n", prevCh);
+            }
+        }
         if (isVariationSelector_Char(ch)) {
             /* TODO: VS15: Should peek ahead for this and prefer the Emoji font. */
             ch = nextChar_(&chPos, text.end); /* just ignore */
@@ -699,6 +723,9 @@ static iRect run_Font_(iFont *d, enum iRunMode mode, iRangecc text, size_t maxLe
                 prevCh = 0;
                 continue;
             }
+            if (isDefaultIgnorable_Char(ch) || isFitzpatrickType_Char(ch)) {
+                continue;
+            }
         }
         const iGlyph *glyph = glyph_Font_(d, ch);
         int x1 = xpos;
@@ -714,6 +741,7 @@ static iRect run_Font_(iFont *d, enum iRunMode mode, iRangecc text, size_t maxLe
             }
             break;
         }
+        const int yLineMax = pos.y + d->height;
         SDL_Rect dst = { x1 + glyph->d[hoff].x,
                          pos.y + glyph->font->baseline + glyph->d[hoff].y,
                          glyph->rect[hoff].size.x,
@@ -739,7 +767,16 @@ static iRect run_Font_(iFont *d, enum iRunMode mode, iRangecc text, size_t maxLe
                 /* Glyphs from a different font may need recentering to look better. */
                 dst.x -= (dst.w - advance) / 2;
             }
-            SDL_RenderCopy(text_.render, text_.cache, (const SDL_Rect *) &glyph->rect[hoff], &dst);
+            SDL_Rect src;
+            memcpy(&src, &glyph->rect[hoff], sizeof(SDL_Rect));
+            /* Clip the glyphs to the font's height. This is useful when the font's line spacing
+               has been reduced or when the glyph is from a different font. */
+            if (dst.y + dst.h > yLineMax) {
+                const int over = dst.y + dst.h - yLineMax;
+                src.h -= over;
+                dst.h -= over;
+            }
+            SDL_RenderCopy(text_.render, text_.cache, &src, &dst);
         }
         /* Symbols and emojis are NOT monospaced, so must conform when the primary font
            is monospaced. Except with Japanese script, that's larger than the normal monospace. */
@@ -755,7 +792,7 @@ static iRect run_Font_(iFont *d, enum iRunMode mode, iRangecc text, size_t maxLe
             const char *peek = chPos;
             const iChar next = nextChar_(&peek, text.end);
             if (enableKerning_Text && !d->manualKernOnly && next) {
-                xpos += d->scale * stbtt_GetGlyphKernAdvance(&d->font, glyph->glyphIndex, next);
+                xpos += d->xScale * stbtt_GetGlyphKernAdvance(&d->font, glyph->glyphIndex, next);
             }
         }
 #endif
@@ -977,7 +1014,7 @@ iString *renderBlockChars_Text(const iBlock *fontData, int height, enum iTextBlo
     size_t      strRemain = length_String(text);
     iConstForEach(String, i, text) {
         if (!strRemain) break;
-        if (i.value == variationSelectorEmoji_Char) {
+        if (isVariationSelector_Char(i.value) || isDefaultIgnorable_Char(i.value)) {
             strRemain--;
             continue;
         }
diff --git a/src/ui/text.h b/src/ui/text.h
index 5bae8e2a..a0b2dc1a 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -114,11 +114,21 @@ enum iFontId {
 iLocalDef iBool isJapanese_FontId(enum iFontId id) {
     return id >= defaultJapanese_FontId && id <= hugeJapanese_FontId;
 }
-iLocalDef iBool isVariationSelector_Char(iChar ch) {
-    return ch >= 0xfe00 && ch <= 0xfe0f;
+iLocalDef iBool isVariationSelector_Char(iChar c) {
+    return (c >= 0xfe00 && c <= 0xfe0f) || (c >= 0xe0100 && c <= 0xe0121);
+}
+iLocalDef iBool isFitzpatrickType_Char(iChar c) {
+    return c >= 0x1f3fb && c <= 0x1f3ff;
+}
+iLocalDef iBool isDefaultIgnorable_Char(iChar c) {
+    return c == 0x115f || (c >= 0x200b && c <= 0x200e) || c == 0x2060 || c == 0x2061 ||
+           c == 0xfeff;
+}
+iLocalDef iBool isEmoji_Char(iChar c) {
+    return (c >= 0x1f300 && c < 0x1f700) || (c >= 0x1f900 && c <= 0x1f9ff);
 }
 
-#define variationSelectorEmoji_Char     ((iChar) 0xfe0f)
+#define emojiVariationSelector_Char     ((iChar) 0xfe0f)
 
 enum iTextFont {
     nunito_TextFont,
diff --git a/src/ui/util.c b/src/ui/util.c
index d9997004..1ad3f30e 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -456,14 +456,14 @@ void openMenu_Widget(iWidget *d, iInt2 coord) {
     if (leftExcess > 0) {
         d->rect.pos.x += leftExcess;
     }
-    refresh_App();
+    postRefresh_App();
     postCommand_Widget(d, "menu.opened");
 }
 
 void closeMenu_Widget(iWidget *d) {
     setFlags_Widget(d, hidden_WidgetFlag, iTrue);
     setFlags_Widget(findChild_Widget(d, "menu.cancel"), disabled_WidgetFlag, iTrue);
-    refresh_App();
+    postRefresh_App();
     postCommand_Widget(d, "menu.closed");
 }
 
@@ -1031,8 +1031,8 @@ iWidget *makePreferences_Widget(void) {
         appendTwoColumnPage_(tabs, "General", '1', &headings, &values);
         addChild_Widget(headings, iClob(makeHeading_Widget("Downloads folder:")));
         setId_Widget(addChild_Widget(values, iClob(new_InputWidget(0))), "prefs.downloads");
-        addChild_Widget(headings, iClob(makeHeading_Widget("Outline on scrollbar:")));
-        addChild_Widget(values, iClob(makeToggle_Widget("prefs.hoveroutline")));
+        /*addChild_Widget(headings, iClob(makeHeading_Widget("Outline on scrollbar:")));
+        addChild_Widget(values, iClob(makeToggle_Widget("prefs.hoveroutline")));*/
         addChild_Widget(headings, iClob(makeHeading_Widget("Smooth scrolling:")));
         addChild_Widget(values, iClob(makeToggle_Widget("prefs.smoothscroll")));
         addChild_Widget(headings, iClob(makeHeading_Widget("Load image on scroll:")));
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 4d50da38..f3e73ee7 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -263,10 +263,13 @@ void arrange_Widget(iWidget *d) {
         setFlags_Widget(d, wasCollapsed_WidgetFlag, iTrue);
         return;
     }
-    if (d->flags & moveToParentRightEdge_WidgetFlag) {
+    if (d->flags & moveToParentLeftEdge_WidgetFlag) {
+        d->rect.pos.x = d->padding[0];
+    }
+    else if (d->flags & moveToParentRightEdge_WidgetFlag) {
         d->rect.pos.x = width_Rect(innerRect_Widget_(d->parent)) - width_Rect(d->rect);
     }
-    if (d->flags & centerHorizontal_WidgetFlag) {
+    else if (d->flags & centerHorizontal_WidgetFlag) {
         centerHorizontal_Widget_(d);
     }
     if (d->flags & resizeToParentWidth_WidgetFlag) {
@@ -388,7 +391,8 @@ void arrange_Widget(iWidget *d) {
             continue;
         }
         if (d->flags & (arrangeHorizontal_WidgetFlag | arrangeVertical_WidgetFlag)) {
-            if (child->flags & moveToParentRightEdge_WidgetFlag) {
+            if (child->flags &
+                (moveToParentLeftEdge_WidgetFlag | moveToParentRightEdge_WidgetFlag)) {
                 continue; /* Not part of the sequential arrangement .*/
             }
             child->rect.pos = pos;
@@ -422,7 +426,8 @@ void arrange_Widget(iWidget *d) {
             iForEach(ObjectList, j, d->children) {
                 iWidget *child = as_Widget(j.object);
                 if (child->flags &
-                    (resizeToParentWidth_WidgetFlag | moveToParentRightEdge_WidgetFlag)) {
+                    (resizeToParentWidth_WidgetFlag | moveToParentLeftEdge_WidgetFlag |
+                     moveToParentRightEdge_WidgetFlag)) {
                     arrange_Widget(child);
                 }
             }
diff --git a/src/ui/widget.h b/src/ui/widget.h
index 278ae081..f06a6607 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -85,10 +85,11 @@ enum iWidgetFlag {
 /* 64-bit extended flags */
 #define wasCollapsed_WidgetFlag             iBit64(32)
 #define centerHorizontal_WidgetFlag         iBit64(33)
-#define moveToParentRightEdge_WidgetFlag    iBit64(34)
-#define wrapText_WidgetFlag                 iBit64(35)
-#define borderTop_WidgetFlag                iBit64(36)
-#define overflowScrollable_WidgetFlag       iBit64(37)
+#define moveToParentLeftEdge_WidgetFlag     iBit64(34)
+#define moveToParentRightEdge_WidgetFlag    iBit64(35)
+#define wrapText_WidgetFlag                 iBit64(36)
+#define borderTop_WidgetFlag                iBit64(37)
+#define overflowScrollable_WidgetFlag       iBit64(38)
 
 enum iWidgetAddPos {
     back_WidgetAddPos,
diff --git a/src/ui/window.c b/src/ui/window.c
index 199e35a7..1bf9065e 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -109,7 +109,8 @@ static const iMenuItem navMenuItems_[] = {
     { "---", 0, 0, NULL },
     { "Show Feed Entries", 0, 0, "!open url:about:feeds" },
     { "---", 0, 0, NULL },
-    { "Toggle Sidebar", SDLK_l, KMOD_PRIMARY | KMOD_SHIFT, "sidebar.toggle" },
+    { "Toggle Left Sidebar", SDLK_l, KMOD_PRIMARY | KMOD_SHIFT, "sidebar.toggle" },
+    { "Toggle Right Sidebar", SDLK_p, KMOD_PRIMARY | KMOD_SHIFT, "sidebar2.toggle" },
     { "Zoom In", SDLK_EQUALS, KMOD_PRIMARY, "zoom.delta arg:10" },
     { "Zoom Out", SDLK_MINUS, KMOD_PRIMARY, "zoom.delta arg:-10" },
     { "Reset Zoom", SDLK_0, KMOD_PRIMARY, "zoom.set arg:100" },
@@ -144,7 +145,8 @@ static const iMenuItem viewMenuItems_[] = {
     { "Show History", '3', KMOD_PRIMARY, "sidebar.mode arg:2 toggle:1" },
     { "Show Identities", '4', KMOD_PRIMARY, "sidebar.mode arg:3 toggle:1" },
     { "Show Page Outline", '5', KMOD_PRIMARY, "sidebar.mode arg:4 toggle:1" },
-    { "Toggle Sidebar", SDLK_l, KMOD_PRIMARY | KMOD_SHIFT, "sidebar.toggle" },
+    { "Toggle Left Sidebar", SDLK_l, KMOD_PRIMARY | KMOD_SHIFT, "sidebar.toggle" },
+    { "Toggle Right Sidebar", SDLK_p, KMOD_PRIMARY | KMOD_SHIFT, "sidebar2.toggle" },
     { "---", 0, 0, NULL },
     { "Go Back", SDLK_LEFTBRACKET, KMOD_PRIMARY, "navigate.back" },
     { "Go Forward", SDLK_RIGHTBRACKET, KMOD_PRIMARY, "navigate.forward" },
@@ -343,7 +345,7 @@ static iBool handleSearchBarCommands_(iWidget *searchBar, const char *cmd) {
             if (!isVisible_Widget(searchBar)) {
                 setFlags_Widget(searchBar, hidden_WidgetFlag | disabled_WidgetFlag, iFalse);
                 arrange_Widget(get_Window()->root);
-                refresh_App();
+                postRefresh_App();
             }
         }
     }
@@ -459,10 +461,12 @@ static void setupUserInterface_Window(iWindow *d) {
             addChild_Widget(buttons, iClob(newIcon_LabelWidget("\u2795", 0, 0, "tabs.new"))),
             "newtab");
     }
-    /* Side bar. */ {
+    /* Side bars. */ {
         iWidget *content = findChild_Widget(d->root, "tabs.content");
-        iSidebarWidget *sidebar = new_SidebarWidget();
-        addChildPos_Widget(content, iClob(sidebar), front_WidgetAddPos);
+        iSidebarWidget *sidebar1 = new_SidebarWidget(left_SideBarSide);
+        addChildPos_Widget(content, iClob(sidebar1), front_WidgetAddPos);
+        iSidebarWidget *sidebar2 = new_SidebarWidget(right_SideBarSide);
+        addChildPos_Widget(content, iClob(sidebar2), back_WidgetAddPos);
     }
     /* Lookup results. */ {
         iLookupWidget *lookup = new_LookupWidget();
@@ -507,6 +511,11 @@ static void setupUserInterface_Window(iWindow *d) {
         addAction_Widget(d->root, '3', KMOD_PRIMARY, "sidebar.mode arg:2 toggle:1");
         addAction_Widget(d->root, '4', KMOD_PRIMARY, "sidebar.mode arg:3 toggle:1");
         addAction_Widget(d->root, '5', KMOD_PRIMARY, "sidebar.mode arg:4 toggle:1");
+        addAction_Widget(d->root, '1', rightSidebar_KeyModifier, "sidebar2.mode arg:0 toggle:1");
+        addAction_Widget(d->root, '2', rightSidebar_KeyModifier, "sidebar2.mode arg:1 toggle:1");
+        addAction_Widget(d->root, '3', rightSidebar_KeyModifier, "sidebar2.mode arg:2 toggle:1");
+        addAction_Widget(d->root, '4', rightSidebar_KeyModifier, "sidebar2.mode arg:3 toggle:1");
+        addAction_Widget(d->root, '5', rightSidebar_KeyModifier, "sidebar2.mode arg:4 toggle:1");
     }
 }