59 files changed, 3990 insertions, 659 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab57900e..a5b41da3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,10 @@ project (Lagrange
 )
 set (COPYRIGHT_YEAR 2020)
+# Build configuration.
+option (ENABLE_KERNING "Enable kerning in font renderer (slower)" ON)
+option (ENABLE_RESOURCE_EMBED "Embed resources inside the executable" OFF)
 include (Embed.cmake)
 find_package (the_Foundation REQUIRED)
 find_package (PkgConfig REQUIRED)
@@ -15,11 +19,10 @@ pkg_check_modules (SDL2 REQUIRED sdl2)
 # Embedded resources are written to a generated source file.
 message (STATUS "Preparing embedded resources...")
 # Fonts are too large to comfortably embed as a C source.
-set (EMBED_IN_EXECUTABLE OFF CACHE BOOL "Embed resources inside the executable")
 set (EMBED_RESOURCES 
-    res/about.gmi
+    res/about/help.gmi
-    res/help.gmi
+    res/about/lagrange.gmi
-    res/version.gmi
+    res/about/version.gmi
    res/SourceSansPro-Regular.ttf
    res/FiraSans-Regular.ttf
    res/FiraSans-Bold.ttf
@@ -34,12 +37,12 @@ set (EMBED_RESOURCES
 endif ()
 embed_make (${EMBED_RESOURCES})
-set (EMB_BIN ${CMAKE_CURRENT_BINARY_DIR}/resources.bin)
+set (EMB_BIN ${CMAKE_CURRENT_BINARY_DIR}/resources.binary)
 set_source_files_properties (${EMB_BIN} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
 # Source files.
 set (SOURCES
-    ${CMAKE_CURRENT_BINARY_DIR}/resources.bin
+    ${CMAKE_CURRENT_BINARY_DIR}/resources.binary
    ${CMAKE_CURRENT_BINARY_DIR}/embedded.c
    ${CMAKE_CURRENT_BINARY_DIR}/embedded.h
    src/main.c
@@ -92,7 +95,7 @@ set (SOURCES
 )
 if (IOS)
 elseif (APPLE)
-    list (APPEND SOURCES src/ui/macos.m src/ui/macos.h)
+    list (APPEND SOURCES src/macos.m src/macos.h)
    list (APPEND RESOURCES "res/Lagrange.icns")
 endif ()
 if (MSYS)
@@ -113,9 +116,13 @@ target_include_directories (app PUBLIC
 )
 target_compile_options (app PUBLIC
    -Werror=implicit-function-declaration
+    -Werror=incompatible-pointer-types
    ${SDL2_CFLAGS}
 )
 target_compile_definitions (app PUBLIC LAGRANGE_APP_VERSION="${PROJECT_VERSION}")
+if (ENABLE_KERNING)
+    target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_KERNING=1)
+endif ()
 target_link_libraries (app PUBLIC the_Foundation::the_Foundation)
 target_link_libraries (app PUBLIC ${SDL2_LDFLAGS})
 if (APPLE)
@@ -145,7 +152,7 @@ endif ()
 # Deployment.
 if (MSYS)
    install (TARGETS app DESTINATION .)
-    if (NOT EMBED_IN_EXECUTABLE)
+    if (NOT ENABLE_RESOURCE_EMBED)
        install (FILES ${EMB_BIN} DESTINATION .)
    endif ()
    install (PROGRAMS 
@@ -172,7 +179,7 @@ Icon=fi.skyjake.lagrange")
         DESTINATION share/icons/hicolor/256x256/apps
         RENAME fi.skyjake.lagrange.png
    )
-    if (NOT EMBED_IN_EXECUTABLE)
+    if (NOT ENABLE_RESOURCE_EMBED)
        install (FILES ${EMB_BIN} DESTINATION share/lagrange)
    endif ()
 endif ()
diff --git a/Embed.cmake b/Embed.cmake
index 4d51f418..c75f19e4 100644
--- a/Embed.cmake
+++ b/Embed.cmake
@@ -2,9 +2,9 @@
 # Copyright: 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
 # License: BSD 2-Clause
-option (EMBED_IN_EXECUTABLE "Embed resources inside the executable" OFF)
+option (ENABLE_RESOURCE_EMBED "Embed resources inside the executable" OFF)
 # Note: If disabled, the Unix "cat" tool is required for concatenating
-# the resources into a single "resources.bin" file.
+# the resources into a single "resources.binary" file.
 function (embed_getname output fn)
    get_filename_component (name ${fn} NAME_WE)
@@ -57,7 +57,7 @@ endfunction (embed_filesize)
 function (embed_make)
    set (EMB_H ${CMAKE_CURRENT_BINARY_DIR}/embedded.h)
    set (EMB_C ${CMAKE_CURRENT_BINARY_DIR}/embedded.c)
-    if (EMBED_IN_EXECUTABLE)
+    if (ENABLE_RESOURCE_EMBED)
        set (needGen NO)
        if (NOT EXISTS ${EMB_H} OR NOT EXISTS ${EMB_C})
            set (needGen YES)
@@ -75,7 +75,7 @@ function (embed_make)
        set (needGen YES)
    endif ()
    if (needGen)
-        if (EMBED_IN_EXECUTABLE)
+        if (ENABLE_RESOURCE_EMBED)
            # Compose a source file with the resource data in an array.
            file (WRITE ${EMB_H} "#include <the_Foundation/block.h>\n")
            file (WRITE ${EMB_C} "#include \"embedded.h\"\n")
@@ -85,7 +85,7 @@ function (embed_make)
            endforeach (fn)
        else ()
            # Collect resources in a single binary file.
-            set (EMB_BIN ${CMAKE_CURRENT_BINARY_DIR}/resources.bin)
+            set (EMB_BIN ${CMAKE_CURRENT_BINARY_DIR}/resources.binary)
            file (REMOVE ${EMB_BIN})
            execute_process (COMMAND cat ${ARGV} OUTPUT_FILE ${EMB_BIN}
                WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
diff --git a/LICENSE.md b/LICENSE.md
new file mode 100644
index 00000000..4de431cf
--- /dev/null
+++ b/LICENSE.md
@@ -0,0 +1,13 @@
+# BSD 2-Clause License
+**Copyright 2020 Jaakko Keränen (jaakko.keranen@iki.fi)**
+All rights reserved.
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/res/MacOSXBundleInfo.plist.in b/res/MacOSXBundleInfo.plist.in
index 74b1662e..07a596aa 100644
--- a/res/MacOSXBundleInfo.plist.in
+++ b/res/MacOSXBundleInfo.plist.in
@@ -38,7 +38,8 @@
                        <key>CFBundleTypeExtensions</key>
                        <array>
                                <string>gmi</string>
-                        </array>
+                                <string>gemini</string>
+                        </array>
                        <key>CFBundleTypeIconFile</key>
                        <string>text-gemini.icns</string>
                        <key>CFBundleTypeName</key>
diff --git a/res/Symbola.ttf b/res/Symbola.ttf
index 59e428fe..f4bb1b7b 100644
--- a/res/Symbola.ttf
+++ b/res/Symbola.ttf
Binary files differ
diff --git a/res/about/help.gmi b/res/about/help.gmi
new file mode 100644
index 00000000..11c76931
--- /dev/null
+++ b/res/about/help.gmi
@@ -0,0 +1,147 @@
+```
+           __   __             __   ___
+|     /\  / _` |__)  /\  |\ | / _` |__
+|___ /~~\ \__> |  \ /~~\ | \| \__> |___
+```
+# Introduction
+## What is Lagrange
+Lagrange is a GUI client for browsing Geminispace. It offers modern conveniences familiar from web browsers, such as smooth scrolling, inline image viewing, multiple tabs, visual themes, Unicode fonts, bookmarks, history, and page outlines.
+Lagrange relies on a minimal set of dependencies. It is written in C and uses SDL for window management and hardware-accelerated graphics. OpenSSL is used for secure communications.
+=> https://www.libsdl.org   SDL: Simple DirectMedia Layer
+=> https://www.openssl.org  OpenSSL: Cryptography and SSL/TLS Toolkit
+## What is Gemini
+Gemini is a simple protocol for serving content over the internet. It specifies a Markdown inspired format allowing basic plain text document markup. Compared to HTTP and HTML, Gemini is vastly simpler and easier to work with.
+=> gemini://gemini.circumlunar.space/docs/faq.gmi Project Gemini FAQ
+=> gemini://gemini.circumlunar.space/docs/specification.gmi Protocol and text/gemini specification
+## Why not just use a web browser
+Modern web browsers are complex beasts. In fact, they are so complex that one can create a fully functional virtual machine inside one and run another operating system!
+=> https://win95.ajf.me Windows 95 on DOSBox (using Emscripten)
+If one seeks to just read text and view images, this is absurd overkill. While having a universal platform that runs on everything and everywhere is clearly a valuable notion, it comes with a hefty price tag. The software stack towers ever higher, and similarly hardware needs to be ever more powerful and complicated to run it well. But everything happening over the internet doesn't have to be on this behemoth.
+One way to browse Gemini content is via web browser extensions or proxies that translate the content for the web. This may be a sufficient and easy solution for you. However, native clients such as Lagrange also benefit from the simpleness of the protocol and the content. The experience can be optimized, and the software runs well even on simple hardware like the Raspberry Pi.
+# User interface
+## Navigation
+When navigating via keyboard, hold down ${ALT} to see link shortcut keys. Try doing so now and see how the link icon below is replaced with a number.
+=> gemini://gemini.circumlunar.space/ Project Gemini
+Each visible link on the page gets an alphanumeric shortcut. For example, the first link can be opened by pressing ${ALT+}1. The tenth link is ${ALT+}A. Additionally hold down ${CTRL} to open the link in a new tab.
+### SEomting
+## Bookmarking
+## Managing and using identities
+TLS client certificates used to identify you.
+# Platform-specific instructions
+# Compiling from source
+# Open source licenses
+Lagrange itself is distributed under the BSD 2-clause license:
+=> https://opensource.org/licenses/BSD-2-Clause  The 2-Clause BSD License
+=> https://git.skyjake.fi/skyjake/lagrange.git  Lagrange Git Repository
+> Copyright 2020 Jaakko Keränen
+>
+> Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+>
+> 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+>
+> 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+>
+> THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+## SDL
+SDL 2.0 and newer are available under the zlib license:
+=> https://www.zlib.net/zlib_license.html ZLIB License
+> This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
+>
+> Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
+>
+> 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+>
+> 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+>
+> 3. This notice may not be removed or altered from any source distribution.
+## the_Foundation
+the_Foundation is an opinionated C11 library by Jaakko Keränen. It is under the BSD 2-clause license. Note that the rest of the libraries in this section are used by the_Foundation, and not directly by Lagrange.
+=> https://opensource.org/licenses/BSD-2-Clause  The 2-Clause BSD License
+=> https://git.skyjake.fi/skyjake/the_Foundation.git  the_Foundation Git Repository
+## OpenSSL
+OpenSSL 1.1.1 is under a double license, which both apply to the library.
+=> https://www.openssl.org/source/license-openssl-ssleay.txt OpenSSL and SSLeay Licenses
+> Copyright (c) 1998-2019 The OpenSSL Project.  All rights reserved.
+>
+> Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+>
+> 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+>
+> 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+>
+> 3. All advertising materials mentioning features or use of this software must display the following acknowledgment: "This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+>
+> 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact openssl-core@openssl.org.
+>
+> 5. Products derived from this software may not be called "OpenSSL" nor may "OpenSSL" appear in their names without prior written permission of the OpenSSL Project.
+>
+> 6. Redistributions of any form whatsoever must retain the following acknowledgment: "This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+>
+> THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+>
+> This product includes cryptographic software written by Eric Young (eay@cryptsoft.com).  This product includes software written by Tim Hudson (tjh@cryptsoft.com).
+SSLeay license:
+> Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+> All rights reserved.
+>
+> This package is an SSL implementation written by Eric Young (eay@cryptsoft.com). The implementation was written so as to conform with Netscapes SSL.
+>
+> This library is free for commercial and non-commercial use as long as the following conditions are aheared to.  The following conditions apply to all code found in this distribution, be it the RC4, RSA, lhash, DES, etc., code; not just the SSL code.  The SSL documentation included with this distribution is covered by the same copyright terms except that the holder is Tim Hudson (tjh@cryptsoft.com).
+>
+> Copyright remains Eric Young's, and as such any Copyright notices in the code are not to be removed. If this package is used in a product, Eric Young should be given attribution as the author of the parts of the library used. This can be in the form of a textual message at program startup or in documentation (online or textual) provided with the package.
+>
+> Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+>
+> 1. Redistributions of source code must retain the copyright notice, this list of conditions and the following disclaimer.
+>
+> 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+>
+> 3. All advertising materials mentioning features or use of this software must display the following acknowledgement: "This product includes cryptographic software written by Eric Young (eay@cryptsoft.com)" The word 'cryptographic' can be left out if the rouines from the library being used are not cryptographic related :-).
+>
+> 4. If you include any Windows specific code (or a derivative thereof) from the apps directory (application code) you must include an acknowledgement: "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+>
+> THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+>
+> The licence and distribution terms for any publically available version or derivative of this code cannot be changed.  i.e. this code cannot simply be copied and put under another distribution licence [including the GNU Public Licence.]
+## GNU libunistring
+The libunistring library is covered by the GNU Lesser General Public License (LGPL):
+=> https://www.gnu.org/software/libunistring/manual/libunistring.html#GNU-LGPL GNU LGPL License
diff --git a/res/about.gmi b/res/about/lagrange.gmi
index 8e78fa60..9c19a465 100644
--- a/res/about.gmi
+++ b/res/about/lagrange.gmi
@@ -12,4 +12,4 @@ o888ooooood8 `Y888""8o `8oooooo.  d888b    `Y888""8o o888o o888o `8oooooo.  `Y8b
 # A Beautiful Gemini Client
 ## Version ${APP_VERSION}
 => https://skyjake.fi/@jk by Jaakko Keränen <code@iki.fi>
-Crafted with ☕️ in Finland
+Crafted with ☕️ in Finland
+\ No newline at end of file
diff --git a/res/version.gmi b/res/about/version.gmi
index 7f303297..7f303297 100644
--- a/res/version.gmi
+++ b/res/about/version.gmi
diff --git a/res/help.gmi b/res/help.gmi
deleted file mode 100644
index 1652f392..00000000
--- a/res/help.gmi
+++ /dev/null
@@ -1,31 +0,0 @@
-```
-           __   __             __   ___ 
-|     /\  / _` |__)  /\  |\ | / _` |__  
-|___ /~~\ \__> |  \ /~~\ | \| \__> |___ 
-```                                        
-# Help
-## What is Lagrange
-## What is the Gemini protocol
-## Why not just use a web browser
-# User interface
-## Navigation
-Hold down Alt/Option to see link shortcut keys. Each visible link on the page gets an alphanumeric shortcut. For example, the first link can be opened by pressing Alt-1. The tenth link is Alt-A. Additionally hold down Control/Command to open the link in a new tab.
-### SEomting
-## Bookmarking
-## Managing and using identities
-TLS client certificates used to identify you.
-# Platform-specific instructions
-# Compiling from source
diff --git a/src/app.c b/src/app.c
index 670adee2..dc61c103 100644
--- a/src/app.c
+++ b/src/app.c
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "app.h"
 #include "bookmarks.h"
 #include "embedded.h"
@@ -25,6 +47,7 @@
 #include <the_Foundation/time.h>
 #include <SDL_events.h>
 #include <SDL_render.h>
+#include <SDL_timer.h>
 #include <SDL_video.h>
 #include <stdio.h>
@@ -32,26 +55,26 @@
 #include <errno.h>
 #if defined (iPlatformApple) && !defined (iPlatformIOS)
-#   include "ui/macos.h"
+#   include "macos.h"
 #endif
 iDeclareType(App)
 #if defined (iPlatformApple)
-#define EMB_BIN "../../Resources/resources.bin"
+#define EMB_BIN "../../Resources/resources.binary"
 static const char *dataDir_App_ = "~/Library/Application Support/fi.skyjake.Lagrange";
 #endif
 #if defined (iPlatformMsys)
-#define EMB_BIN "../resources.bin"
+#define EMB_BIN "../resources.binary"
 static const char *dataDir_App_ = "~/AppData/Roaming/fi.skyjake.Lagrange";
 #endif
 #if defined (iPlatformLinux)
-#define EMB_BIN  "../../share/lagrange/resources.bin"
+#define EMB_BIN  "../../share/lagrange/resources.binary"
-#define EMB_BIN2 "../resources.bin" /* try from build dir as well */
 static const char *dataDir_App_ = "~/.config/lagrange";
 #endif
+#define EMB_BIN2 "../resources.binary" /* fallback from build/executable dir */
 static const char *prefsFileName_App_   = "prefs.cfg";
-static const char *stateFileName_App_   = "state.bin";
+static const char *stateFileName_App_   = "state.binary";
 struct Impl_App {
    iCommandLine args;
@@ -60,6 +83,8 @@ struct Impl_App {
    iBookmarks * bookmarks;
    iWindow *    window;
    iSortedArray tickers;
+    uint32_t     lastTickerTime;
+    uint32_t     elapsedSinceLastTicker;
    iBool        running;
    iBool        pendingRefresh;
    int          tabEnum;
@@ -70,6 +95,9 @@ struct Impl_App {
    float        uiScale;
    int          zoomPercent;
    enum iColorTheme theme;
+    iBool        useSystemTheme;
+    iString      gopherProxy;
+    iString      httpProxy;
 };
 static iApp app_;
@@ -99,21 +127,32 @@ const iString *dateStr_(const iDate *date) {
 static iString *serializePrefs_App_(const iApp *d) {
    iString *str = new_String();
    const iSidebarWidget *sidebar = findWidget_App("sidebar");
+    appendFormat_String(str, "window.retain arg:%d\n", d->retainWindowSize);
    if (d->retainWindowSize) {
        int w, h, x, y;
        SDL_GetWindowSize(d->window->win, &w, &h);
        SDL_GetWindowPosition(d->window->win, &x, &y);
+#if defined (iPlatformLinux)
+        /* Workaround for window position being unaffected by decorations on creation. */ {
+            int bl, bt;
+            SDL_GetWindowBordersSize(d->window->win, &bt, &bl, NULL, NULL);
+            x -= bl;
+            y -= bt;
+        }
+#endif
        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, "retainwindow arg:%d\n", d->retainWindowSize);
    if (isVisible_Widget(constAs_Widget(sidebar))) {
        appendCStr_String(str, "sidebar.toggle\n");
    }
    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, "zoom.set arg:%d\n", d->zoomPercent);
-    appendFormat_String(str, "theme.set arg:%d\n", d->theme);
+    appendFormat_String(str, "theme.set arg:%d auto:1\n", d->theme);
+    appendFormat_String(str, "ostheme arg:%d\n", d->useSystemTheme);
+    appendFormat_String(str, "proxy.gopher address:%s\n", cstr_String(&d->gopherProxy));
+    appendFormat_String(str, "proxy.http address:%s\n", cstr_String(&d->httpProxy));
    return str;
 }
@@ -130,7 +169,7 @@ static void loadPrefs_App_(iApp *d) {
        iString *str = readString_File(f);
        const iRangecc src = range_String(str);
        iRangecc line = iNullRange;
-        while (nextSplit_Rangecc(&src, "\n", &line)) {
+        while (nextSplit_Rangecc(src, "\n", &line)) {
            iString cmdStr;
            initRange_String(&cmdStr, line);
            const char *cmd = cstr_String(&cmdStr);
@@ -231,9 +270,12 @@ static void saveState_App_(const iApp *d) {
 static void init_App_(iApp *d, int argc, char **argv) {
    init_CommandLine(&d->args, argc, argv);
    init_SortedArray(&d->tickers, sizeof(iTicker), cmp_Ticker_);
+    d->lastTickerTime    = SDL_GetTicks();
+    d->elapsedSinceLastTicker = 0;
    d->commandEcho       = checkArgument_CommandLine(&d->args, "echo") != NULL;
    d->initialWindowRect = init_Rect(-1, -1, 800, 500);
    d->theme             = dark_ColorTheme;
+    d->useSystemTheme    = iTrue;
    d->running           = iFalse;
    d->window            = NULL;
    d->retainWindowSize  = iTrue;
@@ -243,15 +285,17 @@ static void init_App_(iApp *d, int argc, char **argv) {
    d->visited           = new_Visited();
    d->bookmarks         = new_Bookmarks();
    d->tabEnum           = 0; /* generates unique IDs for tab pages */
+    init_String(&d->gopherProxy);
+    init_String(&d->httpProxy);
    setThemePalette_Color(d->theme);
    loadPrefs_App_(d);
    load_Visited(d->visited, dataDir_App_);
    load_Bookmarks(d->bookmarks, dataDir_App_);
 #if defined (iHaveLoadEmbed)
    /* Load the resources from a file. */ {
-        if (!load_Embed(concatPath_CStr(cstr_String(execPath_App()), "../resources.bin"))) {
+        if (!load_Embed(concatPath_CStr(cstr_String(execPath_App()), EMB_BIN))) {
-            if (!load_Embed(concatPath_CStr(cstr_String(execPath_App()), EMB_BIN))) {
+            if (!load_Embed(concatPath_CStr(cstr_String(execPath_App()), EMB_BIN2))) {
-                fprintf(stderr, "failed to load resources.bin: %s\n", strerror(errno));
+                fprintf(stderr, "failed to load resources: %s\n", strerror(errno));
                exit(-1);
            }
        }
@@ -269,6 +313,8 @@ static void init_App_(iApp *d, int argc, char **argv) {
 static void deinit_App(iApp *d) {
    saveState_App_(d);
    savePrefs_App_(d);
+    deinit_String(&d->httpProxy);
+    deinit_String(&d->gopherProxy);
    save_Bookmarks(d->bookmarks, dataDir_App_);
    delete_Bookmarks(d->bookmarks);
    save_Visited(d->visited, dataDir_App_);
@@ -288,12 +334,17 @@ const iString *dataDir_App(void) {
    return collect_String(cleanedCStr_Path(dataDir_App_));
 }
+iLocalDef iBool isWaitingAllowed_App_(const iApp *d) {
+    return !d->pendingRefresh && isEmpty_SortedArray(&d->tickers);
+}
 void processEvents_App(enum iAppEventMode eventMode) {
    iApp *d = &app_;
    SDL_Event ev;
-    while (
+    while ((isWaitingAllowed_App_(d) && eventMode == waitForNewEvents_AppEventMode &&
-        (!d->pendingRefresh && eventMode == waitForNewEvents_AppEventMode && SDL_WaitEvent(&ev)) ||
+            SDL_WaitEvent(&ev)) ||
-        ((d->pendingRefresh || eventMode == postedEventsOnly_AppEventMode) && SDL_PollEvent(&ev))) {
+           ((!isWaitingAllowed_App_(d) || eventMode == postedEventsOnly_AppEventMode) &&
+            SDL_PollEvent(&ev))) {
        switch (ev.type) {
            case SDL_QUIT:
                d->running = iFalse;
@@ -325,12 +376,17 @@ backToMainLoop:;
 }
 static void runTickers_App_(iApp *d) {
+    const uint32_t now = SDL_GetTicks();
+    d->elapsedSinceLastTicker = (d->lastTickerTime ? now - d->lastTickerTime : 0);
+    d->lastTickerTime = now;
+    if (isEmpty_SortedArray(&d->tickers)) {
+        d->lastTickerTime = 0;
+        return;
+    }
    /* Tickers may add themselves again, so we'll run off a copy. */
    iSortedArray *pending = copy_SortedArray(&d->tickers);
    clear_SortedArray(&d->tickers);
-    if (!isEmpty_SortedArray(pending)) {
+    postRefresh_App();
-        postRefresh_App();
-    }
    iConstForEach(Array, i, &pending->values) {
        const iTicker *ticker = i.value;
        if (ticker->callback) {
@@ -338,6 +394,9 @@ static void runTickers_App_(iApp *d) {
        }
    }
    delete_SortedArray(pending);
+    if (isEmpty_SortedArray(&d->tickers)) {
+        d->lastTickerTime = 0;
+    }
 }
 static int run_App_(iApp *d) {
@@ -345,8 +404,8 @@ static int run_App_(iApp *d) {
    d->running = iTrue;
    SDL_EventState(SDL_DROPFILE, SDL_ENABLE); /* open files via drag'n'drop */
    while (d->running) {
-        runTickers_App_(d);
        processEvents_App(waitForNewEvents_AppEventMode);
+        runTickers_App_(d);
        refresh_App();
        recycle_Garbage();
    }
@@ -364,6 +423,10 @@ iBool isRefreshPending_App(void) {
    return app_.pendingRefresh;
 }
+uint32_t elapsedSinceLastTicker_App(void) {
+    return app_.elapsedSinceLastTicker;
+}
 int zoom_App(void) {
    return app_.zoomPercent;
 }
@@ -372,6 +435,17 @@ enum iColorTheme colorTheme_App(void) {
    return app_.theme;
 }
+const iString *schemeProxy_App(iRangecc scheme) {
+    iApp *d = &app_;
+    if (equalCase_Rangecc(scheme, "gopher")) {
+        return &d->gopherProxy;
+    }
+    if (equalCase_Rangecc(scheme, "http") || equalCase_Rangecc(scheme, "https")) {
+        return &d->httpProxy;
+    }
+    return NULL;
+}
 int run_App(int argc, char **argv) {
    init_App_(&app_, argc, argv);
    const int rc = run_App_(&app_);
@@ -394,7 +468,12 @@ void postRefresh_App(void) {
 }
 void postCommand_App(const char *command) {
+    iAssert(command);
    SDL_Event ev;
+    if (*command == '!') {
+        /* Global command; this is global context so just ignore. */
+        command++;
+    }
    ev.user.type     = SDL_USEREVENT;
    ev.user.code     = command_UserEventCode;
    ev.user.windowID = get_Window() ? SDL_GetWindowID(get_Window()->win) : 0;
@@ -424,6 +503,7 @@ iAny *findWidget_App(const char *id) {
 void addTicker_App(void (*ticker)(iAny *), iAny *context) {
    iApp *d = &app_;
    insert_SortedArray(&d->tickers, &(iTicker){ context, ticker });
+    postRefresh_App();
 }
 iGmCerts *certs_App(void) {
@@ -450,13 +530,25 @@ static iBool handlePrefsCommands_(iWidget *d, const char *cmd) {
    if (equal_Command(cmd, "prefs.dismiss") || equal_Command(cmd, "preferences")) {
        setUiScale_Window(get_Window(),
                          toFloat_String(text_InputWidget(findChild_Widget(d, "prefs.uiscale"))));
-        postCommandf_App("retainwindow arg:%d",
+        postCommandf_App("window.retain arg:%d",
                         isSelected_Widget(findChild_Widget(d, "prefs.retainwindow")));
+        postCommandf_App("ostheme arg:%d",
+                         isSelected_Widget(findChild_Widget(d, "prefs.ostheme")));
+        postCommandf_App("proxy.http address:%s",
+                         cstr_String(text_InputWidget(findChild_Widget(d, "prefs.proxy.http"))));
+        postCommandf_App("proxy.gopher address:%s",
+                         cstr_String(text_InputWidget(findChild_Widget(d, "prefs.proxy.gopher"))));
        destroy_Widget(d);
        return iTrue;
    }
-    else if (equal_Command(cmd, "theme.changed")) {
+    else if (equal_Command(cmd, "prefs.ostheme.changed")) {
+        postCommandf_App("ostheme arg:%d", arg_Command(cmd));
+    }
+    else if (equal_Command(cmd, "theme.changed")) {        
        updatePrefsThemeButtons_(d);
+        if (!argLabel_Command(cmd, "auto")) {
+            setToggle_Widget(findChild_Widget(d, "prefs.ostheme"), iFalse);
+        }
    }
    return iFalse;
 }
@@ -502,18 +594,81 @@ iDocumentWidget *newTab_App(const iDocumentWidget *duplicateOf) {
    return doc;
 }
+static iBool handleIdentityCreationCommands_(iWidget *dlg, const char *cmd) {
+    iApp *d = &app_;
+    if (equal_Command(cmd, "ident.accept") || equal_Command(cmd, "cancel")) {        
+        if (equal_Command(cmd, "ident.accept")) {
+            const iString *commonName   = text_InputWidget (findChild_Widget(dlg, "ident.common"));
+            const iString *email        = text_InputWidget (findChild_Widget(dlg, "ident.email"));
+            const iString *userId       = text_InputWidget (findChild_Widget(dlg, "ident.userid"));
+            const iString *domain       = text_InputWidget (findChild_Widget(dlg, "ident.domain"));
+            const iString *organization = text_InputWidget (findChild_Widget(dlg, "ident.org"));
+            const iString *country      = text_InputWidget (findChild_Widget(dlg, "ident.country"));
+            const iBool    isTemp       = isSelected_Widget(findChild_Widget(dlg, "ident.temp"));
+            if (isEmpty_String(commonName)) {
+                makeMessage_Widget(orange_ColorEscape "MISSING INFO",
+                                   "A \"Common name\" must be specified.");
+                return iTrue;
+            }
+            iDate until;
+            /* Validate the date. */ {
+                iZap(until);
+                unsigned int val[6];
+                iDate today;
+                initCurrent_Date(&today);
+                const int n =
+                    sscanf(cstr_String(text_InputWidget(findChild_Widget(dlg, "ident.until"))),
+                           "%04u-%u-%u %u:%u:%u",
+                           &val[0], &val[1], &val[2], &val[3], &val[4], &val[5]);
+                if (n <= 0 || val[0] < (unsigned) today.year) {
+                    makeMessage_Widget(orange_ColorEscape "INVALID DATE",
+                                       "Please check the \"Valid until\" date. Examples:\n"
+                                       "\u2022 2030\n"
+                                       "\u2022 2025-06-30\n"
+                                       "\u2022 2021-12-31 23:59:59");
+                    return iTrue;
+                }
+                until.year   = val[0];
+                until.month  = n >= 2 ? val[1] : 1;
+                until.day    = n >= 3 ? val[2] : 1;
+                until.hour   = n >= 4 ? val[3] : 0;
+                until.minute = n >= 5 ? val[4] : 0;
+                until.second = n == 6 ? val[5] : 0;
+                /* In the past? */ {
+                    iTime now, t;
+                    initCurrent_Time(&now);
+                    init_Time(&t, &until);
+                    if (cmp_Time(&t, &now) <= 0) {
+                        makeMessage_Widget(orange_ColorEscape "INVALID DATE",
+                                           "Expiration date must be in the future.");
+                        return iTrue;
+                    }
+                }
+            }
+            /* The input seems fine. */
+            newIdentity_GmCerts(d->certs, isTemp ? temporary_GmIdentityFlag : 0,
+                                until, commonName, email, userId, domain, organization, country);
+            postCommandf_App("sidebar.mode arg:%d show:1", identities_SidebarMode);
+            postCommand_App("idents.changed");
+        }
+        destroy_Widget(dlg);
+        return iTrue;
+    }
+    return iFalse;
+}
 iBool handleCommand_App(const char *cmd) {
    iApp *d = &app_;
-    if (equal_Command(cmd, "retainwindow")) {
+    if (equal_Command(cmd, "window.retain")) {
        d->retainWindowSize = arg_Command(cmd);
        return iTrue;
    }
    else if (equal_Command(cmd, "open")) {
-        const iString *url = collect_String(newCStr_String(suffixPtr_Command(cmd, "url")));
+        const iString *url = collectNewCStr_String(suffixPtr_Command(cmd, "url"));
        iUrl parts;
        init_Url(&parts, url);
-        if (equalCase_Rangecc(&parts.protocol, "http") ||
+        if (isEmpty_String(&d->httpProxy) &&
-            equalCase_Rangecc(&parts.protocol, "https")) {
+            (equalCase_Rangecc(parts.scheme, "http") || equalCase_Rangecc(parts.scheme, "https"))) {
            openInDefaultBrowser_App(url);
            return iTrue;
        }
@@ -523,8 +678,9 @@ iBool handleCommand_App(const char *cmd) {
        }
        iHistory *history = history_DocumentWidget(doc);
        const iBool isHistory = argLabel_Command(cmd, "history") != 0;
+        int redirectCount = argLabel_Command(cmd, "redirect");
        if (!isHistory) {
-            if (argLabel_Command(cmd, "redirect")) {
+            if (redirectCount) {
                replace_History(history, url);
            }
            else {
@@ -533,6 +689,7 @@ iBool handleCommand_App(const char *cmd) {
        }
        visitUrl_Visited(d->visited, url);
        setInitialScroll_DocumentWidget(doc, argfLabel_Command(cmd, "scroll"));
+        setRedirectCount_DocumentWidget(doc, redirectCount);
        setUrlFromCache_DocumentWidget(doc, url, isHistory);
    }
    else if (equal_Command(cmd, "document.request.cancelled")) {
@@ -601,9 +758,14 @@ iBool handleCommand_App(const char *cmd) {
    else if (equal_Command(cmd, "preferences")) {
        iWidget *dlg = makePreferences_Widget();
        updatePrefsThemeButtons_(dlg);
+        setToggle_Widget(findChild_Widget(dlg, "prefs.ostheme"), d->useSystemTheme);
        setToggle_Widget(findChild_Widget(dlg, "prefs.retainwindow"), d->retainWindowSize);
        setText_InputWidget(findChild_Widget(dlg, "prefs.uiscale"),
                            collectNewFormat_String("%g", uiScale_Window(d->window)));
+        setText_InputWidget(findChild_Widget(dlg, "prefs.proxy.http"),
+                            schemeProxy_App(range_CStr("http")));
+        setText_InputWidget(findChild_Widget(dlg, "prefs.proxy.gopher"),
+                            schemeProxy_App(range_CStr("gopher")));
        setCommandHandler_Widget(dlg, handlePrefsCommands_);
    }
    else if (equal_Command(cmd, "navigate.home")) {
@@ -633,17 +795,46 @@ iBool handleCommand_App(const char *cmd) {
    }
    else if (equal_Command(cmd, "bookmark.add")) {
        iDocumentWidget *doc = document_App();
-        add_Bookmarks(d->bookmarks, url_DocumentWidget(doc),
+        makeBookmarkCreation_Widget(url_DocumentWidget(doc),
-                      bookmarkTitle_DocumentWidget(doc),
+                                    bookmarkTitle_DocumentWidget(doc),
-                      collectNew_String(),
+                                    siteIcon_GmDocument(document_DocumentWidget(doc)));
-                      siteIcon_GmDocument(document_DocumentWidget(doc)));
+        return iTrue;
-        postCommand_App("bookmarks.changed");
+    }
+    else if (equal_Command(cmd, "ident.new")) {
+        iWidget *dlg = makeIdentityCreation_Widget();
+        setCommandHandler_Widget(dlg, handleIdentityCreationCommands_);
        return iTrue;
    }
    else if (equal_Command(cmd, "theme.set")) {
+        const int isAuto = argLabel_Command(cmd, "auto");
        d->theme = arg_Command(cmd);
+        if (!isAuto) {
+            postCommand_App("ostheme arg:0");
+        }
        setThemePalette_Color(d->theme);
-        postCommand_App("theme.changed");
+        postCommandf_App("theme.changed auto:%d", isAuto);
+        return iTrue;
+    }
+    else if (equal_Command(cmd, "ostheme")) {
+        d->useSystemTheme = arg_Command(cmd);
+        return iTrue;
+    }
+    else if (equal_Command(cmd, "os.theme.changed")) {
+        if (d->useSystemTheme) {
+            const int dark     = argLabel_Command(cmd, "dark");
+            const int contrast = argLabel_Command(cmd, "contrast");
+            postCommandf_App("theme.set arg:%d auto:1",
+                             dark ? (contrast ? pureBlack_ColorTheme : dark_ColorTheme)
+                                  : (contrast ? pureWhite_ColorTheme : light_ColorTheme));
+        }
+        return iFalse;
+    }
+    else if (equal_Command(cmd, "proxy.gopher")) {
+        setCStr_String(&d->gopherProxy, suffixPtr_Command(cmd, "address"));
+        return iTrue;
+    }
+    else if (equal_Command(cmd, "proxy.http")) {
+        setCStr_String(&d->httpProxy, suffixPtr_Command(cmd, "address"));
        return iTrue;
    }
    else {
@@ -666,3 +857,44 @@ void openInDefaultBrowser_App(const iString *url) {
    start_Process(proc);
    iRelease(proc);
 }
+void revealPath_App(const iString *path) {
+#if defined (iPlatformApple)
+    const char *scriptPath = concatPath_CStr(dataDir_App_, "revealfile.scpt");
+    iFile *f = newCStr_File(scriptPath);
+    if (open_File(f, writeOnly_FileMode | text_FileMode)) {
+        /* AppleScript to select a specific file. */
+        write_File(f, collect_Block(newCStr_Block("on run argv\n"
+                                                  "  tell application \"Finder\"\n"
+                                                  "    activate\n"
+                                                  "    reveal POSIX file (item 1 of argv) as text\n"
+                                                  "  end tell\n"
+                                                  "end run\n")));
+        close_File(f);
+        iProcess *proc = new_Process();
+        setArguments_Process(
+            proc,
+            iClob(newStringsCStr_StringList(
+                "/usr/bin/osascript", scriptPath, cstr_String(path), NULL)));
+        start_Process(proc);
+        iRelease(proc);
+    }
+    iRelease(f);
+#elif defined (iPlatformLinux)
+    iFileInfo *inf = iClob(new_FileInfo(path));
+    iRangecc target;
+    if (isDirectory_FileInfo(inf)) {
+        target = range_String(path);
+    }
+    else {
+        target = dirName_Path(path);
+    }
+    iProcess *proc = new_Process();
+    setArguments_Process(
+        proc, iClob(newStringsCStr_StringList("/usr/bin/xdg-open", cstr_Rangecc(target), NULL)));
+    start_Process(proc);
+    iRelease(proc);
+#else
+    iAssert(0 /* File revealing not implemented on this platform */);
+#endif
+}
diff --git a/src/app.h b/src/app.h
index 11c8c4a3..3d4808bc 100644
--- a/src/app.h
+++ b/src/app.h
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #pragma once
 /* Application core: event loop, base event processing, audio synth. */
@@ -26,14 +48,16 @@ enum iUserEventCode {
 const iString *execPath_App     (void);
 const iString *dataDir_App      (void);
-int         run_App             (int argc, char **argv);
+int         run_App                     (int argc, char **argv);
-void        processEvents_App   (enum iAppEventMode mode);
+void        processEvents_App           (enum iAppEventMode mode);
-iBool       handleCommand_App   (const char *cmd);
+iBool       handleCommand_App           (const char *cmd);
-void        refresh_App         (void);
+void        refresh_App                 (void);
-iBool       isRefreshPending_App(void);
+iBool       isRefreshPending_App        (void);
+uint32_t    elapsedSinceLastTicker_App  (void); /* milliseconds */
 int                 zoom_App            (void);
 enum iColorTheme    colorTheme_App      (void);
+const iString *     schemeProxy_App     (iRangecc scheme);
 iGmCerts *          certs_App           (void);
 iVisited *          visited_App         (void);
@@ -53,3 +77,4 @@ iLocalDef void postCommandString_App(const iString *command) {
 }
 void        openInDefaultBrowser_App    (const iString *url);
+void        revealPath_App              (const iString *path);
diff --git a/src/bookmarks.c b/src/bookmarks.c
index 795e0d44..eff0146d 100644
--- a/src/bookmarks.c
+++ b/src/bookmarks.c
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "bookmarks.h"
 #include <the_Foundation/file.h>
@@ -63,7 +85,7 @@ void load_Bookmarks(iBookmarks *d, const char *dirPath) {
    if (open_File(f, readOnly_FileMode | text_FileMode)) {
        const iRangecc src = range_Block(collect_Block(readAll_File(f)));
        iRangecc line = iNullRange;
-        while (nextSplit_Rangecc(&src, "\n", &line)) {
+        while (nextSplit_Rangecc(src, "\n", &line)) {
            /* Skip empty lines. */ {
                iRangecc ln = line;
                trim_Rangecc(&ln);
@@ -78,9 +100,9 @@ void load_Bookmarks(iBookmarks *d, const char *dirPath) {
            initSeconds_Time(&bm->when, strtod(line.start, &endPos));
            line.start = skipSpace_CStr(endPos);
            setRange_String(&bm->url, line);
-            nextSplit_Rangecc(&src, "\n", &line);
+            nextSplit_Rangecc(src, "\n", &line);
            setRange_String(&bm->title, line);
-            nextSplit_Rangecc(&src, "\n", &line);
+            nextSplit_Rangecc(src, "\n", &line);
            setRange_String(&bm->tags, line);
            insert_Bookmarks_(d, bm);
        }
diff --git a/src/bookmarks.h b/src/bookmarks.h
index e05aefd3..a3269a59 100644
--- a/src/bookmarks.h
+++ b/src/bookmarks.h
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #pragma once
 #include <the_Foundation/hash.h>
@@ -42,7 +64,7 @@ typedef int   (*iBookmarksCompareFunc)(const iBookmark **, const iBookmark **);
 *                returned list is sorted by descending creation time.
 *
 * @return Collected array of bookmarks. Caller does not get ownership of the
- * list or the bookmarks.
+ * listed bookmarks.
 */
 const iPtrArray *list_Bookmarks(const iBookmarks *, iBookmarksFilterFunc filter,
                                iBookmarksCompareFunc cmp);
diff --git a/src/gmcerts.c b/src/gmcerts.c
index 11e9ce2c..b24a6d9c 100644
--- a/src/gmcerts.c
+++ b/src/gmcerts.c
@@ -1,14 +1,41 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "gmcerts.h"
 #include <the_Foundation/file.h>
+#include <the_Foundation/fileinfo.h>
 #include <the_Foundation/mutex.h>
 #include <the_Foundation/path.h>
 #include <the_Foundation/regexp.h>
+#include <the_Foundation/stringarray.h>
 #include <the_Foundation/stringhash.h>
+#include <the_Foundation/stringlist.h>
 #include <the_Foundation/time.h>
 #include <ctype.h>
-static const char *filename_GmCerts_ = "trusted.txt";
+static const char *filename_GmCerts_       = "trusted.txt";
+static const char *identsDir_GmCerts_      = "idents";
+static const char *identsFilename_GmCerts_ = "idents.binary";
 iDeclareClass(TrustEntry)
@@ -27,19 +54,158 @@ void deinit_TrustEntry(iTrustEntry *d) {
    deinit_Block(&d->fingerprint);
 }
-iDefineObjectConstructionArgs(TrustEntry, (const iBlock *fingerprint, const iDate *until), fingerprint, until)
+iDefineObjectConstructionArgs(TrustEntry,
+                              (const iBlock *fingerprint, const iDate *until),
+                              fingerprint, until)
 iDefineClass(TrustEntry)
+/*----------------------------------------------------------------------------------------------*/
+static int cmpUrl_GmIdentity_(const iString *a, const iString *b) {
+    return cmpStringCase_String(a, b);
+}
+void init_GmIdentity(iGmIdentity *d) {
+    d->icon  = 0x1f511; /* key */
+    d->flags = 0;
+    d->cert  = new_TlsCertificate();
+    init_Block(&d->fingerprint, 0);
+    d->useUrls = newCmp_StringSet(cmpUrl_GmIdentity_);
+    init_String(&d->notes);
+}
+void deinit_GmIdentity(iGmIdentity *d) {
+    iRelease(d->useUrls);
+    deinit_String(&d->notes);
+    delete_TlsCertificate(d->cert);
+    deinit_Block(&d->fingerprint);
+}
+void serialize_GmIdentity(const iGmIdentity *d, iStream *outs) {
+    serialize_Block(&d->fingerprint, outs);
+    writeU32_Stream(outs, d->icon);
+    serialize_String(&d->notes, outs);
+    write32_Stream(outs, d->flags);
+    writeU32_Stream(outs, size_StringSet(d->useUrls));
+    iConstForEach(StringSet, i, d->useUrls) {
+        serialize_String(i.value, outs);
+    }
+}
+void deserialize_GmIdentity(iGmIdentity *d, iStream *ins) {
+    deserialize_Block(&d->fingerprint, ins);
+    d->icon = readU32_Stream(ins);
+    deserialize_String(&d->notes, ins);
+    d->flags = read32_Stream(ins);
+    size_t n = readU32_Stream(ins);
+    while (n-- && !atEnd_Stream(ins)) {
+        iString url;
+        init_String(&url);
+        deserialize_String(&url, ins);
+        insert_StringSet(d->useUrls, &url);
+        deinit_String(&url);
+    }
+}
+static iBool isValid_GmIdentity_(const iGmIdentity *d) {
+    return !isEmpty_TlsCertificate(d->cert);
+}
+static void setCertificate_GmIdentity_(iGmIdentity *d, iTlsCertificate *cert) {
+    delete_TlsCertificate(d->cert);
+    d->cert = cert;
+    set_Block(&d->fingerprint, collect_Block(fingerprint_TlsCertificate(cert)));
+}
+static const iString *readFile_(const iString *path) {
+    iString *str = NULL;
+    iFile *f = new_File(path);
+    if (open_File(f, readOnly_FileMode | text_FileMode)) {
+        str = readString_File(f);
+    }
+    iRelease(f);
+    return str ? collect_String(str) : collectNew_String();
+}
+static iBool writeTextFile_(const iString *path, const iString *content) {
+    iFile *f = iClob(new_File(path));
+    if (open_File(f, writeOnly_FileMode | text_FileMode)) {
+        write_File(f, &content->chars);
+        close_File(f);
+        return iTrue;
+    }
+    return iFalse;
+}
+iBool isUsed_GmIdentity(const iGmIdentity *d) {
+    return d && !isEmpty_StringSet(d->useUrls);
+}
+iBool isUsedOn_GmIdentity(const iGmIdentity *d, const iString *url) {
+    size_t pos = iInvalidPos;
+    locate_StringSet(d->useUrls, url, &pos);
+    if (pos < size_StringSet(d->useUrls)) {
+        return startsWithCase_String(url, cstr_String(constAt_StringSet(d->useUrls, pos)));
+    }
+    return iFalse;
+}
+void setUse_GmIdentity(iGmIdentity *d, const iString *url, iBool use) {
+    if (use && isUsedOn_GmIdentity(d, url)) {
+        return; /* Redudant. */
+    }
+    if (use) {
+#if !defined (NDEBUG)
+        const iBool wasInserted =
+#endif
+        insert_StringSet(d->useUrls, url);
+        iAssert(wasInserted);
+    }
+    else {
+        remove_StringSet(d->useUrls, url);
+    }
+}
+void clearUse_GmIdentity(iGmIdentity *d) {
+    clear_StringSet(d->useUrls);
+}
+const iString *name_GmIdentity(const iGmIdentity *d) {
+    return collect_String(subject_TlsCertificate(d->cert));
+}
+iDefineTypeConstruction(GmIdentity)
 /*-----------------------------------------------------------------------------------------------*/
 struct Impl_GmCerts {
    iMutex mtx;
    iString saveDir;
    iStringHash *trusted;
+    iPtrArray idents;
 };
+static const char *magicIdMeta_GmCerts_   = "lgL2";
+static const char *magicIdentity_GmCerts_ = "iden";
 iDefineTypeConstructionArgs(GmCerts, (const char *saveDir), saveDir)
+static void saveIdentities_GmCerts_(const iGmCerts *d) {
+    iFile *f = new_File(collect_String(concatCStr_Path(&d->saveDir, identsFilename_GmCerts_)));
+    if (open_File(f, writeOnly_FileMode)) {
+        writeData_File(f, magicIdMeta_GmCerts_, 4);
+        writeU32_File(f, 0); /* version */
+        iConstForEach(PtrArray, i, &d->idents) {
+            const iGmIdentity *ident = i.ptr;
+            if (~ident->flags & temporary_GmIdentityFlag) {
+                writeData_File(f, magicIdentity_GmCerts_, 4);
+                serialize_GmIdentity(ident, stream_File(f));
+            }
+        }
+    }
+    iRelease(f);
+}
 static void save_GmCerts_(const iGmCerts *d) {
    iBeginCollect();
    iFile *f = new_File(collect_String(concatCStr_Path(&d->saveDir, filename_GmCerts_)));
@@ -61,14 +227,75 @@ static void save_GmCerts_(const iGmCerts *d) {
    iEndCollect();
 }
+static void loadIdentities_GmCerts_(iGmCerts *d) {
+    iFile *f =
+        iClob(new_File(collect_String(concatCStr_Path(&d->saveDir, identsFilename_GmCerts_))));
+    if (open_File(f, readOnly_FileMode)) {
+        char magic[4];
+        readData_File(f, sizeof(magic), magic);
+        if (memcmp(magic, magicIdMeta_GmCerts_, sizeof(magic))) {
+            printf("%s: format not recognized\n", cstr_String(path_File(f)));
+            return;
+        }
+        setVersion_Stream(stream_File(f), readU32_File(f));
+        while (!atEnd_File(f)) {
+            readData_File(f, sizeof(magic), magic);
+            if (!memcmp(magic, magicIdentity_GmCerts_, sizeof(magic))) {
+                iGmIdentity *id = new_GmIdentity();
+                deserialize_GmIdentity(id, stream_File(f));
+                pushBack_PtrArray(&d->idents, id);
+            }
+            else {
+                printf("%s: invalid file contents\n", cstr_String(path_File(f)));
+                break;
+            }
+        }
+    }
+}
+static iGmIdentity *findIdentity_GmCerts_(iGmCerts *d, const iBlock *fingerprint) {
+    iForEach(PtrArray, i, &d->idents) {
+        iGmIdentity *ident = i.ptr;
+        if (cmp_Block(fingerprint, &ident->fingerprint) == 0) { /* TODO: could use a hash */
+            return ident;
+        }
+    }
+    return NULL;
+}
+static void loadIdentityFromCertificate_GmCerts_(iGmCerts *d, const iString *crtPath) {
+    iAssert(fileExists_FileInfo(crtPath));
+    iString *keyPath = collect_String(copy_String(crtPath));
+    truncate_Block(&keyPath->chars, size_String(keyPath) - 3);
+    appendCStr_String(keyPath, "key");
+    if (!fileExists_FileInfo(keyPath)) {
+        return;
+    }
+    iTlsCertificate *cert = newPemKey_TlsCertificate(readFile_(crtPath), readFile_(keyPath));
+    iBlock *finger = fingerprint_TlsCertificate(cert);
+    iGmIdentity *ident = findIdentity_GmCerts_(d, finger);
+    if (!ident) {
+        /* User-provided certificate. */
+        ident = new_GmIdentity();
+        ident->flags |= imported_GmIdentityFlag;
+        iDate today;
+        initCurrent_Date(&today);
+        set_String(&ident->notes, collect_String(format_Date(&today, "Imported on %b %d, %Y")));
+        pushBack_PtrArray(&d->idents, ident);
+    }
+    setCertificate_GmIdentity_(ident, cert);
+    delete_Block(finger);
+}
 static void load_GmCerts_(iGmCerts *d) {
    iFile *f = new_File(collect_String(concatCStr_Path(&d->saveDir, filename_GmCerts_)));
    if (open_File(f, readOnly_FileMode | text_FileMode)) {
        iRegExp *      pattern = new_RegExp("([^\\s]+) ([0-9]+) ([a-z0-9]+)", 0);
        const iRangecc src     = range_Block(collect_Block(readAll_File(f)));
        iRangecc       line    = iNullRange;
-        while (nextSplit_Rangecc(&src, "\n", &line)) {
+        while (nextSplit_Rangecc(src, "\n", &line)) {
            iRegExpMatch m;
+            init_RegExpMatch(&m);
            if (matchRange_RegExp(pattern, line, &m)) {
                const iRangecc domain = capturedRange_RegExpMatch(&m, 1);
                const iRangecc until  = capturedRange_RegExpMatch(&m, 2);
@@ -86,17 +313,44 @@ static void load_GmCerts_(iGmCerts *d) {
        iRelease(pattern);
    }
    iRelease(f);
+    /* Load all identity certificates. */ {
+        loadIdentities_GmCerts_(d);
+        const iString *idDir = collect_String(concatCStr_Path(&d->saveDir, identsDir_GmCerts_));
+        if (!fileExists_FileInfo(idDir)) {
+            mkdir_Path(idDir);
+        }
+        iForEach(DirFileInfo, i, iClob(directoryContents_FileInfo(iClob(new_FileInfo(idDir))))) {
+            const iFileInfo *entry = i.value;
+            if (endsWithCase_String(path_FileInfo(entry), ".crt")) {
+                loadIdentityFromCertificate_GmCerts_(d, path_FileInfo(entry));
+            }
+        }
+        /* Remove certificates whose crt/key files were missing. */
+        iForEach(PtrArray, j, &d->idents) {
+            iGmIdentity *ident = j.ptr;
+            if (!isValid_GmIdentity_(ident)) {
+                delete_GmIdentity(ident);
+                remove_PtrArrayIterator(&j);
+            }
+        }
+    }
 }
 void init_GmCerts(iGmCerts *d, const char *saveDir) {
    init_Mutex(&d->mtx);
    initCStr_String(&d->saveDir, saveDir);
    d->trusted = new_StringHash();
+    init_PtrArray(&d->idents);
    load_GmCerts_(d);
 }
 void deinit_GmCerts(iGmCerts *d) {
    iGuardMutex(&d->mtx, {
+        saveIdentities_GmCerts_(d);
+        iForEach(PtrArray, i, &d->idents) {
+            delete_GmIdentity(i.ptr);
+        }
+        deinit_PtrArray(&d->idents);
        iRelease(d->trusted);
        deinit_String(&d->saveDir);
    });
@@ -142,3 +396,102 @@ iBool checkTrust_GmCerts(iGmCerts *d, iRangecc domain, const iTlsCertificate *ce
    unlock_Mutex(&d->mtx);
    return iTrue;
 }
+iGmIdentity *identity_GmCerts(iGmCerts *d, unsigned int id) {
+    return at_PtrArray(&d->idents, id);
+}
+const iGmIdentity *constIdentity_GmCerts(const iGmCerts *d, unsigned int id) {
+    return constAt_PtrArray(&d->idents, id);
+}
+const iGmIdentity *identityForUrl_GmCerts(const iGmCerts *d, const iString *url) {
+    iConstForEach(PtrArray, i, &d->idents) {
+        const iGmIdentity *ident = i.ptr;
+        iConstForEach(StringSet, j, ident->useUrls) {
+            const iString *used = j.value;
+            if (startsWithCase_String(url, cstr_String(used))) {
+                return ident;
+            }
+        }
+    }
+    return NULL;
+}
+iGmIdentity *newIdentity_GmCerts(iGmCerts *d, int flags, iDate validUntil, const iString *commonName,
+                                 const iString *email, const iString *userId, const iString *domain,
+                                 const iString *org, const iString *country) {
+    const iTlsCertificateName names[] = {
+        { issuerCommonName_TlsCertificateNameType,    collectNewCStr_String("Lagrange v" LAGRANGE_APP_VERSION) },
+        { issuerDomain_TlsCertificateNameType,        collectNewCStr_String("lagrange.skyjake.fi") },
+        { subjectCommonName_TlsCertificateNameType,   commonName },
+        { subjectEmailAddress_TlsCertificateNameType, !isEmpty_String(email)   ? email   : NULL },
+        { subjectUserId_TlsCertificateNameType,       !isEmpty_String(userId)  ? userId  : NULL },
+        { subjectDomain_TlsCertificateNameType,       !isEmpty_String(domain)  ? domain  : NULL },
+        { subjectOrganization_TlsCertificateNameType, !isEmpty_String(org)     ? org     : NULL },
+        { subjectCountry_TlsCertificateNameType,      !isEmpty_String(country) ? country : NULL },
+        { 0, NULL }
+    };
+    iGmIdentity *id = new_GmIdentity();
+    setCertificate_GmIdentity_(id, newSelfSignedRSA_TlsCertificate(2048, validUntil, names));
+    /* Save the certificate and private key as PEM files. */
+    if (~flags & temporary_GmIdentityFlag) {
+        const char *finger = cstrCollect_String(hexEncode_Block(&id->fingerprint));
+        if (!writeTextFile_(
+                collect_String(concatCStr_Path(&d->saveDir, format_CStr("idents/%s.crt", finger))),
+                collect_String(pem_TlsCertificate(id->cert)))) {
+            delete_GmIdentity(id);
+            return NULL;
+        }
+        if (!writeTextFile_(
+                collect_String(concatCStr_Path(&d->saveDir, format_CStr("idents/%s.key", finger))),
+                collect_String(privateKeyPem_TlsCertificate(id->cert)))) {
+            delete_GmIdentity(id);
+            return NULL;
+        }
+    }
+    pushBack_PtrArray(&d->idents, id);
+    return id;
+}
+static const char *certPath_GmCerts_(const iGmCerts *d, const iGmIdentity *identity) {
+    if (!(identity->flags & (temporary_GmIdentityFlag | imported_GmIdentityFlag))) {
+        const char *finger   = cstrCollect_String(hexEncode_Block(&identity->fingerprint));
+        return concatPath_CStr(cstr_String(&d->saveDir), format_CStr("idents/%s", finger));
+    }
+    return NULL;
+}
+void deleteIdentity_GmCerts(iGmCerts *d, iGmIdentity *identity) {
+    /* Only delete the files if we created them. */
+    const char *filename = certPath_GmCerts_(d, identity);
+    if (filename) {
+        remove(format_CStr("%s.crt", filename));
+        remove(format_CStr("%s.key", filename));
+    }
+    removeOne_PtrArray(&d->idents, identity);
+    collect_GmIdentity(identity);
+}
+const iString *certificatePath_GmCerts(const iGmCerts *d, const iGmIdentity *identity) {
+    const char *filename = certPath_GmCerts_(d, identity);
+    if (filename) {
+        return collectNewFormat_String("%s.crt", filename);
+    }
+    return NULL;
+}
+const iPtrArray *identities_GmCerts(const iGmCerts *d) {
+    return &d->idents;
+}
+void signIn_GmCerts(iGmCerts *d, iGmIdentity *identity, const iString *url) {
+    signOut_GmCerts(d, url);
+    setUse_GmIdentity(identity, url, iTrue);
+}
+void signOut_GmCerts(iGmCerts *d, const iString *url) {
+    iForEach(PtrArray, i, &d->idents) {
+        setUse_GmIdentity(i.ptr, url, iFalse);
+    }
+}
diff --git a/src/gmcerts.h b/src/gmcerts.h
index a3df8f33..92a12a6a 100644
--- a/src/gmcerts.h
+++ b/src/gmcerts.h
@@ -1,8 +1,88 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #pragma once
+#include <the_Foundation/ptrarray.h>
+#include <the_Foundation/stringset.h>
 #include <the_Foundation/tlsrequest.h>
+iDeclareType(GmIdentity)
+iDeclareTypeConstruction(GmIdentity)
+iDeclareTypeSerialization(GmIdentity)
+enum iGmIdentityFlags {
+    temporary_GmIdentityFlag = 0x1, /* not saved persistently */
+    imported_GmIdentityFlag  = 0x2, /* user-provided files */
+};
+struct Impl_GmIdentity {
+    iBlock fingerprint;
+    iTlsCertificate *cert;
+    iStringSet *useUrls;
+    iChar icon;
+    iString notes; /* private, local usage notes */
+    int flags;
+};
+iBool   isUsed_GmIdentity   (const iGmIdentity *);
+iBool   isUsedOn_GmIdentity (const iGmIdentity *, const iString *url);
+void    setUse_GmIdentity   (iGmIdentity *, const iString *url, iBool use);
+void    clearUse_GmIdentity (iGmIdentity *);
+const iString *name_GmIdentity(const iGmIdentity *);
+/*----------------------------------------------------------------------------------------------*/
 iDeclareType(GmCerts)
 iDeclareTypeConstructionArgs(GmCerts, const char *saveDir)
-iBool   checkTrust_GmCerts  (iGmCerts *, iRangecc domain, const iTlsCertificate *cert);
+iBool               checkTrust_GmCerts      (iGmCerts *, iRangecc domain, const iTlsCertificate *cert);
+/**
+ * Create a new self-signed TLS client certificate for identifying the user.
+ * @a commonName and the other name parameters are inserted in the subject field
+ * of the certificate.
+ *
+ * @param flags       Identity flags. A temporary identity is not saved persistently and
+ *                    will be erased when the application is shut down.
+ * @param validUntil  Expiration date. Must be in the future.
+ *
+ * @returns Created identity. GmCerts retains ownership of returned object.
+ */
+iGmIdentity *       newIdentity_GmCerts     (iGmCerts *, int flags, iDate validUntil,
+                                             const iString *commonName, const iString *email,
+                                             const iString *userId, const iString *domain,
+                                             const iString *org, const iString *country);
+void                deleteIdentity_GmCerts  (iGmCerts *, iGmIdentity *identity);
+const iString *     certificatePath_GmCerts (const iGmCerts *, const iGmIdentity *identity);
+iGmIdentity *       identity_GmCerts        (iGmCerts *, unsigned int id);
+const iGmIdentity * constIdentity_GmCerts   (const iGmCerts *, unsigned int id);
+const iGmIdentity * identityForUrl_GmCerts  (const iGmCerts *, const iString *url);
+const iPtrArray *   identities_GmCerts      (const iGmCerts *);
+void                signIn_GmCerts          (iGmCerts *, iGmIdentity *identity, const iString *url);
+void                signOut_GmCerts         (iGmCerts *, const iString *url);
diff --git a/src/gmdocument.c b/src/gmdocument.c
index a6fc39c5..fc49dac4 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "gmdocument.h"
 #include "gmutil.h"
 #include "ui/color.h"
@@ -106,11 +128,11 @@ enum iGmLineType {
    max_GmLineType,
 };
-static enum iGmLineType lineType_GmDocument_(const iGmDocument *d, const iRangecc *line) {
+static enum iGmLineType lineType_GmDocument_(const iGmDocument *d, const iRangecc line) {
    if (d->format == plainText_GmDocumentFormat) {
        return text_GmLineType;
    }
-    if (isEmpty_Range(line)) {
+    if (isEmpty_Range(&line)) {
        return text_GmLineType;
    }
    if (startsWith_Rangecc(line, "=>")) {
@@ -128,10 +150,10 @@ static enum iGmLineType lineType_GmDocument_(const iGmDocument *d, const iRangec
    if (startsWith_Rangecc(line, "```")) {
        return preformatted_GmLineType;
    }
-    if (*line->start == '>') {
+    if (*line.start == '>') {
        return quote_GmLineType;
    }
-    if (size_Range(line) >= 2 && line->start[0] == '*' && isspace(line->start[1])) {
+    if (size_Range(&line) >= 2 && line.start[0] == '*' && isspace(line.start[1])) {
        return bullet_GmLineType;
    }
    return text_GmLineType;
@@ -157,11 +179,11 @@ static int lastVisibleRunBottom_GmDocument_(const iGmDocument *d) {
 iInt2 measurePreformattedBlock_GmDocument_(const iGmDocument *d, const char *start, int font) {
    const iRangecc content = { start, constEnd_String(&d->source) };
    iRangecc line = iNullRange;
-    nextSplit_Rangecc(&content, "\n", &line);
+    nextSplit_Rangecc(content, "\n", &line);
-    iAssert(startsWith_Rangecc(&line, "```"));
+    iAssert(startsWith_Rangecc(line, "```"));
    iRangecc preBlock = { line.end + 1, line.end + 1 };
-    while (nextSplit_Rangecc(&content, "\n", &line)) {
+    while (nextSplit_Rangecc(content, "\n", &line)) {
-        if (startsWith_Rangecc(&line, "```")) {
+        if (startsWith_Rangecc(line, "```")) {
            break;
        }
        preBlock.end = line.end;
@@ -170,31 +192,35 @@ iInt2 measurePreformattedBlock_GmDocument_(const iGmDocument *d, const char *sta
 }
 static iRangecc addLink_GmDocument_(iGmDocument *d, iRangecc line, iGmLinkId *linkId) {
-    iRegExp *pattern = new_RegExp("=>\\s*([^\\s]+)(\\s.*)?", caseInsensitive_RegExpOption);
+    static iRegExp *pattern_;
+    if (!pattern_) {
+        pattern_ = new_RegExp("=>\\s*([^\\s]+)(\\s.*)?", caseInsensitive_RegExpOption);
+    }
    iRegExpMatch m;
-    if (matchRange_RegExp(pattern, line, &m)) {
+    init_RegExpMatch(&m);
+    if (matchRange_RegExp(pattern_, line, &m)) {
        iGmLink *link = new_GmLink();
        setRange_String(&link->url, capturedRange_RegExpMatch(&m, 1));
        set_String(&link->url, absoluteUrl_String(&d->url, &link->url));
        /* Check the URL. */ {
            iUrl parts;
            init_Url(&parts, &link->url);
-            if (!equalCase_Rangecc(&parts.host, cstr_String(&d->localHost))) {
+            if (!equalCase_Rangecc(parts.host, cstr_String(&d->localHost))) {
                link->flags |= remote_GmLinkFlag;
            }
-            if (startsWithCase_Rangecc(&parts.protocol, "gemini")) {
+            if (startsWithCase_Rangecc(parts.scheme, "gemini")) {
                link->flags |= gemini_GmLinkFlag;
            }
-            else if (startsWithCase_Rangecc(&parts.protocol, "http")) {
+            else if (startsWithCase_Rangecc(parts.scheme, "http")) {
                link->flags |= http_GmLinkFlag;
            }
-            else if (equalCase_Rangecc(&parts.protocol, "gopher")) {
+            else if (equalCase_Rangecc(parts.scheme, "gopher")) {
                link->flags |= gopher_GmLinkFlag;
            }
-            else if (equalCase_Rangecc(&parts.protocol, "file")) {
+            else if (equalCase_Rangecc(parts.scheme, "file")) {
                link->flags |= file_GmLinkFlag;
            }
-            else if (equalCase_Rangecc(&parts.protocol, "data")) {
+            else if (equalCase_Rangecc(parts.scheme, "data")) {
                link->flags |= data_GmLinkFlag;
            }
            /* Check the file name extension, if present. */
@@ -232,7 +258,6 @@ static iRangecc addLink_GmDocument_(iGmDocument *d, iRangecc line, iGmLinkId *li
            line = capturedRange_RegExpMatch(&m, 1); /* Show the URL. */
        }
    }
-    iRelease(pattern);
    return line;
 }
@@ -254,16 +279,21 @@ static size_t findLinkImage_GmDocument_(const iGmDocument *d, iGmLinkId linkId)
    return iInvalidPos;
 }
+static iBool isGopher_GmDocument_(const iGmDocument *d) {
+    return equalCase_Rangecc(urlScheme_String(&d->url), "gopher");
+}
 static void doLayout_GmDocument_(iGmDocument *d) {
+    const iBool isGemini = !isGopher_GmDocument_(d);
    /* TODO: Collect these parameters into a GmTheme. */
-    static const int fonts[max_GmLineType] = {
+    const int fonts[max_GmLineType] = {
-        paragraph_FontId,
+        isGemini ? paragraph_FontId : preformatted_FontId,
-        paragraph_FontId, /* bullet */
+        isGemini ? paragraph_FontId : preformatted_FontId, /* bullet */
        preformatted_FontId,
        quote_FontId,
-        heading1_FontId,
+        isGemini ? heading1_FontId : preformatted_FontId,
-        heading2_FontId,
+        isGemini ? heading2_FontId : preformatted_FontId,
-        heading3_FontId,
+        isGemini ? heading3_FontId : preformatted_FontId,
        regular_FontId,
    };
    static const int colors[max_GmLineType] = {
@@ -277,7 +307,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
        tmLinkText_ColorId,
    };
    static const int indents[max_GmLineType] = {
-        5, 10, 5, 10, 0, 0, 0, 5
+        6, 12, 6, 12, 0, 0, 0, 6
    };
    static const float topMargin[max_GmLineType] = {
        0.0f, 0.5f, 1.0f, 0.5f, 2.0f, 2.0f, 1.5f, 1.0f
@@ -298,20 +328,21 @@ static void doLayout_GmDocument_(iGmDocument *d) {
        return;
    }
    const iRangecc   content       = range_String(&d->source);
+    iRangecc         contentLine   = iNullRange;
    iInt2            pos           = zero_I2();
-    iRangecc         line          = iNullRange;
+    iBool            isFirstText   = isGemini;
-    iRangecc         preAltText    = iNullRange;
-    enum iGmLineType prevType; //     = text_GmLineType;
    iBool            isPreformat   = iFalse;
-    iBool            isFirstText   = iTrue;
+    iRangecc         preAltText    = iNullRange;
+    int              preFont       = preformatted_FontId;
    iBool            enableIndents = iFalse;
    iBool            addSiteBanner = iTrue;
-    int              preFont       = preformatted_FontId;
+    enum iGmLineType prevType;
    if (d->format == plainText_GmDocumentFormat) {
        isPreformat = iTrue;
        isFirstText = iFalse;
    }
-    while (nextSplit_Rangecc(&content, "\n", &line)) {
+    while (nextSplit_Rangecc(content, "\n", &contentLine)) {
+        iRangecc line = contentLine; /* `line` will be trimmed later; would confuse nextSplit */
        iGmRun run;
        run.flags = 0;
        run.color = white_ColorId;
@@ -320,7 +351,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
        enum iGmLineType type;
        int indent = 0;
        if (!isPreformat) {
-            type = lineType_GmDocument_(d, &line);
+            type = lineType_GmDocument_(d, line);
            if (line.start == content.start) {
                prevType = type;
            }
@@ -358,7 +389,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
            /* Preformatted line. */
            type = preformatted_GmLineType;
            if (d->format == gemini_GmDocumentFormat &&
-                startsWithSc_Rangecc(&line, "```", &iCaseSensitive)) {
+                startsWithSc_Rangecc(line, "```", &iCaseSensitive)) {
                isPreformat = iFalse;
                preAltText = iNullRange;
                addSiteBanner = iFalse; /* overrides the banner */
@@ -664,6 +695,20 @@ void setThemeSeed_GmDocument(iGmDocument *d, const iBlock *seed) {
    }
    /* Set up colors. */
    if (d->themeSeed) {
+        enum iHue {
+            red_Hue,
+            reddishOrange_Hue,
+            yellowishOrange_Hue,
+            yellow_Hue,
+            greenishYellow_Hue,
+            green_Hue,
+            bluishGreen_Hue,
+            cyan_Hue,
+            skyBlue_Hue,
+            blue_Hue,
+            violet_Hue,
+            pink_Hue
+        };
        static const float hues[] = { 5, 25, 40, 56, 80, 120, 160, 180, 208, 231, 270, 324 };
        static const struct {
            int index[2];
@@ -681,9 +726,9 @@ void setThemeSeed_GmDocument(iGmDocument *d, const iBlock *seed) {
            { 8, 9 },  /* violet */
            { 7, 8 },  /* pink */
        };
-        const float saturationLevel = 1.0f; /* TODO: user setting */
        const iBool isBannerLighter = (d->themeSeed & 0x4000) != 0;
        const size_t primIndex = d->themeSeed ? (d->themeSeed & 0xff) % iElemCount(hues) : 2;
+        const float saturationLevel = 1.0f; /* TODO: user setting */
        const iBool  isDarkBgSat =
            (d->themeSeed & 0x200000) != 0 && (primIndex < 1 || primIndex > 4);
        iHSLColor base = { hues[primIndex],
@@ -692,9 +737,10 @@ void setThemeSeed_GmDocument(iGmDocument *d, const iBlock *seed) {
                           1.0f };
        //            printf("background: %d %f %f\n", (int) base.hue, base.sat, base.lum);
        //            printf("isDarkBgSat: %d\n", isDarkBgSat);
-        setHsl_Color(tmBackground_ColorId, base);
+        iHSLColor bgBase = base;
+        setHsl_Color(tmBackground_ColorId, bgBase);
-        setHsl_Color(tmBannerBackground_ColorId, addSatLum_HSLColor(base, 0.1f, 0.04f * (isBannerLighter ? 1 : -1)));
+        setHsl_Color(tmBannerBackground_ColorId, addSatLum_HSLColor(bgBase, 0.1f, 0.04f * (isBannerLighter ? 1 : -1)));
        setHsl_Color(tmBannerTitle_ColorId, setLum_HSLColor(addSatLum_HSLColor(base, 0.1f, 0), 0.55f));
        setHsl_Color(tmBannerIcon_ColorId, setLum_HSLColor(addSatLum_HSLColor(base, 0.35f, 0), 0.65f));
@@ -714,7 +760,7 @@ void setThemeSeed_GmDocument(iGmDocument *d, const iBlock *seed) {
        setHsl_Color(tmHeading3_ColorId, setLum_HSLColor(altBase, titleLum + 0.60f));
        setHsl_Color(tmParagraph_ColorId, addSatLum_HSLColor(base, 0.1f, 0.6f));
-        setHsl_Color(tmFirstParagraph_ColorId, addSatLum_HSLColor(base, 0.2f, 0.8f));
+        setHsl_Color(tmFirstParagraph_ColorId, addSatLum_HSLColor(base, 0.2f, 0.72f));
        setHsl_Color(tmPreformatted_ColorId, (iHSLColor){ altHue2, 1.0f, 0.75f, 1.0f });
        set_Color(tmQuote_ColorId, get_Color(tmPreformatted_ColorId));
        set_Color(tmInlineContentMetadata_ColorId, get_Color(tmHeading3_ColorId));
@@ -736,31 +782,12 @@ void setThemeSeed_GmDocument(iGmDocument *d, const iBlock *seed) {
                else if (i == tmHeading3_ColorId) {
                    color.lum *= 0.75f;
                }
-#if 0
-                else if (isLink_ColorId(i)) {
-                    /* Darken links generally to improve visibility against a
-                       light background. */
-                    color.lum *= 0.5f;
-                    color.sat = 1.0f;
-                }
-#endif
                else if (i == tmBannerIcon_ColorId || i == tmBannerTitle_ColorId) {
-                    if (isBannerLighter) {
+                    color.sat = 1.0f;
-                        color.lum *= 0.75f;
+                    color.lum = 0.35f;
-                    }
-                    else {
-                        color.lum = 0.98f;
-                    }
                }
                else if (i == tmBannerBackground_ColorId) {
-                    if (isBannerLighter) {
+                    color = hsl_Color(get_Color(tmBackground_ColorId));
-                        //color.lum = iMin(0.9, color.lum);
-                        color = hsl_Color(get_Color(tmBackground_ColorId));
-                    }
-                    else {
-                        color.sat *= 0.8f;
-                        color.lum = 0.6f;
-                    }
                }
                else if (isText_ColorId(i)) {
                    color.sat = 0.9f;
@@ -772,7 +799,12 @@ void setThemeSeed_GmDocument(iGmDocument *d, const iBlock *seed) {
                    if (isDarkBgSat) {
                        /* Saturate background, desaturate text. */
                        if (isBackground_ColorId(i)) {
-                            color.sat = (color.sat + 1) / 2;
+                            if (primIndex != green_Hue) {
+                                color.sat = (color.sat + 1) / 2;
+                            }
+                            else {
+                                color.sat *= 0.5f;
+                            }
                            color.lum *= 0.75f;
                        }
                        else if (isText_ColorId(i)) {
@@ -822,11 +854,11 @@ static void normalize_GmDocument(iGmDocument *d) {
    iRangecc src = range_String(&d->source);
    iRangecc line = iNullRange;
    iBool isPreformat = iFalse;
-    if (d->format == plainText_GmDocumentFormat) {
+    if (d->format == plainText_GmDocumentFormat || isGopher_GmDocument_(d)) {
        isPreformat = iTrue; /* Cannot be turned off. */
    }
-    const int preTabWidth = 8; /* TODO: user-configurable parameter */
+    const int preTabWidth = 4; /* TODO: user-configurable parameter */
-    while (nextSplit_Rangecc(&src, "\n", &line)) {
+    while (nextSplit_Rangecc(src, "\n", &line)) {
        if (isPreformat) {
            /* Replace any tab characters with spaces for visualization. */
            for (const char *ch = line.start; ch != line.end; ch++) {
@@ -842,12 +874,12 @@ static void normalize_GmDocument(iGmDocument *d) {
                }
            }
            appendCStr_String(normalized, "\n");
-            if (lineType_GmDocument_(d, &line) == preformatted_GmLineType) {
+            if (lineType_GmDocument_(d, line) == preformatted_GmLineType) {
                isPreformat = iFalse;
            }
            continue;
        }
-        if (lineType_GmDocument_(d, &line) == preformatted_GmLineType) {
+        if (lineType_GmDocument_(d, line) == preformatted_GmLineType) {
            isPreformat = iTrue;
            appendRange_String(normalized, line);
            appendCStr_String(normalized, "\n");
diff --git a/src/gmdocument.h b/src/gmdocument.h
index 9f4bc1ca..b6c1c6ab 100644
--- a/src/gmdocument.h
+++ b/src/gmdocument.h
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #pragma once
 #include "gmutil.h"
@@ -66,7 +88,7 @@ iDeclareObjectConstruction(GmDocument)
 enum iGmDocumentFormat {
    undefined_GmDocumentFormat = -1,
-    gemini_GmDocumentFormat  = 0,
+    gemini_GmDocumentFormat    = 0,
    plainText_GmDocumentFormat,
 };
diff --git a/src/gmrequest.c b/src/gmrequest.c
index 0d69861d..137e8303 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -1,8 +1,31 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "gmrequest.h"
 #include "gmutil.h"
 #include "gmcerts.h"
 #include "app.h" /* dataDir_App() */
 #include "embedded.h"
+#include "ui/text.h"
 #include <the_Foundation/file.h>
 #include <the_Foundation/mutex.h>
@@ -171,11 +194,22 @@ static void checkServerCertificate_GmRequest_(iGmRequest *d) {
    const iTlsCertificate *cert = serverCertificate_TlsRequest(d->req);
    d->resp.certFlags = 0;
    if (cert) {
-        const iRangecc domain = urlHost_String(&d->url);
+        const iRangecc domain = range_String(hostName_Address(address_TlsRequest(d->req)));
        d->resp.certFlags |= available_GmCertFlag;
        if (!isExpired_TlsCertificate(cert)) {
            d->resp.certFlags |= timeVerified_GmCertFlag;
        }
+        /* TODO: Check for IP too (see below), because it may be specified in the SAN. */
+#if 0
+        iString *ip = toStringFlags_Address(address_TlsRequest(d->req), noPort_SocketStringFlag, 0);
+        if (verifyIp_TlsCertificate(cert, ip)) {
+            printf("[GmRequest] IP address %s matches!\n", cstr_String(ip));
+        }
+        else {
+            printf("[GmRequest] IP address %s not matched\n", cstr_String(ip));
+        }
+        delete_String(ip);
+#endif
        if (verifyDomain_TlsCertificate(cert, domain)) {
            d->resp.certFlags |= domainVerified_GmCertFlag;
        }
@@ -265,31 +299,92 @@ static void requestFinished_GmRequest_(iAnyObject *obj) {
 static const iBlock *aboutPageSource_(iRangecc path) {
    const iBlock *src = NULL;
-    if (equalCase_Rangecc(&path, "lagrange")) {
+    if (equalCase_Rangecc(path, "lagrange")) {
-        return &blobAbout_Embedded;
+        return &blobLagrange_Embedded;
    }
-    if (equalCase_Rangecc(&path, "help")) {
+    if (equalCase_Rangecc(path, "help")) {
        return &blobHelp_Embedded;
    }
-    if (equalCase_Rangecc(&path, "version")) {
+    if (equalCase_Rangecc(path, "version")) {
        return &blobVersion_Embedded;
    }
    return src;
 }
 static const iBlock *replaceVariables_(const iBlock *block) {
-    iRegExp *var = new_RegExp("\\$\\{([A-Z_]+)\\}", 0);
+    iRegExp *var = new_RegExp("\\$\\{([^}]+)\\}", 0);
    iRegExpMatch m;
+    init_RegExpMatch(&m);
    if (matchRange_RegExp(var, range_Block(block), &m)) {
        iBlock *replaced = collect_Block(copy_Block(block));
        do {
            const iRangei span = m.range;
-            remove_Block(replaced, span.start, size_Range(&span));
            const iRangecc name = capturedRange_RegExpMatch(&m, 1);
-            if (equal_Rangecc(&name, "APP_VERSION")) {
+            iRangecc repl = iNullRange;
-                insertData_Block(replaced, span.start,
+            if (equal_Rangecc(name, "APP_VERSION")) {
-                                 LAGRANGE_APP_VERSION, strlen(LAGRANGE_APP_VERSION));
+                repl = range_CStr(LAGRANGE_APP_VERSION);
+            }
+            else if (startsWith_Rangecc(name, "BT:")) { /* block text */
+                repl = range_String(collect_String(renderBlockChars_Text(
+                    &fontFiraSansRegular_Embedded,
+                    11, /* should be larger if shaded */
+                    quadrants_TextBlockMode,
+                    &(iString){ iBlockLiteral(
+                        name.start + 3, size_Range(&name) - 3, size_Range(&name) - 3) })));
+            }
+            else if (startsWith_Rangecc(name, "ST:")) { /* shaded text */
+                repl = range_String(collect_String(renderBlockChars_Text(
+                    &fontSymbola_Embedded,
+                    20,
+                    shading_TextBlockMode,
+                    &(iString){ iBlockLiteral(
+                        name.start + 3, size_Range(&name) - 3, size_Range(&name) - 3) })));
+            }
+            else if (equal_Rangecc(name, "ALT")) {
+#if defined (iPlatformApple)
+                repl = range_CStr("\u2325");
+#else
+                repl = range_CStr("Alt");
+#endif
+            }
+            else if (equal_Rangecc(name, "ALT+")) {
+#if defined (iPlatformApple)
+                repl = range_CStr("\u2325");
+#else
+                repl = range_CStr("Alt+");
+#endif
+            }
+            else if (equal_Rangecc(name, "CTRL")) {
+#if defined (iPlatformApple)
+                repl = range_CStr("\u2318");
+#else
+                repl = range_CStr("Ctrl");
+#endif
            }
+            else if (equal_Rangecc(name, "CTRL+")) {
+#if defined (iPlatformApple)
+                repl = range_CStr("\u2318");
+#else
+                repl = range_CStr("Ctrl+");
+#endif
+            }
+            else if (equal_Rangecc(name, "SHIFT")) {
+#if defined (iPlatformApple)
+                repl = range_CStr("\u21e7");
+#else
+                repl = range_CStr("Shift");
+#endif
+            }
+            else if (equal_Rangecc(name, "SHIFT+")) {
+#if defined (iPlatformApple)
+                repl = range_CStr("\u21e7");
+#else
+                repl = range_CStr("Shift+");
+#endif
+            }
+            remove_Block(replaced, span.start, size_Range(&span));
+            insertData_Block(replaced, span.start, repl.start, size_Range(&repl));
+            iZap(m);
        } while (matchRange_RegExp(var, range_Block(replaced), &m));
        block = replaced;
    }
@@ -305,9 +400,12 @@ void submit_GmRequest(iGmRequest *d) {
    clear_GmResponse(&d->resp);
    iUrl url;
    init_Url(&url, &d->url);
-    /* Check for special protocols. */
+    /* Check for special schemes. */
    /* TODO: If this were a library, these could be handled via callbacks. */
-    if (equalCase_Rangecc(&url.protocol, "about")) {
+    /* TODO: Handle app's configured proxies and these via the same mechanism. */
+    const iString *host = collect_String(newRange_String(url.host));
+    uint16_t       port = toInt_String(collect_String(newRange_String(url.port)));
+    if (equalCase_Rangecc(url.scheme, "about")) {
        const iBlock *src = aboutPageSource_(url.path);
        if (src) {
            d->resp.statusCode = success_GmStatusCode;
@@ -323,7 +421,7 @@ void submit_GmRequest(iGmRequest *d) {
        iNotifyAudience(d, finished, GmRequestFinished);
        return;
    }
-    else if (equalCase_Rangecc(&url.protocol, "file")) {
+    else if (equalCase_Rangecc(url.scheme, "file")) {
        iString *path = collect_String(urlDecode_String(collect_String(newRange_String(url.path))));
        iFile *  f    = new_File(path);
        if (open_File(f, readOnly_FileMode)) {
@@ -361,9 +459,9 @@ void submit_GmRequest(iGmRequest *d) {
        iNotifyAudience(d, finished, GmRequestFinished);
        return;
    }
-    else if (equalCase_Rangecc(&url.protocol, "data")) {
+    else if (equalCase_Rangecc(url.scheme, "data")) {
        d->resp.statusCode = success_GmStatusCode;
-        iString *src = collectNewCStr_String(url.protocol.start + 5);
+        iString *src = collectNewCStr_String(url.scheme.start + 5);
        iRangecc header = { constBegin_String(src), constBegin_String(src) };
        while (header.end < constEnd_String(src) && *header.end != ',') {
            header.end++;
@@ -372,8 +470,8 @@ void submit_GmRequest(iGmRequest *d) {
        setRange_String(&d->resp.meta, header);
        /* Check what's in the header. */ {
            iRangecc entry = iNullRange;
-            while (nextSplit_Rangecc(&header, ";", &entry)) {
+            while (nextSplit_Rangecc(header, ";", &entry)) {
-                if (equal_Rangecc(&entry, "base64")) {
+                if (equal_Rangecc(entry, "base64")) {
                    isBase64 = iTrue;
                }
            }
@@ -392,15 +490,31 @@ void submit_GmRequest(iGmRequest *d) {
        iNotifyAudience(d, finished, GmRequestFinished);
        return;
    }
+    else if (schemeProxy_App(url.scheme)) {
+        /* User has configured a proxy server for this scheme. */
+        const iString *proxy = schemeProxy_App(url.scheme);
+        if (contains_String(proxy, ':')) {
+            const size_t cpos = indexOf_String(proxy, ':');
+            port = atoi(cstr_String(proxy) + cpos + 1);
+            host = collect_String(newCStrN_String(cstr_String(proxy), cpos));
+        }
+        else {
+            host = proxy;
+            port = 0;
+        }
+    }
    d->state = receivingHeader_GmRequestState;
    d->req = new_TlsRequest();
+    const iGmIdentity *identity = identityForUrl_GmCerts(d->certs, &d->url);
+    if (identity) {
+        setCertificate_TlsRequest(d->req, identity->cert);
+    }
    iConnect(TlsRequest, d->req, readyRead, d, readIncoming_GmRequest_);
    iConnect(TlsRequest, d->req, finished, d, requestFinished_GmRequest_);
-    uint16_t port = toInt_String(collect_String(newRange_String(url.port)));
    if (port == 0) {
        port = 1965; /* default Gemini port */
    }
-    setUrl_TlsRequest(d->req, collect_String(newRange_String(url.host)), port);
+    setUrl_TlsRequest(d->req, host, port);
    setContent_TlsRequest(d->req,
                          utf8_String(collectNewFormat_String("%s\r\n", cstr_String(&d->url))));
    submit_TlsRequest(d->req);
diff --git a/src/gmrequest.h b/src/gmrequest.h
index cb7c151a..2f1a4261 100644
--- a/src/gmrequest.h
+++ b/src/gmrequest.h
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #pragma once
 #include <the_Foundation/audience.h>
diff --git a/src/gmutil.c b/src/gmutil.c
index 2138caa3..131734b2 100644
--- a/src/gmutil.c
+++ b/src/gmutil.c
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "gmutil.h"
 #include <the_Foundation/regexp.h>
@@ -5,12 +27,17 @@
 #include <the_Foundation/path.h>
 void init_Url(iUrl *d, const iString *text) {
-    iRegExp *absPat =
+    static iRegExp *absoluteUrlPattern_;
-        new_RegExp("([a-z]+:)?(//[^/:?]*)(:[0-9]+)?([^?]*)(\\?.*)?", caseInsensitive_RegExpOption);
+    static iRegExp *relativeUrlPattern_;
+    if (!absoluteUrlPattern_) {
+        absoluteUrlPattern_ = new_RegExp("([a-z]+:)?(//[^/:?]*)(:[0-9]+)?([^?]*)(\\?.*)?",
+                                         caseInsensitive_RegExpOption);
+    }
    iRegExpMatch m;
-    if (matchString_RegExp(absPat, text, &m)) {
+    init_RegExpMatch(&m);
-        d->protocol = capturedRange_RegExpMatch(&m, 1);
+    if (matchString_RegExp(absoluteUrlPattern_, text, &m)) {
-        d->host = capturedRange_RegExpMatch(&m, 2);
+        d->scheme = capturedRange_RegExpMatch(&m, 1);
+        d->host   = capturedRange_RegExpMatch(&m, 2);
        if (!isEmpty_Range(&d->host)) {
            d->host.start += 2; /* skip the double slash */
        }
@@ -18,28 +45,28 @@ void init_Url(iUrl *d, const iString *text) {
        if (!isEmpty_Range(&d->port)) {
            d->port.start++; /* omit the colon */
        }
-        d->path = capturedRange_RegExpMatch(&m, 4);
+        d->path  = capturedRange_RegExpMatch(&m, 4);
        d->query = capturedRange_RegExpMatch(&m, 5);
    }
    else {
        /* Must be a relative path. */
        iZap(*d);
-        iRegExp *relPat = new_RegExp("([a-z]+:)?([^?]*)(\\?.*)?", 0);
+        if (!relativeUrlPattern_) {
-        if (matchString_RegExp(relPat, text, &m)) {
+            relativeUrlPattern_ = new_RegExp("([a-z]+:)?([^?]*)(\\?.*)?", 0);
-            d->protocol = capturedRange_RegExpMatch(&m, 1);
+        }
-            d->path     = capturedRange_RegExpMatch(&m, 2);
+        if (matchString_RegExp(relativeUrlPattern_, text, &m)) {
-            d->query    = capturedRange_RegExpMatch(&m, 3);
+            d->scheme = capturedRange_RegExpMatch(&m, 1);
+            d->path   = capturedRange_RegExpMatch(&m, 2);
+            d->query  = capturedRange_RegExpMatch(&m, 3);
        }
-        iRelease(relPat);
    }
-    iRelease(absPat);
+    if (!isEmpty_Range(&d->scheme)) {
-    if (!isEmpty_Range(&d->protocol)) {
+        d->scheme.end--; /* omit the colon */
-        d->protocol.end--; /* omit the colon */
    }
 }
 static iRangecc dirPath_(iRangecc path) {
-    const size_t pos = lastIndexOfCStr_Rangecc(&path, "/");
+    const size_t pos = lastIndexOfCStr_Rangecc(path, "/");
    if (pos == iInvalidPos) return path;
    return (iRangecc){ path.start, path.start + pos };
 }
@@ -62,13 +89,13 @@ void cleanUrlPath_String(iString *d) {
    iUrl parts;
    init_Url(&parts, d);
    iRangecc seg = iNullRange;
-    while (nextSplit_Rangecc(&parts.path, "/", &seg)) {
+    while (nextSplit_Rangecc(parts.path, "/", &seg)) {
-        if (equal_Rangecc(&seg, "..")) {
+        if (equal_Rangecc(seg, "..")) {
            /* Back up one segment. */
            iRangecc last = prevPathSeg_(constEnd_String(&clean), constBegin_String(&clean));
            truncate_Block(&clean.chars, last.start - constBegin_String(&clean));
        }
-        else if (equal_Rangecc(&seg, ".")) {
+        else if (equal_Rangecc(seg, ".")) {
            /* Skip it. */
        }
        else {
@@ -76,11 +103,11 @@ void cleanUrlPath_String(iString *d) {
            appendRange_String(&clean, seg);
        }
    }
-    if (endsWith_Rangecc(&parts.path, "/")) {
+    if (endsWith_Rangecc(parts.path, "/")) {
        appendCStr_String(&clean, "/");
    }
    /* Replace with the new path. */
-    if (cmpCStrNSc_Rangecc(&parts.path, cstr_String(&clean), size_String(&clean), &iCaseSensitive)) {
+    if (cmpCStrNSc_Rangecc(parts.path, cstr_String(&clean), size_String(&clean), &iCaseSensitive)) {
        const size_t pos = parts.path.start - constBegin_String(d);
        remove_Block(&d->chars, pos, size_Range(&parts.path));
        insertData_Block(&d->chars, pos, cstr_String(&clean), size_String(&clean));
@@ -88,10 +115,10 @@ void cleanUrlPath_String(iString *d) {
    deinit_String(&clean);
 }
-iRangecc urlProtocol_String(const iString *d) {
+iRangecc urlScheme_String(const iString *d) {
    iUrl url;
    init_Url(&url, d);
-    return url.protocol;
+    return url.scheme;
 }
 iRangecc urlHost_String(const iString *d) {
@@ -105,20 +132,20 @@ const iString *absoluteUrl_String(const iString *d, const iString *urlMaybeRelat
    iUrl rel;
    init_Url(&orig, d);
    init_Url(&rel, urlMaybeRelative);
-    if (equalCase_Rangecc(&rel.protocol, "data") || equalCase_Rangecc(&rel.protocol, "about")) {
+    if (equalCase_Rangecc(rel.scheme, "data") || equalCase_Rangecc(rel.scheme, "about")) {
        /* Special case, the contents should be left unparsed. */
        return urlMaybeRelative;
    }
    const iBool isRelative = !isDef_(rel.host);
-    iRangecc protocol = range_CStr("gemini");
+    iRangecc scheme = range_CStr("gemini");
-    if (isDef_(rel.protocol)) {
+    if (isDef_(rel.scheme)) {
-        protocol = rel.protocol;
+        scheme = rel.scheme;
    }
-    else if (isRelative && isDef_(orig.protocol)) {
+    else if (isRelative && isDef_(orig.scheme)) {
-        protocol = orig.protocol;
+        scheme = orig.scheme;
    }
    iString *absolute = collectNew_String();
-    appendRange_String(absolute, protocol);
+    appendRange_String(absolute, scheme);
    appendCStr_String(absolute, "://"); {
        const iUrl *selHost = isDef_(rel.host) ? &rel : &orig;
        appendRange_String(absolute, selHost->host);
@@ -127,11 +154,11 @@ const iString *absoluteUrl_String(const iString *d, const iString *urlMaybeRelat
            appendRange_String(absolute, selHost->port);
        }
    }
-    if (isDef_(rel.protocol) || isDef_(rel.host) || startsWith_Rangecc(&rel.path, "/")) {
+    if (isDef_(rel.scheme) || isDef_(rel.host) || startsWith_Rangecc(rel.path, "/")) {
-        appendRange_String(absolute, rel.path); /* absolute path */
+        appendRange_String(absolute, isDef_(rel.path) ? rel.path : range_CStr("/")); /* absolute path */
    }
    else {
-        if (!endsWith_Rangecc(&orig.path, "/")) {
+        if (!endsWith_Rangecc(orig.path, "/")) {
            /* Referencing a file. */
            appendRange_String(absolute, dirPath_(orig.path));
        }
@@ -200,6 +227,16 @@ static const struct {
        "Invalid Redirect",
        "The server responded with a redirect but did not provide a valid destination URL. "
        "Perhaps the server is malfunctioning." } },
+    { nonGeminiRedirect_GmStatusCode,
+      { 0x27a0, /* dashed arrow */
+        "Redirect to Non-Gemini URL",
+        "The server attempted to redirect us to a non-Gemini URL. Here is the link so you "
+        "can open it manually if appropriate."} },
+    { tooManyRedirects_GmStatusCode,
+      { 0x27a0, /* dashed arrow */
+        "Too Many Redirects",
+        "You may be stuck in a redirection loop. The next redirected URL is below if you "
+        "want to continue manually."} },
    { temporaryFailure_GmStatusCode,
      { 0x1f50c, /* electric plug */
        "Temporary Failure",
diff --git a/src/gmutil.h b/src/gmutil.h
index 9e8c5934..2c017af4 100644
--- a/src/gmutil.h
+++ b/src/gmutil.h
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #pragma once
 #include <the_Foundation/range.h>
@@ -11,6 +33,8 @@ enum iGmStatusCode {
    /* clientside status codes */
    clientSide_GmStatusCode = -100,
    invalidRedirect_GmStatusCode,
+    nonGeminiRedirect_GmStatusCode,
+    tooManyRedirects_GmStatusCode,
    invalidHeader_GmStatusCode,
    unsupportedMimeType_GmStatusCode,
    failedToOpenFile_GmStatusCode,
@@ -61,7 +85,7 @@ iBool               isDefined_GmError   (enum iGmStatusCode code);
 const iGmError *    get_GmError         (enum iGmStatusCode code);
 struct Impl_Url {
-    iRangecc protocol;
+    iRangecc scheme;
    iRangecc host;
    iRangecc port;
    iRangecc path;
@@ -70,7 +94,7 @@ struct Impl_Url {
 void            init_Url                (iUrl *, const iString *text);
-iRangecc        urlProtocol_String      (const iString *);
+iRangecc        urlScheme_String        (const iString *);
 iRangecc        urlHost_String          (const iString *);
 const iString * absoluteUrl_String      (const iString *, const iString *urlMaybeRelative);
 iString *       makeFileUrl_String      (const iString *localFilePath);
diff --git a/src/history.c b/src/history.c
index 24912d81..6e985903 100644
--- a/src/history.c
+++ b/src/history.c
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "history.h"
 #include "app.h"
diff --git a/src/history.h b/src/history.h
index cf3a46be..22fe8bf8 100644
--- a/src/history.h
+++ b/src/history.h
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #pragma once
 #include "gmrequest.h"
diff --git a/src/macos.h b/src/macos.h
new file mode 100644
index 00000000..07990090
--- /dev/null
+++ b/src/macos.h
@@ -0,0 +1,31 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+#pragma once
+#include "ui/util.h"
+/* Platform-specific functionality for macOS */
+void    setupApplication_MacOS  (void);
+void    insertMenuItems_MacOS   (const char *menuLabel, int atIndex, const iMenuItem *items, size_t count);
+void    handleCommand_MacOS     (const char *cmd);
diff --git a/src/ui/macos.m b/src/macos.m
index 9ff2f96e..edbb6df0 100644
--- a/src/ui/macos.m
+++ b/src/macos.m
@@ -1,8 +1,30 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "macos.h"
 #include "app.h"
-#include "command.h"
+#include "ui/command.h"
-#include "widget.h"
+#include "ui/widget.h"
-#include "color.h"
+#include "ui/color.h"
 #import <AppKit/AppKit.h>
@@ -91,6 +113,7 @@ enum iTouchBarVariant {
 @interface MyDelegate : NSResponder<NSApplicationDelegate, NSTouchBarDelegate> {
    enum iTouchBarVariant touchBarVariant;
+    NSString *currentAppearanceName;
    NSObject<NSApplicationDelegate> *sdlDelegate;
    NSMutableDictionary<NSString *, NSString*> *menuCommands;
 }
@@ -105,6 +128,7 @@ enum iTouchBarVariant {
 - (id)initWithSDLDelegate:(NSObject<NSApplicationDelegate> *)sdl {
    [super init];
+    currentAppearanceName = nil;
    menuCommands = [[NSMutableDictionary<NSString *, NSString *> alloc] init];
    touchBarVariant = default_TouchBarVariant;
    sdlDelegate = sdl;
@@ -113,6 +137,7 @@ enum iTouchBarVariant {
 - (void)dealloc {
    [menuCommands release];
+    [currentAppearanceName release];
    [super dealloc];
 }
@@ -121,6 +146,24 @@ enum iTouchBarVariant {
    self.touchBar = nil;
 }
+static void appearanceChanged_MacOS_(NSString *name) {
+    const iBool isDark = [name containsString:@"Dark"];
+    const iBool isHighContrast = [name containsString:@"HighContrast"];
+    postCommandf_App("os.theme.changed dark:%d contrast:%d", isDark ? 1 : 0, isHighContrast ? 1 : 0);
+//    printf("Effective appearance changed: %s\n", [name cStringUsingEncoding:NSUTF8StringEncoding]);
+//    fflush(stdout);
+}
+- (void)setAppearance:(NSString *)name {
+    if (!currentAppearanceName || ![name isEqualToString:currentAppearanceName]) {
+        if (currentAppearanceName) {
+            [currentAppearanceName release];
+        }
+        currentAppearanceName = [name retain];
+        appearanceChanged_MacOS_(currentAppearanceName);
+    }
+}
 - (void)setCommand:(NSString *)command forMenuItem:(NSMenuItem *)menuItem {
    [menuCommands setObject:command forKey:[menuItem title]];
 }
@@ -133,6 +176,16 @@ enum iTouchBarVariant {
    [sdlDelegate applicationDidFinishLaunching:notification];
 }
+- (void)observeValueForKeyPath:(NSString *)keyPath
+                      ofObject:(id)object
+                        change:(NSDictionary *)change
+                       context:(void *)context {
+    iUnused(object, change);
+    if ([keyPath isEqualToString:@"effectiveAppearance"] && context == self) {
+        [self setAppearance:[[NSApp effectiveAppearance] name]];
+    }
+}
 #if 0
 - (NSTouchBar *)makeTouchBar {
    NSTouchBar *bar = [[NSTouchBar alloc] init];
@@ -225,7 +278,7 @@ enum iTouchBarVariant {
        return [[CommandButton alloc] initWithIdentifier:identifier
                                                   title:@"Go to…"
                                                 command:@"pattern.goto arg:-1"];
-    }   
+    }
    else if ([identifier isEqualToString:event_TouchId_]) {
        NSTouchBar *events = [[NSTouchBar alloc] init];
        events.delegate = self;
@@ -344,8 +397,10 @@ void enableMomentumScroll_MacOS(void) {
 void setupApplication_MacOS(void) {
    NSApplication *app = [NSApplication sharedApplication];
+    //appearanceChanged_MacOS_([[app effectiveAppearance] name]);
    /* Our delegate will override SDL's delegate. */
    MyDelegate *myDel = [[MyDelegate alloc] initWithSDLDelegate:app.delegate];
+    [myDel setAppearance:[[app effectiveAppearance] name]];
    app.delegate = myDel;
    NSMenu *appMenu = [[[NSApp mainMenu] itemAtIndex:0] submenu];
    NSMenuItem *prefsItem = [appMenu itemWithTitle:@"Preferences…"];
@@ -361,6 +416,10 @@ void setupApplication_MacOS(void) {
 void insertMenuItems_MacOS(const char *menuLabel, int atIndex, const iMenuItem *items, size_t count) {
    NSApplication *app = [NSApplication sharedApplication];
    MyDelegate *myDel = (MyDelegate *) app.delegate;
+    [app addObserver:myDel
+          forKeyPath:@"effectiveAppearance"
+             options:0
+             context:myDel];
    NSMenu *appMenu = [app mainMenu];
    NSMenuItem *mainItem = [appMenu insertItemWithTitle:[NSString stringWithUTF8String:menuLabel]
                                                 action:nil
@@ -417,6 +476,11 @@ void insertMenuItems_MacOS(const char *menuLabel, int atIndex, const iMenuItem *
 }
 void handleCommand_MacOS(const char *cmd) {
+    if (equal_Command(cmd, "prefs.ostheme.changed")) {
+        if (arg_Command(cmd)) {
+            appearanceChanged_MacOS_([[NSApp effectiveAppearance] name]);
+        }
+    }
 #if 0
    if (equal_Command(cmd, "tabs.changed")) {
        MyDelegate *myDel = (MyDelegate *) [[NSApplication sharedApplication] delegate];
diff --git a/src/main.c b/src/main.c
index 38d01b94..c13b75d1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include <the_Foundation/commandline.h>
 #include <stdio.h>
 #if defined (iPlatformMsys)
diff --git a/src/stb_image.h b/src/stb_image.h
index 2857f05d..accef483 100644
--- a/src/stb_image.h
+++ b/src/stb_image.h
@@ -1,4 +1,4 @@
-/* stb_image - v2.25 - public domain image loader - http://nothings.org/stb
+/* stb_image - v2.26 - public domain image loader - http://nothings.org/stb
                                  no warranty implied; use at your own risk
   Do this:
@@ -48,6 +48,7 @@ LICENSE
 RECENT REVISION HISTORY:
+      2.26  (2020-07-13) many minor fixes
      2.25  (2020-02-02) fix warnings
      2.24  (2020-02-02) fix warnings; thread-local failure_reason and flip_vertically
      2.23  (2019-08-11) fix clang static analysis warning
@@ -93,22 +94,30 @@ RECENT REVISION HISTORY:
    Carmelo J Fdez-Aguera
 Bug & warning fixes
-    Marc LeBlanc            David Woo          Guillaume George   Martins Mozeiko
+    Marc LeBlanc            David Woo          Guillaume George     Martins Mozeiko
-    Christpher Lloyd        Jerry Jansson      Joseph Thomson     Phil Jordan
+    Christpher Lloyd        Jerry Jansson      Joseph Thomson       Blazej Dariusz Roszkowski
-    Dave Moore              Roy Eltham         Hayaki Saito       Nathan Reed
+    Phil Jordan                                Dave Moore           Roy Eltham
-    Won Chun                Luke Graham        Johan Duparc       Nick Verigakis
+    Hayaki Saito            Nathan Reed        Won Chun
-    the Horde3D community   Thomas Ruf         Ronny Chevalier    github:rlyeh
+    Luke Graham             Johan Duparc       Nick Verigakis       the Horde3D community
-    Janez Zemva             John Bartholomew   Michal Cichon      github:romigrou
+    Thomas Ruf              Ronny Chevalier                         github:rlyeh
-    Jonathan Blow           Ken Hamada         Tero Hanninen      github:svdijk
+    Janez Zemva             John Bartholomew   Michal Cichon        github:romigrou
-    Laurent Gomila          Cort Stratton      Sergio Gonzalez    github:snagar
+    Jonathan Blow           Ken Hamada         Tero Hanninen        github:svdijk
-    Aruelien Pocheville     Thibault Reuille   Cass Everitt       github:Zelex
+                            Laurent Gomila     Cort Stratton        github:snagar
-    Ryamond Barbiero        Paul Du Bois       Engin Manap        github:grim210
+    Aruelien Pocheville     Sergio Gonzalez    Thibault Reuille     github:Zelex
-    Aldo Culquicondor       Philipp Wiesemann  Dale Weiler        github:sammyhw
+    Cass Everitt            Ryamond Barbiero                        github:grim210
-    Oriol Ferrer Mesia      Josh Tobin         Matthew Gregan     github:phprus
+    Paul Du Bois            Engin Manap        Aldo Culquicondor    github:sammyhw
-    Julian Raschke          Gregory Mullen     Baldur Karlsson    github:poppolopoppo
+    Philipp Wiesemann       Dale Weiler        Oriol Ferrer Mesia   github:phprus
-    Christian Floisand      Kevin Schmidt      JR Smith           github:darealshinji
+    Josh Tobin                                 Matthew Gregan       github:poppolopoppo
-    Brad Weinberger         Matvey Cherevko                       github:Michaelangel007
+    Julian Raschke          Gregory Mullen     Christian Floisand   github:darealshinji
-    Blazej Dariusz Roszkowski                  Alexander Veselov
+    Baldur Karlsson         Kevin Schmidt      JR Smith             github:Michaelangel007
+                            Brad Weinberger    Matvey Cherevko      [reserved]
+    Luca Sas                Alexander Veselov  Zack Middleton       [reserved]
+    Ryan C. Gordon          [reserved]                              [reserved]
+                     DO NOT ADD YOUR NAME HERE
+  To add your name to the credits, pick a random blank space in the middle and fill it.
+  80% of merge conflicts on stb PRs are due to people adding their name at the end
+  of the credits.
 */
 #ifndef STBI_INCLUDE_STB_IMAGE_H
@@ -318,7 +327,14 @@ RECENT REVISION HISTORY:
 //   - If you use STBI_NO_PNG (or _ONLY_ without PNG), and you still
 //     want the zlib decoder to be available, #define STBI_SUPPORT_ZLIB
 //
+//  - If you define STBI_MAX_DIMENSIONS, stb_image will reject images greater
+//    than that size (in either width or height) without further processing.
+//    This is to let programs in the wild set an upper bound to prevent
+//    denial-of-service attacks on untrusted data, as one could generate a
+//    valid image of gigantic dimensions and force stb_image to allocate a
+//    huge block of memory and spend disproportionate time decoding it. By
+//    default this is set to (1 << 24), which is 16777216, but that's still
+//    very big.
 #ifndef STBI_NO_STDIO
 #include <stdio.h>
@@ -574,13 +590,19 @@ STBIDEF int   stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const ch
 #ifndef STBI_NO_THREAD_LOCALS
   #if defined(__cplusplus) &&  __cplusplus >= 201103L
      #define STBI_THREAD_LOCAL       thread_local
-   #elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
+   #elif defined(__GNUC__) && __GNUC__ < 5
-      #define STBI_THREAD_LOCAL       _Thread_local
-   #elif defined(__GNUC__)
      #define STBI_THREAD_LOCAL       __thread
   #elif defined(_MSC_VER)
      #define STBI_THREAD_LOCAL       __declspec(thread)
-#endif
+   #elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && !defined(__STDC_NO_THREADS__)
+      #define STBI_THREAD_LOCAL       _Thread_local
+   #endif
+   #ifndef STBI_THREAD_LOCAL
+      #if defined(__GNUC__)
+        #define STBI_THREAD_LOCAL       __thread
+      #endif
+   #endif
 #endif
 #ifdef _MSC_VER
@@ -734,6 +756,10 @@ static int stbi__sse2_available(void)
 #define STBI_SIMD_ALIGN(type, name) type name
 #endif
+#ifndef STBI_MAX_DIMENSIONS
+#define STBI_MAX_DIMENSIONS (1 << 24)
+#endif
 ///////////////////////////////////////////////
 //
 //  stbi__context struct and start_xxx functions
@@ -751,6 +777,7 @@ typedef struct
   int read_from_callbacks;
   int buflen;
   stbi_uc buffer_start[128];
+   int callback_already_read;
   stbi_uc *img_buffer, *img_buffer_end;
   stbi_uc *img_buffer_original, *img_buffer_original_end;
@@ -764,6 +791,7 @@ static void stbi__start_mem(stbi__context *s, stbi_uc const *buffer, int len)
 {
   s->io.read = NULL;
   s->read_from_callbacks = 0;
+   s->callback_already_read = 0;
   s->img_buffer = s->img_buffer_original = (stbi_uc *) buffer;
   s->img_buffer_end = s->img_buffer_original_end = (stbi_uc *) buffer+len;
 }
@@ -775,7 +803,8 @@ static void stbi__start_callbacks(stbi__context *s, stbi_io_callbacks *c, void *
   s->io_user_data = user;
   s->buflen = sizeof(s->buffer_start);
   s->read_from_callbacks = 1;
-   s->img_buffer_original = s->buffer_start;
+   s->callback_already_read = 0;
+   s->img_buffer = s->img_buffer_original = s->buffer_start;
   stbi__refill_buffer(s);
   s->img_buffer_original_end = s->img_buffer_end;
 }
@@ -789,12 +818,17 @@ static int stbi__stdio_read(void *user, char *data, int size)
 static void stbi__stdio_skip(void *user, int n)
 {
+   int ch;
   fseek((FILE*) user, n, SEEK_CUR);
+   ch = fgetc((FILE*) user);  /* have to read a byte to reset feof()'s flag */
+   if (ch != EOF) {
+      ungetc(ch, (FILE *) user);  /* push byte back onto stream if valid. */
+   }
 }
 static int stbi__stdio_eof(void *user)
 {
-   return feof((FILE*) user);
+   return feof((FILE*) user) || ferror((FILE *) user);
 }
 static stbi_io_callbacks stbi__stdio_callbacks =
@@ -1171,8 +1205,10 @@ static unsigned char *stbi__load_and_postprocess_8bit(stbi__context *s, int *x,
   if (result == NULL)
      return NULL;
+   // it is the responsibility of the loaders to make sure we get either 8 or 16 bit.
+   STBI_ASSERT(ri.bits_per_channel == 8 || ri.bits_per_channel == 16);
   if (ri.bits_per_channel != 8) {
-      STBI_ASSERT(ri.bits_per_channel == 16);
      result = stbi__convert_16_to_8((stbi__uint16 *) result, *x, *y, req_comp == 0 ? *comp : req_comp);
      ri.bits_per_channel = 8;
   }
@@ -1195,8 +1231,10 @@ static stbi__uint16 *stbi__load_and_postprocess_16bit(stbi__context *s, int *x,
   if (result == NULL)
      return NULL;
+   // it is the responsibility of the loaders to make sure we get either 8 or 16 bit.
+   STBI_ASSERT(ri.bits_per_channel == 8 || ri.bits_per_channel == 16);
   if (ri.bits_per_channel != 16) {
-      STBI_ASSERT(ri.bits_per_channel == 8);
      result = stbi__convert_8_to_16((stbi_uc *) result, *x, *y, req_comp == 0 ? *comp : req_comp);
      ri.bits_per_channel = 16;
   }
@@ -1499,6 +1537,7 @@ enum
 static void stbi__refill_buffer(stbi__context *s)
 {
   int n = (s->io.read)(s->io_user_data,(char*)s->buffer_start,s->buflen);
+   s->callback_already_read += (int) (s->img_buffer - s->img_buffer_original);
   if (n == 0) {
      // at end of file, treat same as if from memory, but need to handle case
      // where s->img_buffer isn't pointing to safe memory, e.g. 0-byte file
@@ -1544,6 +1583,7 @@ stbi_inline static int stbi__at_eof(stbi__context *s)
 #else
 static void stbi__skip(stbi__context *s, int n)
 {
+   if (n == 0) return;  // already there!
   if (n < 0) {
      s->img_buffer = s->img_buffer_end;
      return;
@@ -1686,7 +1726,7 @@ static unsigned char *stbi__convert_format(unsigned char *data, int img_n, int r
         STBI__CASE(4,1) { dest[0]=stbi__compute_y(src[0],src[1],src[2]);                   } break;
         STBI__CASE(4,2) { dest[0]=stbi__compute_y(src[0],src[1],src[2]); dest[1] = src[3]; } break;
         STBI__CASE(4,3) { dest[0]=src[0];dest[1]=src[1];dest[2]=src[2];                    } break;
-         default: STBI_ASSERT(0);
+         default: STBI_ASSERT(0); STBI_FREE(data); STBI_FREE(good); return stbi__errpuc("unsupported", "Unsupported format conversion");
      }
      #undef STBI__CASE
   }
@@ -1743,7 +1783,7 @@ static stbi__uint16 *stbi__convert_format16(stbi__uint16 *data, int img_n, int r
         STBI__CASE(4,1) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]);                   } break;
         STBI__CASE(4,2) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]); dest[1] = src[3]; } break;
         STBI__CASE(4,3) { dest[0]=src[0];dest[1]=src[1];dest[2]=src[2];                       } break;
-         default: STBI_ASSERT(0);
+         default: STBI_ASSERT(0); STBI_FREE(data); STBI_FREE(good); return (stbi__uint16*) stbi__errpuc("unsupported", "Unsupported format conversion");
      }
      #undef STBI__CASE
   }
@@ -2052,7 +2092,7 @@ stbi_inline static int stbi__extend_receive(stbi__jpeg *j, int n)
   sgn = (stbi__int32)j->code_buffer >> 31; // sign bit is always in MSB
   k = stbi_lrot(j->code_buffer, n);
-   STBI_ASSERT(n >= 0 && n < (int) (sizeof(stbi__bmask)/sizeof(*stbi__bmask)));
+   if (n < 0 || n >= (int) (sizeof(stbi__bmask)/sizeof(*stbi__bmask))) return 0;
   j->code_buffer = k & ~stbi__bmask[n];
   k &= stbi__bmask[n];
   j->code_bits -= n;
@@ -2163,6 +2203,7 @@ static int stbi__jpeg_decode_block_prog_dc(stbi__jpeg *j, short data[64], stbi__
      // first scan for DC coefficient, must be first
      memset(data,0,64*sizeof(data[0])); // 0 all the ac values now
      t = stbi__jpeg_huff_decode(j, hdc);
+      if (t == -1) return stbi__err("can't merge dc and ac", "Corrupt JPEG");
      diff = t ? stbi__extend_receive(j, t) : 0;
      dc = j->img_comp[b].dc_pred + diff;
@@ -3153,6 +3194,8 @@ static int stbi__process_frame_header(stbi__jpeg *z, int scan)
   p  = stbi__get8(s);            if (p != 8) return stbi__err("only 8-bit","JPEG format not supported: 8-bit only"); // JPEG baseline
   s->img_y = stbi__get16be(s);   if (s->img_y == 0) return stbi__err("no header height", "JPEG format not supported: delayed height"); // Legal, but we don't handle it--but neither does IJG
   s->img_x = stbi__get16be(s);   if (s->img_x == 0) return stbi__err("0 width","Corrupt JPEG"); // JPEG requires
+   if (s->img_y > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)");
+   if (s->img_x > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)");
   c = stbi__get8(s);
   if (c != 3 && c != 1 && c != 4) return stbi__err("bad component count","Corrupt JPEG");
   s->img_n = c;
@@ -4033,16 +4076,23 @@ typedef struct
   stbi__zhuffman z_length, z_distance;
 } stbi__zbuf;
+stbi_inline static int stbi__zeof(stbi__zbuf *z)
+{
+   return (z->zbuffer >= z->zbuffer_end);
+}
 stbi_inline static stbi_uc stbi__zget8(stbi__zbuf *z)
 {
-   if (z->zbuffer >= z->zbuffer_end) return 0;
+   return stbi__zeof(z) ? 0 : *z->zbuffer++;
-   return *z->zbuffer++;
 }
 static void stbi__fill_bits(stbi__zbuf *z)
 {
   do {
-      STBI_ASSERT(z->code_buffer < (1U << z->num_bits));
+      if (z->code_buffer >= (1U << z->num_bits)) {
+        z->zbuffer = z->zbuffer_end;  /* treat this as EOF so we fail. */
+        return;
+      }
      z->code_buffer |= (unsigned int) stbi__zget8(z) << z->num_bits;
      z->num_bits += 8;
   } while (z->num_bits <= 24);
@@ -4067,10 +4117,11 @@ static int stbi__zhuffman_decode_slowpath(stbi__zbuf *a, stbi__zhuffman *z)
   for (s=STBI__ZFAST_BITS+1; ; ++s)
      if (k < z->maxcode[s])
         break;
-   if (s == 16) return -1; // invalid code!
+   if (s >= 16) return -1; // invalid code!
   // code size is s, so:
   b = (k >> (16-s)) - z->firstcode[s] + z->firstsymbol[s];
-   STBI_ASSERT(z->size[b] == s);
+   if (b >= sizeof (z->size)) return -1; // some data was corrupt somewhere!
+   if (z->size[b] != s) return -1;  // was originally an assert, but report failure instead.
   a->code_buffer >>= s;
   a->num_bits -= s;
   return z->value[b];
@@ -4079,7 +4130,12 @@ static int stbi__zhuffman_decode_slowpath(stbi__zbuf *a, stbi__zhuffman *z)
 stbi_inline static int stbi__zhuffman_decode(stbi__zbuf *a, stbi__zhuffman *z)
 {
   int b,s;
-   if (a->num_bits < 16) stbi__fill_bits(a);
+   if (a->num_bits < 16) {
+      if (stbi__zeof(a)) {
+         return -1;   /* report error for unexpected end of data. */
+      }
+      stbi__fill_bits(a);
+   }
   b = z->fast[a->code_buffer & STBI__ZFAST_MASK];
   if (b) {
      s = b >> 9;
@@ -4093,13 +4149,16 @@ stbi_inline static int stbi__zhuffman_decode(stbi__zbuf *a, stbi__zhuffman *z)
 static int stbi__zexpand(stbi__zbuf *z, char *zout, int n)  // need to make room for n bytes
 {
   char *q;
-   int cur, limit, old_limit;
+   unsigned int cur, limit, old_limit;
   z->zout = zout;
   if (!z->z_expandable) return stbi__err("output buffer limit","Corrupt PNG");
-   cur   = (int) (z->zout     - z->zout_start);
+   cur   = (unsigned int) (z->zout - z->zout_start);
-   limit = old_limit = (int) (z->zout_end - z->zout_start);
+   limit = old_limit = (unsigned) (z->zout_end - z->zout_start);
-   while (cur + n > limit)
+   if (UINT_MAX - cur < (unsigned) n) return stbi__err("outofmem", "Out of memory");
+   while (cur + n > limit) {
+      if(limit > UINT_MAX / 2) return stbi__err("outofmem", "Out of memory");
      limit *= 2;
+   }
   q = (char *) STBI_REALLOC_SIZED(z->zout_start, old_limit, limit);
   STBI_NOTUSED(old_limit);
   if (q == NULL) return stbi__err("outofmem", "Out of memory");
@@ -4197,11 +4256,12 @@ static int stbi__compute_huffman_codes(stbi__zbuf *a)
            c = stbi__zreceive(a,2)+3;
            if (n == 0) return stbi__err("bad codelengths", "Corrupt PNG");
            fill = lencodes[n-1];
-         } else if (c == 17)
+         } else if (c == 17) {
            c = stbi__zreceive(a,3)+3;
-         else {
+         } else if (c == 18) {
-            STBI_ASSERT(c == 18);
            c = stbi__zreceive(a,7)+11;
+         } else {
+            return stbi__err("bad codelengths", "Corrupt PNG");
         }
         if (ntot - n < c) return stbi__err("bad codelengths", "Corrupt PNG");
         memset(lencodes+n, fill, c);
@@ -4227,7 +4287,7 @@ static int stbi__parse_uncompressed_block(stbi__zbuf *a)
      a->code_buffer >>= 8;
      a->num_bits -= 8;
   }
-   STBI_ASSERT(a->num_bits == 0);
+   if (a->num_bits < 0) return stbi__err("zlib corrupt","Corrupt PNG");
   // now fill header the normal way
   while (k < 4)
      header[k++] = stbi__zget8(a);
@@ -4249,6 +4309,7 @@ static int stbi__parse_zlib_header(stbi__zbuf *a)
   int cm    = cmf & 15;
   /* int cinfo = cmf >> 4; */
   int flg   = stbi__zget8(a);
+   if (stbi__zeof(a)) return stbi__err("bad zlib header","Corrupt PNG"); // zlib spec
   if ((cmf*256+flg) % 31 != 0) return stbi__err("bad zlib header","Corrupt PNG"); // zlib spec
   if (flg & 32) return stbi__err("no preset dict","Corrupt PNG"); // preset dictionary not allowed in png
   if (cm != 8) return stbi__err("bad compression","Corrupt PNG"); // DEFLATE required for png
@@ -4510,7 +4571,7 @@ static int stbi__create_png_image_raw(stbi__png *a, stbi_uc *raw, stbi__uint32 r
         return stbi__err("invalid filter","Corrupt PNG");
      if (depth < 8) {
-         STBI_ASSERT(img_width_bytes <= x);
+         if (img_width_bytes > x) return stbi__err("invalid width","Corrupt PNG");
         cur += x*out_n - img_width_bytes; // store output to the rightmost img_len bytes, so we can decode in place
         filter_bytes = 1;
         width = img_width_bytes;
@@ -4905,8 +4966,10 @@ static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp)
            if (!first) return stbi__err("multiple IHDR","Corrupt PNG");
            first = 0;
            if (c.length != 13) return stbi__err("bad IHDR len","Corrupt PNG");
-            s->img_x = stbi__get32be(s); if (s->img_x > (1 << 24)) return stbi__err("too large","Very large image (corrupt?)");
+            s->img_x = stbi__get32be(s);
-            s->img_y = stbi__get32be(s); if (s->img_y > (1 << 24)) return stbi__err("too large","Very large image (corrupt?)");
+            s->img_y = stbi__get32be(s);
+            if (s->img_y > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)");
+            if (s->img_x > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)");
            z->depth = stbi__get8(s);  if (z->depth != 1 && z->depth != 2 && z->depth != 4 && z->depth != 8 && z->depth != 16)  return stbi__err("1/2/4/8/16-bit only","PNG not supported: 1/2/4/8/16-bit only");
            color = stbi__get8(s);  if (color > 6)         return stbi__err("bad ctype","Corrupt PNG");
            if (color == 3 && z->depth == 16)                  return stbi__err("bad ctype","Corrupt PNG");
@@ -5055,10 +5118,12 @@ static void *stbi__do_png(stbi__png *p, int *x, int *y, int *n, int req_comp, st
   void *result=NULL;
   if (req_comp < 0 || req_comp > 4) return stbi__errpuc("bad req_comp", "Internal error");
   if (stbi__parse_png_file(p, STBI__SCAN_load, req_comp)) {
-      if (p->depth < 8)
+      if (p->depth <= 8)
         ri->bits_per_channel = 8;
+      else if (p->depth == 16)
+         ri->bits_per_channel = 16;
      else
-         ri->bits_per_channel = p->depth;
+         return stbi__errpuc("bad bits_per_channel", "PNG not supported: unsupported color depth");
      result = p->out;
      p->out = NULL;
      if (req_comp && req_comp != p->s->img_out_n) {
@@ -5219,6 +5284,8 @@ static void *stbi__bmp_parse_header(stbi__context *s, stbi__bmp_data *info)
   info->mr = info->mg = info->mb = info->ma = 0;
   info->extra_read = 14;
+   if (info->offset < 0) return stbi__errpuc("bad BMP", "bad BMP");
   if (hsz != 12 && hsz != 40 && hsz != 56 && hsz != 108 && hsz != 124) return stbi__errpuc("unknown BMP", "BMP type not supported: unknown");
   if (hsz == 12) {
      s->img_x = stbi__get16le(s);
@@ -5310,6 +5377,9 @@ static void *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req
   flip_vertically = ((int) s->img_y) > 0;
   s->img_y = abs((int) s->img_y);
+   if (s->img_y > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)");
+   if (s->img_x > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)");
   mr = info.mr;
   mg = info.mg;
   mb = info.mb;
@@ -5324,7 +5394,10 @@ static void *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req
         psize = (info.offset - info.extra_read - info.hsz) >> 2;
   }
   if (psize == 0) {
-      STBI_ASSERT(info.offset == (s->img_buffer - s->buffer_start));
+      STBI_ASSERT(info.offset == s->callback_already_read + (int) (s->img_buffer - s->img_buffer_original));
+      if (info.offset != s->callback_already_read + (s->img_buffer - s->buffer_start)) {
+        return stbi__errpuc("bad offset", "Corrupt BMP");
+      }
   }
   if (info.bpp == 24 && ma == 0xff000000)
@@ -5419,6 +5492,7 @@ static void *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req
         gshift = stbi__high_bit(mg)-7; gcount = stbi__bitcount(mg);
         bshift = stbi__high_bit(mb)-7; bcount = stbi__bitcount(mb);
         ashift = stbi__high_bit(ma)-7; acount = stbi__bitcount(ma);
+         if (rcount > 8 || gcount > 8 || bcount > 8 || acount > 8) { STBI_FREE(out); return stbi__errpuc("bad masks", "Corrupt BMP"); }
      }
      for (j=0; j < (int) s->img_y; ++j) {
         if (easy) {
@@ -5643,6 +5717,9 @@ static void *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req
   STBI_NOTUSED(tga_x_origin); // @TODO
   STBI_NOTUSED(tga_y_origin); // @TODO
+   if (tga_height > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)");
+   if (tga_width > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)");
   //   do a tiny bit of precessing
   if ( tga_image_type >= 8 )
   {
@@ -5682,6 +5759,11 @@ static void *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req
      //   do I need to load a palette?
      if ( tga_indexed)
      {
+         if (tga_palette_len == 0) {  /* you have to have at least one entry! */
+            STBI_FREE(tga_data);
+            return stbi__errpuc("bad palette", "Corrupt TGA");
+         }
         //   any data to skip? (offset usually = 0)
         stbi__skip(s, tga_palette_start );
         //   load the palette
@@ -5890,6 +5972,9 @@ static void *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int req
   h = stbi__get32be(s);
   w = stbi__get32be(s);
+   if (h > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)");
+   if (w > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)");
   // Make sure the depth is 8 bits.
   bitdepth = stbi__get16be(s);
   if (bitdepth != 8 && bitdepth != 16)
@@ -6244,6 +6329,10 @@ static void *stbi__pic_load(stbi__context *s,int *px,int *py,int *comp,int req_c
   x = stbi__get16be(s);
   y = stbi__get16be(s);
+   if (y > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)");
+   if (x > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)");
   if (stbi__at_eof(s))  return stbi__errpuc("bad file","file too short (pic header)");
   if (!stbi__mad3sizes_valid(x, y, 4, 0)) return stbi__errpuc("too large", "PIC image too large to decode");
@@ -6352,6 +6441,9 @@ static int stbi__gif_header(stbi__context *s, stbi__gif *g, int *comp, int is_in
   g->ratio = stbi__get8(s);
   g->transparent = -1;
+   if (g->w > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)");
+   if (g->h > STBI_MAX_DIMENSIONS) return stbi__err("too large","Very large image (corrupt?)");
   if (comp != 0) *comp = 4;  // can't actually tell whether it's 3 or 4 until we parse the comments
   if (is_info) return 1;
@@ -6529,7 +6621,7 @@ static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, i
      memset(g->history, 0x00, pcount);        // pixels that were affected previous frame
      first_frame = 1;
   } else {
-      // second frame - how do we dispoase of the previous one?
+      // second frame - how do we dispose of the previous one?
      dispose = (g->eflags & 0x1C) >> 2;
      pcount = g->w * g->h;
@@ -6683,6 +6775,8 @@ static void *stbi__load_gif_main(stbi__context *s, int **delays, int *x, int *y,
      stbi_uc *two_back = 0;
      stbi__gif g;
      int stride;
+      int out_size = 0;
+      int delays_size = 0;
      memset(&g, 0, sizeof(g));
      if (delays) {
         *delays = 0;
@@ -6699,22 +6793,28 @@ static void *stbi__load_gif_main(stbi__context *s, int **delays, int *x, int *y,
            stride = g.w * g.h * 4;
            if (out) {
-               void *tmp = (stbi_uc*) STBI_REALLOC( out, layers * stride );
+               void *tmp = (stbi_uc*) STBI_REALLOC_SIZED( out, out_size, layers * stride );
               if (NULL == tmp) {
                  STBI_FREE(g.out);
                  STBI_FREE(g.history);
                  STBI_FREE(g.background);
                  return stbi__errpuc("outofmem", "Out of memory");
               }
-               else
+               else {
-                  out = (stbi_uc*) tmp;
+                   out = (stbi_uc*) tmp;
+                   out_size = layers * stride;
+               }
               if (delays) {
-                  *delays = (int*) STBI_REALLOC( *delays, sizeof(int) * layers );
+                  *delays = (int*) STBI_REALLOC_SIZED( *delays, delays_size, sizeof(int) * layers );
+                  delays_size = layers * sizeof(int);
               }
            } else {
               out = (stbi_uc*)stbi__malloc( layers * stride );
+               out_size = layers * stride;
               if (delays) {
                  *delays = (int*) stbi__malloc( layers * sizeof(int) );
+                  delays_size = layers * sizeof(int);
               }
            }
            memcpy( out + ((layers - 1) * stride), u, stride );
@@ -6893,6 +6993,9 @@ static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int re
   token += 3;
   width = (int) strtol(token, NULL, 10);
+   if (height > STBI_MAX_DIMENSIONS) return stbi__errpf("too large","Very large image (corrupt?)");
+   if (width > STBI_MAX_DIMENSIONS) return stbi__errpf("too large","Very large image (corrupt?)");
   *x = width;
   *y = height;
@@ -7207,6 +7310,9 @@ static void *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req
   if (!stbi__pnm_info(s, (int *)&s->img_x, (int *)&s->img_y, (int *)&s->img_n))
      return 0;
+   if (s->img_y > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)");
+   if (s->img_x > STBI_MAX_DIMENSIONS) return stbi__errpuc("too large","Very large image (corrupt?)");
   *x = s->img_x;
   *y = s->img_y;
   if (comp) *comp = s->img_n;
diff --git a/src/stb_truetype.h b/src/stb_truetype.h
index 935a6de2..62595a15 100644
--- a/src/stb_truetype.h
+++ b/src/stb_truetype.h
@@ -53,8 +53,8 @@
 //       Johan Duparc               Thomas Fields
 //       Hou Qiming                 Derek Vinyard
 //       Rob Loach                  Cort Stratton
-//       Kenney Phillis Jr.         Brian Costabile            
+//       Kenney Phillis Jr.         Brian Costabile
-//       Ken Voskuil (kaesve)       
+//       Ken Voskuil (kaesve)
 //
 // VERSION HISTORY
 //
diff --git a/src/ui/color.c b/src/ui/color.c
index 7d6ab2c2..723e9805 100644
--- a/src/ui/color.c
+++ b/src/ui/color.c
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "color.h"
 #include <the_Foundation/string.h>
@@ -62,6 +84,7 @@ void setThemePalette_Color(enum iColorTheme theme) {
            copy_(uiTextStrong_ColorId, white_ColorId);
            copy_(uiTextSelected_ColorId, white_ColorId);
            copy_(uiTextFramelessHover_ColorId, white_ColorId);
+            copy_(uiTextDisabled_ColorId, gray25_ColorId);
            copy_(uiTextShortcut_ColorId, cyan_ColorId);
            copy_(uiTextAction_ColorId, cyan_ColorId);
            copy_(uiTextCaution_ColorId, orange_ColorId);
@@ -86,7 +109,8 @@ void setThemePalette_Color(enum iColorTheme theme) {
            copy_(uiInputCursor_ColorId, orange_ColorId);
            copy_(uiInputCursorText_ColorId, black_ColorId);
            copy_(uiHeading_ColorId, cyan_ColorId);
-            copy_(uiIcon_ColorId, teal_ColorId);
+            copy_(uiAnnotation_ColorId, teal_ColorId);
+            copy_(uiIcon_ColorId, cyan_ColorId);
            copy_(uiIconHover_ColorId, cyan_ColorId);
            copy_(uiSeparator_ColorId, gray25_ColorId);
            copy_(uiMarked_ColorId, brown_ColorId);
@@ -103,6 +127,7 @@ void setThemePalette_Color(enum iColorTheme theme) {
            copy_(uiTextPressed_ColorId, black_ColorId);
            copy_(uiTextStrong_ColorId, white_ColorId);
            copy_(uiTextSelected_ColorId, white_ColorId);
+            copy_(uiTextDisabled_ColorId, gray50_ColorId);
            copy_(uiTextFramelessHover_ColorId, white_ColorId);
            copy_(uiTextShortcut_ColorId, cyan_ColorId);
            copy_(uiTextAction_ColorId, cyan_ColorId);
@@ -128,6 +153,7 @@ void setThemePalette_Color(enum iColorTheme theme) {
            copy_(uiInputCursor_ColorId, orange_ColorId);
            copy_(uiInputCursorText_ColorId, black_ColorId);
            copy_(uiHeading_ColorId, cyan_ColorId);
+            copy_(uiAnnotation_ColorId, teal_ColorId);
            copy_(uiIcon_ColorId, cyan_ColorId);
            copy_(uiIconHover_ColorId, cyan_ColorId);
            copy_(uiSeparator_ColorId, black_ColorId);
@@ -141,9 +167,10 @@ void setThemePalette_Color(enum iColorTheme theme) {
            copy_(uiBackgroundPressed_ColorId, cyan_ColorId);
            copy_(uiBackgroundFramelessHover_ColorId, orange_ColorId);
            copy_(uiText_ColorId, black_ColorId);
-            copy_(uiTextStrong_ColorId, brown_ColorId);
+            copy_(uiTextStrong_ColorId, teal_ColorId);
            copy_(uiTextPressed_ColorId, black_ColorId);
            copy_(uiTextSelected_ColorId, black_ColorId);
+            copy_(uiTextDisabled_ColorId, gray50_ColorId);
            copy_(uiTextFramelessHover_ColorId, black_ColorId);
            copy_(uiTextShortcut_ColorId, brown_ColorId);
            copy_(uiTextAction_ColorId, brown_ColorId);
@@ -163,15 +190,16 @@ void setThemePalette_Color(enum iColorTheme theme) {
            copy_(uiInputBackgroundFocused_ColorId, white_ColorId);
            copy_(uiInputText_ColorId, gray25_ColorId);
            copy_(uiInputTextFocused_ColorId, black_ColorId);
-            copy_(uiInputFrame_ColorId, gray25_ColorId);
+            copy_(uiInputFrame_ColorId, gray50_ColorId);
            copy_(uiInputFrameHover_ColorId, brown_ColorId);
            copy_(uiInputFrameFocused_ColorId, teal_ColorId);
            copy_(uiInputCursor_ColorId, teal_ColorId);
            copy_(uiInputCursorText_ColorId, white_ColorId);
            copy_(uiHeading_ColorId, brown_ColorId);
+            copy_(uiAnnotation_ColorId, gray50_ColorId);
            copy_(uiIcon_ColorId, brown_ColorId);
            copy_(uiIconHover_ColorId, brown_ColorId);
-            copy_(uiSeparator_ColorId, gray25_ColorId);
+            copy_(uiSeparator_ColorId, gray50_ColorId);
            copy_(uiMarked_ColorId, cyan_ColorId);
            copy_(uiMatching_ColorId, orange_ColorId);
            break;
@@ -183,6 +211,7 @@ void setThemePalette_Color(enum iColorTheme theme) {
            copy_(uiBackgroundFramelessHover_ColorId, orange_ColorId);
            copy_(uiText_ColorId, gray25_ColorId);
            copy_(uiTextPressed_ColorId, black_ColorId);
+            copy_(uiTextDisabled_ColorId, gray75_ColorId);
            copy_(uiTextStrong_ColorId, black_ColorId);
            copy_(uiTextSelected_ColorId, black_ColorId);
            copy_(uiTextFramelessHover_ColorId, black_ColorId);
@@ -210,13 +239,16 @@ void setThemePalette_Color(enum iColorTheme theme) {
            copy_(uiInputCursor_ColorId, teal_ColorId);
            copy_(uiInputCursorText_ColorId, white_ColorId);
            copy_(uiHeading_ColorId, brown_ColorId);
+            copy_(uiAnnotation_ColorId, gray50_ColorId);
            copy_(uiIcon_ColorId, brown_ColorId);
            copy_(uiIconHover_ColorId, brown_ColorId);
-            copy_(uiSeparator_ColorId, gray50_ColorId);
+            copy_(uiSeparator_ColorId, gray75_ColorId);
            copy_(uiMarked_ColorId, cyan_ColorId);
            copy_(uiMatching_ColorId, orange_ColorId);
            break;
    }
+    palette_[uiMarked_ColorId].a = 128;
+    palette_[uiMatching_ColorId].a = 128;
 }
 iColor get_Color(int color) {
@@ -233,6 +265,14 @@ void set_Color(int color, iColor rgba) {
    }
 }
+iColor mix_Color(iColor c1, iColor c2, float t) {
+    t = iClamp(t, 0.0f, 1.0f);
+    return (iColor){ c1.r * (1 - t) + c2.r * t,
+                     c1.g * (1 - t) + c2.g * t,
+                     c1.b * (1 - t) + c2.b * t,
+                     c1.a * (1 - t) + c2.a * t };
+}
 iLocalDef iBool equal_Color_(const iColor *x, const iColor *y) {
    return memcmp(x, y, sizeof(iColor)) == 0;
 }
@@ -361,7 +401,8 @@ const char *escape_Color(int color) {
    if (color >= 0 && color < (int) iElemCount(esc)) {
        return esc[color];
    }
-    return format_CStr("\r%c", color + '0');
+    iAssert(asciiBase_ColorEscape + color <= 127);
+    return format_CStr("\r%c", asciiBase_ColorEscape + color);
 }
 iHSLColor setSat_HSLColor(iHSLColor d, float sat) {
diff --git a/src/ui/color.h b/src/ui/color.h
index 596fec7a..76e5b2a7 100644
--- a/src/ui/color.h
+++ b/src/ui/color.h
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #pragma once
 #include <the_Foundation/range.h>
@@ -46,6 +68,7 @@ enum iColorId {
    uiText_ColorId,
    uiTextPressed_ColorId,
    uiTextSelected_ColorId,
+    uiTextDisabled_ColorId,
    uiTextFramelessHover_ColorId,
    uiTextFramelessSelected_ColorId,
    uiTextStrong_ColorId,
@@ -73,6 +96,7 @@ enum iColorId {
    uiInputCursor_ColorId,
    uiInputCursorText_ColorId,
    uiHeading_ColorId,
+    uiAnnotation_ColorId,
    uiIcon_ColorId,
    uiIconHover_ColorId,
    uiSeparator_ColorId,
@@ -139,24 +163,26 @@ iLocalDef iBool isRegularText_ColorId(enum iColorId d) {
 #define mask_ColorId                0x7f
 #define permanent_ColorId           0x80 /* cannot be changed via escapes */
-#define black_ColorEscape           "\r0"
+#define asciiBase_ColorEscape       33
-#define gray25_ColorEscape          "\r1"
-#define gray50_ColorEscape          "\r2"
+#define black_ColorEscape           "\r!"
-#define gray75_ColorEscape          "\r3"
+#define gray25_ColorEscape          "\r\""
-#define white_ColorEscape           "\r4"
+#define gray50_ColorEscape          "\r#"
-#define brown_ColorEscape           "\r5"
+#define gray75_ColorEscape          "\r$"
-#define orange_ColorEscape          "\r6"
+#define white_ColorEscape           "\r%"
-#define teal_ColorEscape            "\r7"
+#define brown_ColorEscape           "\r&"
-#define cyan_ColorEscape            "\r8"
+#define orange_ColorEscape          "\r'"
-#define yellow_ColorEscape          "\r9"
+#define teal_ColorEscape            "\r("
-#define red_ColorEscape             "\r:"
+#define cyan_ColorEscape            "\r)"
-#define magenta_ColorEscape         "\r;"
+#define yellow_ColorEscape          "\r*"
-#define blue_ColorEscape            "\r<"
+#define red_ColorEscape             "\r+"
-#define green_ColorEscape           "\r="
+#define magenta_ColorEscape         "\r,"
-#define uiText_ColorEscape          "\rC"
+#define blue_ColorEscape            "\r-"
-#define uiTextAction_ColorEscape    "\rJ"
+#define green_ColorEscape           "\r."
-#define uiTextCaution_ColorEscape   "\rK"
+#define uiText_ColorEscape          "\r4"
-#define uiHeading_ColorEscape       "\r`"
+#define uiTextAction_ColorEscape    "\r<"
+#define uiTextCaution_ColorEscape   "\r="
+#define uiHeading_ColorEscape       "\rR"
 iDeclareType(Color)
 iDeclareType(HSLColor)
@@ -180,6 +206,7 @@ iColor          get_Color       (int color);
 int             darker_Color    (int color);
 int             lighter_Color   (int color);
 void            set_Color       (int color, iColor rgba);
+iColor          mix_Color       (iColor c1, iColor c2, float t);
 iLocalDef void setHsl_Color(int color, iHSLColor hsl) {
    set_Color(color, rgb_HSLColor(hsl));
diff --git a/src/ui/command.c b/src/ui/command.c
index 19228e46..cf8c7032 100644
--- a/src/ui/command.c
+++ b/src/ui/command.c
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "command.h"
 #include "app.h"
diff --git a/src/ui/command.h b/src/ui/command.h
index 2124d527..4798baa6 100644
--- a/src/ui/command.h
+++ b/src/ui/command.h
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #pragma once
 #include <the_Foundation/vec2.h>
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 29803252..6ca6e4c2 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "documentwidget.h"
 #include "scrollwidget.h"
 #include "inputwidget.h"
@@ -105,6 +127,43 @@ iDefineTypeConstruction(Model)
 /*----------------------------------------------------------------------------------------------*/
+iDeclareType(VisBuffer)
+iDeclareTypeConstruction(VisBuffer)
+struct Impl_VisBuffer {
+    SDL_Texture *  texture[2];
+    int            index;
+    iInt2          size;
+    iRangei        validRange;
+};
+void init_VisBuffer(iVisBuffer *d) {
+    iZap(*d);
+}
+void deinit_VisBuffer(iVisBuffer *d) {
+    iForIndices(i, d->texture) {
+        if (d->texture[i]) {
+            SDL_DestroyTexture(d->texture[i]);
+        }
+    }
+}
+void dealloc_VisBuffer(iVisBuffer *d) {
+    d->size = zero_I2();
+    iZap(d->validRange);
+    iForIndices(i, d->texture) {
+        SDL_DestroyTexture(d->texture[i]);
+        d->texture[i] = NULL;
+    }
+}
+iDefineTypeConstruction(VisBuffer)
+/*----------------------------------------------------------------------------------------------*/
+static const int smoothSpeed_DocumentWidget_ = 120; /* unit: gap_Text per second */
 enum iRequestState {
    blank_RequestState,
    fetching_RequestState,
@@ -124,26 +183,26 @@ struct Impl_DocumentWidget {
    int            certFlags;
    iDate          certExpiry;
    iString *      certSubject;
+    int            redirectCount;
    iBool          selecting;
    iRangecc       selectMark;
    iRangecc       foundMark;
    int            pageMargin;
    iPtrArray      visibleLinks;
    const iGmRun * hoverLink;
+    const iGmRun * contextLink;
    iBool          noHoverWhileScrolling;
    iBool          showLinkNumbers;
    iClick         click;
    float          initNormScrollY;
    int            scrollY;
    iScrollWidget *scroll;
+    int            smoothScroll;
+    int            smoothSpeed;
+    int            smoothLastOffset;
+    iBool          smoothContinue;
    iWidget *      menu;
-    SDL_Cursor *   arrowCursor; /* TODO: cursors belong in Window */
+    iVisBuffer *   visBuffer;
-    SDL_Cursor *   beamCursor;
-    SDL_Cursor *   handCursor;
-    SDL_Texture *  visBuffer[2];
-    int            visBufferIndex;
-    iInt2          visBufferSize;
-    iRangei        visBufferValidRange;
 };
 iDefineObjectConstruction(DocumentWidget)
@@ -163,22 +222,22 @@ void init_DocumentWidget(iDocumentWidget *d) {
    d->isRequestUpdated = iFalse;
    d->media            = new_ObjectList();
    d->doc              = new_GmDocument();
+    d->redirectCount    = 0;
    d->initNormScrollY  = 0;
    d->scrollY          = 0;
+    d->smoothScroll     = 0;
+    d->smoothSpeed      = 0;
+    d->smoothLastOffset = 0;
+    d->smoothContinue   = iFalse;
    d->selecting        = iFalse;
    d->selectMark       = iNullRange;
    d->foundMark        = iNullRange;
    d->pageMargin       = 5;
    d->hoverLink        = NULL;
+    d->contextLink      = NULL;
    d->noHoverWhileScrolling = iFalse;
    d->showLinkNumbers  = iFalse;
-    iZap(d->visBuffer);
+    d->visBuffer        = new_VisBuffer();
-    d->visBufferIndex = 0;
-    d->visBufferSize  = zero_I2();
-    iZap(d->visBufferValidRange);
-    d->arrowCursor    = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_ARROW);
-    d->beamCursor     = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_IBEAM);
-    d->handCursor     = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_HAND);
    init_PtrArray(&d->visibleLinks);
    init_Click(&d->click, d, SDL_BUTTON_LEFT);
    addChild_Widget(w, iClob(d->scroll = new_ScrollWidget()));
@@ -197,18 +256,23 @@ void init_DocumentWidget(iDocumentWidget *d) {
 }
 void deinit_DocumentWidget(iDocumentWidget *d) {
+    delete_VisBuffer(d->visBuffer);
    iRelease(d->media);
    iRelease(d->request);
    iRelease(d->doc);
    deinit_PtrArray(&d->visibleLinks);
    delete_String(d->certSubject);
    delete_String(d->titleUser);
-    SDL_FreeCursor(d->arrowCursor);
-    SDL_FreeCursor(d->beamCursor);
-    SDL_FreeCursor(d->handCursor);
    deinit_Model(&d->mod);
 }
+static void resetSmoothScroll_DocumentWidget_(iDocumentWidget *d) {
+    d->smoothSpeed      = 0;
+    d->smoothScroll     = 0;
+    d->smoothLastOffset = 0;
+    d->smoothContinue   = iFalse;
+}
 static int documentWidth_DocumentWidget_(const iDocumentWidget *d) {
    const iWidget *w = constAs_Widget(d);
    const iRect bounds = bounds_Widget(w);
@@ -242,9 +306,11 @@ iLocalDef int documentToWindowY_DocumentWidget_(const iDocumentWidget *d, int do
    return docY - d->scrollY + documentBounds_DocumentWidget_(d).pos.y;
 }
+#if 0
 iLocalDef int windowToDocumentY_DocumentWidget_(const iDocumentWidget *d, int localY) {
    return localY + d->scrollY - documentBounds_DocumentWidget_(d).pos.y;
 }
+#endif
 static iInt2 documentPos_DocumentWidget_(const iDocumentWidget *d, iInt2 pos) {
    return addY_I2(sub_I2(pos, topLeft_Rect(documentBounds_DocumentWidget_(d))), d->scrollY);
@@ -291,15 +357,16 @@ static float normScrollPos_DocumentWidget_(const iDocumentWidget *d) {
 static int scrollMax_DocumentWidget_(const iDocumentWidget *d) {
    return size_GmDocument(d->doc).y - height_Rect(bounds_Widget(constAs_Widget(d))) +
-           2 * d->pageMargin * gap_UI;
+           (hasSiteBanner_GmDocument(d->doc) ? 1 : 2) * d->pageMargin * gap_UI;
 }
 static void updateHover_DocumentWidget_(iDocumentWidget *d, iInt2 mouse) {
-    const iRect docBounds      = documentBounds_DocumentWidget_(d);
+    const iWidget *w            = constAs_Widget(d);
-    const iGmRun *oldHoverLink = d->hoverLink;
+    const iRect    docBounds    = documentBounds_DocumentWidget_(d);
-    d->hoverLink               = NULL;
+    const iGmRun * oldHoverLink = d->hoverLink;
-    const iInt2 hoverPos = addY_I2(sub_I2(mouse, topLeft_Rect(docBounds)), d->scrollY);
+    d->hoverLink                = NULL;
-    if (!d->noHoverWhileScrolling &&
+    const iInt2 hoverPos        = addY_I2(sub_I2(mouse, topLeft_Rect(docBounds)), d->scrollY);
+    if (isHover_Widget(w) && !d->noHoverWhileScrolling &&
        (d->state == ready_RequestState || d->state == receivedPartialResponse_RequestState)) {
        iConstForEach(PtrArray, i, &d->visibleLinks) {
            const iGmRun *run = i.ptr;
@@ -312,12 +379,9 @@ static void updateHover_DocumentWidget_(iDocumentWidget *d, iInt2 mouse) {
    if (d->hoverLink != oldHoverLink) {
        refresh_Widget(as_Widget(d));
    }
-    if (!contains_Widget(constAs_Widget(d), mouse) ||
+    if (isHover_Widget(w) && !contains_Widget(constAs_Widget(d->scroll), mouse)) {
-        contains_Widget(constAs_Widget(d->scroll), mouse)) {
+        setCursor_Window(get_Window(),
-        SDL_SetCursor(d->arrowCursor);
+                         d->hoverLink ? SDL_SYSTEM_CURSOR_HAND : SDL_SYSTEM_CURSOR_IBEAM);
-    }
-    else {
-        SDL_SetCursor(d->hoverLink ? d->handCursor : d->beamCursor);
    }
 }
@@ -424,38 +488,52 @@ static void updateWindowTitle_DocumentWidget_(const iDocumentWidget *d) {
    }
 }
+static void invalidate_DocumentWidget_(iDocumentWidget *d) {
+    iZap(d->visBuffer->validRange);
+}
 static void setSource_DocumentWidget_(iDocumentWidget *d, const iString *source) {
    setUrl_GmDocument(d->doc, d->mod.url);
    setSource_GmDocument(d->doc, source, documentWidth_DocumentWidget_(d));
-    d->foundMark  = iNullRange;
+    d->foundMark   = iNullRange;
-    d->selectMark = iNullRange;
+    d->selectMark  = iNullRange;
-    d->hoverLink  = NULL;
+    d->hoverLink   = NULL;
+    d->contextLink = NULL;
    updateWindowTitle_DocumentWidget_(d);
    updateVisible_DocumentWidget_(d);
+    invalidate_DocumentWidget_(d);
    refresh_Widget(as_Widget(d));
 }
-static void showErrorPage_DocumentWidget_(iDocumentWidget *d, enum iGmStatusCode code) {
+static void showErrorPage_DocumentWidget_(iDocumentWidget *d, enum iGmStatusCode code,
+                                          const iString *meta) {
    iString *src = collectNewCStr_String("# ");
    const iGmError *msg = get_GmError(code);
    appendChar_String(src, msg->icon ? msg->icon : 0x2327); /* X in a box */
    appendFormat_String(src, " %s\n%s", msg->title, msg->info);
-    switch (code) {
+    if (meta) {
-        case failedToOpenFile_GmStatusCode:
+        switch (code) {
-        case certificateNotValid_GmStatusCode:
+            case nonGeminiRedirect_GmStatusCode:
-            appendFormat_String(src, "\n\n%s", cstr_String(meta_GmRequest(d->request)));
+            case tooManyRedirects_GmStatusCode:
-            break;
+                appendFormat_String(src, "\n=> %s\n", cstr_String(meta));
-        case unsupportedMimeType_GmStatusCode:
+                break;
-            appendFormat_String(src, "\n```\n%s\n```\n", cstr_String(meta_GmRequest(d->request)));
+            case failedToOpenFile_GmStatusCode:
-            break;
+            case certificateNotValid_GmStatusCode:
-        case slowDown_GmStatusCode:
+                appendFormat_String(src, "\n\n%s", cstr_String(meta));
-            appendFormat_String(src, "\n\nWait %s seconds before your next request.",
+                break;
-                                cstr_String(meta_GmRequest(d->request)));
+            case unsupportedMimeType_GmStatusCode:
-            break;
+                appendFormat_String(src, "\n```\n%s\n```\n", cstr_String(meta));
-        default:
+                break;
-            break;
+            case slowDown_GmStatusCode:
+                appendFormat_String(src, "\n\nWait %s seconds before your next request.",
+                                    cstr_String(meta));
+                break;
+            default:
+                break;
+        }
    }
    setSource_DocumentWidget_(d, src);
+    resetSmoothScroll_DocumentWidget_(d);
    d->scrollY = 0;
    d->state = ready_RequestState;
 }
@@ -470,10 +548,6 @@ static void updateTheme_DocumentWidget_(iDocumentWidget *d) {
    }
 }
-static void invalidate_DocumentWidget_(iDocumentWidget *d) {
-    iZap(d->visBufferValidRange);
-}
 static void updateDocument_DocumentWidget_(iDocumentWidget *d, const iGmResponse *response) {
    if (d->state == ready_RequestState) {
        return;
@@ -493,16 +567,16 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d, const iGmResponse
            const iString *mimeStr = collect_String(lower_String(&response->meta)); /* for convenience */
            iRangecc mime = range_String(mimeStr);
            iRangecc seg = iNullRange;
-            while (nextSplit_Rangecc(&mime, ";", &seg)) {
+            while (nextSplit_Rangecc(mime, ";", &seg)) {
                iRangecc param = seg;
                trim_Rangecc(&param);
-                if (equal_Rangecc(&param, "text/plain")) {
+                if (equal_Rangecc(param, "text/plain")) {
                    docFormat = plainText_GmDocumentFormat;
                }
-                else if (equal_Rangecc(&param, "text/gemini")) {
+                else if (equal_Rangecc(param, "text/gemini")) {
                    docFormat = gemini_GmDocumentFormat;
                }
-                else if (startsWith_Rangecc(&param, "image/")) {
+                else if (startsWith_Rangecc(param, "image/")) {
                    docFormat = gemini_GmDocumentFormat;
                    if (!d->request || isFinished_GmRequest(d->request)) {
                        /* Make a simple document with an image. */
@@ -521,7 +595,7 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d, const iGmResponse
                        clear_String(&str);
                    }
                }
-                else if (startsWith_Rangecc(&param, "charset=")) {
+                else if (startsWith_Rangecc(param, "charset=")) {
                    charset = (iRangecc){ param.start + 8, param.end };
                    /* Remove whitespace and quotes. */
                    trim_Rangecc(&charset);
@@ -532,12 +606,12 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d, const iGmResponse
                }
            }
            if (docFormat == undefined_GmDocumentFormat) {
-                showErrorPage_DocumentWidget_(d, unsupportedMimeType_GmStatusCode);
+                showErrorPage_DocumentWidget_(d, unsupportedMimeType_GmStatusCode, &response->meta);
                deinit_String(&str);
                return;
            }
            /* Convert the source to UTF-8 if needed. */
-            if (!equalCase_Rangecc(&charset, "utf-8")) {
+            if (!equalCase_Rangecc(charset, "utf-8")) {
                set_String(&str,
                           collect_String(decode_Block(&str.chars, cstr_Rangecc(charset))));
            }
@@ -609,6 +683,7 @@ static void parseUser_DocumentWidget_(iDocumentWidget *d) {
    iRegExp *userPats[2] = { new_RegExp("~([^/?]+)", 0),
                             new_RegExp("/users/([^/?]+)", caseInsensitive_RegExpOption) };
    iRegExpMatch m;
+    init_RegExpMatch(&m);
    iForIndices(i, userPats) {
        if (matchString_RegExp(userPats[i], d->mod.url, &m)) {
            setRange_String(d->titleUser, capturedRange_RegExpMatch(&m, 1));
@@ -621,6 +696,8 @@ static iBool updateFromHistory_DocumentWidget_(iDocumentWidget *d) {
    const iRecentUrl *recent = findUrl_History(d->mod.history, d->mod.url);
    if (recent && recent->cachedResponse) {
        const iGmResponse *resp = recent->cachedResponse;
+        clear_ObjectList(d->media);
+        reset_GmDocument(d->doc);
        d->state = fetching_RequestState;
        d->initNormScrollY = recent->normScrollY;
        /* Use the cached response data. */
@@ -676,6 +753,10 @@ void setInitialScroll_DocumentWidget(iDocumentWidget *d, float normScrollY) {
    d->initNormScrollY = normScrollY;
 }
+void setRedirectCount_DocumentWidget(iDocumentWidget *d, int count) {
+    d->redirectCount = count;
+}
 iBool isRequestOngoing_DocumentWidget(const iDocumentWidget *d) {
    return d->state == fetching_RequestState || d->state == receivedPartialResponse_RequestState;
 }
@@ -696,6 +777,37 @@ static void scroll_DocumentWidget_(iDocumentWidget *d, int offset) {
    refresh_Widget(as_Widget(d));
 }
+static void doScroll_DocumentWidget_(iAny *ptr) {
+    iDocumentWidget *d = ptr;
+    if (!d->smoothScroll) return; /* was cancelled */
+    const double elapsed = (double) elapsedSinceLastTicker_App() / 1000.0;
+    int delta = d->smoothSpeed * elapsed * iSign(d->smoothScroll);
+    if (iAbs(d->smoothScroll) <= iAbs(delta)) {
+        if (d->smoothContinue) {
+            d->smoothScroll += d->smoothLastOffset;
+        }
+        else {
+            delta = d->smoothScroll;
+        }
+    }
+    scroll_DocumentWidget_(d, delta);
+    d->smoothScroll -= delta;
+    if (d->smoothScroll != 0) {
+        addTicker_App(doScroll_DocumentWidget_, d);
+    }
+}
+static void smoothScroll_DocumentWidget_(iDocumentWidget *d, int offset, int speed) {
+    if (speed == 0) {
+        scroll_DocumentWidget_(d, offset);
+        return;
+    }
+    d->smoothSpeed = speed;
+    d->smoothScroll += offset;
+    d->smoothLastOffset = offset;
+    addTicker_App(doScroll_DocumentWidget_, d);
+}
 static void scrollTo_DocumentWidget_(iDocumentWidget *d, int documentY, iBool centered) {
    d->scrollY = documentY - (centered ? documentBounds_DocumentWidget_(d).size.y / 2 :
                                       lineHeight_Text(paragraph_FontId));
@@ -733,32 +845,43 @@ static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
            }
            case categorySuccess_GmStatusCode:
                d->scrollY = 0;
+                resetSmoothScroll_DocumentWidget_(d);
                reset_GmDocument(d->doc); /* new content incoming */
                updateDocument_DocumentWidget_(d, response_GmRequest(d->request));
                break;
            case categoryRedirect_GmStatusCode:
                if (isEmpty_String(meta_GmRequest(d->request))) {
-                    showErrorPage_DocumentWidget_(d, invalidRedirect_GmStatusCode);
+                    showErrorPage_DocumentWidget_(d, invalidRedirect_GmStatusCode, NULL);
                }
                else {
-                    /* TODO: only accept redirects that use gemini protocol */
+                    /* Only accept redirects that use gemini scheme. */
-                    postCommandf_App(
+                    const iString *dstUrl = absoluteUrl_String(d->mod.url, meta_GmRequest(d->request));
-                        "open redirect:1 url:%s",
+                    if (d->redirectCount >= 5) {
-                        cstr_String(absoluteUrl_String(d->mod.url, meta_GmRequest(d->request))));
+                        showErrorPage_DocumentWidget_(d, tooManyRedirects_GmStatusCode, dstUrl);
+                    }
+                    else if (equalCase_Rangecc(urlScheme_String(dstUrl), "gemini")) {
+                        postCommandf_App(
+                            "open redirect:%d url:%s", d->redirectCount + 1, cstr_String(dstUrl));
+                    }
+                    else {
+                        showErrorPage_DocumentWidget_(d, nonGeminiRedirect_GmStatusCode, dstUrl);
+                    }
                    iReleasePtr(&d->request);
                }
                break;
            default:
                if (isDefined_GmError(statusCode)) {
-                    showErrorPage_DocumentWidget_(d, statusCode);
+                    showErrorPage_DocumentWidget_(d, statusCode, meta_GmRequest(d->request));
                }
                else if (category_GmStatusCode(statusCode) ==
                         categoryTemporaryFailure_GmStatusCode) {
-                    showErrorPage_DocumentWidget_(d, temporaryFailure_GmStatusCode);
+                    showErrorPage_DocumentWidget_(
+                        d, temporaryFailure_GmStatusCode, meta_GmRequest(d->request));
                }
                else if (category_GmStatusCode(statusCode) ==
                         categoryPermanentFailure_GmStatusCode) {
-                    showErrorPage_DocumentWidget_(d, permanentFailure_GmStatusCode);
+                    showErrorPage_DocumentWidget_(
+                        d, permanentFailure_GmStatusCode, meta_GmRequest(d->request));
                }
                break;
        }
@@ -872,32 +995,33 @@ static iBool handleMediaCommand_DocumentWidget_(iDocumentWidget *d, const char *
    return iFalse;
 }
-static void deallocVisBuffer_DocumentWidget_(iDocumentWidget *d) {
+static void deallocVisBuffer_DocumentWidget_(const iDocumentWidget *d) {
-    d->visBufferSize = zero_I2();
+    d->visBuffer->size = zero_I2();
-    iZap(d->visBufferValidRange);
+    iZap(d->visBuffer->validRange);
-    iForIndices(i, d->visBuffer) {
+    iForIndices(i, d->visBuffer->texture) {
-        SDL_DestroyTexture(d->visBuffer[i]);
+        SDL_DestroyTexture(d->visBuffer->texture[i]);
-        d->visBuffer[i] = NULL;
+        d->visBuffer->texture[i] = NULL;
-    }
+    }
-}
+}
-static void allocVisBuffer_DocumentWidget_(iDocumentWidget *d) {
+static void allocVisBuffer_DocumentWidget_(const iDocumentWidget *d) {
-    iWidget *w = as_Widget(d);
+    const iWidget *w         = constAs_Widget(d);
-    const iBool isVisible = isVisible_Widget(w);
+    const iBool    isVisible = isVisible_Widget(w);
-    const iInt2 size = bounds_Widget(w).size;
+    const iInt2    size      = bounds_Widget(w).size;
-    if (!isEqual_I2(size, d->visBufferSize) || !isVisible) {
+    if (!isEqual_I2(size, d->visBuffer->size) || !isVisible) {
-        deallocVisBuffer_DocumentWidget_(d);
+        dealloc_VisBuffer(d->visBuffer);
-    }
+    }
-    if (isVisible && !d->visBuffer[0]) {
+    if (isVisible && !d->visBuffer->texture[0]) {
-        iZap(d->visBufferValidRange);
+        iZap(d->visBuffer->validRange);
-        d->visBufferSize = size;
+        d->visBuffer->size = size;
-        iForIndices(i, d->visBuffer) {
+        iForIndices(i, d->visBuffer->texture) {
-            d->visBuffer[i] = SDL_CreateTexture(renderer_Window(get_Window()),
+            d->visBuffer->texture[i] =
-                                                SDL_PIXELFORMAT_RGBA8888,
+                SDL_CreateTexture(renderer_Window(get_Window()),
-                                                SDL_TEXTUREACCESS_STATIC | SDL_TEXTUREACCESS_TARGET,
+                                  SDL_PIXELFORMAT_RGBA8888,
-                                                size.x,
+                                  SDL_TEXTUREACCESS_STATIC | SDL_TEXTUREACCESS_TARGET,
-                                                size.y);
+                                  size.x,
-            SDL_SetTextureBlendMode(d->visBuffer[i], SDL_BLENDMODE_NONE);
+                                  size.y);
+            SDL_SetTextureBlendMode(d->visBuffer->texture[i], SDL_BLENDMODE_NONE);
        }
    }
 }
@@ -973,7 +1097,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
                                                          : "Not trusted"));
        return iTrue;
    }
-    else if (equal_Command(cmd, "copy") && document_App() == d) {
+    else if (equal_Command(cmd, "copy") && document_App() == d && !focus_Widget()) {
        iString *copied;
        if (d->selectMark.start) {
            iRangecc mark = d->selectMark;
@@ -990,10 +1114,10 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
        delete_String(copied);
        return iTrue;
    }
-    else if (equalWidget_Command(cmd, w, "document.copylink")) {
+    else if (equal_Command(cmd, "document.copylink") && document_App() == d) {
-        if (d->hoverLink) {
+        if (d->contextLink) {
            SDL_SetClipboardText(cstr_String(
-                absoluteUrl_String(d->mod.url, linkUrl_GmDocument(d->doc, d->hoverLink->linkId))));
+                absoluteUrl_String(d->mod.url, linkUrl_GmDocument(d->doc, d->contextLink->linkId))));
        }
        else {
            SDL_SetClipboardText(cstr_String(d->mod.url));
@@ -1001,18 +1125,16 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
        return iTrue;
    }
    else if (equal_Command(cmd, "document.input.submit")) {
-        if (arg_Command(cmd)) {
+        iString *value = collect_String(suffix_Command(cmd, "value"));
-            iString *value = collect_String(suffix_Command(cmd, "value"));
+        urlEncode_String(value);
-            urlEncode_String(value);
+        iString *url = collect_String(copy_String(d->mod.url));
-            iString *url = collect_String(copy_String(d->mod.url));
+        const size_t qPos = indexOfCStr_String(url, "?");
-            const size_t qPos = indexOfCStr_String(url, "?");
+        if (qPos != iInvalidPos) {
-            if (qPos != iInvalidPos) {
+            remove_Block(&url->chars, qPos, iInvalidSize);
-                remove_Block(&url->chars, qPos, iInvalidSize);
-            }
-            appendCStr_String(url, "?");
-            append_String(url, value);
-            postCommandf_App("open url:%s", cstr_String(url));
        }
+        appendCStr_String(url, "?");
+        append_String(url, value);
+        postCommandf_App("open url:%s", cstr_String(url));
        return iTrue;
    }
    else if (equal_Command(cmd, "valueinput.cancelled") &&
@@ -1028,11 +1150,11 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
    else if (equalWidget_Command(cmd, w, "document.request.finished") &&
             pointerLabel_Command(cmd, "request") == d->request) {
        checkResponse_DocumentWidget_(d);
+        resetSmoothScroll_DocumentWidget_(d);
        d->scrollY = d->initNormScrollY * size_GmDocument(d->doc).y;
        d->state = ready_RequestState;
        /* The response may be cached. */ {
-            const iRangecc proto = urlProtocol_String(d->mod.url);
+            if (!equal_Rangecc(urlScheme_String(d->mod.url), "about")) {
-            if (!equal_Rangecc(&proto, "about")) {
                setCachedResponse_History(d->mod.history, response_GmRequest(d->request));
            }
        }
@@ -1076,12 +1198,24 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
    }
    else if (equalWidget_Command(cmd, w, "scroll.moved")) {
        d->scrollY = arg_Command(cmd);
+        resetSmoothScroll_DocumentWidget_(d);
        updateVisible_DocumentWidget_(d);
        return iTrue;
    }
    else if (equalWidget_Command(cmd, w, "scroll.page")) {
-        scroll_DocumentWidget_(d,
+        if (argLabel_Command(cmd, "repeat")) {
-                               arg_Command(cmd) * height_Rect(documentBounds_DocumentWidget_(d)));
+            if (!d->smoothContinue) {
+                d->smoothContinue = iTrue;
+            }
+            else {
+                return iTrue;
+            }
+        }
+        smoothScroll_DocumentWidget_(d,
+                                     arg_Command(cmd) *
+                                         (0.5f * height_Rect(documentBounds_DocumentWidget_(d)) -
+                                          0 * lineHeight_Text(paragraph_FontId)),
+                                     25 * smoothSpeed_DocumentWidget_);
        return iTrue;
    }
    else if (equal_Command(cmd, "document.goto") && document_App() == d) {
@@ -1164,6 +1298,13 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                    refresh_Widget(w);
                }
                break;
+            case SDLK_PAGEUP:
+            case SDLK_PAGEDOWN:
+            case SDLK_SPACE:
+            case SDLK_UP:
+            case SDLK_DOWN:
+                d->smoothContinue = iFalse;
+                break;
        }
    }
    if (ev->type == SDL_KEYDOWN) {
@@ -1194,12 +1335,14 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                break;
            case SDLK_HOME:
                d->scrollY = 0;
+                resetSmoothScroll_DocumentWidget_(d);
                scroll_DocumentWidget_(d, 0);
                updateVisible_DocumentWidget_(d);
                refresh_Widget(w);
                return iTrue;
            case SDLK_END:
                d->scrollY = scrollMax_DocumentWidget_(d);
+                resetSmoothScroll_DocumentWidget_(d);
                scroll_DocumentWidget_(d, 0);
                updateVisible_DocumentWidget_(d);
                refresh_Widget(w);
@@ -1207,24 +1350,37 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
            case SDLK_UP:
            case SDLK_DOWN:
                if (mods == 0) {
-                    scroll_DocumentWidget_(d, 2 * lineHeight_Text(default_FontId) *
+                    if (ev->key.repeat) {
-                                                  (key == SDLK_UP ? -1 : 1));
+                        if (!d->smoothContinue) {
+                            d->smoothContinue = iTrue;
+                        }
+                        else return iTrue;
+                    }
+                    smoothScroll_DocumentWidget_(d,
+                                                 3 * lineHeight_Text(paragraph_FontId) *
+                                                     (key == SDLK_UP ? -1 : 1),
+                                                 gap_Text * smoothSpeed_DocumentWidget_);
                    return iTrue;
                }
                break;
            case SDLK_PAGEUP:
            case SDLK_PAGEDOWN:
-            case ' ':
+            case SDLK_SPACE:
-                postCommand_Widget(w, "scroll.page arg:%d", key == SDLK_PAGEUP ? -1 : +1);
+                postCommand_Widget(
+                    w,
+                    "scroll.page arg:%d repeat:%d",
+                    (key == SDLK_SPACE && mods & KMOD_SHIFT) || key == SDLK_PAGEUP ? -1 : +1,
+                    ev->key.repeat != 0);
                return iTrue;
-#if 0
+#if 1
-            case SDLK_9: {
+            case SDLK_KP_1: {
                iBlock *seed = new_Block(64);
                for (size_t i = 0; i < 64; ++i) {
                    setByte_Block(seed, i, iRandom(0, 255));
                }
                setThemeSeed_GmDocument(d->doc, seed);
                delete_Block(seed);
+                invalidate_DocumentWidget_(d);
                refresh_Widget(w);
                break;
            }
@@ -1258,7 +1414,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
    else if (ev->type == SDL_MOUSEMOTION) {
        d->noHoverWhileScrolling = iFalse;
        if (isVisible_Widget(d->menu)) {
-            SDL_SetCursor(d->arrowCursor);
+            setCursor_Window(get_Window(), SDL_SYSTEM_CURSOR_ARROW);
        }
        else {
            updateHover_DocumentWidget_(d, init_I2(ev->motion.x, ev->motion.y));
@@ -1274,6 +1430,9 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
            return iTrue;
        }
    }
+    if (!isVisible_Widget(d->menu)) {
+        d->contextLink = d->hoverLink;
+    }
    processContextMenuEvent_Widget(d->menu, ev, d->hoverLink = NULL);
    switch (processEvent_Click(&d->click, ev)) {
        case started_ClickResult:
@@ -1282,6 +1441,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
        case drag_ClickResult: {
            /* Begin selecting a range of text. */
            if (!d->selecting) {
+                setFocus_Widget(NULL); /* TODO: Focus this document? */
                d->selecting = iTrue;
                d->selectMark.start = d->selectMark.end =
                    sourceLoc_DocumentWidget_(d, d->click.startPos);
@@ -1418,8 +1578,12 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
    }
    /* Text markers. */
    if (d->pass == dynamic_DrawRunPass) {
+        SDL_SetRenderDrawBlendMode(renderer_Window(get_Window()),
+                                   isDark_ColorTheme(colorTheme_App()) ? SDL_BLENDMODE_ADD
+                                                                       : SDL_BLENDMODE_BLEND);
        fillRange_DrawContext_(d, run, uiMatching_ColorId, d->widget->foundMark, &d->inFoundMark);
        fillRange_DrawContext_(d, run, uiMarked_ColorId, d->widget->selectMark, &d->inSelectMark);
+        SDL_SetRenderDrawBlendMode(renderer_Window(get_Window()), SDL_BLENDMODE_NONE);
    }
    enum iColorId      fg  = run->color;
    const iGmDocument *doc = d->widget->doc;
@@ -1505,6 +1669,12 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
                appendFormat_String(
                    &text, "  %s\u2a2f", isHover ? escape_Color(tmLinkText_ColorId) : "");
            }
+            const iInt2 size = measureRange_Text(metaFont, range_String(&text));
+            fillRect_Paint(
+                &d->paint,
+                (iRect){ add_I2(origin, addX_I2(topRight_Rect(run->bounds), -size.x - gap_UI)),
+                         addX_I2(size, 2 * gap_UI) },
+                tmBackground_ColorId);
            drawAlign_Text(metaFont,
                           add_I2(topRight_Rect(run->bounds), origin),
                           fg,
@@ -1527,9 +1697,8 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
            const int       flags  = linkFlags_GmDocument(doc, linkId);
            iUrl parts;
            init_Url(&parts, url);
-            const iString *host = collect_String(newRange_String(parts.host));
            fg = linkColor_GmDocument(doc, linkId, textHover_GmLinkPart);
-            const iBool showHost  = (!isEmpty_String(host) && flags & userFriendly_GmLinkFlag);
+            const iBool showHost  = (!isEmpty_Range(&parts.host) && flags & userFriendly_GmLinkFlag);
            const iBool showImage = (flags & imageFileExtension_GmLinkFlag) != 0;
            const iBool showAudio = (flags & audioFileExtension_GmLinkFlag) != 0;
            iString str;
@@ -1541,11 +1710,16 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
                    &str,
                    " \u2014%s%s%s\r%c%s",
                    showHost ? " " : "",
-                    showHost ? cstr_String(host) : "",
+                    showHost ? (!equalCase_Rangecc(parts.scheme, "gemini")
+                                    ? format_CStr("%s://%s",
+                                                  cstr_Rangecc(parts.scheme),
+                                                  cstr_Rangecc(parts.host))
+                                    : cstr_Rangecc(parts.host))
+                             : "",
                    showHost && (showImage || showAudio) ? " \u2014" : "",
                    showImage || showAudio
-                        ? '0' + fg
+                        ? asciiBase_ColorEscape + fg
-                        : ('0' + linkColor_GmDocument(doc, run->linkId, domain_GmLinkPart)),
+                        : (asciiBase_ColorEscape + linkColor_GmDocument(doc, run->linkId, domain_GmLinkPart)),
                    showImage ? " View Image \U0001f5bc"
                              : showAudio ? " Play Audio \U0001f3b5" : "");
            }
@@ -1599,8 +1773,9 @@ static void draw_DocumentWidget_(const iDocumentWidget *d) {
    const iRect    bounds   = bounds_Widget(w);
    const iInt2    origin   = topLeft_Rect(bounds);
    const iRangei  visRange = visibleRange_DocumentWidget_(d);
+    iVisBuffer *   visBuf   = d->visBuffer; /* this may be updated/modified here */
    draw_Widget(w);
-    allocVisBuffer_DocumentWidget_(iConstCast(iDocumentWidget *, d));
+    allocVisBuffer_DocumentWidget_(d);
    iDrawContext ctxDynamic = {
        .pass         = dynamic_DrawRunPass,
        .widget       = d,
@@ -1618,36 +1793,38 @@ static void draw_DocumentWidget_(const iDocumentWidget *d) {
    /* Static content. */ {
        iPaint *p = &ctxStatic.paint;
        init_Paint(p);
-        const int vbSrc = d->visBufferIndex;
+        const int vbSrc = visBuf->index;
-        const int vbDst = d->visBufferIndex ^ 1;
+        const int vbDst = visBuf->index ^ 1;
        iRangei drawRange = visRange;
-        iAssert(d->visBuffer[vbDst]);
+        iAssert(visBuf->texture[vbDst]);
-        beginTarget_Paint(p, d->visBuffer[vbDst]);
+        beginTarget_Paint(p, visBuf->texture[vbDst]);
-        const iRect visBufferRect = { zero_I2(), d->visBufferSize };
+        const iRect visBufferRect = { zero_I2(), visBuf->size };
        iRect drawRect = visBufferRect;
-        if (!isEmpty_Rangei_(intersect_Rangei_(visRange, d->visBufferValidRange))) {
+        if (!isEmpty_Rangei_(intersect_Rangei_(visRange, visBuf->validRange))) {
-            if (visRange.start < d->visBufferValidRange.start) {
+            if (visRange.start < visBuf->validRange.start) {
-                drawRange = (iRangei){ visRange.start, d->visBufferValidRange.start };
+                drawRange = (iRangei){ visRange.start, visBuf->validRange.start };
            }
            else {
-                drawRange = (iRangei){ d->visBufferValidRange.end, visRange.end };
+                drawRange = (iRangei){ visBuf->validRange.end, visRange.end };
            }
            if (isEmpty_Range(&drawRange)) {
-                SDL_RenderCopy(render, d->visBuffer[vbSrc], NULL, NULL);
+                SDL_RenderCopy(render, visBuf->texture[vbSrc], NULL, NULL);
            }
            else {
                SDL_RenderCopy(
                    render,
-                    d->visBuffer[vbSrc],
+                    visBuf->texture[vbSrc],
                    NULL,
                    &(SDL_Rect){ 0,
-                                 documentToWindowY_DocumentWidget_(d, d->visBufferValidRange.start) - origin.y,
+                                 documentToWindowY_DocumentWidget_(d, visBuf->validRange.start) -
-                                 d->visBufferSize.x,
+                                     origin.y,
-                                 d->visBufferSize.y });
+                                 visBuf->size.x,
-                drawRect = init_Rect(0,
+                                 visBuf->size.y });
-                                     documentToWindowY_DocumentWidget_(d, drawRange.start) - origin.y,
+                drawRect =
-                                     d->visBufferSize.x,
+                    init_Rect(0,
-                                     size_Range(&drawRange));
+                              documentToWindowY_DocumentWidget_(d, drawRange.start) - origin.y,
+                              visBuf->size.x,
+                              size_Range(&drawRange));
            }
        }
        if (!isEmpty_Range(&drawRange)) {
@@ -1657,17 +1834,20 @@ static void draw_DocumentWidget_(const iDocumentWidget *d) {
            unsetClip_Paint(p);
        }
        endTarget_Paint(p);
-        SDL_RenderCopy(render, d->visBuffer[vbDst], NULL,
+        SDL_RenderCopy(render, visBuf->texture[vbDst], NULL,
                       &(SDL_Rect){ origin.x, origin.y, bounds.size.x, bounds.size.y } );
-        iConstCast(iDocumentWidget *, d)->visBufferValidRange = visRange;
+        visBuf->validRange = visRange;
-        iConstCast(iDocumentWidget *, d)->visBufferIndex = vbDst;
+        visBuf->index = vbDst;
    }
    /* Dynamic content. */ {
+        extern int enableKerning_Text;
+        enableKerning_Text = iFalse; /* need to be fast, these is redone on every redraw */
        iPaint *p = &ctxDynamic.paint;
        init_Paint(p);
        setClip_Paint(p, bounds);
        render_GmDocument(d->doc, visRange, drawRun_DrawContext_, &ctxDynamic);
        unsetClip_Paint(p);
+        enableKerning_Text = iTrue;
    }
 //    drawRect_Paint(&ctx.paint,
diff --git a/src/ui/documentwidget.h b/src/ui/documentwidget.h
index 074516c3..5a3125af 100644
--- a/src/ui/documentwidget.h
+++ b/src/ui/documentwidget.h
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #pragma once
 #include "widget.h"
@@ -23,5 +45,6 @@ const iString *     bookmarkTitle_DocumentWidget    (const iDocumentWidget *);
 void    setUrl_DocumentWidget           (iDocumentWidget *, const iString *url);
 void    setUrlFromCache_DocumentWidget  (iDocumentWidget *, const iString *url, iBool isFromCache);
 void    setInitialScroll_DocumentWidget (iDocumentWidget *, float normScrollY); /* set after content received */
+void    setRedirectCount_DocumentWidget (iDocumentWidget *, int count);
 void    updateSize_DocumentWidget       (iDocumentWidget *);
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index d367952d..d583b109 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "inputwidget.h"
 #include "paint.h"
 #include "util.h"
@@ -7,17 +29,40 @@
 #include <SDL_clipboard.h>
 #include <SDL_timer.h>
-static const int REFRESH_INTERVAL = 256;
+static const int    refreshInterval_InputWidget_ = 256;
+static const size_t maxUndo_InputWidget_         = 64;
+iDeclareType(InputUndo)
+struct Impl_InputUndo {
+    iArray text;
+    size_t cursor;
+};
+static void init_InputUndo_(iInputUndo *d, const iArray *text, size_t cursor) {
+    initCopy_Array(&d->text, text);
+    d->cursor = cursor;
+}
+static void deinit_InputUndo_(iInputUndo *d) {
+    deinit_Array(&d->text);
+}
 struct Impl_InputWidget {
    iWidget         widget;
    enum iInputMode mode;
    iBool           isSensitive;
    iBool           enterPressed;
+    iBool           selectAllOnFocus;
    size_t          maxLen;
    iArray          text;    /* iChar[] */
    iArray          oldText; /* iChar[] */
+    iString         hint;
    size_t          cursor;
+    size_t          lastCursor;
+    iBool           isMarking;
+    iRanges         mark;
+    iArray          undoStack;
    int             font;
    iClick          click;
    uint32_t        timer;
@@ -25,16 +70,29 @@ struct Impl_InputWidget {
 iDefineObjectConstructionArgs(InputWidget, (size_t maxLen), maxLen)
+static void clearUndo_InputWidget_(iInputWidget *d) {
+    iForEach(Array, i, &d->undoStack) {
+        deinit_InputUndo_(i.value);
+    }
+    clear_Array(&d->undoStack);
+}
 void init_InputWidget(iInputWidget *d, size_t maxLen) {
    iWidget *w = &d->widget;
    init_Widget(w);
    setFlags_Widget(w, focusable_WidgetFlag | hover_WidgetFlag, iTrue);
    init_Array(&d->text, sizeof(iChar));
    init_Array(&d->oldText, sizeof(iChar));
+    init_String(&d->hint);
+    init_Array(&d->undoStack, sizeof(iInputUndo));
    d->font   = uiInput_FontId;
    d->cursor = 0;
-    d->isSensitive = iFalse;
+    d->lastCursor = 0;
-    d->enterPressed = iFalse;
+    d->isMarking = iFalse;
+    iZap(d->mark);
+    d->isSensitive      = iFalse;
+    d->enterPressed     = iFalse;
+    d->selectAllOnFocus = iFalse;
    setMaxLen_InputWidget(d, maxLen);
    /* Caller must arrange the width, but the height is fixed. */
    w->rect.size.y = lineHeight_Text(default_FontId) + 2 * gap_UI;
@@ -44,13 +102,39 @@ void init_InputWidget(iInputWidget *d, size_t maxLen) {
 }
 void deinit_InputWidget(iInputWidget *d) {
+    clearUndo_InputWidget_(d);
+    deinit_Array(&d->undoStack);
    if (d->timer) {
        SDL_RemoveTimer(d->timer);
    }
+    deinit_String(&d->hint);
    deinit_Array(&d->oldText);
    deinit_Array(&d->text);
 }
+static void pushUndo_InputWidget_(iInputWidget *d) {
+    iInputUndo undo;
+    init_InputUndo_(&undo, &d->text, d->cursor);
+    pushBack_Array(&d->undoStack, &undo);
+    if (size_Array(&d->undoStack) > maxUndo_InputWidget_) {
+        deinit_InputUndo_(front_Array(&d->undoStack));
+        popFront_Array(&d->undoStack);
+    }
+}
+static iBool popUndo_InputWidget_(iInputWidget *d) {
+    if (!isEmpty_Array(&d->undoStack)) {
+        iInputUndo *undo = back_Array(&d->undoStack);
+        setCopy_Array(&d->text, &undo->text);
+        d->cursor = undo->cursor;
+        deinit_InputUndo_(undo);
+        popBack_Array(&d->undoStack);
+        iZap(d->mark);
+        return iTrue;
+    }
+    return iFalse;
+}
 void setMode_InputWidget(iInputWidget *d, enum iInputMode mode) {
    d->mode = mode;
 }
@@ -78,7 +162,12 @@ void setMaxLen_InputWidget(iInputWidget *d, size_t maxLen) {
    }
 }
+void setHint_InputWidget(iInputWidget *d, const char *hintText) {
+    setCStr_String(&d->hint, hintText);
+}
 void setText_InputWidget(iInputWidget *d, const iString *text) {
+    clearUndo_InputWidget_(d);
    clear_Array(&d->text);
    iConstForEach(String, i, text) {
        pushBack_Array(&d->text, &i.value);
@@ -92,10 +181,6 @@ void setTextCStr_InputWidget(iInputWidget *d, const char *cstr) {
    delete_String(str);
 }
-void setCursor_InputWidget(iInputWidget *d, size_t pos) {
-    d->cursor = iMin(pos, size_Array(&d->text));
-}
 static uint32_t refreshTimer_(uint32_t interval, void *d) {
    refresh_Widget(d);
    return interval;
@@ -118,8 +203,14 @@ void begin_InputWidget(iInputWidget *d) {
    SDL_StartTextInput();
    setFlags_Widget(w, selected_WidgetFlag, iTrue);
    refresh_Widget(w);
-    d->timer = SDL_AddTimer(REFRESH_INTERVAL, refreshTimer_, d);
+    d->timer = SDL_AddTimer(refreshInterval_InputWidget_, refreshTimer_, d);
    d->enterPressed = iFalse;
+    if (d->selectAllOnFocus) {
+        d->mark = (iRanges){ 0, size_Array(&d->text) };
+    }
+    else {
+        iZap(d->mark);
+    }
 }
 void end_InputWidget(iInputWidget *d, iBool accept) {
@@ -159,6 +250,168 @@ static void insertChar_InputWidget_(iInputWidget *d, iChar chr) {
    refresh_Widget(as_Widget(d));
 }
+iLocalDef size_t cursorMax_InputWidget_(const iInputWidget *d) {
+    return iMin(size_Array(&d->text), d->maxLen - 1);
+}
+iLocalDef iBool isMarking_(void) {
+    return (SDL_GetModState() & KMOD_SHIFT) != 0;
+}
+void setCursor_InputWidget(iInputWidget *d, size_t pos) {
+    if (isEmpty_Array(&d->text)) {
+        d->cursor = 0;
+    }
+    else {
+        d->cursor = iClamp(pos, 0, cursorMax_InputWidget_(d));
+    }
+    /* Update selection. */
+    if (isMarking_()) {
+        if (isEmpty_Range(&d->mark)) {
+            d->mark.start = d->lastCursor;
+            d->mark.end   = d->cursor;
+        }
+        else {
+            d->mark.end = d->cursor;
+        }
+    }
+    else {
+        iZap(d->mark);
+    }
+}
+void setSelectAllOnFocus_InputWidget(iInputWidget *d, iBool selectAllOnFocus) {
+    d->selectAllOnFocus = selectAllOnFocus;
+}
+static iRanges mark_InputWidget_(const iInputWidget *d) {
+    return (iRanges){ iMin(d->mark.start, d->mark.end), iMax(d->mark.start, d->mark.end) };
+}
+static iBool deleteMarked_InputWidget_(iInputWidget *d) {
+    const iRanges m = mark_InputWidget_(d);
+    if (!isEmpty_Range(&m)) {
+        removeRange_Array(&d->text, m);
+        setCursor_InputWidget(d, m.start);
+        iZap(d->mark);
+        return iTrue;
+    }
+    return iFalse;
+}
+static iBool isWordChar_InputWidget_(const iInputWidget *d, size_t pos) {
+    const iChar ch = pos < size_Array(&d->text) ? constValue_Array(&d->text, pos, iChar) : ' ';
+    return isAlphaNumeric_Char(ch);
+}
+iLocalDef iBool movePos_InputWidget_(const iInputWidget *d, size_t *pos, int dir) {
+    if (dir < 0) {
+        if (*pos > 0) (*pos)--; else return iFalse;
+    }
+    else {
+        if (*pos < cursorMax_InputWidget_(d)) (*pos)++; else return iFalse;
+    }
+    return iTrue;
+}
+static size_t skipWord_InputWidget_(const iInputWidget *d, size_t pos, int dir) {
+    const iBool startedAtNonWord = !isWordChar_InputWidget_(d, pos);
+    if (!movePos_InputWidget_(d, &pos, dir)) {
+        return pos;
+    }
+    /* Skip any non-word characters at start position. */
+    while (!isWordChar_InputWidget_(d, pos)) {
+        if (!movePos_InputWidget_(d, &pos, dir)) {
+            return pos;
+        }
+    }
+    if (startedAtNonWord && dir > 0) {
+        return pos; /* Found the start of a word. */
+    }
+    /* Skip the word. */
+    while (isWordChar_InputWidget_(d, pos)) {
+        if (!movePos_InputWidget_(d, &pos, dir)) {
+            return pos;
+        }
+    }
+    if (dir > 0) {
+        /* Skip to the beginning of the word. */
+        while (!isWordChar_InputWidget_(d, pos)) {
+            if (!movePos_InputWidget_(d, &pos, dir)) {
+                return pos;
+            }
+        }
+    }
+    else {
+        movePos_InputWidget_(d, &pos, +1);
+    }
+    return pos;
+}
+static const iChar sensitiveChar_ = 0x25cf; /* black circle */
+static iString *visText_InputWidget_(const iInputWidget *d) {
+    iString *text;
+    if (!d->isSensitive) {
+        text = newUnicodeN_String(constData_Array(&d->text), size_Array(&d->text));
+    }
+    else {
+        text = new_String();
+        for (size_t i = 0; i < size_Array(&d->text); ++i) {
+            appendChar_String(text, sensitiveChar_);
+        }
+    }
+    return text;
+}
+iLocalDef iInt2 padding_(void) {
+    return init_I2(gap_UI / 2, gap_UI / 2);
+}
+static iInt2 textOrigin_InputWidget_(const iInputWidget *d, const char *visText) {
+    const iWidget *w         = constAs_Widget(d);
+    iRect          bounds    = adjusted_Rect(bounds_Widget(w), padding_(), neg_I2(padding_()));
+    const iInt2    emSize    = advance_Text(d->font, "M");
+    const int      textWidth = advance_Text(d->font, visText).x;
+    const int      cursorX   = advanceN_Text(d->font, visText, d->cursor).x;
+    int            xOff      = 0;
+    shrink_Rect(&bounds, init_I2(gap_UI * (flags_Widget(w) & tight_WidgetFlag ? 1 : 2), 0));
+    if (d->maxLen == 0) {
+        if (textWidth > width_Rect(bounds) - emSize.x) {
+            xOff = width_Rect(bounds) - emSize.x - textWidth;
+        }
+        if (cursorX + xOff < width_Rect(bounds) / 2) {
+            xOff = width_Rect(bounds) / 2 - cursorX;
+        }
+        xOff = iMin(xOff, 0);
+    }
+    const int yOff = (height_Rect(bounds) - lineHeight_Text(d->font)) / 2;
+    return add_I2(topLeft_Rect(bounds), init_I2(xOff, yOff));
+}
+static size_t coordIndex_InputWidget_(const iInputWidget *d, iInt2 coord) {
+    iString *visText = visText_InputWidget_(d);
+    iInt2    pos     = sub_I2(coord, textOrigin_InputWidget_(d, cstr_String(visText)));
+    size_t   index   = 0;
+    if (pos.x > 0) {
+        const char *endPos;
+        tryAdvanceNoWrap_Text(d->font, range_String(visText), pos.x, &endPos);
+        if (endPos == constEnd_String(visText)) {
+            index = cursorMax_InputWidget_(d);
+        }
+        else {
+            /* Need to know the actual character index. */
+            /* TODO: tryAdvance could tell us this directly with an extra return value */
+            iConstForEach(String, i, visText) {
+                if (i.pos >= endPos) break;
+                index++;
+            }
+        }
+    }
+    delete_String(visText);
+    return index;
+}
 static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
    iWidget *w = as_Widget(d);
    if (isCommand_Widget(w, ev, "focus.gained")) {
@@ -173,25 +426,51 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
        case none_ClickResult:
            break;
        case started_ClickResult:
-        case drag_ClickResult:
+            setFocus_Widget(w);
+            setCursor_InputWidget(d, coordIndex_InputWidget_(d, pos_Click(&d->click)));
+            iZap(d->mark);
+            d->isMarking = iFalse;
+            return iTrue;
        case double_ClickResult:
        case aborted_ClickResult:
            return iTrue;
+        case drag_ClickResult:
+            d->cursor = coordIndex_InputWidget_(d, pos_Click(&d->click));
+            if (!d->isMarking) {
+                d->isMarking = iTrue;
+                d->mark.start = d->cursor;
+            }
+            d->mark.end = d->cursor;
+            refresh_Widget(w);
+            return iTrue;
        case finished_ClickResult:
-            setFocus_Widget(as_Widget(d));
            return iTrue;
    }
    if (ev->type == SDL_KEYUP && isFocused_Widget(w)) {
        return iTrue;
    }
-    const size_t curMax = iMin(size_Array(&d->text), d->maxLen - 1);
+    const size_t curMax = cursorMax_InputWidget_(d);
    if (ev->type == SDL_KEYDOWN && isFocused_Widget(w)) {
        const int key  = ev->key.keysym.sym;
        const int mods = keyMods_Sym(ev->key.keysym.mod);
        if (mods == KMOD_PRIMARY) {
            switch (key) {
+                case 'c':
+                case 'x':
+                    if (!isEmpty_Range(&d->mark)) {
+                        const iRanges m = mark_InputWidget_(d);
+                        SDL_SetClipboardText(cstrCollect_String(
+                            newUnicodeN_String(constAt_Array(&d->text, m.start), size_Range(&m))));
+                        if (key == 'x') {
+                            pushUndo_InputWidget_(d);
+                            deleteMarked_InputWidget_(d);
+                        }
+                    }
+                    return iTrue;
                case 'v':
                    if (SDL_HasClipboardText()) {
+                        pushUndo_InputWidget_(d);
+                        deleteMarked_InputWidget_(d);
                        char *text = SDL_GetClipboardText();
                        iString *paste = collect_String(newCStr_String(text));
                        SDL_free(text);
@@ -200,8 +479,14 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
                        }
                    }
                    return iTrue;
+                case 'z':
+                    if (popUndo_InputWidget_(d)) {
+                        refresh_Widget(w);
+                    }
+                    return iTrue;
            }
        }
+        d->lastCursor = d->cursor;
        switch (key) {
            case SDLK_RETURN:
            case SDLK_KP_ENTER:
@@ -213,11 +498,18 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
                setFocus_Widget(NULL);
                return iTrue;
            case SDLK_BACKSPACE:
-                if (mods & KMOD_ALT) {
+                if (!isEmpty_Range(&d->mark)) {
-                    clear_Array(&d->text);
+                    pushUndo_InputWidget_(d);
-                    d->cursor = 0;
+                    deleteMarked_InputWidget_(d);
+                }
+                else if (mods & KMOD_ALT) {
+                    pushUndo_InputWidget_(d);
+                    d->mark.start = d->cursor;
+                    d->mark.end   = skipWord_InputWidget_(d, d->cursor, -1);
+                    deleteMarked_InputWidget_(d);
                }
                else if (d->cursor > 0) {
+                    pushUndo_InputWidget_(d);
                    remove_Array(&d->text, --d->cursor);
                }
                refresh_Widget(w);
@@ -225,49 +517,79 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
            case SDLK_d:
                if (mods != KMOD_CTRL) break;
            case SDLK_DELETE:
-                if (d->cursor < size_Array(&d->text)) {
+                if (!isEmpty_Range(&d->mark)) {
+                    pushUndo_InputWidget_(d);
+                    deleteMarked_InputWidget_(d);
+                }
+                else if (mods & KMOD_ALT) {
+                    pushUndo_InputWidget_(d);
+                    d->mark.start = d->cursor;
+                    d->mark.end   = skipWord_InputWidget_(d, d->cursor, +1);
+                    deleteMarked_InputWidget_(d);
+                }
+                else if (d->cursor < size_Array(&d->text)) {
+                    pushUndo_InputWidget_(d);
                    remove_Array(&d->text, d->cursor);
-                    refresh_Widget(w);
                }
+                refresh_Widget(w);
                return iTrue;
            case SDLK_k:
                if (mods == KMOD_CTRL) {
-                    removeN_Array(&d->text, d->cursor, size_Array(&d->text) - d->cursor);
+                    if (!isEmpty_Range(&d->mark)) {
+                        pushUndo_InputWidget_(d);
+                        deleteMarked_InputWidget_(d);
+                    }
+                    else {
+                        pushUndo_InputWidget_(d);
+                        removeN_Array(&d->text, d->cursor, size_Array(&d->text) - d->cursor);
+                    }
                    refresh_Widget(w);
                    return iTrue;
                }
                break;
            case SDLK_HOME:
            case SDLK_END:
-                d->cursor = (key == SDLK_HOME ? 0 : curMax);
+                setCursor_InputWidget(d, key == SDLK_HOME ? 0 : curMax);
                refresh_Widget(w);
                return iTrue;
            case SDLK_a:
+#if defined (iPlatformApple)
+                if (mods == KMOD_PRIMARY) {
+                    d->mark.start = 0;
+                    d->mark.end   = curMax;
+                    d->cursor     = curMax;
+                    refresh_Widget(w);
+                    return iTrue;
+                }
+#endif
+                /* fall through for Emacs-style Home/End */
            case SDLK_e:
-                if (mods == KMOD_CTRL) {
+                if (mods == KMOD_CTRL || mods == (KMOD_CTRL | KMOD_SHIFT)) {
-                    d->cursor = (key == 'a' ? 0 : curMax);
+                    setCursor_InputWidget(d, key == 'a' ? 0 : curMax);
                    refresh_Widget(w);
                    return iTrue;
                }
                break;
            case SDLK_LEFT:
+            case SDLK_RIGHT: {
+                const int dir = (key == SDLK_LEFT ? -1 : +1);
                if (mods & KMOD_PRIMARY) {
-                    d->cursor = 0;
+                    setCursor_InputWidget(d, dir < 0 ? 0 : curMax);
                }
-                else if (d->cursor > 0) {
+                else if (mods & KMOD_ALT) {
-                    d->cursor--;
+                    setCursor_InputWidget(d, skipWord_InputWidget_(d, d->cursor, dir));
                }
-                refresh_Widget(w);
+                else if (!isMarking_() && !isEmpty_Range(&d->mark)) {
-                return iTrue;
+                    const iRanges m = mark_InputWidget_(d);
-            case SDLK_RIGHT:
+                    setCursor_InputWidget(d, dir < 0 ? m.start : m.end);
-                if (mods & KMOD_PRIMARY) {
+                    iZap(d->mark);
-                    d->cursor = curMax;
                }
-                else if (d->cursor < curMax) {
+                else if ((dir < 0 && d->cursor > 0) || (dir > 0 && d->cursor < curMax)) {
-                    d->cursor++;
+                    setCursor_InputWidget(d, d->cursor + dir);
                }
                refresh_Widget(w);
                return iTrue;
+            }
            case SDLK_TAB:
                /* Allow focus switching. */
                return processEvent_Widget(as_Widget(d), ev);
@@ -278,6 +600,8 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
        return iTrue;
    }
    else if (ev->type == SDL_TEXTINPUT && isFocused_Widget(w)) {
+        pushUndo_InputWidget_(d);
+        deleteMarked_InputWidget_(d);
        const iString *uni = collectNewCStr_String(ev->text.text);
        iConstForEach(String, i, uni) {
            insertChar_InputWidget_(d, i.value);
@@ -287,27 +611,29 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
    return processEvent_Widget(w, ev);
 }
-static const iChar sensitiveChar_ = 0x25cf; /* black circle */
+static iBool isWhite_(const iString *str) {
+    iConstForEach(String, i, str) {
+        if (!isSpace_Char(i.value)) {
+            return iFalse;
+        }
+    }
+    return iTrue;
+}
 static void draw_InputWidget_(const iInputWidget *d) {
    const iWidget *w         = constAs_Widget(d);
    const uint32_t time      = frameTime_Window(get_Window());
-    const iInt2    padding   = init_I2(gap_UI / 2, gap_UI / 2);
+    iRect          bounds    = adjusted_Rect(bounds_Widget(w), padding_(), neg_I2(padding_()));
-    iRect          bounds    = adjusted_Rect(bounds_Widget(w), padding, neg_I2(padding));
+    iBool          isHint    = iFalse;
    const iBool    isFocused = isFocused_Widget(w);
    const iBool    isHover   = isHover_Widget(w) &&
                               contains_Widget(w, mouseCoord_Window(get_Window()));
    iPaint p;
    init_Paint(&p);
-    iString text;
+    iString *text = visText_InputWidget_(d);
-    if (!d->isSensitive) {
+    if (isWhite_(text) && !isEmpty_String(&d->hint)) {
-        initUnicodeN_String(&text, constData_Array(&d->text), size_Array(&d->text));
+        set_String(text, &d->hint);
-    }
+        isHint = iTrue;
-    else {
-        init_String(&text);
-        for (size_t i = 0; i < size_Array(&d->text); ++i) {
-            appendChar_String(&text, sensitiveChar_);
-        }
    }
    fillRect_Paint(
        &p, bounds, isFocused ? uiInputBackgroundFocused_ColorId : uiInputBackground_ColorId);
@@ -317,34 +643,27 @@ static void draw_InputWidget_(const iInputWidget *d) {
                            isFocused ? uiInputFrameFocused_ColorId
                                      : isHover ? uiInputFrameHover_ColorId : uiInputFrame_ColorId);
    setClip_Paint(&p, bounds);
-    shrink_Rect(&bounds, init_I2(gap_UI * (flags_Widget(w) & tight_WidgetFlag ? 1 : 2), 0));
+    const iInt2 textOrigin = textOrigin_InputWidget_(d, cstr_String(text));
-    const iInt2 emSize    = advance_Text(d->font, "M");
+    if (isFocused && !isEmpty_Range(&d->mark)) {
-    const int   textWidth = advance_Text(d->font, cstr_String(&text)).x;
+        /* Draw the selected range. */
-    const int   cursorX   = advanceN_Text(d->font, cstr_String(&text), d->cursor).x;
+        const int m1 = advanceN_Text(d->font, cstr_String(text), d->mark.start).x;
-    int         xOff      = 0;
+        const int m2 = advanceN_Text(d->font, cstr_String(text), d->mark.end).x;
-    if (d->maxLen == 0) {
+        fillRect_Paint(&p,
-        if (textWidth > width_Rect(bounds) - emSize.x) {
+                       (iRect){ addX_I2(textOrigin, iMin(m1, m2)),
-            xOff = width_Rect(bounds) - emSize.x - textWidth;
+                                init_I2(iAbs(m2 - m1), lineHeight_Text(d->font)) },
-        }
+                       uiMarked_ColorId);
-        if (cursorX + xOff < width_Rect(bounds) / 2) {
-            xOff = width_Rect(bounds) / 2 - cursorX;
-        }
-        xOff = iMin(xOff, 0);
    }
-    const int yOff = (height_Rect(bounds) - lineHeight_Text(d->font)) / 2;
    draw_Text(d->font,
-              add_I2(topLeft_Rect(bounds), init_I2(xOff, yOff)),
+              textOrigin,
-              isFocused ? uiInputTextFocused_ColorId : uiInputText_ColorId,
+              isHint ? uiAnnotation_ColorId
+                     : isFocused && !isEmpty_Array(&d->text) ? uiInputTextFocused_ColorId
+                                                             : uiInputText_ColorId,
              "%s",
-              cstr_String(&text));
+              cstr_String(text));
    unsetClip_Paint(&p);
    /* Cursor blinking. */
    if (isFocused && (time & 256)) {
-        const iInt2 prefixSize = advanceN_Text(d->font, cstr_String(&text), d->cursor);
+        iString cur;
-        const iInt2 curPos = init_I2(xOff + left_Rect(bounds) + prefixSize.x,
-                                     yOff + top_Rect(bounds));
-        const iRect curRect = { curPos, addX_I2(emSize, 1) };
-        iString     cur;
        if (d->cursor < size_Array(&d->text)) {
            if (!d->isSensitive) {
                initUnicodeN_String(&cur, constAt_Array(&d->text, d->cursor), 1);
@@ -356,11 +675,14 @@ static void draw_InputWidget_(const iInputWidget *d) {
        else {
            initCStr_String(&cur, " ");
        }
+        const iInt2 prefixSize = advanceN_Text(d->font, cstr_String(text), d->cursor);
+        const iInt2 curPos     = addX_I2(textOrigin, prefixSize.x);
+        const iRect curRect    = { curPos, addX_I2(advance_Text(d->font, cstr_String(&cur)), 1) };
        fillRect_Paint(&p, curRect, uiInputCursor_ColorId);
        draw_Text(d->font, curPos, uiInputCursorText_ColorId, cstr_String(&cur));
        deinit_String(&cur);
    }
-    deinit_String(&text);
+    delete_String(text);
 }
 iBeginDefineSubclass(InputWidget, Widget)
diff --git a/src/ui/inputwidget.h b/src/ui/inputwidget.h
index 903e428a..fed9c3d9 100644
--- a/src/ui/inputwidget.h
+++ b/src/ui/inputwidget.h
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #pragma once
 #include "widget.h"
@@ -10,13 +32,21 @@ enum iInputMode {
    overwrite_InputMode,
 };
+void    setHint_InputWidget     (iInputWidget *, const char *hintText);
 void    setSensitive_InputWidget(iInputWidget *, iBool isSensitive);
 void    setMode_InputWidget     (iInputWidget *, enum iInputMode mode);
 void    setMaxLen_InputWidget   (iInputWidget *, size_t maxLen);
 void    setText_InputWidget     (iInputWidget *, const iString *text);
 void    setTextCStr_InputWidget (iInputWidget *, const char *cstr);
 void    setCursor_InputWidget   (iInputWidget *, size_t pos);
+void    setSelectAllOnFocus_InputWidget(iInputWidget *, iBool selectAllOnFocus);
 void    begin_InputWidget       (iInputWidget *);
 void    end_InputWidget         (iInputWidget *, iBool accept);
 const iString * text_InputWidget    (const iInputWidget *);
+iLocalDef iInputWidget *newHint_InputWidget(size_t maxLen, const char *hint) {
+    iInputWidget *d = new_InputWidget(maxLen);
+    setHint_InputWidget(d, hint);
+    return d;
+}
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index a3daff44..8b2506e7 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "labelwidget.h"
 #include "text.h"
 #include "color.h"
@@ -133,6 +155,9 @@ static void getColors_LabelWidget_(const iLabelWidget *d, int *bg, int *fg, int
    *fg     = uiText_ColorId;
    *frame1 = isButton ? uiEmboss1_ColorId : uiFrame_ColorId;
    *frame2 = isButton ? uiEmboss2_ColorId : *frame1;
+    if (flags_Widget(w) & disabled_WidgetFlag && isButton) {
+        *fg = uiTextDisabled_ColorId;
+    }
    if (isSel) {
        *bg = uiBackgroundSelected_ColorId;
        *fg = uiTextSelected_ColorId;
@@ -150,11 +175,11 @@ static void getColors_LabelWidget_(const iLabelWidget *d, int *bg, int *fg, int
            /* Frames matching color escaped text. */
            if (startsWith_String(&d->label, "\r")) {
                if (isDark_ColorTheme(colorTheme_App())) {
-                    *frame1 = cstr_String(&d->label)[1] - '0';
+                    *frame1 = cstr_String(&d->label)[1] - asciiBase_ColorEscape;
                    *frame2 = darker_Color(*frame1);
                }
                else {
-                    *bg = *frame1 = *frame2 = cstr_String(&d->label)[1] - '0';
+                    *bg = *frame1 = *frame2 = cstr_String(&d->label)[1] - asciiBase_ColorEscape;
                    *fg = uiBackground_ColorId | permanent_ColorId;
                }
            }
@@ -311,10 +336,20 @@ void setTextCStr_LabelWidget(iLabelWidget *d, const char *text) {
    updateSize_LabelWidget(d);
 }
+const iString *label_LabelWidget(const iLabelWidget *d) {
+    return &d->label;
+}
 const iString *command_LabelWidget(const iLabelWidget *d) {
    return &d->command;
 }
+iLabelWidget *newColor_LabelWidget(const char *text, int color) {
+    iLabelWidget *d = new_LabelWidget(format_CStr("%s%s", escape_Color(color), text), 0, 0, NULL);
+    setFlags_Widget(as_Widget(d), frameless_WidgetFlag, iTrue);
+    return d;
+}
 iBeginDefineSubclass(LabelWidget, Widget)
    .processEvent = (iAny *) processEvent_LabelWidget_,
    .draw         = (iAny *) draw_LabelWidget_,
diff --git a/src/ui/labelwidget.h b/src/ui/labelwidget.h
index aaa897c9..c55ecd08 100644
--- a/src/ui/labelwidget.h
+++ b/src/ui/labelwidget.h
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #pragma once
 /* Text label/button. */
@@ -16,8 +38,11 @@ void    updateSize_LabelWidget      (iLabelWidget *);
 void    updateText_LabelWidget      (iLabelWidget *, const iString *text); /* not resized */
 void    updateTextCStr_LabelWidget  (iLabelWidget *, const char *text); /* not resized */
+const iString *label_LabelWidget    (const iLabelWidget *);
 const iString *command_LabelWidget  (const iLabelWidget *);
+iLabelWidget *newColor_LabelWidget(const char *text, int color);
 iLocalDef iLabelWidget *newEmpty_LabelWidget(void) {
    return new_LabelWidget("", 0, 0, NULL);
 }
diff --git a/src/ui/macos.h b/src/ui/macos.h
deleted file mode 100644
index a491e721..00000000
--- a/src/ui/macos.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-#include "util.h"
-/* Platform-specific functionality for macOS */
-void    setupApplication_MacOS  (void);
-void    insertMenuItems_MacOS   (const char *menuLabel, int atIndex, const iMenuItem *items, size_t count);
-void    handleCommand_MacOS     (const char *cmd);
diff --git a/src/ui/metrics.c b/src/ui/metrics.c
index 3c4bfd75..537aaf98 100644
--- a/src/ui/metrics.c
+++ b/src/ui/metrics.c
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "metrics.h"
 #include <the_Foundation/math.h>
diff --git a/src/ui/metrics.h b/src/ui/metrics.h
index 39fc6415..207dd59d 100644
--- a/src/ui/metrics.h
+++ b/src/ui/metrics.h
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #pragma once
 #include <the_Foundation/vec2.h>
diff --git a/src/ui/paint.c b/src/ui/paint.c
index 264ca0d8..0166e398 100644
--- a/src/ui/paint.c
+++ b/src/ui/paint.c
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "paint.h"
 #include <SDL_version.h>
diff --git a/src/ui/paint.h b/src/ui/paint.h
index 5b29b176..7c9e5e51 100644
--- a/src/ui/paint.h
+++ b/src/ui/paint.h
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #pragma once
 #include <the_Foundation/rect.h>
diff --git a/src/ui/scrollwidget.c b/src/ui/scrollwidget.c
index 3d8f5eaa..f5340897 100644
--- a/src/ui/scrollwidget.c
+++ b/src/ui/scrollwidget.c
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "scrollwidget.h"
 #include "paint.h"
 #include "util.h"
@@ -39,6 +61,7 @@ static iRect thumbRect_ScrollWidget_(const iScrollWidget *d) {
    const int total = size_Range(&d->range);
    if (total > 0) {
        const int tsize = thumbSize_ScrollWidget_(d);
+//        iAssert(tsize <= height_Rect(bounds));
        const int tpos =
            iClamp((float) d->thumb / (float) total, 0, 1) * (height_Rect(bounds) - tsize);
        rect.pos.y  = bounds.pos.y + tpos;
diff --git a/src/ui/scrollwidget.h b/src/ui/scrollwidget.h
index 7b44dced..e6cda03d 100644
--- a/src/ui/scrollwidget.h
+++ b/src/ui/scrollwidget.h
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #pragma once
 #include "widget.h"
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 71b641d4..40c3f55e 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -1,16 +1,41 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "sidebarwidget.h"
-#include "labelwidget.h"
-#include "scrollwidget.h"
+#include "app.h"
+#include "bookmarks.h"
+#include "command.h"
 #include "documentwidget.h"
+#include "gmcerts.h"
+#include "gmdocument.h"
 #include "inputwidget.h"
-#include "bookmarks.h"
+#include "labelwidget.h"
 #include "paint.h"
+#include "scrollwidget.h"
 #include "util.h"
-#include "command.h"
+#include "visited.h"
-#include "../gmdocument.h"
-#include "app.h"
-#include <the_Foundation/array.h>
+#include <the_Foundation/stringarray.h>
 #include <SDL_clipboard.h>
 #include <SDL_mouse.h>
@@ -23,6 +48,8 @@ struct Impl_SidebarItem {
    iString     label;
    iString     meta;
    iString     url;
+    iBool       isSeparator;
+    iBool       isSelected;
 };
 void init_SidebarItem(iSidebarItem *d) {
@@ -32,6 +59,8 @@ void init_SidebarItem(iSidebarItem *d) {
    init_String(&d->label);
    init_String(&d->meta);
    init_String(&d->url);
+    d->isSeparator = iFalse;
+    d->isSelected = iFalse;
 }
 void deinit_SidebarItem(iSidebarItem *d) {
@@ -49,6 +78,7 @@ struct Impl_SidebarWidget {
    enum iSidebarMode mode;
    iScrollWidget *scroll;
    int scrollY;
+    int modeScroll[max_SidebarMode];
    int width;
    iLabelWidget *modeButtons[max_SidebarMode];
    int itemHeight;
@@ -141,12 +171,7 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
                item.icon = bm->icon;
                set_String(&item.url, &bm->url);
                set_String(&item.label, &bm->title);
-//                iDate date;
-//                init_Date(&date, &bm->when);
-//                iString *ds = format_Date(&date, "%Y %b %d");
-//                set_String(&item.meta, ds);
                set_String(&item.meta, &bm->tags);
-//                delete_String(ds);
                pushBack_Array(&d->items, &item);
            }
            d->menu = makeMenu_Widget(
@@ -158,8 +183,97 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
                4);
            break;
        }
-        case history_SidebarMode:
+        case history_SidebarMode: {
+            iDate on;
+            initCurrent_Date(&on);
+            const int thisYear = on.year;
+            iConstForEach(PtrArray, i, list_Visited(visited_App(), 200)) {
+                const iVisitedUrl *visit = i.ptr;
+                iSidebarItem item;
+                init_SidebarItem(&item);
+                set_String(&item.url, &visit->url);
+                iDate date;
+                init_Date(&date, &visit->when);
+                if (date.day != on.day || date.month != on.month || date.year != on.year) {
+                    on = date;
+                    /* Date separator. */
+                    iSidebarItem sep;
+                    init_SidebarItem(&sep);
+                    sep.isSeparator = iTrue;
+                    set_String(&sep.meta,
+                               collect_String(format_Date(
+                                   &date, date.year != thisYear ? "%b %d %Y" : "%b %d")));
+                    pushBack_Array(&d->items, &sep);                    
+                    /* Date separators are two items tall. */
+                    init_SidebarItem(&sep);
+                    sep.isSeparator = iTrue;
+                    pushBack_Array(&d->items, &sep);
+                }
+                pushBack_Array(&d->items, &item);
+            }
+            d->menu = makeMenu_Widget(
+                as_Widget(d),
+                (iMenuItem[]){
+                    { "Copy URL", 0, 0, "history.copy" },
+                    { "Add Bookmark...", 0, 0, "history.addbookmark" },
+                    { "---", 0, 0, NULL },
+                    { "Remove URL", 0, 0, "history.delete" },
+                    { "---", 0, 0, NULL },
+                    { uiTextCaution_ColorEscape "Clear History...", 0, 0, "history.clear confirm:1" },
+                }, 6);
+            break;
+        }
+        case identities_SidebarMode: {
+            const iString *tabUrl = url_DocumentWidget(document_App());
+            iConstForEach(PtrArray, i, identities_GmCerts(certs_App())) {
+                const iGmIdentity *ident = i.ptr;
+                iSidebarItem item;
+                init_SidebarItem(&item);
+                item.id = index_PtrArrayConstIterator(&i);
+                item.icon = ident->icon;
+                set_String(&item.label, collect_String(subject_TlsCertificate(ident->cert)));
+                iDate until;
+                validUntil_TlsCertificate(ident->cert, &until);
+                const iBool isActive = isUsedOn_GmIdentity(ident, tabUrl);
+                format_String(
+                    &item.meta,
+                    "%s",
+                    isActive ? "Using"
+                             : isUsed_GmIdentity(ident)
+                                   ? format_CStr("Used on %zu URLs", size_StringSet(ident->useUrls))
+                                   : "Not used");
+                const char *expiry =
+                    ident->flags & temporary_GmIdentityFlag
+                        ? "Temporary"
+                        : cstrCollect_String(format_Date(&until, "Expires %b %d, %Y"));
+                if (isEmpty_String(&ident->notes)) {
+                    appendFormat_String(&item.meta, "\n%s", expiry);
+                }
+                else {
+                    appendFormat_String(&item.meta,
+                                        " \u2014 %s\n%s%s",
+                                        expiry,
+                                        escape_Color(uiHeading_ColorId),
+                                        cstr_String(&ident->notes));
+                }
+                item.isSelected = isActive;
+                pushBack_Array(&d->items, &item);
+            }
+            const iMenuItem menuItems[] = {
+                { "Use on This Page", 0, 0, "ident.use arg:1" },
+                { "Stop Using This Page", 0, 0, "ident.use arg:0" },
+                { "Stop Using Everywhere", 0, 0, "ident.use arg:0 clear:1" },
+                { "Show Usage", 0, 0, "ident.showuse" },
+                { "---", 0, 0, NULL },
+                { "Edit Notes...", 0, 0, "ident.edit" },
+                { "Pick Icon...", 0, 0, "ident.pickicon" },
+                { "---", 0, 0, NULL },
+                { "Reveal Files", 0, 0, "ident.reveal" },
+                { uiTextCaution_ColorEscape "Delete Identity...", 0, 0, "ident.delete confirm:1" },
+            };
+            d->menu = makeMenu_Widget(as_Widget(d), menuItems, iElemCount(menuItems));
            break;
+        }
        default:
            break;
    }
@@ -167,14 +281,35 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
    invalidate_SidebarWidget_(d);
 }
+static void scroll_SidebarWidget_(iSidebarWidget *d, int offset) {
+    const int oldScroll = d->scrollY;
+    d->scrollY += offset;
+    if (d->scrollY < 0) {
+        d->scrollY = 0;
+    }
+    const int scrollMax = scrollMax_SidebarWidget_(d);
+    d->scrollY = iMin(d->scrollY, scrollMax);
+    if (oldScroll != d->scrollY) {
+        d->hoverItem = iInvalidPos;
+        updateVisible_SidebarWidget_(d);
+        invalidate_SidebarWidget_(d);
+    }
+}
 void setMode_SidebarWidget(iSidebarWidget *d, enum iSidebarMode mode) {
    if (d->mode == mode) return;
+    if (d->mode >= 0 && d->mode < max_SidebarMode) {
+        d->modeScroll[d->mode] = d->scrollY; /* saved for later */
+    }
    d->mode = mode;
    for (enum iSidebarMode i = 0; i < max_SidebarMode; i++) {
        setFlags_Widget(as_Widget(d->modeButtons[i]), selected_WidgetFlag, i == d->mode);
    }
-    const float heights[max_SidebarMode] = { 1.333f, 3, 3, 1.2f };
+    const float heights[max_SidebarMode] = { 1.333f, 1.333f, 3.5f, 1.2f };
    d->itemHeight = heights[mode] * lineHeight_Text(uiContent_FontId);
+    invalidate_SidebarWidget_(d);
+    /* Restore previous scroll position. */
+    d->scrollY = d->modeScroll[mode];
 }
 enum iSidebarMode mode_SidebarWidget(const iSidebarWidget *d) {
@@ -209,8 +344,9 @@ void init_SidebarWidget(iSidebarWidget *d) {
                        resizeWidthOfChildren_WidgetFlag | collapse_WidgetFlag,
                    iTrue);
    d->scrollY = 0;
-    d->mode    = -1;
+    iZap(d->modeScroll);
-    d->width   = 75 * gap_UI;
+    d->mode  = -1;
+    d->width = 60 * gap_UI;
    init_Array(&d->items, sizeof(iSidebarItem));
    d->hoverItem = iInvalidPos;
    init_Click(&d->click, d, SDL_BUTTON_LEFT);
@@ -220,7 +356,7 @@ void init_SidebarWidget(iSidebarWidget *d) {
        d->modeButtons[i] = addChildFlags_Widget(
            w,
            iClob(
-                new_LabelWidget(normalModeLabels_[i], 0, 0, format_CStr("sidebar.mode arg:%d", i))),
+                new_LabelWidget(tightModeLabels_[i], 0, 0, format_CStr("sidebar.mode arg:%d", i))),
            frameless_WidgetFlag | expand_WidgetFlag);
        d->maxButtonLabelWidth =
            iMaxi(d->maxButtonLabelWidth,
@@ -270,7 +406,53 @@ static size_t itemIndex_SidebarWidget_(const iSidebarWidget *d, iInt2 pos) {
    return index;
 }
+static const iSidebarItem *constHoverItem_SidebarWidget_(const iSidebarWidget *d) {
+    if (d->hoverItem < size_Array(&d->items)) {
+        return constAt_Array(&d->items, d->hoverItem);
+    }
+    return NULL;
+}
+static iSidebarItem *hoverItem_SidebarWidget_(iSidebarWidget *d) {
+    if (d->hoverItem < size_Array(&d->items)) {
+        return at_Array(&d->items, d->hoverItem);
+    }
+    return NULL;
+}
+static const iGmIdentity *constHoverIdentity_SidebarWidget_(const iSidebarWidget *d) {
+    if (d->mode == identities_SidebarMode) {
+        const iSidebarItem *hoverItem = constHoverItem_SidebarWidget_(d);
+        if (hoverItem) {
+            return identity_GmCerts(certs_App(), hoverItem->id);
+        }
+    }
+    return NULL;
+}
+static iGmIdentity *hoverIdentity_SidebarWidget_(const iSidebarWidget *d) {
+    return iConstCast(iGmIdentity *, constHoverIdentity_SidebarWidget_(d));
+}
+static void setHoverItem_SidebarWidget_(iSidebarWidget *d, size_t index) {
+    if (index < size_Array(&d->items)) {
+        if (constValue_Array(&d->items, index, iSidebarItem).isSeparator) {
+            index = iInvalidPos;
+        }
+    }
+    if (d->hoverItem != index) {
+        d->hoverItem = index;
+        invalidate_SidebarWidget_(d);
+    }
+}
+static void updateMouseHover_SidebarWidget_(iSidebarWidget *d) {
+    const iInt2 mouse = mouseCoord_Window(get_Window());
+    setHoverItem_SidebarWidget_(d, itemIndex_SidebarWidget_(d, mouse));
+}
 static void itemClicked_SidebarWidget_(iSidebarWidget *d, size_t index) {
+    setFocus_Widget(NULL);
    const iSidebarItem *item = constAt_Array(&d->items, index);
    switch (d->mode) {
        case documentOutline_SidebarMode: {
@@ -279,25 +461,30 @@ static void itemClicked_SidebarWidget_(iSidebarWidget *d, size_t index) {
            postCommandf_App("document.goto loc:%p", head->text.start);
            break;
        }
-        case bookmarks_SidebarMode: {
+        case bookmarks_SidebarMode:
-            postCommandf_App("open url:%s", cstr_String(&item->url));
+        case history_SidebarMode: {
+            if (!isEmpty_String(&item->url)) {
+                postCommandf_App("open url:%s", cstr_String(&item->url));
+            }
            break;
        }
-    }
+        case identities_SidebarMode: {
-}
+            iGmIdentity *ident = hoverIdentity_SidebarWidget_(d);
+            if (ident) {
-static void scroll_SidebarWidget_(iSidebarWidget *d, int offset) {
+                const iString *tabUrl = url_DocumentWidget(document_App());
-    const int oldScroll = d->scrollY;
+                if (isUsedOn_GmIdentity(ident, tabUrl)) {
-    d->scrollY += offset;
+                    signOut_GmCerts(certs_App(), tabUrl);
-    if (d->scrollY < 0) {
+                }
-        d->scrollY = 0;
+                else {
-    }
+                    signIn_GmCerts(certs_App(), ident, tabUrl);
-    const int scrollMax = scrollMax_SidebarWidget_(d);
+                }
-    d->scrollY = iMin(d->scrollY, scrollMax);
+                updateItems_SidebarWidget_(d);
-    if (oldScroll != d->scrollY) {
+                updateMouseHover_SidebarWidget_(d);
-        d->hoverItem = iInvalidPos;
+            }
-        updateVisible_SidebarWidget_(d);
+            break;
-        invalidate_SidebarWidget_(d);
+        }
+        default:
+            break;
    }
 }
@@ -316,13 +503,6 @@ static void checkModeButtonLayout_SidebarWidget_(iSidebarWidget *d) {
    }
 }
-static iSidebarItem *hoverItem_SidebarWidget_(iSidebarWidget *d) {
-    if (d->hoverItem < size_Array(&d->items)) {
-        return at_Array(&d->items, d->hoverItem);
-    }
-    return NULL;
-}
 void setWidth_SidebarWidget(iSidebarWidget *d, int width) {
    iWidget *w = as_Widget(d);
    width = iMax(30 * gap_UI, width);
@@ -339,15 +519,18 @@ void setWidth_SidebarWidget(iSidebarWidget *d, int width) {
 }
 iBool handleBookmarkEditorCommands_SidebarWidget_(iWidget *editor, const char *cmd) {
-    iSidebarWidget *d = findWidget_App("sidebar");
    if (equal_Command(cmd, "bmed.accept") || equal_Command(cmd, "cancel")) {
+        iSidebarWidget *d = findWidget_App("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"));
+            const iString *tags  = text_InputWidget(findChild_Widget(editor, "bmed.tags"));
            const iSidebarItem *item = hoverItem_SidebarWidget_(d);
            iAssert(item); /* hover item cannot have been changed */
            iBookmark *bm = get_Bookmarks(bookmarks_App(), item->id);
-            set_String(&bm->title, text_InputWidget(findChild_Widget(editor, "bmed.title")));
+            set_String(&bm->title, title);
-            set_String(&bm->url, text_InputWidget(findChild_Widget(editor, "bmed.url")));
+            set_String(&bm->url, url);
-            set_String(&bm->tags, text_InputWidget(findChild_Widget(editor, "bmed.tags")));
+            set_String(&bm->tags, tags);
            postCommand_App("bookmarks.changed");
        }
        setFlags_Widget(as_Widget(d), disabled_WidgetFlag, iFalse);
@@ -399,11 +582,15 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
            setMode_SidebarWidget(d, arg_Command(cmd));
            updateItems_SidebarWidget_(d);
            if (argLabel_Command(cmd, "show") && !isVisible_Widget(w)) {
-                postCommand_App("sidebar.toggle");
+                postCommand_App("sidebar.toggle arg:1");
            }
+            scroll_SidebarWidget_(d, 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;
@@ -421,7 +608,6 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
            return iTrue;
        }
        else if (equal_Command(cmd, "tabs.changed") || equal_Command(cmd, "document.changed")) {
-            d->scrollY = 0;
            updateItems_SidebarWidget_(d);
        }
        else if (equal_Command(cmd, "theme.changed")) {
@@ -455,25 +641,156 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
            }
            return iTrue;
        }
-        else if (equal_Command(cmd, "bookmarks.changed")) {
+        else if (equal_Command(cmd, "bookmarks.changed") && d->mode == bookmarks_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  = hoverIdentity_SidebarWidget_(d);
+            const iString *tabUrl = url_DocumentWidget(document_App());
+            if (ident) {
+                if (argLabel_Command(cmd, "clear")) {
+                    clearUse_GmIdentity(ident);
+                }
+                else if (arg_Command(cmd)) {
+                    signIn_GmCerts(certs_App(), ident, tabUrl);
+                }
+                else {
+                    signOut_GmCerts(certs_App(), tabUrl);
+                }
+                updateItems_SidebarWidget_(d);
+            }
+            return iTrue;
+        }
+        else if (isCommand_Widget(w, ev, "ident.showuse")) {
+            const iGmIdentity *ident = constHoverIdentity_SidebarWidget_(d);
+            if (ident) {
+                makeMessage_Widget(uiHeading_ColorEscape "IDENTITY USAGE",
+                                   cstrCollect_String(joinCStr_StringSet(ident->useUrls, "\n")));
+            }
+            return iTrue;
+        }
+        else if (isCommand_Widget(w, ev, "ident.edit")) {
+            const iGmIdentity *ident = constHoverIdentity_SidebarWidget_(d);
+            if (ident) {
+                makeValueInput_Widget(get_Window()->root,
+                                      &ident->notes,
+                                      uiHeading_ColorEscape "IDENTITY NOTES",
+                                      format_CStr("Notes about %s:", cstr_String(name_GmIdentity(ident))),
+                                      uiTextAction_ColorEscape "OK",
+                                      format_CStr("ident.setnotes ident:%p", ident));
+            }
+            return iTrue;
+        }
+        else if (equal_Command(cmd, "ident.setnotes")) {
+            iGmIdentity *ident = pointerLabel_Command(cmd, "ident");
+            if (ident) {
+                setCStr_String(&ident->notes, suffixPtr_Command(cmd, "value"));
+                updateItems_SidebarWidget_(d);
+            }
+            return iTrue;
+        }
+        else if (isCommand_Widget(w, ev, "ident.pickicon")) {
+            return iTrue;
+        }
+        else if (isCommand_Widget(w, ev, "ident.reveal")) {
+            const iGmIdentity *ident = constHoverIdentity_SidebarWidget_(d);
+            if (ident) {
+                const iString *crtPath = certificatePath_GmCerts(certs_App(), ident);
+                if (crtPath) {
+                    revealPath_App(crtPath);
+                }
+            }
+            return iTrue;
+        }
+        else if (equal_Command(cmd, "ident.delete")) {
+            iSidebarItem *item = hoverItem_SidebarWidget_(d);
+            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);
+                return iTrue;
+            }
+            deleteIdentity_GmCerts(certs_App(), hoverIdentity_SidebarWidget_(d));
            updateItems_SidebarWidget_(d);
+            return iTrue;
+        }
+        else if (equal_Command(cmd, "history.delete")) {
+            const iSidebarItem *item = hoverItem_SidebarWidget_(d);
+            if (item && !isEmpty_String(&item->url)) {
+                removeUrl_Visited(visited_App(), &item->url);
+                updateItems_SidebarWidget_(d);
+                scroll_SidebarWidget_(d, 0);
+            }
+            return iTrue;
+        }
+        else if (equal_Command(cmd, "history.copy")) {
+            const iSidebarItem *item = hoverItem_SidebarWidget_(d);
+            if (item && !isEmpty_String(&item->url)) {
+                SDL_SetClipboardText(cstr_String(&item->url));
+            }
+            return iTrue;
+        }
+        else if (equal_Command(cmd, "history.addbookmark")) {
+            const iSidebarItem *item = hoverItem_SidebarWidget_(d);
+            if (!isEmpty_String(&item->url)) {
+                makeBookmarkCreation_Widget(
+                    &item->url,
+                    collect_String(newRange_String(urlHost_String(&item->url))),
+                    0x1f310 /* globe */);
+            }
+        }
+        else if (equal_Command(cmd, "history.clear")) {
+            if (argLabel_Command(cmd, "confirm")) {
+                makeQuestion_Widget(
+                    uiTextCaution_ColorEscape "CLEAR HISTORY",
+                    "Do you really want to erase the history of all visited pages?",
+                    (const char *[]){ "Cancel", uiTextCaution_ColorEscape "Clear History" },
+                    (const char *[]){ "cancel", "history.clear confirm:0" },
+                    2);
+            }
+            else {
+                clear_Visited(visited_App());
+                updateItems_SidebarWidget_(d);
+                scroll_SidebarWidget_(d, 0);
+            }
+            return iTrue;
        }
    }
    if (ev->type == SDL_MOUSEMOTION && !isVisible_Widget(d->menu)) {
        const iInt2 mouse = init_I2(ev->motion.x, ev->motion.y);
        size_t hover = iInvalidPos;
        if (contains_Widget(d->resizer, mouse)) {
-            SDL_SetCursor(d->resizeCursor);
+            setCursor_Window(get_Window(), SDL_SYSTEM_CURSOR_SIZEWE);
        }
-        else {
+        else if (contains_Widget(constAs_Widget(d->scroll), mouse)) {
-            SDL_SetCursor(NULL);
+            setCursor_Window(get_Window(), SDL_SYSTEM_CURSOR_ARROW);
-            if (contains_Widget(w, mouse)) {
-                hover = itemIndex_SidebarWidget_(d, mouse);
-            }
        }
-        if (hover != d->hoverItem) {
+        else if (contains_Widget(w, mouse)) {
-            d->hoverItem = hover;
+            hover = itemIndex_SidebarWidget_(d, mouse);
-            invalidate_SidebarWidget_(d);
+        }
+        setHoverItem_SidebarWidget_(d, hover);
+        /* Update cursor. */
+        if (contains_Widget(w, mouse) && !contains_Widget(d->resizer, mouse) &&
+            !contains_Widget(constAs_Widget(d->scroll), mouse)) {
+            const iSidebarItem *item = constHoverItem_SidebarWidget_(d);
+            if (item && d->mode != identities_SidebarMode) {
+                setCursor_Window(get_Window(), item->isSeparator ? SDL_SYSTEM_CURSOR_ARROW
+                                                                 : SDL_SYSTEM_CURSOR_HAND);
+            }
+            else {
+                setCursor_Window(get_Window(), SDL_SYSTEM_CURSOR_ARROW);
+            }
        }
    }
    if (ev->type == SDL_MOUSEWHEEL && isHover_Widget(w)) {
@@ -486,10 +803,42 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
        return iTrue;
    }
    if (d->menu && ev->type == SDL_MOUSEBUTTONDOWN) {
-        if (d->hoverItem != iInvalidPos || isVisible_Widget(d->menu)) {
+        if (ev->button.button == SDL_BUTTON_RIGHT) {
-            processContextMenuEvent_Widget(d->menu, ev, {});
+            if (!isVisible_Widget(d->menu)) {
+                setHoverItem_SidebarWidget_(
+                    d, itemIndex_SidebarWidget_(d, init_I2(ev->button.x, ev->button.y)));
+            }
+            if (d->hoverItem != iInvalidPos || isVisible_Widget(d->menu)) {
+                /* Update menu items. */
+                if (d->mode == identities_SidebarMode) {
+                    const iGmIdentity *ident  = constHoverIdentity_SidebarWidget_(d);
+                    const iString *    docUrl = url_DocumentWidget(document_App());
+                    iForEach(ObjectList, i, children_Widget(d->menu)) {
+                        if (isInstance_Object(i.object, &Class_LabelWidget)) {
+                            iLabelWidget *menuItem = i.object;
+                            const char *  cmdItem  = cstr_String(command_LabelWidget(menuItem));
+                            if (equal_Command(cmdItem, "ident.use")) {
+                                const iBool cmdUse   = arg_Command(cmdItem) != 0;
+                                const iBool cmdClear = argLabel_Command(cmdItem, "clear") != 0;
+                                setFlags_Widget(
+                                    as_Widget(menuItem),
+                                    disabled_WidgetFlag,
+                                    (cmdClear && !isUsed_GmIdentity(ident)) ||
+                                        (!cmdClear && cmdUse && isUsedOn_GmIdentity(ident, docUrl)) ||
+                                        (!cmdClear && !cmdUse && !isUsedOn_GmIdentity(ident, docUrl)));
+                            }
+                            else if (equal_Command(cmdItem, "ident.showuse")) {
+                                setFlags_Widget(as_Widget(menuItem),
+                                                disabled_WidgetFlag,
+                                                !isUsed_GmIdentity(ident));
+                            }
+                        }
+                    }
+                }
+            }
        }
    }
+    processContextMenuEvent_Widget(d->menu, ev, {});
    switch (processEvent_Click(&d->click, ev)) {
        case started_ClickResult:
            invalidate_SidebarWidget_(d);
@@ -524,8 +873,8 @@ static void allocVisBuffer_SidebarWidget_(iSidebarWidget *d) {
 }
 static void draw_SidebarWidget_(const iSidebarWidget *d) {
-    const iWidget *w      = constAs_Widget(d);
+    const iWidget *w          = constAs_Widget(d);
-    const iRect    bounds = contentBounds_SidebarWidget_(d);
+    const iRect    bounds     = contentBounds_SidebarWidget_(d);
    const iBool    isPressing = d->click.isActive && contains_Rect(bounds, pos_Click(&d->click));
    iPaint p;
    init_Paint(&p);
@@ -545,9 +894,12 @@ static void draw_SidebarWidget_(const iSidebarWidget *d) {
            for (size_t i = visRange.start; i < visRange.end; i++) {
                const iSidebarItem *item     = constAt_Array(&d->items, i);
                const iRect         itemRect = { pos, init_I2(width_Rect(bufBounds), d->itemHeight) };
-                const iBool         isHover  = (d->hoverItem == i);
+                const iBool         isHover  = isHover_Widget(w) && (d->hoverItem == i);
+                const int           iconColor =
+                    isHover ? (isPressing ? uiTextPressed_ColorId : uiIconHover_ColorId)
+                            : uiIcon_ColorId;
                setClip_Paint(&p, intersect_Rect(itemRect, bufBounds));
-                if (isHover) {
+                if (isHover && !item->isSeparator) {
                    fillRect_Paint(&p,
                                   itemRect,
                                   isPressing ? uiBackgroundPressed_ColorId
@@ -576,8 +928,7 @@ static void draw_SidebarWidget_(const iSidebarWidget *d) {
                        font,
                        iconArea,
                        iTrue,
-                        isHover ? (isPressing ? uiTextPressed_ColorId : uiIconHover_ColorId)
+                        iconColor,
-                                : uiIcon_ColorId,
                        "%s",
                        cstr_String(&str));
                    deinit_String(&str);
@@ -585,6 +936,81 @@ static void draw_SidebarWidget_(const iSidebarWidget *d) {
                                            (d->itemHeight - lineHeight_Text(font)) / 2);
                    drawRange_Text(font, textPos, fg, range_String(&item->label));
                }
+                else if (d->mode == history_SidebarMode) {
+                    iBeginCollect();
+                    const int fg = isHover ? (isPressing ? uiTextPressed_ColorId
+                                                         : uiTextFramelessHover_ColorId)
+                                           : uiText_ColorId;
+                    if (item->isSeparator) {
+                        if (!isEmpty_String(&item->meta)) {
+                            unsetClip_Paint(&p);
+                            iInt2 drawPos = addY_I2(topLeft_Rect(itemRect), d->itemHeight * 0.666f);
+                            drawHLine_Paint(
+                                &p, drawPos, width_Rect(itemRect), uiIcon_ColorId);
+                            drawRange_Text(
+                                default_FontId,
+                                add_I2(drawPos,
+                                       init_I2(3 * gap_UI,
+                                               (d->itemHeight - lineHeight_Text(default_FontId)) / 2)),
+                                uiIcon_ColorId,
+                                range_String(&item->meta));
+                        }
+                    }
+                    else {
+                        iUrl parts;
+                        init_Url(&parts, &item->url);
+                        const iBool isGemini = equalCase_Rangecc(parts.scheme, "gemini");
+                        draw_Text(
+                            font,
+                            add_I2(topLeft_Rect(itemRect),
+                                   init_I2(3 * gap_UI, (d->itemHeight - lineHeight_Text(font)) / 2)),
+                            fg,
+                            "%s%s%s%s%s%s",
+                            isGemini ? "" : cstr_Rangecc(parts.scheme),
+                            isGemini ? "" : "://",
+                            escape_Color(isHover ? (isPressing ? uiTextPressed_ColorId
+                                                               : uiTextFramelessHover_ColorId)
+                                                 : uiTextStrong_ColorId),
+                            cstr_Rangecc(parts.host),
+                            escape_Color(fg),
+                            cstr_Rangecc(parts.path));
+                    }
+                    iEndCollect();
+                }
+                else if (d->mode == identities_SidebarMode) {
+                    const int fg = isHover ? (isPressing ? uiTextPressed_ColorId
+                                                         : uiTextFramelessHover_ColorId)
+                                           : uiTextStrong_ColorId;
+                    if (item->isSelected) {
+                        drawRectThickness_Paint(&p,
+                                                adjusted_Rect(itemRect, zero_I2(), init_I2(-2, -1)),
+                                                gap_UI / 4,
+                                                isHover && isPressing ? uiTextPressed_ColorId
+                                                                      : uiIcon_ColorId);
+                    }
+                    iString icon;
+                    initUnicodeN_String(&icon, &item->icon, 1);                    
+                    iInt2 cPos = topLeft_Rect(itemRect);
+                    addv_I2(&cPos,
+                            init_I2(3 * gap_UI,
+                                    (d->itemHeight - lineHeight_Text(default_FontId) * 2 -
+                                     lineHeight_Text(font)) /
+                                        2));
+                    const int metaFg =
+                        isHover ? permanent_ColorId | (isPressing ? uiTextPressed_ColorId
+                                                                  : uiTextFramelessHover_ColorId)
+                                : uiText_ColorId;
+                    drawRange_Text(
+                        font, cPos, item->isSelected ? iconColor : metaFg, range_String(&icon));
+                    deinit_String(&icon);
+                    drawRange_Text(font, add_I2(cPos, init_I2(6 * gap_UI, 0)),
+                                   fg, range_String(&item->label));
+                    drawRange_Text(
+                        default_FontId,
+                        add_I2(cPos, init_I2(6 * gap_UI, lineHeight_Text(font))),
+                        metaFg,
+                        range_String(&item->meta));
+                }
                unsetClip_Paint(&p);
                pos.y += d->itemHeight;
            }
diff --git a/src/ui/sidebarwidget.h b/src/ui/sidebarwidget.h
index 3ff20b7f..7ccc64dd 100644
--- a/src/ui/sidebarwidget.h
+++ b/src/ui/sidebarwidget.h
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #pragma once
 #include "widget.h"
diff --git a/src/ui/text.c b/src/ui/text.c
index 1e702eee..836d540f 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "text.h"
 #include "color.h"
 #include "metrics.h"
@@ -11,6 +33,7 @@
 #include <the_Foundation/file.h>
 #include <the_Foundation/hash.h>
 #include <the_Foundation/math.h>
+#include <the_Foundation/stringlist.h>
 #include <the_Foundation/regexp.h>
 #include <the_Foundation/path.h>
 #include <the_Foundation/vec2.h>
@@ -25,6 +48,7 @@ iDeclareTypeConstructionArgs(Glyph, iChar ch)
 int gap_Text;                           /* cf. gap_UI in metrics.h */
 int enableHalfPixelGlyphs_Text = iTrue; /* debug setting */
+int enableKerning_Text         = iTrue; /* looking up kern pairs is slow */
 struct Impl_Glyph {
    iHashNode node;
@@ -62,6 +86,7 @@ struct Impl_Font {
    int            baseline;
    iHash          glyphs;
    iBool          isMonospaced;
+    iBool          manualKernOnly;
    enum iFontId   symbolsFont; /* font to use for symbols */
 };
@@ -120,7 +145,7 @@ static void initFonts_Text_(iText *d) {
        int symbolsFont;
    } fontData[max_FontId] = {
        { &fontSourceSansProRegular_Embedded, fontSize_UI,          defaultSymbols_FontId },
-        { &fontSourceSansProRegular_Embedded, fontSize_UI * 1.150f, defaultMediumSymbols_FontId },
+        { &fontSourceSansProRegular_Embedded, fontSize_UI * 1.125f, defaultMediumSymbols_FontId },
        { &fontFiraMonoRegular_Embedded,      fontSize_UI * 0.866f, defaultSymbols_FontId },
        { &fontFiraSansRegular_Embedded,      textSize,             symbols_FontId },
        { &fontFiraMonoRegular_Embedded,      textSize * 0.866f,    smallSymbols_FontId },
@@ -133,14 +158,14 @@ static void initFonts_Text_(iText *d) {
        { &fontFiraSansBold_Embedded,         textSize * 2.000f,    hugeSymbols_FontId },
        { &fontFiraSansLight_Embedded,        textSize * 1.666f,    largeSymbols_FontId },
        { &fontSymbola_Embedded,              fontSize_UI,          defaultSymbols_FontId },
-        { &fontSymbola_Embedded,              fontSize_UI * 1.150f, defaultMediumSymbols_FontId },
+        { &fontSymbola_Embedded,              fontSize_UI * 1.125f, defaultMediumSymbols_FontId },
        { &fontSymbola_Embedded,              textSize,             symbols_FontId },
        { &fontSymbola_Embedded,              textSize * 1.333f,    mediumSymbols_FontId },
        { &fontSymbola_Embedded,              textSize * 1.666f,    largeSymbols_FontId },
        { &fontSymbola_Embedded,              textSize * 2.000f,    hugeSymbols_FontId },
        { &fontSymbola_Embedded,              textSize * 0.866f,    smallSymbols_FontId },
        { &fontNotoEmojiRegular_Embedded,     fontSize_UI,          defaultSymbols_FontId },
-        { &fontNotoEmojiRegular_Embedded,     fontSize_UI * 1.150f, defaultMediumSymbols_FontId },
+        { &fontNotoEmojiRegular_Embedded,     fontSize_UI * 1.125f, defaultMediumSymbols_FontId },
        { &fontNotoEmojiRegular_Embedded,     textSize,             symbols_FontId },
        { &fontNotoEmojiRegular_Embedded,     textSize * 1.333f,    mediumSymbols_FontId },
        { &fontNotoEmojiRegular_Embedded,     textSize * 1.666f,    largeSymbols_FontId },
@@ -153,6 +178,9 @@ static void initFonts_Text_(iText *d) {
        if (fontData[i].ttf == &fontFiraMonoRegular_Embedded) {
            font->isMonospaced = iTrue;
        }
+        if (i == default_FontId || i == defaultMedium_FontId) {
+            font->manualKernOnly = iTrue;
+        }
    }
    gap_Text = iRound(gap_UI * d->contentFontSize);
 }
@@ -287,8 +315,8 @@ static void cache_Font_(iFont *d, iGlyph *glyph, int hoff) {
    /* Rasterize the glyph using stbtt. */ {
        surface = rasterizeGlyph_Font_(d, ch, hoff * 0.5f);
        if (hoff == 0) {
-            int adv, lsb;
+            int adv;
-            stbtt_GetCodepointHMetrics(&d->font, ch, &adv, &lsb);
+            stbtt_GetCodepointHMetrics(&d->font, ch, &adv, NULL);
            glyph->advance = d->scale * adv;
        }
        stbtt_GetCodepointBitmapBoxSubpixel(&d->font,
@@ -406,6 +434,7 @@ static iRect run_Font_(iFont *d, enum iRunMode mode, iRangecc text, size_t maxLe
            /* ANSI escape. */
            chPos++;
            iRegExpMatch m;
+            init_RegExpMatch(&m);
            if (match_RegExp(text_.ansiEscape, chPos, text.end - chPos, &m)) {
                if (mode == draw_RunMode) {
                    /* Change the color. */
@@ -431,7 +460,7 @@ static iRect run_Font_(iFont *d, enum iRunMode mode, iRangecc text, size_t maxLe
            if (ch == '\r') {
                const iChar esc = nextChar_(&chPos, text.end);
                if (mode == draw_RunMode) {
-                    const iColor clr = get_Color(esc - '0');
+                    const iColor clr = get_Color(esc - asciiBase_ColorEscape);
                    SDL_SetTextureColorMod(text_.cache, clr.r, clr.g, clr.b);
                }
                prevCh = 0;
@@ -488,9 +517,11 @@ static iRect run_Font_(iFont *d, enum iRunMode mode, iRangecc text, size_t maxLe
                /* Manual kerning for double-slash. */
                xpos -= glyph->rect[hoff].size.x * 0.5f;
            }
-            else if (next) {
+#if defined (LAGRANGE_ENABLE_KERNING)
+            else if (enableKerning_Text && !d->manualKernOnly && next) {
                xpos += d->scale * stbtt_GetCodepointKernAdvance(&d->font, ch, next);
            }
+#endif
        }
        prevCh = ch;
        if (--maxLen == 0) {
@@ -658,6 +689,111 @@ SDL_Texture *glyphCache_Text(void) {
    return text_.cache;
 }
+static void freeBitmap_(void *ptr) {
+    stbtt_FreeBitmap(ptr, NULL);
+}
+iString *renderBlockChars_Text(const iBlock *fontData, int height, enum iTextBlockMode mode,
+                               const iString *text) {
+    iBeginCollect();
+    stbtt_fontinfo font;
+    iZap(font);
+    stbtt_InitFont(&font, constData_Block(fontData), 0);
+    int ascent;
+    stbtt_GetFontVMetrics(&font, &ascent, NULL, NULL);
+    iDeclareType(CharBuf);
+    struct Impl_CharBuf {
+        uint8_t *pixels;
+        iInt2 size;
+        int dy;
+        int advance;
+    };
+    iArray *    chars     = collectNew_Array(sizeof(iCharBuf));
+    int         pxRatio   = (mode == quadrants_TextBlockMode ? 2 : 1);
+    int         pxHeight  = height * pxRatio;
+    const float scale     = stbtt_ScaleForPixelHeight(&font, pxHeight);
+    const float xScale    = scale * 2; /* character aspect ratio */
+    const int   baseline  = ascent * scale;
+    int         width     = 0;
+    size_t      strRemain = length_String(text);
+    iConstForEach(String, i, text) {
+        if (!strRemain) break;
+        if (i.value == variationSelectorEmoji_Char) {
+            strRemain--;
+            continue;
+        }
+        iCharBuf buf;
+        buf.pixels = stbtt_GetCodepointBitmap(
+            &font, xScale, scale, i.value, &buf.size.x, &buf.size.y, 0, &buf.dy);
+        stbtt_GetCodepointHMetrics(&font, i.value, &buf.advance, NULL);
+        buf.advance *= xScale;
+        if (!isSpace_Char(i.value)) {
+            if (mode == quadrants_TextBlockMode) {
+                buf.advance = (buf.size.x - 1) / 2 * 2 + 2;
+            }
+            else {
+                buf.advance = buf.size.x + 1;
+            }
+        }
+        pushBack_Array(chars, &buf);
+        collect_Garbage(buf.pixels, freeBitmap_);
+        width += buf.advance;
+        strRemain--;
+    }
+    const size_t len = (mode == quadrants_TextBlockMode ? height * ((width + 1) / 2 + 1)
+                                                        : (height * (width + 1)));
+    iChar *outBuf = iCollectMem(malloc(sizeof(iChar) * len));
+    for (size_t i = 0; i < len; ++i) {
+        outBuf[i] = 0x20;
+    }
+    iChar *outPos = outBuf;
+    for (int y = 0; y < pxHeight; y += pxRatio) {
+        const iCharBuf *ch = constData_Array(chars);
+        int lx = 0;
+        for (int x = 0; x < width; x += pxRatio, lx += pxRatio) {
+            if (lx >= ch->advance) {
+                ch++;
+                lx = 0;
+            }
+            const int ly = y - baseline - ch->dy;
+            if (mode == quadrants_TextBlockMode) {
+                #define checkPixel_(offx, offy) \
+                    (lx + offx < ch->size.x && ly + offy < ch->size.y && ly + offy >= 0 ? \
+                        ch->pixels[(lx + offx) + (ly + offy) * ch->size.x] > 155 \
+                        : iFalse)
+                const int mask = (checkPixel_(0, 0) ? 1 : 0) |
+                                 (checkPixel_(1, 0) ? 2 : 0) |
+                                 (checkPixel_(0, 1) ? 4 : 0) |
+                                 (checkPixel_(1, 1) ? 8 : 0);
+                #undef checkPixel_
+                static const iChar blocks[16] = { 0x0020, 0x2598, 0x259D, 0x2580, 0x2596, 0x258C,
+                                                  0x259E, 0x259B, 0x2597, 0x259A, 0x2590, 0x259C,
+                                                  0x2584, 0x2599, 0x259F, 0x2588 };
+                *outPos++ = blocks[mask];
+            }
+            else {
+                static const iChar shades[5] = { 0x0020, 0x2591, 0x2592, 0x2593, 0x2588 };
+                *outPos++ = shades[lx < ch->size.x && ly < ch->size.y && ly >= 0 ?
+                                   ch->pixels[lx + ly * ch->size.x] * 5 / 256 : 0];
+            }
+        }
+        *outPos++ = '\n';
+    }
+    /* We could compose the lines separately, but we'd still need to convert them to Strings
+       individually to trim them. */
+    iStringList *lines = split_String(collect_String(newUnicodeN_String(outBuf, len)), "\n");
+    while (!isEmpty_StringList(lines) &&
+           isEmpty_String(collect_String(trimmed_String(at_StringList(lines, 0))))) {
+        popFront_StringList(lines);
+    }
+    while (!isEmpty_StringList(lines) && isEmpty_String(collect_String(trimmed_String(
+                                             at_StringList(lines, size_StringList(lines) - 1))))) {
+        popBack_StringList(lines);
+    }
+    iEndCollect();
+    return joinCStr_StringList(iClob(lines), "\n");
+}
 /*-----------------------------------------------------------------------------------------------*/
 iDefineTypeConstructionArgs(TextBuf, (int font, const char *text), font, text)
diff --git a/src/ui/text.h b/src/ui/text.h
index 2d49a1a6..2b4ec5c3 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #pragma once
 #include <the_Foundation/rect.h>
@@ -36,6 +58,7 @@ enum iFontId {
    hugeEmoji_FontId,
    smallEmoji_FontId,
    max_FontId,
    /* Meta: */
    fromSymbolsToEmojiOffset_FontId = 7,
    /* UI fonts: */
@@ -90,6 +113,11 @@ void    drawRange_Text      (int fontId, iInt2 pos, int color, iRangecc text);
 SDL_Texture *   glyphCache_Text     (void);
+enum iTextBlockMode { quadrants_TextBlockMode, shading_TextBlockMode };
+iString *   renderBlockChars_Text   (const iBlock *fontData, int height, enum iTextBlockMode,
+                                     const iString *text);
 /*-----------------------------------------------------------------------------------------------*/
 iDeclareType(TextBuf)
diff --git a/src/ui/util.c b/src/ui/util.c
index 9f4768d9..dfe364a5 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1,8 +1,32 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "util.h"
 #include "app.h"
+#include "bookmarks.h"
 #include "color.h"
 #include "command.h"
+#include "gmutil.h"
 #include "labelwidget.h"
 #include "inputwidget.h"
 #include "widget.h"
@@ -157,7 +181,13 @@ static iBool menuHandler_(iWidget *menu, const char *cmd) {
            /* Don't reopen self; instead, root will close the menu. */
            return iFalse;
        }
-        if (!equal_Command(cmd, "window.resized")) {
+        if (equal_Command(cmd, "mouse.clicked") && arg_Command(cmd)) {
+            /* Dismiss open menus when clicking outside them. */
+            closeMenu_Widget(menu);
+            return iTrue;
+        }
+        if (!equal_Command(cmd, "window.resized") &&
+            !(equal_Command(cmd, "mouse.clicked") && !arg_Command(cmd)) /* ignore button release */) {
            closeMenu_Widget(menu);
        }
    }
@@ -234,7 +264,7 @@ void closeMenu_Widget(iWidget *d) {
 }
 int checkContextMenu_Widget(iWidget *menu, const SDL_Event *ev) {
-    if (ev->type == SDL_MOUSEBUTTONDOWN && ev->button.button == SDL_BUTTON_RIGHT) {
+    if (menu && ev->type == SDL_MOUSEBUTTONDOWN && ev->button.button == SDL_BUTTON_RIGHT) {
        if (isVisible_Widget(menu)) {
            closeMenu_Widget(menu);
            return 0x1;
@@ -476,6 +506,7 @@ iBool filePathHandler_(iWidget *dlg, const char *cmd) {
 iWidget *makeSheet_Widget(const char *id) {
    iWidget *sheet = new_Widget();
+    setPadding1_Widget(sheet, 3 * gap_UI);
    setId_Widget(sheet, id);
    setFrameColor_Widget(sheet, uiSeparator_ColorId);
    setBackgroundColor_Widget(sheet, uiBackground_ColorId);
@@ -483,9 +514,6 @@ iWidget *makeSheet_Widget(const char *id) {
                    mouseModal_WidgetFlag | keepOnTop_WidgetFlag | arrangeVertical_WidgetFlag |
                        arrangeSize_WidgetFlag,
                    iTrue);
-    //    const iInt2 rootSize = rootSize_Window(get_Window());
-    //    setSize_Widget(sheet, init_I2(rootSize.x / 2, 0));
-    //    setFlags_Widget(sheet, fixedHeight_WidgetFlag, iFalse);
    return sheet;
 }
@@ -529,11 +557,13 @@ void makeFilePath_Widget(iWidget *      parent,
 static void acceptValueInput_(iWidget *dlg) {
    const iInputWidget *input = findChild_Widget(dlg, "input");
-    const iString *val = text_InputWidget(input);
+    if (!isEmpty_String(id_Widget(dlg))) {
-    postCommandf_App("%s arg:%d value:%s",
+        const iString *val = text_InputWidget(input);
-                     cstr_String(id_Widget(dlg)),
+        postCommandf_App("%s arg:%d value:%s",
-                     toInt_String(val),
+                         cstr_String(id_Widget(dlg)),
-                     cstr_String(val));
+                         toInt_String(val),
+                         cstr_String(val));
+    }
 }
 static void updateValueInputWidth_(iWidget *dlg) {
@@ -560,6 +590,7 @@ iBool valueInputHandler_(iWidget *dlg, const char *cmd) {
            }
            else {
                postCommandf_App("valueinput.cancelled id:%s", cstr_String(id_Widget(dlg)));
+                setId_Widget(dlg, ""); /* no further commands to emit */
            }
            destroy_Widget(dlg);
            return iTrue;
@@ -568,6 +599,7 @@ iBool valueInputHandler_(iWidget *dlg, const char *cmd) {
    }
    else if (equal_Command(cmd, "cancel")) {
        postCommandf_App("valueinput.cancelled id:%s", cstr_String(id_Widget(dlg)));
+        setId_Widget(dlg, ""); /* no further commands to emit */
        destroy_Widget(dlg);
        return iTrue;
    }
@@ -633,11 +665,12 @@ static iBool messageHandler_(iWidget *msg, const char *cmd) {
    return iFalse;
 }
-void makeMessage_Widget(const char *title, const char *msg) {
+iWidget *makeMessage_Widget(const char *title, const char *msg) {
    iWidget *dlg = makeQuestion_Widget(
        title, msg, (const char *[]){ "Continue" }, (const char *[]){ "message.ok" }, 1);
    addAction_Widget(dlg, SDLK_ESCAPE, 0, "message.ok");
    addAction_Widget(dlg, SDLK_SPACE, 0, "message.ok");
+    return dlg;
 }
 iWidget *makeQuestion_Widget(const char *title,
@@ -666,9 +699,11 @@ iWidget *makeQuestion_Widget(const char *title,
 }
 void setToggle_Widget(iWidget *d, iBool active) {
-    setFlags_Widget(d, selected_WidgetFlag, active);
+    if (d) {
-    updateText_LabelWidget((iLabelWidget *) d,
+        setFlags_Widget(d, selected_WidgetFlag, active);
-                           collectNewFormat_String("%s", isSelected_Widget(d) ? "YES" : "NO"));
+        updateText_LabelWidget((iLabelWidget *) d,
+                               collectNewFormat_String("%s", isSelected_Widget(d) ? "YES" : "NO"));
+    }
 }
 static iBool toggleHandler_(iWidget *d, const char *cmd) {
@@ -684,8 +719,9 @@ static iBool toggleHandler_(iWidget *d, const char *cmd) {
 }
 iWidget *makeToggle_Widget(const char *id) {
-    iWidget *toggle = as_Widget(new_LabelWidget("YES", 0, 0, "toggle"));
+    iWidget *toggle = as_Widget(new_LabelWidget("YES", 0, 0, "toggle")); /* "YES" for sizing */
    setId_Widget(toggle, id);
+    updateTextCStr_LabelWidget((iLabelWidget *) toggle, "NO"); /* actual initial value */
    setCommandHandler_Widget(toggle, toggleHandler_);
    return toggle;
 }
@@ -702,9 +738,11 @@ iWidget *makePreferences_Widget(void) {
        page, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);    
    iWidget *values = addChildFlags_Widget(
        page, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);
-//    setBackgroundColor_Widget(headings, none_ColorId);
+#if defined (iPlatformApple) || defined (iPlatformMSys)
-//    setBackgroundColor_Widget(values, none_ColorId);
+    addChild_Widget(headings, iClob(makeHeading_Widget("Use system theme:")));
-    addChild_Widget(headings, iClob(makeHeading_Widget("Theme:")));
+    addChild_Widget(values, iClob(makeToggle_Widget("prefs.ostheme")));
+#endif
+    addChild_Widget(headings, iClob(makeHeading_Widget("Theme:")));    
    iWidget *themes = new_Widget();
    /* Themes. */ {
        setId_Widget(addChild_Widget(themes, iClob(new_LabelWidget("Pure Black", 0, 0, "theme.set arg:0"))), "prefs.theme.0");
@@ -717,8 +755,18 @@ iWidget *makePreferences_Widget(void) {
    addChild_Widget(values, iClob(makeToggle_Widget("prefs.retainwindow")));
    addChild_Widget(headings, iClob(makeHeading_Widget("UI scale factor:")));
    setId_Widget(addChild_Widget(values, iClob(new_InputWidget(8))), "prefs.uiscale");
+    addChild_Widget(headings, iClob(makeHeading_Widget(uiHeading_ColorEscape "Proxies")));
+    addChild_Widget(values, iClob(makeHeading_Widget("")));
+    addChild_Widget(headings, iClob(makeHeading_Widget("HTTP proxy:")));
+    setId_Widget(addChild_Widget(values, iClob(new_InputWidget(0))), "prefs.proxy.http");
+    addChild_Widget(headings, iClob(makeHeading_Widget("Gopher proxy:")));
+    setId_Widget(addChild_Widget(values, iClob(new_InputWidget(0))), "prefs.proxy.gopher");
    arrange_Widget(dlg);
-//    as_Widget(songDir)->rect.size.x = dlg->rect.size.x - headings->rect.size.x;
+    /* Text input widths. */ {
+        const int inputWidth = width_Rect(page->rect) - width_Rect(headings->rect);
+        as_Widget(findChild_Widget(values, "prefs.proxy.http"))->rect.size.x = inputWidth;
+        as_Widget(findChild_Widget(values, "prefs.proxy.gopher"))->rect.size.x = inputWidth;
+    }
    iWidget *div = new_Widget(); {
        setFlags_Widget(div, arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
        addChild_Widget(div, iClob(new_LabelWidget("Dismiss", SDLK_ESCAPE, 0, "prefs.dismiss")));
@@ -731,9 +779,11 @@ iWidget *makePreferences_Widget(void) {
 iWidget *makeBookmarkEditor_Widget(void) {
    iWidget *dlg = makeSheet_Widget("bmed");
-    addChildFlags_Widget(dlg,
+    setId_Widget(addChildFlags_Widget(
-                         iClob(new_LabelWidget(uiHeading_ColorEscape "EDIT BOOKMARK", 0, 0, NULL)),
+                     dlg,
-                         frameless_WidgetFlag);
+                     iClob(new_LabelWidget(uiHeading_ColorEscape "EDIT BOOKMARK", 0, 0, NULL)),
+                     frameless_WidgetFlag),
+                 "bmed.heading");
    iWidget *page = new_Widget();
    addChild_Widget(dlg, iClob(page));
    setFlags_Widget(page, arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
@@ -741,9 +791,8 @@ iWidget *makeBookmarkEditor_Widget(void) {
        page, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);
    iWidget *values = addChildFlags_Widget(
        page, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);
-    iInputWidget *inputs[4];
+    iInputWidget *inputs[3];
-    iWidget *hd;
+    addChild_Widget(headings, iClob(makeHeading_Widget("Title:")));
-    addChild_Widget(headings, iClob(hd = makeHeading_Widget("Title:")));
    setId_Widget(addChild_Widget(values, iClob(inputs[0] = new_InputWidget(0))), "bmed.title");
    addChild_Widget(headings, iClob(makeHeading_Widget("URL:")));
    setId_Widget(addChild_Widget(values, iClob(inputs[1] = new_InputWidget(0))), "bmed.url");
@@ -759,7 +808,100 @@ iWidget *makeBookmarkEditor_Widget(void) {
        addChild_Widget(
            div,
            iClob(new_LabelWidget(
-                uiTextCaution_ColorEscape "Save", SDLK_RETURN, KMOD_PRIMARY, "bmed.accept")));
+                uiTextCaution_ColorEscape "Save Bookmark", SDLK_RETURN, KMOD_PRIMARY, "bmed.accept")));
+    }
+    addChild_Widget(dlg, iClob(div));
+    addChild_Widget(get_Window()->root, iClob(dlg));
+    centerSheet_Widget(dlg);
+    return dlg;
+}
+static iBool handleBookmarkCreationCommands_SidebarWidget_(iWidget *editor, const char *cmd) {
+    if (equal_Command(cmd, "bmed.accept") || equal_Command(cmd, "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"));
+            add_Bookmarks(bookmarks_App(),
+                          url,
+                          title,
+                          tags,
+                          first_String(label_LabelWidget(findChild_Widget(editor, "bmed.icon"))));
+            postCommand_App("bookmarks.changed");
+        }
+        destroy_Widget(editor);
+        return iTrue;
+    }
+    return iFalse;
+}
+iWidget *makeBookmarkCreation_Widget(const iString *url, const iString *title, iChar icon) {
+    iWidget *dlg = makeBookmarkEditor_Widget();
+    setId_Widget(dlg, "bmed.create");
+    setTextCStr_LabelWidget(findChild_Widget(dlg, "bmed.heading"),
+                            uiHeading_ColorEscape "ADD BOOKMARK");
+    iUrl parts;
+    init_Url(&parts, url);
+    setTextCStr_InputWidget(findChild_Widget(dlg, "bmed.title"),
+                            title ? cstr_String(title) : cstr_Rangecc(parts.host));
+    setText_InputWidget(findChild_Widget(dlg, "bmed.url"), url);
+    setId_Widget(
+        addChildFlags_Widget(
+            dlg,
+            iClob(new_LabelWidget(cstrCollect_String(newUnicodeN_String(&icon, 1)), 0, 0, NULL)),
+            collapse_WidgetFlag | hidden_WidgetFlag | disabled_WidgetFlag),
+        "bmed.icon");
+    setCommandHandler_Widget(dlg, handleBookmarkCreationCommands_SidebarWidget_);
+    return dlg;
+}
+iWidget *makeIdentityCreation_Widget(void) {
+    iWidget *dlg = makeSheet_Widget("ident");
+    setId_Widget(addChildFlags_Widget(
+                     dlg,
+                     iClob(new_LabelWidget(uiHeading_ColorEscape "NEW IDENTITY", 0, 0, NULL)),
+                     frameless_WidgetFlag),
+                 "ident.heading");
+    iWidget *page = new_Widget();
+    addChildFlags_Widget(
+        dlg,
+        iClob(
+            new_LabelWidget("Creating a 2048-bit self-signed RSA certificate.", 0, 0, NULL)),
+        frameless_WidgetFlag);
+    addChild_Widget(dlg, iClob(page));
+    setFlags_Widget(page, arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
+    iWidget *headings = addChildFlags_Widget(
+        page, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);
+    iWidget *values = addChildFlags_Widget(
+        page, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);
+    iInputWidget *inputs[6];
+    addChild_Widget(headings, iClob(makeHeading_Widget("Common name:")));
+    setId_Widget(addChild_Widget(values, iClob(inputs[0] = new_InputWidget(0))), "ident.common");
+    addChild_Widget(headings, iClob(makeHeading_Widget("Email:")));
+    setId_Widget(addChild_Widget(values, iClob(inputs[1] = newHint_InputWidget(0, "optional"))), "ident.email");
+    addChild_Widget(headings, iClob(makeHeading_Widget("User ID:")));
+    setId_Widget(addChild_Widget(values, iClob(inputs[2] = newHint_InputWidget(0, "optional"))), "ident.userid");
+    addChild_Widget(headings, iClob(makeHeading_Widget("Domain:")));
+    setId_Widget(addChild_Widget(values, iClob(inputs[3] = newHint_InputWidget(0, "optional"))), "ident.domain");
+    addChild_Widget(headings, iClob(makeHeading_Widget("Organization:")));
+    setId_Widget(addChild_Widget(values, iClob(inputs[4] = newHint_InputWidget(0, "optional"))), "ident.org");
+    addChild_Widget(headings, iClob(makeHeading_Widget("Country:")));
+    setId_Widget(addChild_Widget(values, iClob(inputs[5] = newHint_InputWidget(0, "optional"))), "ident.country");
+    addChild_Widget(headings, iClob(makeHeading_Widget("Valid until:")));
+    setId_Widget(addChild_Widget(values, iClob(newHint_InputWidget(19, "YYYY-MM-DD HH:MM:SS"))), "ident.until");
+    addChild_Widget(headings, iClob(makeHeading_Widget("Temporary:")));
+    addChild_Widget(values, iClob(makeToggle_Widget("ident.temp")));
+    arrange_Widget(dlg);
+    for (size_t i = 0; i < iElemCount(inputs); ++i) {
+        as_Widget(inputs[i])->rect.size.x = 100 * gap_UI - headings->rect.size.x;
+    }
+    iWidget *div = new_Widget(); {
+        setFlags_Widget(div, arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
+        addChild_Widget(div, iClob(new_LabelWidget("Cancel", SDLK_ESCAPE, 0, "cancel")));
+        addChild_Widget(
+            div,
+            iClob(new_LabelWidget(
+                uiTextAction_ColorEscape "Create Identity", SDLK_RETURN, KMOD_PRIMARY, "ident.accept")));
    }
    addChild_Widget(dlg, iClob(div));
    addChild_Widget(get_Window()->root, iClob(dlg));
diff --git a/src/ui/util.h b/src/ui/util.h
index 6595b94c..9ef166de 100644
--- a/src/ui/util.h
+++ b/src/ui/util.h
@@ -1,5 +1,28 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #pragma once
+#include <the_Foundation/string.h>
 #include <the_Foundation/rect.h>
 #include <the_Foundation/vec2.h>
 #include <SDL_events.h>
@@ -117,8 +140,11 @@ void        makeFilePath_Widget     (iWidget *parent, const iString *initialPath
 iWidget *   makeValueInput_Widget   (iWidget *parent, const iString *initialValue, const char *title,
                                     const char *prompt, const char *acceptLabel, const char *command);
 void        updateValueInput_Widget (iWidget *, const char *title, const char *prompt);
-void        makeMessage_Widget      (const char *title, const char *msg);
+iWidget *   makeMessage_Widget      (const char *title, const char *msg);
 iWidget *   makeQuestion_Widget     (const char *title, const char *msg,
                                     const char *labels[], const char *commands[], size_t count);
-iWidget *   makePreferences_Widget  (void);
-iWidget *   makeBookmarkEditor_Widget(void);
+iWidget *   makePreferences_Widget      (void);
+iWidget *   makeBookmarkEditor_Widget   (void);
+iWidget *   makeBookmarkCreation_Widget (const iString *url, const iString *title, iChar icon);
+iWidget *   makeIdentityCreation_Widget (void);
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 1c19b70f..b5ea3b0f 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "widget.h"
 #include "app.h"
@@ -6,6 +28,7 @@
 #include "util.h"
 #include "window.h"
+#include <the_Foundation/ptrarray.h>
 #include <the_Foundation/ptrset.h>
 #include <SDL_mouse.h>
 #include <stdarg.h>
@@ -16,15 +39,15 @@ struct Impl_RootData {
    iWidget *hover;
    iWidget *mouseGrab;
    iWidget *focus;
-    iPtrSet *onTop;
+    iPtrArray *onTop; /* order is important; last one is topmost */
    iPtrSet *pendingDestruction;
 };
 static iRootData rootData_;
-iPtrSet *onTop_RootData_(void) {
+iPtrArray *onTop_RootData_(void) {
    if (!rootData_.onTop) {
-        rootData_.onTop = new_PtrSet();
+        rootData_.onTop = new_PtrArray();
    }
    return rootData_.onTop;
 }
@@ -32,7 +55,7 @@ iPtrSet *onTop_RootData_(void) {
 void destroyPending_Widget(void) {
    iForEach(PtrSet, i, rootData_.pendingDestruction) {
        iWidget *widget = *i.value;
-        remove_PtrSet(onTop_RootData_(), widget);
+        removeOne_PtrArray(onTop_RootData_(), widget);
        if (widget->parent) {
            iRelease(removeChild_Widget(widget->parent, widget));
        }
@@ -54,6 +77,7 @@ void init_Widget(iWidget *d) {
    d->children       = NULL;
    d->parent         = NULL;
    d->commandHandler = NULL;
+    iZap(d->padding);
 }
 void deinit_Widget(iWidget *d) {
@@ -103,10 +127,10 @@ void setFlags_Widget(iWidget *d, int flags, iBool set) {
    iChangeFlags(d->flags, flags, set);
    if (flags & keepOnTop_WidgetFlag) {
        if (set) {
-            insert_PtrSet(onTop_RootData_(), d);
+            pushBack_PtrArray(onTop_RootData_(), d);
        }
        else {
-            remove_PtrSet(onTop_RootData_(), d);
+            removeOne_PtrArray(onTop_RootData_(), d);
        }
    }
 }
@@ -120,6 +144,13 @@ void setSize_Widget(iWidget *d, iInt2 size) {
    setFlags_Widget(d, fixedSize_WidgetFlag, iTrue);
 }
+void setPadding_Widget(iWidget *d, int left, int top, int right, int bottom) {
+    d->padding[0] = left;
+    d->padding[1] = top;
+    d->padding[2] = right;
+    d->padding[3] = bottom;
+}
 void setBackgroundColor_Widget(iWidget *d, int bgColor) {
    d->bgColor = bgColor;
 }
@@ -169,19 +200,26 @@ iLocalDef iBool isCollapsed_Widget_(const iWidget *d) {
           (hidden_WidgetFlag | collapse_WidgetFlag);
 }
+iLocalDef iRect innerRect_Widget_(const iWidget *d) {
+    return init_Rect(d->padding[0],
+                     d->padding[1],
+                     width_Rect(d->rect) - d->padding[0] - d->padding[2],
+                     height_Rect(d->rect) - d->padding[1] - d->padding[3]);
+}
 void arrange_Widget(iWidget *d) {
    if (isCollapsed_Widget_(d)) {
        setFlags_Widget(d, wasCollapsed_WidgetFlag, iTrue);
        return;
    }
    if (d->flags & moveToParentRightEdge_WidgetFlag) {
-        d->rect.pos.x = width_Rect(d->parent->rect) - width_Rect(d->rect);
+        d->rect.pos.x = width_Rect(innerRect_Widget_(d->parent)) - width_Rect(d->rect);
    }
    if (d->flags & resizeToParentWidth_WidgetFlag) {
-        setWidth_Widget_(d, d->parent->rect.size.x);
+        setWidth_Widget_(d, width_Rect(innerRect_Widget_(d->parent)));
    }
    if (d->flags & resizeToParentHeight_WidgetFlag) {
-        setHeight_Widget_(d, d->parent->rect.size.y);
+        setHeight_Widget_(d, height_Rect(innerRect_Widget_(d->parent)));
    }
    /* The rest of the arrangement depends on child widgets. */
    if (!d->children) {
@@ -214,7 +252,7 @@ void arrange_Widget(iWidget *d) {
        const int expCount = numExpandingChildren_Widget_(d);
        /* Only resize the expanding children, not touching the others. */
        if (expCount > 0) {
-            iInt2 avail = d->rect.size;
+            iInt2 avail = innerRect_Widget_(d).size;
            iConstForEach(ObjectList, i, d->children) {
                const iWidget *child = constAs_Widget(i.object);
                if (~child->flags & expand_WidgetFlag) {
@@ -228,27 +266,27 @@ void arrange_Widget(iWidget *d) {
                if (child->flags & expand_WidgetFlag) {
                    if (d->flags & arrangeHorizontal_WidgetFlag) {
                        if (dirs.x) setWidth_Widget_(child, avail.x);
-                        if (dirs.y) setHeight_Widget_(child, d->rect.size.y);
+                        if (dirs.y) setHeight_Widget_(child, height_Rect(innerRect_Widget_(d)));
                    }
                    else if (d->flags & arrangeVertical_WidgetFlag) {
-                        if (dirs.x) setWidth_Widget_(child, d->rect.size.x);
+                        if (dirs.x) setWidth_Widget_(child, width_Rect(innerRect_Widget_(d)));
                        if (dirs.y) setHeight_Widget_(child, avail.y);
                    }
                }
                else {
                    /* Fill the off axis, though. */
                    if (d->flags & arrangeHorizontal_WidgetFlag) {
-                        if (dirs.y) setHeight_Widget_(child, d->rect.size.y);
+                        if (dirs.y) setHeight_Widget_(child, height_Rect(innerRect_Widget_(d)));
                    }
                    else if (d->flags & arrangeVertical_WidgetFlag) {
-                        if (dirs.x) setWidth_Widget_(child, d->rect.size.x);
+                        if (dirs.x) setWidth_Widget_(child, width_Rect(innerRect_Widget_(d)));
                    }
                }
            }
        }
        else {
            /* Evenly size all children. */
-            iInt2 childSize = d->rect.size;
+            iInt2 childSize = innerRect_Widget_(d).size;
            if (d->flags & arrangeHorizontal_WidgetFlag) {
                childSize.x /= childCount;
            }
@@ -270,7 +308,7 @@ void arrange_Widget(iWidget *d) {
            setWidth_Widget_(as_Widget(i.object), widest);
        }
    }
-    iInt2 pos = zero_I2();
+    iInt2 pos = initv_I2(d->padding);
    iForEach(ObjectList, i, d->children) {
        iWidget *child = as_Widget(i.object);
        arrange_Widget(child);
@@ -286,6 +324,9 @@ void arrange_Widget(iWidget *d) {
                pos.y += child->rect.size.y;
            }
        }
+        else if (d->flags & resizeChildren_WidgetFlag) {
+            child->rect.pos = pos;
+        }
    }
    /* Update the size of the widget according to the arrangement. */
    if (d->flags & arrangeSize_WidgetFlag) {
@@ -299,6 +340,7 @@ void arrange_Widget(iWidget *d) {
                bounds = union_Rect(bounds, child->rect);
            }
        }
+        adjustEdges_Rect(&bounds, -d->padding[1], d->padding[2], d->padding[3], -d->padding[0]);
        if (d->flags & arrangeWidth_WidgetFlag) {
            setWidth_Widget_(d, bounds.size.x);
            /* Parent size changed, must update the children.*/
@@ -381,7 +423,7 @@ iBool dispatchEvent_Widget(iWidget *d, const SDL_Event *ev) {
            }
        }
        /* Root offers events first to widgets on top. */
-        iForEach(PtrSet, i, rootData_.onTop) {
+        iReverseForEach(PtrArray, i, rootData_.onTop) {
            iWidget *widget = *i.value;
            if (isVisible_Widget(widget) && dispatchEvent_Widget(widget, ev)) {
                return iTrue;
@@ -454,6 +496,7 @@ iBool processEvent_Widget(iWidget *d, const SDL_Event *ev) {
        }
    }
    if (d->flags & mouseModal_WidgetFlag && isMouseEvent_(ev)) {
+        setCursor_Window(get_Window(), SDL_SYSTEM_CURSOR_ARROW);
        return iTrue;
    }
    return iFalse;
@@ -480,7 +523,7 @@ void draw_Widget(const iWidget *d) {
    }
    /* Root draws the on-top widgets on top of everything else. */
    if (!d->parent) {
-        iConstForEach(PtrSet, i, onTop_RootData_()) {
+        iConstForEach(PtrArray, i, onTop_RootData_()) {
            draw_Widget(*i.value);
        }
    }
@@ -594,7 +637,7 @@ iBool isHover_Widget(const iWidget *d) {
 }
 iBool isSelected_Widget(const iWidget *d) {
-    return (d->flags & selected_WidgetFlag) != 0;
+    return d && (d->flags & selected_WidgetFlag) != 0;
 }
 iBool equalWidget_Command(const char *cmd, const iWidget *widget, const char *checkCommand) {
diff --git a/src/ui/widget.h b/src/ui/widget.h
index e88a10dc..3f03fc07 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #pragma once
 /* Base class for UI widgets. */
@@ -73,6 +95,7 @@ struct Impl_Widget {
    iString      id;
    int          flags;
    iRect        rect;
+    int          padding[4]; /* left, top, right, bottom */
    int          bgColor;
    int          frameColor;
    iObjectList *children;
@@ -107,7 +130,8 @@ void    destroyPending_Widget(void);
 const iString *id_Widget    (const iWidget *);
 int     flags_Widget        (const iWidget *);
-iRect   bounds_Widget       (const iWidget *);
+iRect   bounds_Widget       (const iWidget *); /* outer bounds */
+iRect   innerBounds_Widget  (const iWidget *);
 iInt2   localCoord_Widget   (const iWidget *, iInt2 coord);
 iBool   contains_Widget     (const iWidget *, iInt2 coord);
 iAny *  findChild_Widget    (const iWidget *, const char *id);
@@ -131,6 +155,8 @@ void    setId_Widget        (iWidget *, const char *id);
 void    setFlags_Widget     (iWidget *, int flags, iBool set);
 void    setPos_Widget       (iWidget *, iInt2 pos);
 void    setSize_Widget      (iWidget *, iInt2 size);
+void    setPadding_Widget   (iWidget *, int left, int top, int right, int bottom);
+iLocalDef void setPadding1_Widget   (iWidget *d, int padding) { setPadding_Widget(d, padding, padding, padding, padding); }
 void    setBackgroundColor_Widget   (iWidget *, int bgColor);
 void    setFrameColor_Widget        (iWidget *, int frameColor);
 void    setCommandHandler_Widget    (iWidget *, iBool (*handler)(iWidget *, const char *));
diff --git a/src/ui/window.c b/src/ui/window.c
index 3d9d98d1..650bc9ee 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -1,17 +1,39 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "window.h"
+#include "labelwidget.h"
+#include "inputwidget.h"
+#include "documentwidget.h"
+#include "sidebarwidget.h"
 #include "embedded.h"
-#include "app.h"
 #include "command.h"
 #include "paint.h"
-#include "text.h"
 #include "util.h"
+#include "../app.h"
 #include "../visited.h"
-#include "labelwidget.h"
+#include "../gmcerts.h"
-#include "inputwidget.h"
+#include "../gmutil.h"
-#include "documentwidget.h"
-#include "sidebarwidget.h"
-#include "gmutil.h"
 #if defined (iPlatformMsys)
 #   include "../win32.h"
 #endif
@@ -80,6 +102,8 @@ static const iMenuItem navMenuItems[] = {
    { "Reset Zoom", SDLK_0, KMOD_PRIMARY, "zoom.set arg:100" },
    { "---", 0, 0, NULL },
    { "Preferences...", SDLK_COMMA, KMOD_PRIMARY, "preferences" },
+    { "Help", 0, 0, "!open url:about:help" },
+    { "Release Notes", 0, 0, "!open url:about:version" },
    { "---", 0, 0, NULL },
    { "Quit Lagrange", 'q', KMOD_PRIMARY, "quit" }
 };
@@ -94,8 +118,13 @@ static const iMenuItem fileMenuItems[] = {
 static const iMenuItem editMenuItems[] = {
    { "Copy Source Text", SDLK_c, KMOD_PRIMARY, "copy" },
+    { "Copy Link to Page", SDLK_c, KMOD_PRIMARY | KMOD_SHIFT, "document.copylink" },
    { "---", 0, 0, NULL },
-    { "Bookmark This Page", SDLK_d, KMOD_PRIMARY, "bookmark.add" },
+    { "Bookmark This Page...", SDLK_d, KMOD_PRIMARY, "bookmark.add" },
+};
+static const iMenuItem identityMenuItems[] = {
+    { "New Identity...", SDLK_n, KMOD_PRIMARY | KMOD_SHIFT, "ident.new" },
 };
 static const iMenuItem viewMenuItems[] = {
@@ -115,14 +144,43 @@ static const iMenuItem viewMenuItems[] = {
 };
 static const iMenuItem helpMenuItems[] = {
-    { "Help", 0, 0, "open url:about:help" },
+    { "Help", 0, 0, "!open url:about:help" },
-    { "Release Notes", 0, 0, "open url:about:version" },
+    { "Release Notes", 0, 0, "!open url:about:version" },
 };
 #endif
+static const iMenuItem identityButtonMenuItems[] = {
+    { "No Active Identity", 0, 0, "ident.showactive" },
+    { "---", 0, 0, NULL },
+#if !defined (iHaveNativeMenus)
+    { "New Identity...", SDLK_n, KMOD_PRIMARY | KMOD_SHIFT, "ident.new" },
+    { "---", 0, 0, NULL },
+    { "Show Identities", '3', KMOD_PRIMARY, "sidebar.mode arg:2 show:1" },
+#else
+    { "New Identity...", 0, 0, "ident.new" },
+    { "---", 0, 0, NULL },
+    { "Show Identities", 0, 0, "sidebar.mode arg:2 show:1" },
+#endif
+};
 static const char *reloadCStr_ = "\U0001f503";
 static const char *stopCStr_   = uiTextCaution_ColorEscape "\U0001f310";
+static void updateNavBarIdentity_(iWidget *navBar) {
+    const iGmIdentity *ident =
+        identityForUrl_GmCerts(certs_App(), url_DocumentWidget(document_App()));
+    iWidget *button = findChild_Widget(navBar, "navbar.ident");
+    setFlags_Widget(button, selected_WidgetFlag, ident != NULL);
+    /* Update menu. */
+    iLabelWidget *idItem = child_Widget(findChild_Widget(button, "menu"), 0);
+    setTextCStr_LabelWidget(
+        idItem,
+        ident ? format_CStr(uiTextAction_ColorEscape "%s",
+                            cstrCollect_String(subject_TlsCertificate(ident->cert)))
+              : "No Active Identity");
+    setFlags_Widget(as_Widget(idItem), disabled_WidgetFlag, !ident);
+}
 static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
    if (equal_Command(cmd, "window.resized")) {
        const iBool isNarrow = width_Rect(bounds_Widget(navBar)) / gap_UI < 140;
@@ -160,6 +218,7 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
                const iString *urlStr = collect_String(suffix_Command(cmd, "url"));
                setText_InputWidget(url, urlStr);
                updateTextCStr_LabelWidget(reloadButton, reloadCStr_);
+                updateNavBarIdentity_(navBar);
                return iFalse;
            }
            else if (equal_Command(cmd, "document.request.cancelled")) {
@@ -184,12 +243,13 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
            setText_InputWidget(findChild_Widget(navBar, "url"), url_DocumentWidget(doc));
            updateTextCStr_LabelWidget(findChild_Widget(navBar, "reload"),
                                       isRequestOngoing_DocumentWidget(doc) ? stopCStr_ : reloadCStr_);
+            updateNavBarIdentity_(navBar);
        }
    }
-    else if (equal_Command(cmd, "mouse.clicked")) {
+    else if (equal_Command(cmd, "mouse.clicked") && arg_Command(cmd)) {
        iWidget *widget = pointer_Command(cmd);
        iWidget *menu = findWidget_App("doctabs.menu");
-        if (isTabButton_Widget(widget)) {
+        if (isTabButton_Widget(widget) && !isVisible_Widget(menu)) {
            iWidget *tabs = findWidget_App("doctabs");
            showTabPage_Widget(tabs,
                               tabPage_Widget(tabs, childIndex_Widget(widget->parent, widget)));
@@ -261,6 +321,7 @@ static void setupUserInterface_Window(iWindow *d) {
    /* Navigation bar. */ {
        iWidget *navBar = new_Widget();
        setId_Widget(navBar, "navbar");
+        setPadding_Widget(navBar, gap_UI / 2, 0, gap_UI / 2, 0);
        setFlags_Widget(navBar,
                        arrangeHeight_WidgetFlag | resizeChildren_WidgetFlag |
                            arrangeHorizontal_WidgetFlag,
@@ -270,7 +331,11 @@ static void setupUserInterface_Window(iWindow *d) {
        setCommandHandler_Widget(navBar, handleNavBarCommands_);
        addChild_Widget(navBar, iClob(newIcon_LabelWidget("\U0001f850", 0, 0, "navigate.back")));
        addChild_Widget(navBar, iClob(newIcon_LabelWidget("\U0001f852", 0, 0, "navigate.forward")));
-        addChild_Widget(navBar, iClob(newIcon_LabelWidget("\U0001f3e0", 0, 0, "navigate.home")));
+        iLabelWidget *idMenu =
+            makeMenuButton_LabelWidget("\U0001f464", identityButtonMenuItems, iElemCount(identityButtonMenuItems));
+        setAlignVisually_LabelWidget(idMenu, iTrue);
+        addChild_Widget(navBar, iClob(idMenu));
+        setId_Widget(as_Widget(idMenu), "navbar.ident");
        iLabelWidget *lock =
            addChildFlags_Widget(navBar,
                                 iClob(newIcon_LabelWidget("\U0001f513", 0, 0, "server.showcert")),
@@ -279,14 +344,16 @@ static void setupUserInterface_Window(iWindow *d) {
        setFont_LabelWidget(lock, defaultSymbols_FontId);
        updateTextCStr_LabelWidget(lock, "\U0001f512");
        iInputWidget *url = new_InputWidget(0);
+        setSelectAllOnFocus_InputWidget(url, iTrue);
        setId_Widget(as_Widget(url), "url");
        setTextCStr_InputWidget(url, "gemini://");
        addChildFlags_Widget(navBar, iClob(url), expand_WidgetFlag);
-        setId_Widget(
+        setId_Widget(addChild_Widget(
-            addChild_Widget(navBar, iClob(newIcon_LabelWidget(reloadCStr_, 0, 0, "navigate.reload"))),
+                         navBar, iClob(newIcon_LabelWidget(reloadCStr_, 0, 0, "navigate.reload"))),
-            "reload");
+                     "reload");
-        addChild_Widget(navBar, iClob(newIcon_LabelWidget("\U0001f464", 0, 0, "cert.client")));
+        addChild_Widget(navBar,
+                        iClob(newIcon_LabelWidget(
+                            "\U0001f3e0", SDLK_h, KMOD_PRIMARY | KMOD_SHIFT, "navigate.home")));
 #if !defined (iHaveNativeMenus)
        iLabelWidget *navMenu =
            makeMenuButton_LabelWidget("\U0001d362", navMenuItems, iElemCount(navMenuItems));
@@ -296,7 +363,8 @@ static void setupUserInterface_Window(iWindow *d) {
        insertMenuItems_MacOS("File", 1, fileMenuItems, iElemCount(fileMenuItems));
        insertMenuItems_MacOS("Edit", 2, editMenuItems, iElemCount(editMenuItems));
        insertMenuItems_MacOS("View", 3, viewMenuItems, iElemCount(viewMenuItems));
-        insertMenuItems_MacOS("Help", 5, helpMenuItems, iElemCount(helpMenuItems));
+        insertMenuItems_MacOS("Identity", 4, identityMenuItems, iElemCount(identityMenuItems));
+        insertMenuItems_MacOS("Help", 6, helpMenuItems, iElemCount(helpMenuItems));
 #endif
    }
    /* Tab bar. */ {
@@ -380,6 +448,8 @@ static void drawBlank_Window_(iWindow *d) {
 void init_Window(iWindow *d, iRect rect) {
    theWindow_ = d;
+    iZap(d->cursors);
+    d->pendingCursor = NULL;
    d->isDrawFrozen = iTrue;
    uint32_t flags = SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI;
 #if defined (iPlatformApple)
@@ -396,7 +466,7 @@ void init_Window(iWindow *d, iRect rect) {
    if (left_Rect(rect) >= 0) {
        SDL_SetWindowPosition(d->win, left_Rect(rect), top_Rect(rect));
    }
-    SDL_SetWindowMinimumSize(d->win, 400, 200);
+    SDL_SetWindowMinimumSize(d->win, 400, 250);
    SDL_SetWindowTitle(d->win, "Lagrange");    
    /* Some info. */ {
        SDL_RendererInfo info;
@@ -442,6 +512,11 @@ void deinit_Window(iWindow *d) {
    if (theWindow_ == d) {
        theWindow_ = NULL;
    }
+    iForIndices(i, d->cursors) {
+        if (d->cursors[i]) {
+            SDL_FreeCursor(d->cursors[i]);
+        }
+    }
    iReleasePtr(&d->root);
    deinit_Text();
    SDL_DestroyRenderer(d->render);
@@ -470,6 +545,13 @@ static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
    return iFalse;
 }
+static void applyCursor_Window_(iWindow *d) {
+    if (d->pendingCursor) {
+        SDL_SetCursor(d->pendingCursor);
+        d->pendingCursor = NULL;
+    }
+}
 iBool processEvent_Window(iWindow *d, const SDL_Event *ev) {
    switch (ev->type) {
        case SDL_WINDOWEVENT: {
@@ -484,6 +566,7 @@ iBool processEvent_Window(iWindow *d, const SDL_Event *ev) {
            }
            /* Map mouse pointer coordinate to our coordinate system. */
            if (event.type == SDL_MOUSEMOTION) {
+                setCursor_Window(d, SDL_SYSTEM_CURSOR_ARROW); /* default cursor */
                const iInt2 pos = coord_Window(d, event.motion.x, event.motion.y);
                event.motion.x = pos.x;
                event.motion.y = pos.y;
@@ -506,6 +589,9 @@ iBool processEvent_Window(iWindow *d, const SDL_Event *ev) {
            if (oldHover != hover_Widget()) {
                postRefresh_App();
            }
+            if (event.type == SDL_MOUSEMOTION) {
+                applyCursor_Window_(d);
+            }
            return wasUsed;
        }
    }
@@ -564,6 +650,13 @@ void setFreezeDraw_Window(iWindow *d, iBool freezeDraw) {
    d->isDrawFrozen = freezeDraw;
 }
+void setCursor_Window(iWindow *d, int cursor) {    
+    if (!d->cursors[cursor]) {
+        d->cursors[cursor] = SDL_CreateSystemCursor(cursor);
+    }
+    d->pendingCursor = d->cursors[cursor];
+}
 iInt2 rootSize_Window(const iWindow *d) {
    return d->root->rect.size;
 }
diff --git a/src/ui/window.h b/src/ui/window.h
index d6eed841..4aec2fa7 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #pragma once
 #include "widget.h"
@@ -19,6 +41,8 @@ struct Impl_Window {
    float         uiScale;
    uint32_t      frameTime;
    double        presentTime;
+    SDL_Cursor *  cursors[SDL_NUM_SYSTEM_CURSORS];
+    SDL_Cursor *  pendingCursor;
 };
 iBool       processEvent_Window     (iWindow *, const SDL_Event *);
@@ -27,6 +51,7 @@ void        resize_Window           (iWindow *, int w, int h);
 void        setTitle_Window         (iWindow *, const iString *title);
 void        setUiScale_Window       (iWindow *, float uiScale);
 void        setFreezeDraw_Window    (iWindow *, iBool freezeDraw);
+void        setCursor_Window        (iWindow *, int cursor);
 iInt2       rootSize_Window         (const iWindow *);
 float       uiScale_Window          (const iWindow *);
diff --git a/src/visited.c b/src/visited.c
index af976be5..912a6318 100644
--- a/src/visited.c
+++ b/src/visited.c
@@ -1,8 +1,31 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "visited.h"
 #include "app.h"
 #include <the_Foundation/file.h>
 #include <the_Foundation/path.h>
+#include <the_Foundation/ptrarray.h>
 #include <the_Foundation/sortedarray.h>
 static const size_t maxAgeVisited_Visited_ = 3600 * 24 * 30; /* one month */
@@ -73,7 +96,7 @@ void load_Visited(iVisited *d, const char *dirPath) {
        iRangecc       line = iNullRange;
        iTime          now;
        initCurrent_Time(&now);
-        while (nextSplit_Rangecc(&src, "\n", &line)) {
+        while (nextSplit_Rangecc(src, "\n", &line)) {
            int y, m, D, H, M, S;
            sscanf(line.start, "%04d-%02d-%02dT%02d:%02d:%02d ", &y, &m, &D, &H, &M, &S);
            if (!y) break;
@@ -99,6 +122,16 @@ void clear_Visited(iVisited *d) {
    clear_SortedArray(&d->visited);
 }
+static size_t find_Visited_(const iVisited *d, const iString *url) {
+    iVisitedUrl visit;
+    init_VisitedUrl(&visit);
+    set_String(&visit.url, url);
+    size_t pos = iInvalidPos;
+    locate_SortedArray(&d->visited, &visit, &pos);
+    deinit_VisitedUrl(&visit);
+    return pos;
+}
 void visitUrl_Visited(iVisited *d, const iString *url) {
    iVisitedUrl visit;
    init_VisitedUrl(&visit);
@@ -115,6 +148,14 @@ void visitUrl_Visited(iVisited *d, const iString *url) {
    insert_SortedArray(&d->visited, &visit);
 }
+void removeUrl_Visited(iVisited *d, const iString *url) {
+    size_t pos = find_Visited_(d, url);
+    if (pos != iInvalidPos) {
+        deinit_VisitedUrl(at_SortedArray(&d->visited, pos));
+        remove_Array(&d->visited.values, pos);
+    }
+}
 iTime urlVisitTime_Visited(const iVisited *d, const iString *url) {
    iVisitedUrl item;
    size_t pos;
@@ -126,3 +167,17 @@ iTime urlVisitTime_Visited(const iVisited *d, const iString *url) {
    deinit_String(&item.url);
    return item.when;
 }
+static int cmpWhenDescending_VisitedUrlPtr_(const void *a, const void *b) {
+    const iVisitedUrl *s = *(const void **) a, *t = *(const void **) b;
+    return -cmp_Time(&s->when, &t->when);
+}
+const iArray *list_Visited(const iVisited *d, size_t count) {
+    iPtrArray *urls = collectNew_PtrArray();
+    iConstForEach(Array, i, &d->visited.values) {
+        pushBack_PtrArray(urls, i.value);
+    }
+    sort_Array(urls, cmpWhenDescending_VisitedUrlPtr_);
+    return urls;
+}
diff --git a/src/visited.h b/src/visited.h
index 2f8382c7..5a34d008 100644
--- a/src/visited.h
+++ b/src/visited.h
@@ -1,8 +1,30 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #pragma once
 #include "gmrequest.h"
-#include <the_Foundation/array.h>
+#include <the_Foundation/ptrarray.h>
 #include <the_Foundation/string.h>
 #include <the_Foundation/time.h>
@@ -23,3 +45,6 @@ void    save_Visited            (const iVisited *, const char *dirPath);
 iTime   urlVisitTime_Visited    (const iVisited *, const iString *url);
 void    visitUrl_Visited        (iVisited *, const iString *url); /* adds URL to the visited URLs set */
+void    removeUrl_Visited       (iVisited *, const iString *url);
+const iPtrArray *  list_Visited (const iVisited *, size_t count); /* returns collected */
diff --git a/src/win32.c b/src/win32.c
index 1cdcf34c..7685fcac 100644
--- a/src/win32.c
+++ b/src/win32.c
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "win32.h"
 #include <SDL_syswm.h>
diff --git a/src/win32.h b/src/win32.h
index b223ea4d..3dac677c 100644
--- a/src/win32.h
+++ b/src/win32.h
@@ -1,3 +1,25 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #pragma once
 #include <SDL_video.h>