80 files changed, 2127 insertions, 368 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index edee3d85..006a3df8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,14 +18,14 @@
 cmake_minimum_required (VERSION 3.9)
 project (Lagrange
-    VERSION 1.5.0
+    VERSION 1.5.2
    DESCRIPTION "A Beautiful Gemini Client"
    LANGUAGES C
 )
 set (COPYRIGHT_YEAR 2021)
 if (IOS)
    set (PROJECT_VERSION 1.4)  # pinned for TestFlight
-    set (IOS_BUNDLE_VERSION 7) # just increment this
+    set (IOS_BUNDLE_VERSION 8) # just increment this
 endif ()
 # Build configuration.
@@ -72,17 +72,19 @@ set (EMBED_RESOURCES
    res/fonts/NotoSansArabicUI-Regular.ttf
    res/fonts/NotoSansJP-Regular.ttf
    res/fonts/NotoSansSC-Regular.ttf
+    res/fonts/NotoSansSymbols-Regular.ttf
+    res/fonts/NotoSansSymbols2-Regular.ttf
    res/fonts/Nunito-Bold.ttf
    res/fonts/Nunito-ExtraBold.ttf
    res/fonts/Nunito-ExtraLight.ttf
    res/fonts/Nunito-LightItalic.ttf
    res/fonts/Nunito-Regular.ttf
+    res/fonts/SmolEmoji-Regular.ttf
    res/fonts/SourceSans3-Bold.ttf
    res/fonts/SourceSans3-ExtraLight.ttf
    res/fonts/SourceSans3-It.ttf
    res/fonts/SourceSans3-Regular.ttf
    res/fonts/SourceSans3-Semibold.ttf
-    res/fonts/Symbola.ttf
    res/lang/de.bin
    res/lang/en.bin
    res/lang/es.bin
@@ -396,6 +398,7 @@ Categories=Network
 Exec=${CMAKE_INSTALL_PREFIX}/bin/lagrange %U
 Terminal=false
 Type=Application
+StartupWMClass=lagrange
 Icon=fi.skyjake.Lagrange
 MimeType=x-scheme-handler/gemini;x-scheme-handler/gopher
 ")
diff --git a/po/de.po b/po/de.po
index 63f395e7..3af2dff3 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: jaakko.keranen@iki.fi\n"
-"PO-Revision-Date: 2021-05-06 09:39+0000\n"
+"PO-Revision-Date: 2021-05-15 06:18+0000\n"
-"Last-Translator: Jaakko Keränen <jaakko.keranen@iki.fi>\n"
+"Last-Translator: Nikolay Korotkiy <sikmir@gmail.com>\n"
 "Language-Team: German <http://weblate.skyjake.fi/projects/lagrange/ui/de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -1100,7 +1100,7 @@ msgid "prefs.mono"
 msgstr "Körper in Monospace:"
 msgid "prefs.linewidth"
-msgstr "Zeilenbreite"
+msgstr "Zeilenbreite:"
 msgid "prefs.linewidth.fill"
 msgstr "Füllung"
@@ -1208,3 +1208,9 @@ msgstr "SEITENINHALT"
 msgid "heading.prefs.proxies"
 msgstr "PROXIES"
+msgid "gempub.meta.lang"
+msgstr "Sprache"
+msgid "lang.pl"
+msgstr "Polnisch"
diff --git a/po/en.po b/po/en.po
index 60beade4..8fe6b96d 100644
--- a/po/en.po
+++ b/po/en.po
@@ -108,8 +108,8 @@ msgstr "Powered by SDL 2, OpenSSL, and ☕️"
 msgid "cancel"
 msgstr "Cancel"
-msgid "dismiss"
+msgid "close"
-msgstr "Dismiss"
+msgstr "Close"
 msgid "dlg.message.ok"
 msgstr "Continue"
@@ -191,6 +191,9 @@ msgstr "Save to Files"
 msgid "menu.save.downloads"
 msgstr "Save to Downloads"
+msgid "menu.save.downloads.open"
+msgstr "Save to Downloads and Open File"
 msgid "menu.sidebar"
 msgstr "Toggle Sidebar"
@@ -542,8 +545,8 @@ msgstr "Stop Using on This Page"
 msgid "ident.stopuse.all"
 msgstr "Stop Using Everywhere"
-msgid "ident.showuse"
+msgid "ident.export"
-msgstr "Show Usage"
+msgstr "Export"
 msgid "heading.ident.use"
 msgstr "IDENTITY USAGE"
@@ -597,6 +600,9 @@ msgstr "Unsubscribe"
 msgid "error.unsupported.suggestsave"
 msgstr "You can save it as a file to your Downloads folder: press %s or select \"%s\" from the menu."
+msgid "error.server.msg"
+msgstr "Server responded with the message:"
 msgid "heading.pageinfo"
 msgstr "PAGE INFORMATION"
@@ -916,7 +922,7 @@ msgid "dlg.newident.until"
 msgstr "Valid until:"
 msgid "hint.newident.date"
-msgstr "YYYY-MM-DD HH:MM:SS"
+msgstr "YYYY or YYYY-MM-DD"
 msgid "hint.newident.optional"
 msgstr "optional"
@@ -930,6 +936,18 @@ msgstr "Temporary:"
 msgid "dlg.newident.notsaved"
 msgstr "not saved to disk"
+msgid "dlg.newident.scope"
+msgstr "Use on:"
+msgid "dlg.newident.scope.domain"
+msgstr "Current Domain"
+msgid "dlg.newident.scope.page"
+msgstr "Current Page"
+msgid "dlg.newident.scope.none"
+msgstr "Not Used"
 msgid "dlg.newident.email"
 msgstr "Email:"
@@ -945,6 +963,9 @@ msgstr "Organization:"
 msgid "dlg.newident.country"
 msgstr "Country:"
+msgid "dlg.newident.more"
+msgstr "More…"
 msgid "dlg.newident.create"
 msgstr "Create Identity"
@@ -1139,6 +1160,9 @@ msgstr "UI scale factor:"
 msgid "prefs.customframe"
 msgstr "Custom window frame:"
+msgid "prefs.animate"
+msgstr "Animations:"
 msgid "prefs.retainwindow"
 msgstr "Retain placement:"
@@ -1201,6 +1225,9 @@ msgstr "On Dark"
 msgid "prefs.boldlink.light"
 msgstr "On Light"
+msgid "prefs.userfont"
+msgstr "Symbol font:"
 msgid "prefs.linewidth"
 msgstr "Line width:"
@@ -1366,6 +1393,9 @@ msgstr "Set view split mode"
 msgid "keys.split.next"
 msgstr "Switch focus to next split"
+msgid "keys.split.item"
+msgstr "Split view menu:"
 msgid "keys.hoverurl"
 msgstr "Toggle show URL on hover"
diff --git a/po/eo.po b/po/eo.po
index 2ad7847c..2dd2cb79 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: jaakko.keranen@iki.fi\n"
-"PO-Revision-Date: 2021-05-05 03:55+0000\n"
+"PO-Revision-Date: 2021-05-15 06:18+0000\n"
 "Last-Translator: Nikolay Korotkiy <sikmir@gmail.com>\n"
 "Language-Team: Esperanto <http://weblate.skyjake.fi/projects/lagrange/ui/eo/>"
 "\n"
@@ -695,3 +695,6 @@ msgstr "Eldonita"
 msgid "gempub.meta.version"
 msgstr "Versio"
+msgid "lang.pl"
+msgstr "Pola"
diff --git a/po/es.po b/po/es.po
index 6edf2c41..9e540dc4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: jaakko.keranen@iki.fi\n"
-"PO-Revision-Date: 2021-05-05 03:55+0000\n"
+"PO-Revision-Date: 2021-06-04 14:18+0000\n"
 "Last-Translator: Wally Hackenslacker <mastor89@protonmail.com>\n"
 "Language-Team: Spanish <http://weblate.skyjake.fi/projects/lagrange/ui/es/>\n"
 "Language: es\n"
@@ -919,7 +919,7 @@ msgid "dlg.newident.until"
 msgstr "Válido hasta:"
 msgid "hint.newident.date"
-msgstr "YYYY-MM-DD HH:MM:SS"
+msgstr "YYYY ó YYYY-MM-DD"
 msgid "hint.newident.optional"
 msgstr "opcional"
@@ -1560,3 +1560,91 @@ msgstr "Idioma"
 msgid "gempub.meta.license"
 msgstr "Licencia"
+msgid "lang.pl"
+msgstr "Polaco"
+#, c-format
+msgid "doc.archive"
+msgstr "%s es un archivo comprimido."
+msgid "doc.archive.view"
+msgstr "Ver el contenido del archivo"
+msgid "bookmark.tag.linksplit"
+msgstr "Abrir enlaces a un lado"
+msgid "lang.tok"
+msgstr "Toki Pona"
+msgid "archive.exit"
+msgstr "Salir del archivo"
+#, c-format
+msgid "archive.summary"
+msgid_plural "archive.summary.n"
+msgstr[0] "Este archivo contiene %zu item y su tamaño comprimido es de %.1f MB."
+msgstr[1] "Este archivo contiene %zu items y su tamaño comprimido es de %.1f MB."
+#, c-format
+msgid "dir.summary"
+msgid_plural "dir.summary.n"
+msgstr[0] "Este directorio contiene %zu item."
+msgstr[1] "Este directorio contiene %zu items."
+msgid "keys.tab.close.other"
+msgstr "Cerrar otras pestañas"
+msgid "prefs.pinsplit"
+msgstr "Fijar pestaña para vista dividida:"
+msgid "prefs.pinsplit.none"
+msgstr "Ninguna"
+msgid "prefs.pinsplit.left"
+msgstr "Pestaña Izquierda"
+msgid "prefs.pinsplit.right"
+msgstr "Pestaña Derecha"
+msgid "dir.empty"
+msgstr "Este directorio está vacío."
+msgid "prefs.animate"
+msgstr "Animaciones:"
+msgid "close"
+msgstr "Cerrar"
+msgid "ident.export"
+msgstr "Exportar"
+msgid "error.server.msg"
+msgstr "El servidor respondió con el mensaje:"
+msgid "dlg.input.linebreak"
+msgstr "Salto de linea"
+msgid "dlg.newident.scope"
+msgstr "Usar en:"
+msgid "prefs.userfont"
+msgstr "Fuente simbólica:"
+msgid "keys.split.item"
+msgstr "Menú de vista dividida:"
+msgid "dlg.newident.scope.domain"
+msgstr "Dominio Actual"
+msgid "dlg.newident.scope.page"
+msgstr "Página Actual"
+msgid "dlg.newident.scope.none"
+msgstr "Sin Usar"
+msgid "dlg.newident.more"
+msgstr "Más…"
+msgid "menu.save.downloads.open"
+msgstr "Guardar a Descargas y Abrir Archivo"
diff --git a/po/fi.po b/po/fi.po
index 60dfc33b..20b853f5 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: jaakko.keranen@iki.fi\n"
 "POT-Creation-Date: 2021-03-23 09:09+0000\n"
-"PO-Revision-Date: 2021-05-13 05:38+0000\n"
+"PO-Revision-Date: 2021-05-29 12:27+0000\n"
 "Last-Translator: Jaakko Keränen <jaakko.keranen@iki.fi>\n"
 "Language-Team: Finnish <http://weblate.skyjake.fi/projects/lagrange/ui/fi/>\n"
 "Language: fi\n"
@@ -679,7 +679,7 @@ msgid "dlg.newident.until"
 msgstr "Voimassa:"
 msgid "hint.newident.date"
-msgstr "VVVV-KK-PP TT:MM:SS"
+msgstr "VVVV tai VVVV-KK-PP"
 msgid "hint.newident.optional"
 msgstr "vapaaehtoinen"
@@ -1579,3 +1579,66 @@ msgstr "Aktivoi seuraava jakaus"
 msgid "lang.pl"
 msgstr "Puola"
+msgid "close"
+msgstr "Sulje"
+msgid "ident.export"
+msgstr "Vie"
+msgid "error.server.msg"
+msgstr "Palvelin vastasi seuraavalla viestillä:"
+msgid "dlg.input.linebreak"
+msgstr "Rivinvaihto"
+msgid "dlg.newident.scope"
+msgstr "Käytössä:"
+msgid "dlg.newident.more"
+msgstr "Lisää…"
+msgid "prefs.userfont"
+msgstr "Kuvakefontti:"
+msgid "keys.split.menu.vert21"
+msgstr "Jaetun näkymän valikko: pysty 2:1"
+msgid "dlg.newident.scope.domain"
+msgstr "Tämä verkkotunnus"
+msgid "dlg.newident.scope.page"
+msgstr "Tämä sivu"
+msgid "dlg.newident.scope.none"
+msgstr "Ei käytetä"
+msgid "keys.split.menu.merge"
+msgstr "Jaetun näkymän valikko: yhdistä välilehdet"
+msgid "keys.split.menu.swap"
+msgstr "Jaetun näkymän valikko: vaihda puolia"
+msgid "keys.split.menu.horiz"
+msgstr "Jaetun näkymän valikko: vaaka"
+msgid "keys.split.menu.horiz12"
+msgstr "Jaetun näkymän valikko: vaaka 1:2"
+msgid "keys.split.menu.horiz21"
+msgstr "Jaetun näkymän valikko: vaaka 2:1"
+msgid "keys.split.menu.vert"
+msgstr "Jaetun näkymän valikko: pysty"
+msgid "keys.split.menu.vert12"
+msgstr "Jaetun näkymän valikko: pysty 1:2"
+msgid "prefs.animate"
+msgstr "Animaatiot:"
+msgid "menu.save.downloads.open"
+msgstr "Tallenna latauskansioon ja avaa tiedosto"
+msgid "keys.split.item"
+msgstr "Jaetun näkymän valikko:"
diff --git a/po/fr.po b/po/fr.po
index 29ed8118..e0522323 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: jaakko.keranen@iki.fi\n"
-"PO-Revision-Date: 2021-05-05 03:55+0000\n"
+"PO-Revision-Date: 2021-05-21 08:18+0000\n"
 "Last-Translator: MCMic <come@chilliet.eu>\n"
 "Language-Team: French <http://weblate.skyjake.fi/projects/lagrange/ui/fr/>\n"
 "Language: fr\n"
@@ -158,7 +158,7 @@ msgstr "Copier l’empreinte"
 # Inline download status message.
 msgid "media.download.warnclose"
-msgstr "Le téléchargement sera annulé si l'onglet est fermé."
+msgstr "Le téléchargement sera annulé si cet onglet est fermé."
 # Inline download status message.
 msgid "media.download.complete"
@@ -1547,3 +1547,60 @@ msgstr "Licence"
 msgid "gempub.cover.view"
 msgstr "Voir le contenu du Gempub"
+msgid "lang.pl"
+msgstr "Polonais"
+msgid "link.side.newtab"
+msgstr "Ouvrir le lien dans un nouvel onglet sur le côté"
+msgid "keys.tab.close.other"
+msgstr "Fermer les autres onglets"
+msgid "doc.archive.view"
+msgstr "Afficher le contenu de l’archive"
+#, c-format
+msgid "doc.archive"
+msgstr "%s est une archive compressée."
+msgid "bookmark.tag.linksplit"
+msgstr "Ouverture des liens sur le côté"
+msgid "link.side"
+msgstr "Ouvrir le lien sur le côté"
+msgid "lang.tok"
+msgstr "Toki Pona"
+msgid "prefs.pinsplit"
+msgstr "Épingler un des côtés :"
+msgid "prefs.pinsplit.none"
+msgstr "Aucun"
+msgid "archive.exit"
+msgstr "Sortir de l’archive"
+#, c-format
+msgid "archive.summary"
+msgid_plural "archive.summary.n"
+msgstr[0] ""
+"Cette archive contient %zu élément et sa taille compressée est de %.1f Mo."
+msgstr[1] ""
+"Cette archive contient %zu éléments et sa taille compressée est de %.1f Mo."
+msgid "dir.empty"
+msgstr "Ce répertoire est vide."
+#, c-format
+msgid "dir.summary"
+msgid_plural "dir.summary.n"
+msgstr[0] "Ce répertoire contient %zu élément."
+msgstr[1] "Ce répertoire contient %zu éléments."
+msgid "menu.split.swap"
+msgstr "Échanger les côtés"
+msgid "keys.split.menu"
+msgstr "Définir le mode de vues séparées"
diff --git a/po/ia.po b/po/ia.po
index 5fc721f3..2ea0e277 100644
--- a/po/ia.po
+++ b/po/ia.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: jaakko.keranen@iki.fi\n"
-"PO-Revision-Date: 2021-05-06 09:39+0000\n"
+"PO-Revision-Date: 2021-05-24 13:18+0000\n"
 "Last-Translator: Olga Smirnova <mistresssilvara@hotmail.com>\n"
 "Language-Team: Interlingua <http://weblate.skyjake.fi/projects/lagrange/ui/"
 "ia/>\n"
@@ -1549,3 +1549,9 @@ msgstr "Editor"
 msgid "gempub.meta.pubdate"
 msgstr "Data de publication"
+msgid "lang.pl"
+msgstr "Polonese"
+msgid "gempub.cover.viewlocal"
+msgstr "On pote vider iste libro Gempub post que lo es salvate localmente."
diff --git a/po/ie.po b/po/ie.po
index 27782f11..13f94026 100644
--- a/po/ie.po
+++ b/po/ie.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: jaakko.keranen@iki.fi\n"
-"PO-Revision-Date: 2021-05-06 09:39+0000\n"
+"PO-Revision-Date: 2021-06-04 14:18+0000\n"
 "Last-Translator: Olga Smirnova <mistresssilvara@hotmail.com>\n"
 "Language-Team: Occidental <http://weblate.skyjake.fi/projects/lagrange/ui/ie/"
 ">\n"
@@ -783,7 +783,7 @@ msgid "dlg.newident.until"
 msgstr "Valid til:"
 msgid "hint.newident.date"
-msgstr "AAAA-MM-DD HH:MM:SS"
+msgstr "AAAA o AAAA-MM-DD"
 msgid "hint.newident.optional"
 msgstr "facultativ"
@@ -1589,3 +1589,72 @@ msgstr "Cluder li altri cartes"
 msgid "keys.split.menu"
 msgstr "Selecter li mode de fension"
+msgid "lang.pl"
+msgstr "Polonesi"
+msgid "keys.split.menu.horiz21"
+msgstr "Fendet vise: horizontalmen 2:1"
+msgid "close"
+msgstr "Cluder"
+msgid "ident.export"
+msgstr "Exportar"
+msgid "error.server.msg"
+msgstr "Li servitor respondet per li missage:"
+msgid "dlg.input.linebreak"
+msgstr "Rupter li linea"
+msgid "dlg.newident.scope"
+msgstr "Usar sur:"
+msgid "dlg.newident.more"
+msgstr "Plu…"
+msgid "prefs.userfont"
+msgstr "Fonde simbolic:"
+msgid "dlg.newident.scope.domain"
+msgstr "Li actual dominia"
+msgid "dlg.newident.scope.page"
+msgstr "Li actual págine"
+msgid "dlg.newident.scope.none"
+msgstr "Ne usat"
+msgid "keys.split.menu.vert"
+msgstr "Fendet vise: verticalmen"
+msgid "keys.split.menu.vert12"
+msgstr "Fendet vise: verticalmen 1:2"
+msgid "keys.split.menu.vert21"
+msgstr "Fendet vise: verticalmen 2:1"
+msgid "keys.split.menu.merge"
+msgstr "Fendet vise: unir cartes"
+msgid "keys.split.menu.horiz"
+msgstr "Fendet vise: horizontalmen"
+msgid "keys.split.menu.horiz12"
+msgstr "Fendet vise: horizontalmen 1:2"
+msgid "prefs.animate"
+msgstr "Animationes:"
+msgid "keys.split.item"
+msgstr "Menú de fendet vise:"
+msgid "menu.save.downloads.open"
+msgstr "Gardar al Descargates e aperter"
+msgid "link.side.newtab"
+msgstr "Aperter in un nov carte láteralmen"
+msgid "prefs.pinsplit"
+msgstr "Fixation de fendet vise:"
diff --git a/po/lt.po b/po/lt.po
new file mode 100644
index 00000000..ee536e7f
--- /dev/null
+++ b/po/lt.po
@@ -0,0 +1,125 @@
+msgid ""
+msgstr ""
+"Report-Msgid-Bugs-To: jaakko.keranen@iki.fi\n"
+"PO-Revision-Date: 2021-06-04 14:18+0000\n"
+"Last-Translator: Arns Udovič <zordsdavini@arns.lt>\n"
+"Language-Team: Lithuanian <http://weblate.skyjake.fi/projects/lagrange/ui/lt/"
+">\n"
+"Language: lt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n % 10 == 1 && (n % 100 < 11 || n % 100 > "
+"19)) ? 0 : ((n % 10 >= 2 && n % 10 <= 9 && (n % 100 < 11 || n % 100 > 19)) ? "
+"1 : 2);\n"
+"X-Generator: Weblate 4.5.1\n"
+msgid "doc.pre.nocaption"
+msgstr "Neformatuotas tekstas be aprašymo"
+# Link download progress message.
+msgid "doc.fetching"
+msgstr "Kraunama"
+#, c-format
+msgid "doc.archive"
+msgstr "%s yra suspaustas archyvas."
+msgid "doc.archive.view"
+msgstr "Peržiūrėti archyvo turinį"
+# Inline download status message.
+msgid "media.download.warnclose"
+msgstr "Parsiuntimas bus nutrauktas, jei uždarysite skirtuką."
+# Inline download status message.
+msgid "media.download.complete"
+msgstr "Parsiuntimas baigtas."
+# Used in inline audio player metadata popup.
+msgid "audio.meta.title"
+msgstr "Pavadinimas"
+# Used in inline audio player metadata popup.
+msgid "audio.meta.artist"
+msgstr "Atlikėjas"
+# Used in inline audio player metadata popup.
+msgid "audio.meta.genre"
+msgstr "Žanras"
+# Used in inline audio player metadata popup.
+msgid "audio.meta.date"
+msgstr "Data"
+# Hertz, unit for frequency values
+msgid "hz"
+msgstr "Hz"
+msgid "feeds.list.refreshtime.now"
+msgstr "Paskutinis atnaujinimas įvyko vos prieš akimirką."
+#, c-format
+msgid "feeds.list.refreshtime"
+msgstr "Paskutinis atnaujinimas įvyko %s."
+#, c-format
+msgid "minutes.ago"
+msgid_plural "minutes.ago.n"
+msgstr[0] "prieš %d minutę"
+msgstr[1] "prieš %d minutes"
+msgstr[2] "prieš %d minučių"
+#, c-format
+msgid "hours.ago"
+msgid_plural "hours.ago.n"
+msgstr[0] "prieš %d valandą"
+msgstr[1] "preš %d valandas"
+msgstr[2] "prieš %d valandų"
+#, c-format
+msgid "days.ago"
+msgid_plural "days.ago.n"
+msgstr[0] "prieš %d dieną"
+msgstr[1] "prieš %d dienas"
+msgstr[2] "prieš %d dienų"
+# Alt-text of the preformatted logo.
+msgid "about.logo"
+msgstr "ASCII menas: žodis „Lagrange“, kuriame naudojamas didelis šriftas"
+msgid "about.tagline"
+msgstr "Graži Gemini naršyklė"
+msgid "about.version"
+msgstr "Versija"
+msgid "cancel"
+msgstr "Atšaukti"
+msgid "close"
+msgstr "Uždaryti"
+msgid "dlg.message.ok"
+msgstr "Tęsti"
+msgid "dlg.default"
+msgstr " OK "
+msgid "toggle.yes"
+msgstr "Taip"
+msgid "toggle.no"
+msgstr "Ne"
+msgid "menu.title.file"
+msgstr "Failas"
+msgid "menu.title.edit"
+msgstr "Redaguoti"
+msgid "menu.title.bookmarks"
+msgstr "Žymės"
+msgid "gempub.meta.license"
+msgstr "Licenzija"
diff --git a/po/pl.po b/po/pl.po
index 01e295b8..db8de568 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: jaakko.keranen@iki.fi\n"
-"PO-Revision-Date: 2021-05-13 04:58+0000\n"
+"PO-Revision-Date: 2021-05-21 08:18+0000\n"
 "Last-Translator: Waterrail <maksymiliankrol03@gmail.com>\n"
 "Language-Team: Polish <http://weblate.skyjake.fi/projects/lagrange/ui/pl/>\n"
 "Language: pl\n"
@@ -1627,3 +1627,6 @@ msgstr ""
 "Żądanie proxy nie powiodło się, ponieważ serwer nie był w stanie pomyślnie "
 "zakończyć transakcji ze zdalnym hostem. Mogły wystąpić problemy z łącznością "
 "sieciową."
+msgid "lang.pl"
+msgstr "polski"
diff --git a/po/ru.po b/po/ru.po
index adab62c6..e43fa4af 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: jaakko.keranen@iki.fi\n"
 "POT-Creation-Date: 2021-03-23 19:02+0000\n"
-"PO-Revision-Date: 2021-05-06 09:39+0000\n"
+"PO-Revision-Date: 2021-06-01 07:18+0000\n"
 "Last-Translator: jan Anja <cyber@sysrq.in>\n"
 "Language-Team: Russian <http://weblate.skyjake.fi/projects/lagrange/ui/ru/>\n"
 "Language: ru\n"
@@ -688,7 +688,7 @@ msgid "dlg.newident.until"
 msgstr "Действителен до:"
 msgid "hint.newident.date"
-msgstr "ГГГГ-����-��Д ����:ММ:����"
+msgstr "ГГГГ ������ ������-��М-����"
 msgid "hint.newident.optional"
 msgstr "необязательно"
@@ -1595,3 +1595,45 @@ msgstr[2] "Каталог содержит %zu элементов."
 msgid "keys.tab.close.other"
 msgstr "Закрыть другие владки"
+msgid "lang.pl"
+msgstr "Польский"
+msgid "ident.export"
+msgstr "Экспорт"
+msgid "close"
+msgstr "Закрыть"
+msgid "error.server.msg"
+msgstr "Сообщение от сервера:"
+msgid "dlg.input.linebreak"
+msgstr "Перенос строки"
+msgid "dlg.newident.scope.domain"
+msgstr "Текущий домен"
+msgid "prefs.animate"
+msgstr "Анимации:"
+msgid "keys.split.item"
+msgstr "Меню действий с окном:"
+msgid "prefs.userfont"
+msgstr "Шрифт TrueType:"
+msgid "dlg.newident.scope"
+msgstr "Область использования:"
+msgid "dlg.newident.more"
+msgstr "Ещё…"
+msgid "menu.save.downloads.open"
+msgstr "Сохранить и открыть"
+msgid "dlg.newident.scope.page"
+msgstr "Текущая страница"
+msgid "dlg.newident.scope.none"
+msgstr "Нигде"
diff --git a/po/sr.po b/po/sr.po
index d456fa24..edec39f5 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: jaakko.keranen@iki.fi\n"
-"PO-Revision-Date: 2021-05-06 15:03+0000\n"
+"PO-Revision-Date: 2021-06-01 07:18+0000\n"
 "Last-Translator: Страхиња Радић <contact@strahinja.org>\n"
 "Language-Team: Serbian <http://weblate.skyjake.fi/projects/lagrange/ui/sr/>\n"
 "Language: sr\n"
@@ -503,7 +503,7 @@ msgid "dlg.newident.until"
 msgstr "Важи до:"
 msgid "hint.newident.date"
-msgstr "ГГГГ-����-��Д ����:ММ:����"
+msgstr "ГГГГ ������ ������Г-��М-����"
 msgid "hint.newident.optional"
 msgstr "необавезно"
@@ -1616,3 +1616,69 @@ msgstr[2] "Овај директоријум садржи %zu ставки."
 msgid "keys.tab.close.other"
 msgstr "Затварање осталих картица"
+msgid "lang.pl"
+msgstr "Пољски"
+msgid "dlg.newident.scope.domain"
+msgstr "Текућем домену"
+msgid "dlg.newident.scope.page"
+msgstr "Текућој страници"
+msgid "dlg.newident.scope.none"
+msgstr "Не користити"
+msgid "keys.split.menu.merge"
+msgstr "Мени раздвојеног погледа: Спој картице"
+msgid "keys.split.menu.swap"
+msgstr "Мени раздвојеног погледа: Замени стране"
+msgid "keys.split.menu.horiz"
+msgstr "Мени раздвојеног погледа: Хоризонтално"
+msgid "keys.split.menu.horiz12"
+msgstr "Мени раздвојеног погледа: Хоризонтално 1:2"
+msgid "keys.split.menu.horiz21"
+msgstr "Мени раздвојеног погледа: Хоризонтално 2:1"
+msgid "keys.split.menu.vert"
+msgstr "Мени раздвојеног погледа: Вертикално"
+msgid "keys.split.menu.vert12"
+msgstr "Мени раздвојеног погледа: Вертикално 1:2"
+msgid "keys.split.menu.vert21"
+msgstr "Мени раздвојеног погледа: Вертикално 2:1"
+msgid "dlg.newident.more"
+msgstr "Више…"
+msgid "dlg.newident.scope"
+msgstr "Користити на:"
+msgid "prefs.userfont"
+msgstr "Фонт за симболе:"
+msgid "close"
+msgstr "Затвори"
+msgid "ident.export"
+msgstr "Извези"
+msgid "error.server.msg"
+msgstr "Сервер је одговорио поруком:"
+msgid "dlg.input.linebreak"
+msgstr "Прелом реда"
+msgid "prefs.animate"
+msgstr "Анимације:"
+msgid "keys.split.item"
+msgstr "Мени раздвојеног погледа:"
+msgid "menu.save.downloads.open"
+msgstr "Сачувај у фолдеру за преузимања и отвори"
diff --git a/po/tok.po b/po/tok.po
index 79d31fd1..1e6e890d 100644
--- a/po/tok.po
+++ b/po/tok.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: jaakko.keranen@iki.fi\n"
-"PO-Revision-Date: 2021-05-10 06:26+0000\n"
+"PO-Revision-Date: 2021-06-01 07:18+0000\n"
 "Last-Translator: jan Anja <cyber@sysrq.in>\n"
 "Language-Team: Toki Pona <http://weblate.skyjake.fi/projects/lagrange/ui/tok/"
 ">\n"
@@ -877,7 +877,7 @@ msgid "prefs.saturation"
 msgstr "kule:"
 msgid "prefs.headingfont"
-msgstr "nasin lukin pi sitelen suli:"
+msgstr "nasin lukin tawa sitelen suli:"
 msgid "prefs.font"
 msgstr "nasin lukin tawa sitelen:"
@@ -1572,3 +1572,45 @@ msgstr[0] "ijo %zu li lon poki ni."
 msgid "keys.tab.close.other"
 msgstr "o pini e poki ante"
+msgid "lang.pl"
+msgstr "toki Posuka"
+msgid "prefs.userfont"
+msgstr "sitelen TTF:"
+msgid "dlg.newident.scope.page"
+msgstr "lipu ni"
+msgid "dlg.newident.scope.none"
+msgstr "lipu ala"
+msgid "dlg.newident.scope.domain"
+msgstr "mun ni"
+msgid "prefs.animate"
+msgstr "tawa namako:"
+msgid "menu.save.downloads.open"
+msgstr "o awen li open e lipu"
+msgid "keys.split.item"
+msgstr "ijo kipisi:"
+msgid "ident.export"
+msgstr "o pana"
+msgid "error.server.msg"
+msgstr "ilo pana li toki e ni:"
+msgid "dlg.input.linebreak"
+msgstr "linja sin"
+msgid "close"
+msgstr "o pini"
+msgid "dlg.newident.more"
+msgstr "namako…"
+msgid "dlg.newident.scope"
+msgstr "o kepeken e ona lon:"
diff --git a/po/zh_Hant.po b/po/zh_Hant.po
index 93119373..26f1377a 100644
--- a/po/zh_Hant.po
+++ b/po/zh_Hant.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: jaakko.keranen@iki.fi\n"
-"PO-Revision-Date: 2021-04-14 09:18+0000\n"
+"PO-Revision-Date: 2021-05-18 04:18+0000\n"
 "Last-Translator: Shibo Lyu <github@of.sb>\n"
 "Language-Team: Chinese (Traditional) <http://weblate.skyjake.fi/projects/"
 "lagrange/ui/zh_Hant/>\n"
@@ -1408,3 +1408,145 @@ msgstr "建立…"
 msgid "sidebar.action.ident.import"
 msgstr "匯入…"
+#, c-format
+msgid "dir.summary"
+msgid_plural "dir.summary.n"
+msgstr[0] "該檔案夾內含 %zu 項。"
+msgid "lang.pl"
+msgstr "波蘭語"
+# User preference that controls whether index.gmi pages get automatically opened when browsing the contents of a directory inside a compressed archive.
+msgid "prefs.archive.openindex"
+msgstr "檢視存檔內檔案夾時使用 index.gmi："
+#, c-format
+msgid "archive.summary"
+msgid_plural "archive.summary.n"
+msgstr[0] "該存檔內含 %zu 項，壓縮後共 %.1f MB。"
+msgid "keys.split.menu"
+msgstr "設定分屏模式"
+msgid "menu.downloads"
+msgstr "顯示下載檔案夾"
+#, c-format
+msgid "doc.archive"
+msgstr "%s 是一個壓縮檔。"
+msgid "doc.archive.view"
+msgstr "檢視存檔內容"
+msgid "bookmark.tag.linksplit"
+msgstr "在側邊打開連結"
+msgid "dlg.save.opendownload"
+msgstr "打開下載的檔案"
+msgid "link.side"
+msgstr "在側邊打開連結"
+msgid "link.side.newtab"
+msgstr "在側邊新標籤頁中打開連結"
+msgid "lang.ia"
+msgstr "因特語"
+msgid "lang.tok"
+msgstr "道本語"
+msgid "heading.newident.missing"
+msgstr "資料缺失"
+msgid "dlg.newindent.missing.commonname"
+msgstr "必須指定一個「通用名稱（CN）」。"
+msgid "heading.newident.date.bad"
+msgstr "無效日期"
+msgid "dlg.newident.date.past"
+msgstr "過期日必須在未來。"
+msgid "dlg.newident.date.example"
+msgstr ""
+"請檢查「有效期至」欄位。例子：\n"
+"• 2030\n"
+"• 2025-06-30\n"
+"• 2021-12-31 23:59:59"
+msgid "menu.split.merge"
+msgstr "合併標籤頁"
+msgid "menu.split.swap"
+msgstr "交換位置"
+msgid "menu.split.horizontal"
+msgstr "橫向"
+msgid "menu.split.vertical"
+msgstr "縱向"
+msgid "menu.view.split"
+msgstr "分屏…"
+msgid "gempub.cover.untitled"
+msgstr "未名書"
+msgid "prefs.pinsplit"
+msgstr "總在側邊打開連結："
+msgid "prefs.pinsplit.none"
+msgstr "關閉"
+msgid "prefs.pinsplit.left"
+msgstr "左"
+msgid "prefs.pinsplit.right"
+msgstr "右"
+msgid "archive.exit"
+msgstr "退出存檔"
+msgid "dir.empty"
+msgstr "檔案夾為空。"
+msgid "keys.tab.close.other"
+msgstr "關閉其他標籤頁"
+msgid "keys.split.next"
+msgstr "切換焦點至下一分屏"
+msgid "gempub.cover.viewlocal"
+msgstr "該 Gempub 書籍可以在被儲存後閱讀。"
+msgid "gempub.cover.aboutbook"
+msgstr "有關本書"
+msgid "gempub.cover.view"
+msgstr "檢視 Gempub 目錄"
+msgid "gempub.cover.image"
+msgstr "封面圖"
+msgid "gempub.meta.author"
+msgstr "作者"
+msgid "gempub.meta.version"
+msgstr "版本"
+msgid "gempub.meta.revdate"
+msgstr "修訂日期"
+msgid "gempub.meta.pub"
+msgstr "已發行"
+msgid "gempub.meta.pubdate"
+msgstr "發行日期"
+msgid "gempub.meta.lang"
+msgstr "語言"
+msgid "gempub.meta.license"
+msgstr "授權協議"
diff --git a/res/about/license.gmi b/res/about/license.gmi
index 087ce3cf..6721ab9b 100644
--- a/res/about/license.gmi
+++ b/res/about/license.gmi
@@ -107,10 +107,10 @@ This application uses fonts licensed under the Open Font License.
 => https://www.google.com/get/noto/#sans-arab  Noto Sans Arabic
 => https://www.google.com/get/noto/help/cjk/  Noto Sans CJK (JP, SC)
 => https://github.com/googlefonts/nunito/blob/master/OFL.txt  Nunito
+=> https://github.com/skyjake/lagrange/blob/dev/res/fonts/LICENSE_SmolEmoji.txt  Smol Emoji
 => https://github.com/adobe-fonts/source-sans/blob/release/LICENSE.md  Source Sans 3
 Additional fonts:
 => https://github.com/googlefonts/noto-emoji/blob/master/LICENSE  Noto Emoji (Apache License 2.0)
-=> https://dn-works.com/ufas/  Symbola (Public Domain)
 => https://fonts.google.com/specimen/Tinos#license  Tinos (Apache License 2.0)
diff --git a/res/about/version.gmi b/res/about/version.gmi
index 23eeebef..0a51df34 100644
--- a/res/about/version.gmi
+++ b/res/about/version.gmi
@@ -6,6 +6,62 @@
 ```
 # Release notes
+## 1.5.2
+* Fixed pasting a PEM-formatted certificate and/or private key via clipboard in Import Identity.
+* Normalize page contents (NFC) to avoid most common issues with diacritics.
+## 1.5.1
+* Updated UI translations.
+* Updated "Smol Emoji" font with new and improved glyphs.
+## 1.5
+* Added "Smol Emoji" and "Noto Sans Symbols" fonts, removed Symbola.
+⚠️ Many Emoji and pictographs defined in the last five years are currently missing.
+* Added document footer buttons: on certain pages (e.g., error messages) show relevant actions in the bottom of the page. For example, if a certificate is required for viewing a page, show buttons for creating a new identity and showing the Identities sidebar.
+* Error pages include the human-readable text sent by the server.
+* Disregard old feed entries whose unread status would have been forgotten.
+* Added UI language: Polish.
+Identity management:
+* Revised New Identity dialog. An option is provided to automatically use the new identity on the current domain/page. The additional fields are hidden by default.
+* Improved usability of Identities sidebar. No more accidental activations: left-clicking an identity opens the context menu without making any changes. The context menu shows each active URL as a menu item for easy access. Identity icons reflect the usage status: all identities used on the current domain get highlighted in addition to the currently used one.
+* Identities can be exported: certificate and private key are opened in a new tab in plain text PEM format.
+* Fixed issues with identity usage: a higher-up URL overrides and deactivates all contained URLs to avoid redundant activation.
+Text input:
+* Revised text input widgets: added support for multiple lines, and when entering user response to a query, show how many bytes are remaining for the response URL about to be submitted. In dialogs, input fields expand vertically instead of scrolling their content horizontally.
+* Input widgets allow inserting newlines using Shift+Return.
+* Disallow sending query responses that are too long (1024 bytes maximum).
+* Shift-click to select a range of text in input widgets (i.e, without dragging).
+Rendering:
+* Animate showing and hiding of sidebars and dialogs. Animations are enabled by default, by can be disabled with Preferences > Interface > Animations.
+* Added setting for a custom TrueType symbol font for any missing characters. Note: Must be a .TTF file — OpenType and bitmap fonts are not supported.
+* Link navigation shortcut icons (home row and numbered) are drawn with a consistent appearance.
+* Improved icon alignment in lists.
+* Reduced line gap between word-wrapped top-level headings.
+* Modal dialog background dimming fades in/out smoothly.
+* macOS: Workaround for an issue that causes UI refresh to pause occasionally for ~100 ms.
+Split view:
+* Added keybindings for split view menu items.
+* Changed default split view keys to conform to Emacs (3 for horizontal, 2 for vertical split).
+* Fixes and improvements for touch screen event handling in split view mode.
+Command line:
+* Added --url-or-search (-u) command line option. Depending on the parameter, either open an URL or make a search query.
+* Open all URLs/files specified on the command line in new tabs, and raise the window if the app is already running. (Kudos to Alyssa Rosenzweig.)
+Gempub:
+* Linear navigation through the book with Left/Right arrow keys and via footer buttons. The navigation order is determined by links on the Gempub index page.
+## 1.4.2
+* Fixed UI colors being all black on the first run.
+* Fixed right mouse click on an inactive split not having any effect.
+* Fixed action buttons showing under the Help link in an empty Identities sidebar.
+* Fixed potential crash at shutdown.
+* Fixed minor UI layout issues.
 ## 1.4.1
 * Fixed removing the left side split by closing all its tabs. The URL input field got confused about which tab was currently open, and the wrong theme was active.
 * Fixed tab merging when unsplitting the window: keep the currently active tab open.
diff --git a/res/arg-help.txt b/res/arg-help.txt
index d8e8c76c..e87881d3 100644
--- a/res/arg-help.txt
+++ b/res/arg-help.txt
@@ -1,13 +1,17 @@
 Usage: lagrange [options] [URLs] [paths]
-URLs and local files are opened in separate tabs. By default the first 
+When multiple URLs and local files are specified, they are opened in
-URL/path opens in the currently open tab.
+separate tabs.
 General options:
  -E, --echo            Print all internal app events to stdout.
      --help            Print these instructions.
      --sw              Disable hardware accelerated rendering.
+  -u, --url-or-search URL | text
+                        Open a URL, or make a search query with given text.
+                        This only works if the search query URL has been
+                        configured.
  -V, --version         Print the application version.
 Options that control a running instance of Lagrange:
diff --git a/res/fi.skyjake.Lagrange.appdata.xml b/res/fi.skyjake.Lagrange.appdata.xml
index e3b75771..8f8ca7b3 100644
--- a/res/fi.skyjake.Lagrange.appdata.xml
+++ b/res/fi.skyjake.Lagrange.appdata.xml
@@ -45,6 +45,54 @@
    <update_contact>jaakko.keranen@iki.fi</update_contact>
    <releases>
+        <release version="1.5.1" date="2021-06-06">
+            <description>
+                <p>Resource update:</p>
+                <ul>
+                    <li>Latest UI translation strings.</li>
+                    <li>More glyphs in the Smol Emoji font.</li>
+                </ul>
+            </description>
+            <url>https://github.com/skyjake/lagrange/releases/tag/v1.5.1</url>
+        </release>
+        <release version="1.5" date="2021-05-29">
+            <description>
+                <p>This release contains several user interface improvements.</p>
+                <ul>
+                    <li>Improved identity management: revised certificate creation UI,
+                        taking a new identity into use immediately, sidebar context
+                        menu shows used URLs as clickable menu items, exporting
+                        identities.</li>
+                    <li>Improved text input: inserting line breaks, input fields use word
+                        wrapping and expand vertically, query URL length
+                        indicator.</li>
+                    <li>Show buttons in the page footer area for performing relevant
+                        actions conveniently.</li>
+                    <li>Animated showing of sidebars and dialogs.</li>
+                    <li>Font updates, setting for custom fallback TrueType font.</li>
+                    <li>Gempub: Linear navigation through the book.</li>
+                    <li>New UI language: Polish.</li>
+                </ul>
+                <p>The full release notes can be viewed inside the app by opening
+                    the "about:version" page.</p>
+            </description>
+            <url>https://github.com/skyjake/lagrange/releases/tag/v1.5.0</url>
+        </release>
+        <release version="1.4.2" date="2021-05-22">
+            <description>
+                <p>Bug fixes:</p>
+                <ul>
+                    <li>UI colors were all black on the first run.</li>
+                    <li>Right mouse click on an inactive split does not have any
+                        effect.</li>
+                    <li>Action buttons showing under the Help link in an empty
+                        Identities sidebar.</li>
+                    <li>Potential crash at shutdown.</li>
+                    <li>Minor UI layout issues.</li>
+                </ul>
+            </description>
+            <url>https://github.com/skyjake/lagrange/releases/tag/v1.4.2</url>
+        </release>
        <release version="1.4.1" date="2021-05-13">
            <description>
                <p>Bug fixes:</p>
diff --git a/res/fonts/LICENSE_SmolEmoji.txt b/res/fonts/LICENSE_SmolEmoji.txt
new file mode 100644
index 00000000..3513b65a
--- /dev/null
+++ b/res/fonts/LICENSE_SmolEmoji.txt
@@ -0,0 +1,94 @@
+Copyright 2021 Jaakko Keränen <jaakko.keranen@iki.fi>
+This Font Software is licensed under the SIL Open Font License,
+Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font
+creation efforts of academic and linguistic communities, and to
+provide a free and open framework in which fonts may be shared and
+improved in partnership with others.
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply to
+any document created using the fonts or their derivatives.
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+"Original Version" refers to the collection of Font Software
+components as distributed by the Copyright Holder(s).
+"Modified Version" refers to any derivative made by adding to,
+deleting, or substituting -- in part or in whole -- any of the
+components of the Original Version, by changing formats or by porting
+the Font Software to a new environment.
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed,
+modify, redistribute, and sell modified and unmodified copies of the
+Font Software, subject to the following conditions:
+1) Neither the Font Software nor any of its individual components, in
+Original or Modified Versions, may be sold by itself.
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the
+corresponding Copyright Holder. This restriction only applies to the
+primary font name as presented to the users.
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created using
+the Font Software.
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/res/fonts/NotoSansSymbols-Regular.ttf b/res/fonts/NotoSansSymbols-Regular.ttf
new file mode 100644
index 00000000..68847551
--- /dev/null
+++ b/res/fonts/NotoSansSymbols-Regular.ttf
Binary files differ
diff --git a/res/fonts/NotoSansSymbols2-Regular.ttf b/res/fonts/NotoSansSymbols2-Regular.ttf
new file mode 100644
index 00000000..79706435
--- /dev/null
+++ b/res/fonts/NotoSansSymbols2-Regular.ttf
Binary files differ
diff --git a/res/fonts/SmolEmoji-Regular.ttf b/res/fonts/SmolEmoji-Regular.ttf
new file mode 100644
index 00000000..806766c2
--- /dev/null
+++ b/res/fonts/SmolEmoji-Regular.ttf
Binary files differ
diff --git a/res/fonts/Symbola.ttf b/res/fonts/Symbola.ttf
deleted file mode 100644
index f4bb1b7b..00000000
--- a/res/fonts/Symbola.ttf
+++ /dev/null
Binary files differ
diff --git a/res/lang/de.bin b/res/lang/de.bin
index 45c01abd..b89c8b0f 100644
--- a/res/lang/de.bin
+++ b/res/lang/de.bin
Binary files differ
diff --git a/res/lang/en.bin b/res/lang/en.bin
index 0a9a3c0f..0ac42d88 100644
--- a/res/lang/en.bin
+++ b/res/lang/en.bin
Binary files differ
diff --git a/res/lang/es.bin b/res/lang/es.bin
index 0d3e80c7..8f3940f1 100644
--- a/res/lang/es.bin
+++ b/res/lang/es.bin
Binary files differ
diff --git a/res/lang/fi.bin b/res/lang/fi.bin
index 00039ebd..d19dc0e8 100644
--- a/res/lang/fi.bin
+++ b/res/lang/fi.bin
Binary files differ
diff --git a/res/lang/fr.bin b/res/lang/fr.bin
index 139f8e51..0b78f3b7 100644
--- a/res/lang/fr.bin
+++ b/res/lang/fr.bin
Binary files differ
diff --git a/res/lang/ia.bin b/res/lang/ia.bin
index e7607899..e6590afc 100644
--- a/res/lang/ia.bin
+++ b/res/lang/ia.bin
Binary files differ
diff --git a/res/lang/ie.bin b/res/lang/ie.bin
index 79b517df..f852ba0e 100644
--- a/res/lang/ie.bin
+++ b/res/lang/ie.bin
Binary files differ
diff --git a/res/lang/pl.bin b/res/lang/pl.bin
index e208f3ba..9f42024c 100644
--- a/res/lang/pl.bin
+++ b/res/lang/pl.bin
Binary files differ
diff --git a/res/lang/ru.bin b/res/lang/ru.bin
index 4e775c94..5c9e3488 100644
--- a/res/lang/ru.bin
+++ b/res/lang/ru.bin
Binary files differ
diff --git a/res/lang/sr.bin b/res/lang/sr.bin
index 19408d1a..f4239f1f 100644
--- a/res/lang/sr.bin
+++ b/res/lang/sr.bin
Binary files differ
diff --git a/res/lang/tok.bin b/res/lang/tok.bin
index 2d8017cb..1a6b5baf 100644
--- a/res/lang/tok.bin
+++ b/res/lang/tok.bin
Binary files differ
diff --git a/res/lang/zh_Hans.bin b/res/lang/zh_Hans.bin
index 171bd2a8..b155036d 100644
--- a/res/lang/zh_Hans.bin
+++ b/res/lang/zh_Hans.bin
Binary files differ
diff --git a/res/lang/zh_Hant.bin b/res/lang/zh_Hant.bin
index 6518c7bf..57ce2d83 100644
--- a/res/lang/zh_Hant.bin
+++ b/res/lang/zh_Hant.bin
Binary files differ
diff --git a/src/app.c b/src/app.c
index 3bf9aec1..71cff954 100644
--- a/src/app.c
+++ b/src/app.c
@@ -204,6 +204,7 @@ static iString *serializePrefs_App_(const iApp *d) {
    appendFormat_String(str, "uiscale arg:%f\n", uiScale_Window(d->window));
    appendFormat_String(str, "prefs.dialogtab arg:%d\n", d->prefs.dialogTab);
    appendFormat_String(str, "font.set arg:%d\n", d->prefs.font);
+    appendFormat_String(str, "font.user path:%s\n", cstr_String(&d->prefs.symbolFontPath));
    appendFormat_String(str, "headingfont.set arg:%d\n", d->prefs.headingFont);
    appendFormat_String(str, "zoom.set arg:%d\n", d->prefs.zoomPercent);
    appendFormat_String(str, "smoothscroll arg:%d\n", d->prefs.smoothScrolling);
@@ -212,6 +213,7 @@ static iString *serializePrefs_App_(const iApp *d) {
    appendFormat_String(str, "decodeurls arg:%d\n", d->prefs.decodeUserVisibleURLs);
    appendFormat_String(str, "linewidth.set arg:%d\n", d->prefs.lineWidth);
    /* TODO: Set up an array of booleans in Prefs and do these in a loop. */
+    appendFormat_String(str, "prefs.animate.changed arg:%d\n", d->prefs.uiAnimations);
    appendFormat_String(str, "prefs.mono.gemini.changed arg:%d\n", d->prefs.monospaceGemini);
    appendFormat_String(str, "prefs.mono.gopher.changed arg:%d\n", d->prefs.monospaceGopher);
    appendFormat_String(str, "prefs.boldlink.dark.changed arg:%d\n", d->prefs.boldLinkDark);
@@ -545,6 +547,7 @@ static void terminate_App_(int rc) {
 static void communicateWithRunningInstance_App_(iApp *d, iProcessId instance,
                                                const iStringList *openCmds) {
    iString *cmds = new_String();
+    iBool requestRaise = iFalse;
    const iProcessId pid = currentId_Process();
    iConstForEach(CommandLine, i, &d->args) {
        if (i.argType == value_CommandLineArgType) {
@@ -552,6 +555,7 @@ static void communicateWithRunningInstance_App_(iApp *d, iProcessId instance,
        }
        if (equal_CommandLineConstIterator(&i, "go-home")) {
            appendCStr_String(cmds, "navigate.home\n");
+            requestRaise = iTrue;
        }
        else if (equal_CommandLineConstIterator(&i, "new-tab")) {
            iCommandLineArg *arg = argument_CommandLineConstIterator(&i);
@@ -563,6 +567,7 @@ static void communicateWithRunningInstance_App_(iApp *d, iProcessId instance,
                appendCStr_String(cmds, "tabs.new\n");
            }
            iRelease(arg);
+            requestRaise = iTrue;
        }
        else if (equal_CommandLineConstIterator(&i, "close-tab")) {
            appendCStr_String(cmds, "tabs.close\n");
@@ -573,13 +578,15 @@ static void communicateWithRunningInstance_App_(iApp *d, iProcessId instance,
    }
    if (!isEmpty_StringList(openCmds)) {
        append_String(cmds, collect_String(joinCStr_StringList(openCmds, "\n")));
+        requestRaise = iTrue;
    }
    if (isEmpty_String(cmds)) {
        /* By default open a new tab. */
        appendCStr_String(cmds, "tabs.new\n");
+        requestRaise = iTrue;
    }
    if (!isEmpty_String(cmds)) {
-        iString *result = communicate_Ipc(cmds);
+        iString *result = communicate_Ipc(cmds, requestRaise);
        if (result) {
            fwrite(cstr_String(result), 1, size_String(result), stdout);
            fflush(stdout);
@@ -594,6 +601,18 @@ static void communicateWithRunningInstance_App_(iApp *d, iProcessId instance,
 }
 #endif /* defined (LAGRANGE_ENABLE_IPC) */
+static iBool hasCommandLineOpenableScheme_(const iRangecc uri) {
+    static const char *schemes[] = {
+        "gemini:", "gopher:", "finger:", "file:", "data:", "about:"
+    };
+    iForIndices(i, schemes) {
+        if (startsWithCase_Rangecc(uri, schemes[i])) {
+            return iTrue;
+        }
+    }
+    return iFalse;
+}
 static void init_App_(iApp *d, int argc, char **argv) {
    init_CommandLine(&d->args, argc, argv);
    /* Where was the app started from? We ask SDL first because the command line alone is
@@ -628,6 +647,7 @@ static void init_App_(iApp *d, int argc, char **argv) {
        defineValues_CommandLine(&d->args, "go-home", 0);
        defineValues_CommandLine(&d->args, "help", 0);
        defineValues_CommandLine(&d->args, listTabUrls_CommandLineOption, 0);
+        defineValues_CommandLine(&d->args, openUrlOrSearch_CommandLineOption, 1);
        defineValuesN_CommandLine(&d->args, "new-tab", 0, 1);
        defineValues_CommandLine(&d->args, "sw", 0);
        defineValues_CommandLine(&d->args, "version;V", 0);
@@ -643,30 +663,38 @@ static void init_App_(iApp *d, int argc, char **argv) {
            terminate_App_(0);
        }
        /* Check for URLs. */
-        iBool newTab = iFalse;
        iConstForEach(CommandLine, i, &d->args) {
            const iRangecc arg = i.entry;
            if (i.argType == value_CommandLineArgType) {
                /* URLs and file paths accepted. */
-                const iBool isKnownScheme =
+                const iBool isOpenable = hasCommandLineOpenableScheme_(arg);
-                    startsWithCase_Rangecc(arg, "gemini:") || startsWithCase_Rangecc(arg, "gopher:") ||
+                if (isOpenable || fileExistsCStr_FileInfo(cstr_Rangecc(arg))) {
-                    startsWithCase_Rangecc(arg, "finger:") || startsWithCase_Rangecc(arg, "file:")   ||
-                    startsWithCase_Rangecc(arg, "data:")   || startsWithCase_Rangecc(arg, "about:");
-                if (isKnownScheme || fileExistsCStr_FileInfo(cstr_Rangecc(arg))) {
                    iString *decUrl =
-                        isKnownScheme ? urlDecodeExclude_String(collectNewRange_String(arg), "/?#:")
+                        isOpenable ? urlDecodeExclude_String(collectNewRange_String(arg), "/?#:")
-                                      : makeFileUrl_String(collectNewRange_String(arg));
+                                   : makeFileUrl_String(collectNewRange_String(arg));
                    pushBack_StringList(openCmds,
                                        collectNewFormat_String(
-                                            "open newtab:%d url:%s", newTab, cstr_String(decUrl)));
+                                            "open newtab:1 url:%s", cstr_String(decUrl)));
                    delete_String(decUrl);
-                    newTab = iTrue;
                }
                else {
                    fprintf(stderr, "Invalid URL/file: %s\n", cstr_Rangecc(arg));
                    terminate_App_(1);
                }
            }
+            else if (equal_CommandLineConstIterator(&i, openUrlOrSearch_CommandLineOption)) {
+                const iCommandLineArg *arg = iClob(argument_CommandLineConstIterator(&i));
+                const iString *input = value_CommandLineArg(arg, 0);
+                if (startsWith_String(input, "//")) {
+                    input = collectNewFormat_String("gemini:%s", cstr_String(input));
+                }
+                if (hasCommandLineOpenableScheme_(range_String(input))) {
+                    input = collect_String(urlDecodeExclude_String(input, "/?#:"));
+                }
+                pushBack_StringList(
+                    openCmds,
+                    collectNewFormat_String("search newtab:1 query:%s", cstr_String(input)));
+            }
            else if (!isDefined_CommandLine(&d->args, collectNewRange_String(i.entry))) {
                fprintf(stderr, "Unknown option: %s\n", cstr_Rangecc(arg));
                terminate_App_(1);
@@ -1541,24 +1569,25 @@ static iBool handlePrefsCommands_(iWidget *d, const char *cmd) {
                         isSelected_Widget(findChild_Widget(d, "prefs.imageloadscroll")));
        postCommandf_App("hidetoolbarscroll arg:%d",
                         isSelected_Widget(findChild_Widget(d, "prefs.hidetoolbarscroll")));
-        postCommandf_App("ostheme arg:%d",
+        postCommandf_App("ostheme arg:%d", isSelected_Widget(findChild_Widget(d, "prefs.ostheme")));
-                         isSelected_Widget(findChild_Widget(d, "prefs.ostheme")));
+        postCommandf_App("font.user path:%s",
+                         cstrText_InputWidget(findChild_Widget(d, "prefs.userfont")));
        postCommandf_App("decodeurls arg:%d",
                         isSelected_Widget(findChild_Widget(d, "prefs.decodeurls")));
        postCommandf_App("searchurl address:%s",
-                         cstr_String(text_InputWidget(findChild_Widget(d, "prefs.searchurl"))));
+                         cstrText_InputWidget(findChild_Widget(d, "prefs.searchurl")));
        postCommandf_App("cachesize.set arg:%d",
-                         toInt_String(text_InputWidget(findChild_Widget(d, "prefs.cachesize"))));
+                         toInt_String(text_InputWidget(findChild_Widget(d, "prefs.cachesize"))));        
        postCommandf_App("ca.file path:%s",
-                         cstr_String(text_InputWidget(findChild_Widget(d, "prefs.ca.file"))));
+                         cstrText_InputWidget(findChild_Widget(d, "prefs.ca.file")));
        postCommandf_App("ca.path path:%s",
-                         cstr_String(text_InputWidget(findChild_Widget(d, "prefs.ca.path"))));
+                         cstrText_InputWidget(findChild_Widget(d, "prefs.ca.path")));
        postCommandf_App("proxy.gemini address:%s",
-                         cstr_String(text_InputWidget(findChild_Widget(d, "prefs.proxy.gemini"))));
+                         cstrText_InputWidget(findChild_Widget(d, "prefs.proxy.gemini")));
        postCommandf_App("proxy.gopher address:%s",
-                         cstr_String(text_InputWidget(findChild_Widget(d, "prefs.proxy.gopher"))));
+                         cstrText_InputWidget(findChild_Widget(d, "prefs.proxy.gopher")));
        postCommandf_App("proxy.http address:%s",
-                         cstr_String(text_InputWidget(findChild_Widget(d, "prefs.proxy.http"))));
+                         cstrText_InputWidget(findChild_Widget(d, "prefs.proxy.http")));
        const iWidget *tabs = findChild_Widget(d, "prefs.tabs");
        if (tabs) {
            postCommandf_App("prefs.dialogtab arg:%u",
@@ -1665,12 +1694,36 @@ iDocumentWidget *newTab_App(const iDocumentWidget *duplicateOf, iBool switchToNe
 static iBool handleIdentityCreationCommands_(iWidget *dlg, const char *cmd) {
    iApp *d = &app_;
+    if (equal_Command(cmd, "ident.showmore")) {
+        iForEach(ObjectList, i, children_Widget(findChild_Widget(dlg, "headings"))) {
+            if (flags_Widget(i.object) & collapse_WidgetFlag) {
+                setFlags_Widget(i.object, hidden_WidgetFlag, iFalse);
+            }
+        }
+        iForEach(ObjectList, j, children_Widget(findChild_Widget(dlg, "values"))) {
+            if (flags_Widget(j.object) & collapse_WidgetFlag) {
+                setFlags_Widget(j.object, hidden_WidgetFlag, iFalse);
+            }
+        }
+        setFlags_Widget(child_Widget(findChild_Widget(dlg, "dialogbuttons"), 0), disabled_WidgetFlag,
+                        iTrue);
+        arrange_Widget(dlg);
+        refresh_Widget(dlg);        
+        return iTrue;
+    }
+    if (equal_Command(cmd, "ident.scope")) {
+        iLabelWidget *scope = findChild_Widget(dlg, "ident.scope");
+        setText_LabelWidget(scope,
+                            text_LabelWidget(child_Widget(
+                                findChild_Widget(as_Widget(scope), "menu"), arg_Command(cmd))));
+        return iTrue;
+    }
    if (equal_Command(cmd, "ident.temp.changed")) {
        setFlags_Widget(
            findChild_Widget(dlg, "ident.temp.note"), hidden_WidgetFlag, !arg_Command(cmd));
        return iFalse;
    }
-    if (equal_Command(cmd, "ident.accept") || equal_Command(cmd, "cancel")) {
+    if (equal_Command(cmd, "ident.accept") || equal_Command(cmd, "ident.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"));
@@ -1718,11 +1771,52 @@ static iBool handleIdentityCreationCommands_(iWidget *dlg, const char *cmd) {
                }
            }
            /* The input seems fine. */
-            newIdentity_GmCerts(d->certs, isTemp ? temporary_GmIdentityFlag : 0,
+            iGmIdentity *ident = newIdentity_GmCerts(d->certs,
-                                until, commonName, email, userId, domain, organization, country);
+                                                     isTemp ? temporary_GmIdentityFlag : 0,
+                                                     until,
+                                                     commonName,
+                                                     email,
+                                                     userId,
+                                                     domain,
+                                                     organization,
+                                                     country);
+            /* Use in the chosen scope. */ {
+                const iLabelWidget *scope    = findChild_Widget(dlg, "ident.scope");
+                const iString *     selLabel = text_LabelWidget(scope);
+                int                 selScope = 0;
+                iConstForEach(ObjectList,
+                              i,
+                              children_Widget(findChild_Widget(constAs_Widget(scope), "menu"))) {
+                    if (isInstance_Object(i.object, &Class_LabelWidget)) {
+                        const iLabelWidget *item = i.object;
+                        if (equal_String(text_LabelWidget(item), selLabel)) {
+                            break;
+                        }
+                        selScope++;
+                    }
+                }
+                const iString *docUrl = url_DocumentWidget(document_Root(dlg->root));
+                iString *useUrl = NULL;
+                switch (selScope) {
+                    case 0: /* current domain */
+                        useUrl = collectNewFormat_String("gemini://%s",
+                                                         cstr_Rangecc(urlHost_String(docUrl)));
+                        break;
+                    case 1: /* current page */
+                        useUrl = collect_String(copy_String(docUrl));
+                        break;
+                    default: /* not used */
+                        break;
+                }
+                if (useUrl) {
+                    signIn_GmCerts(d->certs, ident, useUrl);
+                    postCommand_App("navigate.reload");
+                }
+            }
            postCommandf_App("sidebar.mode arg:%d show:1", identities_SidebarMode);
            postCommand_App("idents.changed");
        }
+        setupSheetTransition_Mobile(dlg, iFalse);
        destroy_Widget(dlg);
        return iTrue;
    }
@@ -1813,6 +1907,22 @@ iBool handleCommand_App(const char *cmd) {
        resetFonts_Text();
        return iTrue;
    }
+    else if (equal_Command(cmd, "font.user")) {
+        const char *path = suffixPtr_Command(cmd, "path");
+        if (cmp_String(&d->prefs.symbolFontPath, path)) {
+            if (!isFrozen) {
+                setFreezeDraw_Window(get_Window(), iTrue);
+            }
+            setCStr_String(&d->prefs.symbolFontPath, path);
+            loadUserFonts_Text();
+            resetFonts_Text();
+            if (!isFrozen) {
+                postCommand_App("font.changed");
+                postCommand_App("window.unfreeze");
+            }
+        }
+        return iTrue;
+    }
    else if (equal_Command(cmd, "font.set")) {
        if (!isFrozen) {
            setFreezeDraw_Window(get_Window(), iTrue);
@@ -2011,6 +2121,10 @@ iBool handleCommand_App(const char *cmd) {
        d->prefs.openArchiveIndexPages = arg_Command(cmd) != 0;
        return iTrue;
    }
+    else if (equal_Command(cmd, "prefs.animate.changed")) {
+        d->prefs.uiAnimations = arg_Command(cmd) != 0;
+        return iTrue;
+    }
    else if (equal_Command(cmd, "saturation.set")) {
        d->prefs.saturation = (float) arg_Command(cmd) / 100.0f;
        if (!isFrozen) {
@@ -2070,6 +2184,20 @@ iBool handleCommand_App(const char *cmd) {
        }
        return iTrue;
    }
+    else if (equal_Command(cmd, "search")) {
+        const int newTab = argLabel_Command(cmd, "newtab");
+        const iString *query = collect_String(suffix_Command(cmd, "query"));
+        if (!isLikelyUrl_String(query)) {
+            const iString *url = searchQueryUrl_App(query);
+            if (!isEmpty_String(url)) {
+                postCommandf_App("open newtab:%d url:%s", newTab, cstr_String(url));
+            }
+        }
+        else {
+            postCommandf_App("open newtab:%d url:%s", newTab, cstr_String(query));
+        }
+        return iTrue;
+    }
    else if (equal_Command(cmd, "open")) {
        iString *url = collectNewCStr_String(suffixPtr_Command(cmd, "url"));
        const iBool noProxy = argLabel_Command(cmd, "noproxy");
@@ -2239,6 +2367,8 @@ iBool handleCommand_App(const char *cmd) {
        setToggle_Widget(findChild_Widget(dlg, "prefs.archive.openindex"), d->prefs.openArchiveIndexPages);
        setToggle_Widget(findChild_Widget(dlg, "prefs.ostheme"), d->prefs.useSystemTheme);
        setToggle_Widget(findChild_Widget(dlg, "prefs.customframe"), d->prefs.customFrame);
+        setToggle_Widget(findChild_Widget(dlg, "prefs.animate"), d->prefs.uiAnimations);
+        setText_InputWidget(findChild_Widget(dlg, "prefs.userfont"), &d->prefs.symbolFontPath);
        updatePrefsPinSplitButtons_(dlg, d->prefs.pinSplit);
        updateDropdownSelection_(findChild_Widget(dlg, "prefs.uilang"), cstr_String(&d->prefs.uiLanguage));
        setToggle_Widget(findChild_Widget(dlg, "prefs.retainwindow"), d->prefs.retainWindowSize);
@@ -2454,6 +2584,11 @@ iBool handleCommand_App(const char *cmd) {
        return iTrue;
    }
    else if (equal_Command(cmd, "ipc.signal")) {
+        if (argLabel_Command(cmd, "raise")) {
+            if (d->window && d->window->win) {
+                SDL_RaiseWindow(d->window->win);
+            }
+        }
        signal_Ipc(arg_Command(cmd));
        return iTrue;
    }
diff --git a/src/app.h b/src/app.h
index 0fb6be29..918cd396 100644
--- a/src/app.h
+++ b/src/app.h
@@ -42,7 +42,8 @@ iDeclareType(Visited)
 iDeclareType(Window)
 /* Command line options strings. */
-#define listTabUrls_CommandLineOption   "list-tab-urls;L"
+#define listTabUrls_CommandLineOption       "list-tab-urls;L"
+#define openUrlOrSearch_CommandLineOption   "url-or-search;u"
 enum iAppDeviceType {
    desktop_AppDeviceType,
diff --git a/src/defs.h b/src/defs.h
index 0da404bf..ff68e7e5 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -42,6 +42,8 @@ enum iFileVersion {
 /* Icons */
+#define rightArrowhead_Icon "\u27a4"
+#define leftArrowhead_Icon  "\u27a4"
 #define warning_Icon        "\u26a0"
 #define openLock_Icon       "\U0001f513"
 #define closedLock_Icon     "\U0001f512"
@@ -62,12 +64,13 @@ enum iFileVersion {
 #define whiteStar_Icon      "\u2606"
 #define person_Icon         "\U0001f464"
 #define download_Icon       "\u2ba7"
+#define export_Icon         "\U0001f4e4"
 #define hourglass_Icon      "\u231b"
 #define timer_Icon          "\u23f2"
 #define home_Icon           "\U0001f3e0"
 #define edit_Icon           "\u270e"
 #define delete_Icon         "\u232b"
-#define copy_Icon           "\u2bba"
+#define copy_Icon           "\u2398" //"\u2bba"
 #define check_Icon          "\u2714"
 #define ballotCheck_Icon    "\U0001f5f9"
 #define inbox_Icon          "\U0001f4e5"
@@ -97,7 +100,7 @@ enum iFileVersion {
 #define globe_Icon          "\U0001f310"
 #define magnifyingGlass_Icon "\U0001f50d"
 #define midEllipsis_Icon    "\u00b7\u00b7\u00b7"
-#define return_Icon         "\u21a9"
+#define return_Icon         "\u23ce"
 #if defined (iPlatformApple)
 #   define shift_Icon       "\u21e7"
diff --git a/src/feeds.c b/src/feeds.c
index dcd97b43..6b102fef 100644
--- a/src/feeds.c
+++ b/src/feeds.c
@@ -300,8 +300,16 @@ static iBool isHeadingEntry_FeedEntry_(const iFeedEntry *d) {
 static iBool updateEntries_Feeds_(iFeeds *d, iPtrArray *incoming) {
    iBool gotNew = iFalse;
    lock_Mutex(d->mtx);
+    iTime now;
+    initCurrent_Time(&now);
    iForEach(PtrArray, i, incoming) {
        iFeedEntry *entry = i.ptr;
+        /* Disregard old entries. */
+        if (secondsSince_Time(&now, &entry->posted) >= maxAge_Visited) {
+            /* We don't remember this far back, so the unread status of the entry would
+               be incorrect. */
+            continue;
+        }
        size_t pos;
        if (locate_SortedArray(&d->entries, &entry, &pos)) {
            iFeedEntry *existing = *(iFeedEntry **) at_SortedArray(&d->entries, pos);
diff --git a/src/gempub.c b/src/gempub.c
index aa03d835..1f5d58ce 100644
--- a/src/gempub.c
+++ b/src/gempub.c
@@ -94,6 +94,9 @@ static void parseNavigationLinks_Gempub_(const iGempub *d) {
                set_String(&link.url, absoluteUrl_String(url_GmRequest(index), collectNewRange_String(url)));
                setRange_String(&link.label, capturedRange_RegExpMatch(&m, 2));
                trim_String(&link.label);
+                if (isEmpty_String(&link.label)) {
+                    setRange_String(&link.label, url);                    
+                }
                pushBack_Array(d->navLinks, &link);
            }
            iEndCollect();
@@ -213,6 +216,10 @@ iBool isOpen_Gempub(const iGempub *d) {
    return d->arch != NULL;
 }
+const iString *property_Gempub(const iGempub *d, enum iGempubProperty prop) {
+    return &d->props[prop];
+}
 const iString *coverPageUrl_Gempub(const iGempub *d) {
    return &d->baseUrl;
 }
@@ -232,6 +239,39 @@ const iString *navStartLinkUrl_Gempub(const iGempub *d) {
    return &((const iGempubNavLink *) constFront_Array(d->navLinks))->url;
 }
+size_t navSize_Gempub(const iGempub *d) {
+    parseNavigationLinks_Gempub_(d);
+    return size_Array(d->navLinks);
+}
+size_t navIndex_Gempub(const iGempub *d, const iString *url) {
+    parseNavigationLinks_Gempub_(d);
+    const iString *normUrl = withSpacesEncoded_String(url);
+    iConstForEach(Array, i, d->navLinks) {
+        const iGempubNavLink *nav = i.value;
+        if (equalCase_String(&nav->url, normUrl)) {
+            return index_ArrayConstIterator(&i);
+        }
+    }
+    return iInvalidPos;
+}
+const iString *navLinkUrl_Gempub(const iGempub *d, size_t index) {
+    parseNavigationLinks_Gempub_(d);
+    if (index < size_Array(d->navLinks)) {
+        return &constValue_Array(d->navLinks, index, iGempubNavLink).url;
+    }
+    return NULL;
+}
+const iString *navLinkLabel_Gempub(const iGempub *d, size_t index) {
+    parseNavigationLinks_Gempub_(d);
+    if (index < size_Array(d->navLinks)) {
+        return &constValue_Array(d->navLinks, index, iGempubNavLink).label;
+    }
+    return NULL;    
+}
 static iBool hasProperty_Gempub_(const iGempub *d, enum iGempubProperty prop) {
    return !isEmpty_String(&d->props[prop]);
 }
@@ -243,7 +283,7 @@ static void appendProperty_Gempub_(const iGempub *d, const char *label,
    }
 }
-static iBool isRemote_Gempub_(const iGempub *d) {
+iBool isRemote_Gempub(const iGempub *d) {
    return !equalCase_Rangecc(urlScheme_String(&d->baseUrl), "file");
 }
@@ -258,7 +298,7 @@ iString *coverPageSource_Gempub(const iGempub *d) {
    }
    appendCStr_String(out, "\n");
    appendProperty_Gempub_(d, "${gempub.meta.author}:", author_GempubProperty, out);
-    if (!isRemote_Gempub_(d)) {
+    if (!isRemote_Gempub(d)) {
        appendFormat_String(out, "\n=> %s " book_Icon " ${gempub.cover.view}\n",
                            cstr_String(indexPageUrl_Gempub(d)));
        if (hasProperty_Gempub_(d, cover_GempubProperty)) {
@@ -269,12 +309,12 @@ iString *coverPageSource_Gempub(const iGempub *d) {
    else {
        iString *key = collectNew_String(); /* TODO: add a helper for this */
        toString_Sym(SDLK_s, KMOD_PRIMARY, key);
-        appendCStr_String(out, "\n${gempub.cover.viewlocal} ");
+        appendCStr_String(out, "\n${gempub.cover.viewlocal}\n");
-        appendFormat_String(out,
+//        appendFormat_String(out,
-                            cstr_Lang("error.unsupported.suggestsave"),
+//                            cstr_Lang("error.unsupported.suggestsave"),
-                            cstr_String(key),
+//                            cstr_String(key),
-                            saveToDownloads_Label);
+//                            saveToDownloads_Label);
-        appendCStr_String(out, "\n");
+//        appendCStr_String(out, "\n");
    }
    appendCStr_String(out, "\n## ${gempub.cover.aboutbook}\n");
    appendProperty_Gempub_(d, "${gempub.meta.version}:", version_GempubProperty, out);
diff --git a/src/gempub.h b/src/gempub.h
index 6912bcc9..e5f1b8eb 100644
--- a/src/gempub.h
+++ b/src/gempub.h
@@ -53,6 +53,7 @@ void        close_Gempub            (iGempub *);
 void        setBaseUrl_Gempub       (iGempub *, const iString *baseUrl);
 iBool       isOpen_Gempub           (const iGempub *);
+iBool       isRemote_Gempub         (const iGempub *);
 iString *   coverPageSource_Gempub  (const iGempub *);
 iBool       preloadCoverImage_Gempub(const iGempub *, iGmDocument *doc);
@@ -60,5 +61,9 @@ const iString * property_Gempub         (const iGempub *, enum iGempubProperty);
 const iString * coverPageUrl_Gempub     (const iGempub *);
 const iString * indexPageUrl_Gempub     (const iGempub *);
 const iString * navStartLinkUrl_Gempub  (const iGempub *); /* for convenience */
+size_t          navSize_Gempub          (const iGempub *);
+size_t          navIndex_Gempub         (const iGempub *, const iString *url);
+const iString * navLinkUrl_Gempub       (const iGempub *, size_t index);
+const iString * navLinkLabel_Gempub     (const iGempub *, size_t index);
 extern const char *mimeType_Gempub;
diff --git a/src/gmcerts.c b/src/gmcerts.c
index 35d784f6..8577cf2b 100644
--- a/src/gmcerts.c
+++ b/src/gmcerts.c
@@ -105,7 +105,7 @@ void deserialize_GmIdentity(iGmIdentity *d, iStream *ins) {
        iString url;
        init_String(&url);
        deserialize_String(&url, ins);
-        insert_StringSet(d->useUrls, &url);
+        setUse_GmIdentity(d, &url, iTrue);
        deinit_String(&url);
    }
 }
@@ -161,11 +161,30 @@ iBool isUsedOn_GmIdentity(const iGmIdentity *d, const iString *url) {
    return iFalse;
 }
+iBool isUsedOnDomain_GmIdentity(const iGmIdentity *d, const iRangecc domain) {
+    iConstForEach(StringSet, i, d->useUrls) {
+        const iRangecc host = urlHost_String(i.value);
+        if (equalRangeCase_Rangecc(host, domain)) {
+            return iTrue;
+        }
+    }
+    return iFalse;
+}
 void setUse_GmIdentity(iGmIdentity *d, const iString *url, iBool use) {
    if (use && isUsedOn_GmIdentity(d, url)) {
        return; /* Redudant. */
    }
    if (use) {
+        /* Remove all use-URLs that become redundant by this newly added URL. */
+        /* TODO: StringSet could have a non-const iterator. */
+        iForEach(Array, i, &d->useUrls->strings.values) {
+            iString *used = i.value;
+            if (startsWithCase_String(used, cstr_String(url))) {
+                deinit_String(used);
+                remove_ArrayIterator(&i);
+            }
+        }
 #if !defined (NDEBUG)
        const iBool wasInserted =
 #endif
@@ -182,7 +201,11 @@ void clearUse_GmIdentity(iGmIdentity *d) {
 }
 const iString *name_GmIdentity(const iGmIdentity *d) {
-    return collect_String(subject_TlsCertificate(d->cert));
+    iString *name = collect_String(subject_TlsCertificate(d->cert));
+    if (startsWith_String(name, "CN = ")) {
+        remove_Block(&name->chars, 0, 5);
+    }
+    return name;
 }
 iDefineTypeConstruction(GmIdentity)
diff --git a/src/gmcerts.h b/src/gmcerts.h
index a9859845..a962d8b6 100644
--- a/src/gmcerts.h
+++ b/src/gmcerts.h
@@ -44,8 +44,9 @@ struct Impl_GmIdentity {
    int flags;
 };
-iBool   isUsed_GmIdentity   (const iGmIdentity *);
+iBool   isUsed_GmIdentity           (const iGmIdentity *);
-iBool   isUsedOn_GmIdentity (const iGmIdentity *, const iString *url);
+iBool   isUsedOn_GmIdentity         (const iGmIdentity *, const iString *url);
+iBool   isUsedOnDomain_GmIdentity   (const iGmIdentity *, const iRangecc domain);
 void    setUse_GmIdentity   (iGmIdentity *, const iString *url, iBool use);
 void    clearUse_GmIdentity (iGmIdentity *);
diff --git a/src/gmdocument.c b/src/gmdocument.c
index f8d41172..56953255 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -31,6 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "visited.h"
 #include "bookmarks.h"
 #include "app.h"
+#include "defs.h"
 #include <the_Foundation/ptrarray.h>
 #include <the_Foundation/regexp.h>
@@ -329,14 +330,15 @@ static void alignDecoration_GmRun_(iGmRun *run, iBool isCentered) {
    int         xAdjust   = 0;
    if (!isCentered) {
        /* Keep the icon aligned to the left edge. */
+        const int alignWidth = width_Rect(run->visBounds) * 3 / 4;
        xAdjust -= left_Rect(visBounds);
-        if (visWidth > width_Rect(run->visBounds)) {
+        if (visWidth > alignWidth) {
            /* ...unless it's a wide icon, in which case move it to the left. */
-            xAdjust -= visWidth - width_Rect(run->visBounds);
+            xAdjust -= visWidth - alignWidth;
        }
-        else if (visWidth < width_Rect(run->visBounds) * 3 / 4) {
+        else if (visWidth < alignWidth) {
            /* ...or a narrow icon, which needs to be centered but leave a gap. */
-            xAdjust += (width_Rect(run->visBounds) * 3 / 4 - visWidth) / 2;
+            xAdjust += (alignWidth - visWidth) / 2;
        }
    }
    else {
@@ -401,7 +403,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
    static const float bottomMargin[max_GmLineType] = {
        0.0f, 0.333f, 1.0f, 0.5f, 0.5f, 0.5f, 0.5f, 0.25f
    };
-    static const char *arrow           = "\u27a4";
+    static const char *arrow           = rightArrowhead_Icon;
    static const char *envelope        = "\U0001f4e7";
    static const char *bullet          = "\u2022";
    static const char *folder          = "\U0001f4c1";
@@ -618,7 +620,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
            iGmRun bulRun = run;
            if (prefs->font == literata_TextFont) {
                /* Something wrong this the glyph in Literata, looks cropped. */
-                bulRun.font = defaultContentSized_FontId;
+                bulRun.font = defaultContentRegular_FontId;
            }
            bulRun.color = tmQuote_ColorId;
            bulRun.visBounds.pos = addX_I2(pos, (indents[text_GmLineType] - 0.55f) * gap_Text);
@@ -724,7 +726,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
                lineHeightReduction = 0.10f;
            }
            else if (type == heading2_GmLineType) {
-                lineHeightReduction = 0.05f;
+                lineHeightReduction = 0.06f;
            }
            /* Visited links are never bold. */
            if (run.linkId && linkFlags_GmDocument(d, run.linkId) & visited_GmLinkFlag) {
@@ -1517,6 +1519,7 @@ static void normalize_GmDocument(iGmDocument *d) {
    printf("wasNormalized: %d\n", wasNormalized);
    fflush(stdout);
    set_String(&d->source, collect_String(normalized));
+    normalize_String(&d->source); /* NFC */
    printf("orig:%zu norm:%zu\n", size_String(&d->unormSource), size_String(&d->source));
    /* normalized source has an extra newline at the end */
 //    iAssert(wasNormalized || equal_String(&d->unormSource, &d->source));
diff --git a/src/gmdocument.h b/src/gmdocument.h
index 5137bb28..943a408c 100644
--- a/src/gmdocument.h
+++ b/src/gmdocument.h
@@ -65,7 +65,7 @@ iBool isDark_GmDocumentTheme(enum iGmDocumentTheme);
 typedef uint16_t iGmLinkId;
-enum iGmLinkFlags {
+enum iGmLinkFlag {
    gemini_GmLinkFlag             = iBit(1),
    gopher_GmLinkFlag             = iBit(2),
    finger_GmLinkFlag             = iBit(3),
diff --git a/src/gmrequest.c b/src/gmrequest.c
index 3dd92eec..1325c025 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -346,6 +346,7 @@ static const iBlock *replaceVariables_(const iBlock *block) {
            if (equal_Rangecc(name, "APP_VERSION")) {
                repl = range_CStr(LAGRANGE_APP_VERSION);
            }
+#if 0
            else if (startsWith_Rangecc(name, "BT:")) { /* block text */
                repl = range_String(collect_String(renderBlockChars_Text(
                    &fontFiraSansRegular_Embedded,
@@ -356,12 +357,13 @@ static const iBlock *replaceVariables_(const iBlock *block) {
            }
            else if (startsWith_Rangecc(name, "ST:")) { /* shaded text */
                repl = range_String(collect_String(renderBlockChars_Text(
-                    &fontSymbola_Embedded,
+                    &fontSmolEmojiRegular_Embedded,
                    20,
                    shading_TextBlockMode,
                    &(iString){ iBlockLiteral(
                        name.start + 3, size_Range(&name) - 3, size_Range(&name) - 3) })));
            }
+#endif
            else if (equal_Rangecc(name, "ALT")) {
 #if defined (iPlatformApple)
                repl = range_CStr("\u2325");
diff --git a/src/gmrequest.h b/src/gmrequest.h
index 2cf9e4ff..0cba4ea3 100644
--- a/src/gmrequest.h
+++ b/src/gmrequest.h
@@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 iDeclareType(GmCerts)
 iDeclareType(GmResponse)
-enum iGmCertFlags {
+enum iGmCertFlag {
    available_GmCertFlag       = iBit(1), /* certificate provided by server */
    trusted_GmCertFlag         = iBit(2), /* TOFU status */
    timeVerified_GmCertFlag    = iBit(3), /* has not expired */
diff --git a/src/gmutil.c b/src/gmutil.c
index 718a0a9a..3ca93901 100644
--- a/src/gmutil.c
+++ b/src/gmutil.c
@@ -262,7 +262,20 @@ void urlEncodePath_String(iString *d) {
    delete_String(encoded);
 }
-static iBool isSupportedUrlScheme_Rangecc_(iRangecc scheme) {
+iBool isKnownScheme_Rangecc(iRangecc scheme) {
+    if (isKnownUrlScheme_Rangecc(scheme)) {
+        return iTrue;
+    }
+    static const char *uriSchemes[] = { "about", "data" };
+    iForIndices(i, uriSchemes) {
+        if (equalCase_Rangecc(scheme, uriSchemes[i])) {
+            return iTrue;
+        }
+    }    
+    return iFalse;
+}
+iBool isKnownUrlScheme_Rangecc(iRangecc scheme) {
    static const char *schemes[] = { "gemini", "gopher", "finger", "http", "https", "file" };
    iForIndices(i, schemes) {
        if (equalCase_Rangecc(scheme, schemes[i])) {
@@ -277,7 +290,7 @@ const iString *absoluteUrl_String(const iString *d, const iString *urlMaybeRelat
    iUrl rel;
    init_Url(&orig, d);
    init_Url(&rel, urlMaybeRelative);
-    if (!isEmpty_Range(&rel.scheme) && !isSupportedUrlScheme_Rangecc_(rel.scheme) &&
+    if (!isEmpty_Range(&rel.scheme) && !isKnownUrlScheme_Rangecc(rel.scheme) &&
        isEmpty_Range(&rel.host)) {
        /* Probably not an URL, so we can't make this absolute. */
        return urlMaybeRelative;
@@ -475,6 +488,9 @@ const char *mediaType_Path(const iString *path) {
             endsWithCase_String(path, ".hpp")) {
        return "text/plain";
    }
+    else if (endsWithCase_String(path, ".pem")) {
+        return "application/x-pem-file";
+    }
    else if (endsWithCase_String(path, ".zip")) {
        return "application/zip";
    }
diff --git a/src/gmutil.h b/src/gmutil.h
index 09d333e7..e7ff7cc5 100644
--- a/src/gmutil.h
+++ b/src/gmutil.h
@@ -110,6 +110,8 @@ iRangecc        urlUser_String          (const iString *);
 iRangecc        urlRoot_String          (const iString *);
 const iString * absoluteUrl_String      (const iString *, const iString *urlMaybeRelative);
 iBool           isLikelyUrl_String      (const iString *);
+iBool           isKnownScheme_Rangecc   (iRangecc scheme); /* any URI scheme */
+iBool           isKnownUrlScheme_Rangecc(iRangecc scheme); /* URL schemes only */
 void            punyEncodeDomain_Rangecc(iRangecc domain, iString *encoded_out);
 void            punyEncodeUrlHost_String(iString *absoluteUrl);
 void            stripDefaultUrlPort_String(iString *);
diff --git a/src/history.c b/src/history.c
index 87cf28e6..fdd0ff55 100644
--- a/src/history.c
+++ b/src/history.c
@@ -286,7 +286,7 @@ void add_History(iHistory *d, const iString *url ){
 iBool goBack_History(iHistory *d) {
    lock_Mutex(d->mtx);
-    if (d->recentPos < size_Array(&d->recent) - 1) {
+    if (!isEmpty_Array(&d->recent) && d->recentPos < size_Array(&d->recent) - 1) {
        d->recentPos++;
        postCommandf_Root(get_Root(),
                          "open history:1 scroll:%f url:%s",
@@ -322,7 +322,8 @@ iBool atLatest_History(const iHistory *d) {
 iBool atOldest_History(const iHistory *d) {
    iBool isOldest;
-    iGuardMutex(d->mtx, isOldest = (d->recentPos == size_Array(&d->recent) - 1));
+    iGuardMutex(d->mtx, isOldest = (isEmpty_Array(&d->recent) ||
+                                    d->recentPos == size_Array(&d->recent) - 1));
    return isOldest;
 }
diff --git a/src/ipc.c b/src/ipc.c
index b0e996fb..ce98b6cf 100644
--- a/src/ipc.c
+++ b/src/ipc.c
@@ -176,8 +176,9 @@ iBool write_Ipc(iProcessId pid, const iString *input, enum iIpcWrite type) {
    iFile *f = newCStr_File(inputFilePath_(&ipc_, pid));
    if (open_File(f, text_FileMode | append_FileMode)) {
        write_File(f, utf8_String(input));
-        if (type == command_IpcWrite) {
+        if (type != response_IpcWrite) {
-            printf_Stream(stream_File(f), "\nipc.signal arg:%d\n", currentId_Process());
+            printf_Stream(stream_File(f), "\nipc.signal arg:%d%s\n", currentId_Process(),
+                          type == commandAndRaise_IpcWrite ? " raise:1" : "");
        }
        close_File(f);
        ok = iTrue;
@@ -186,10 +187,10 @@ iBool write_Ipc(iProcessId pid, const iString *input, enum iIpcWrite type) {
    return ok;
 }
-iString *communicate_Ipc(const iString *command) {
+iString *communicate_Ipc(const iString *command, iBool requestRaise) {
    const iProcessId dst = check_Ipc();
    if (dst) {
-        if (write_Ipc(dst, command, command_IpcWrite)) {
+        if (write_Ipc(dst, command, requestRaise ? commandAndRaise_IpcWrite : command_IpcWrite)) {
            response_ = new_IpcResponse();
            signal(SIGUSR1, handleSignal_IpcResponse_);
            lock_Mutex(&response_->mtx);
@@ -300,7 +301,7 @@ iBool write_Ipc(iProcessId pid, const iString *input, enum iIpcWrite type) {
    return ok;
 }
-iString *communicate_Ipc(const iString *command) {
+iString *communicate_Ipc(const iString *command, iBool requestRaise) {
    iProcessId pid = check_Ipc();
    if (!pid) {
        return NULL;
@@ -308,7 +309,7 @@ iString *communicate_Ipc(const iString *command) {
    /* Open a mailslot for the response. */
    HANDLE responseSlot = CreateMailslotA(slotName_(currentId_Process()), 0, 1000, NULL);
    /* Write the commands. */
-    if (!write_Ipc(pid, command, command_IpcWrite)) {
+    if (!write_Ipc(pid, command, requestRaise ? commandAndRaise_IpcWrite : command_IpcWrite)) {
        CloseHandle(responseSlot);
        return NULL;
    }
diff --git a/src/ipc.h b/src/ipc.h
index 69852876..5fd6167d 100644
--- a/src/ipc.h
+++ b/src/ipc.h
@@ -31,11 +31,12 @@ void        deinit_Ipc  (void);
 iProcessId  check_Ipc           (void);
 void        listen_Ipc          (void);
-iString *   communicate_Ipc     (const iString *command);
+iString *   communicate_Ipc     (const iString *command, iBool requestRaise);
 void        signal_Ipc          (iProcessId pid);
 enum iIpcWrite {
    command_IpcWrite,
+    commandAndRaise_IpcWrite,
    response_IpcWrite,
 };
diff --git a/src/macos.m b/src/macos.m
index 709a97f7..6bacfdd1 100644
--- a/src/macos.m
+++ b/src/macos.m
@@ -60,8 +60,9 @@ static NSString *currentSystemAppearance_(void) {
 }
 iBool shouldDefaultToMetalRenderer_MacOS(void) {
+    return iFalse; /*
    const iInt2 ver = macVer_();
-    return ver.x > 10 || ver.y > 13;
+    return ver.x > 10 || ver.y > 13;*/
 }
 /*----------------------------------------------------------------------------------------------*/
diff --git a/src/periodic.c b/src/periodic.c
index 068f2a1e..ef3d8033 100644
--- a/src/periodic.c
+++ b/src/periodic.c
@@ -91,9 +91,11 @@ iBool dispatchCommands_Periodic(iPeriodic *d) {
            .data1 = (void *) cstr_String(&pc->command),
            .data2 = findRoot_Window(get_Window(), pc->context)
        };
-        setCurrent_Root(ev.data2);
+        if (ev.data2) {
-        dispatchEvent_Widget(pc->context, (const SDL_Event *) &ev);
+            setCurrent_Root(ev.data2);
-        wasPosted = iTrue;
+            dispatchEvent_Widget(pc->context, (const SDL_Event *) &ev);
+            wasPosted = iTrue;
+        }
    }
    removePending_Periodic_(d);
    setCurrent_Root(NULL);
diff --git a/src/prefs.c b/src/prefs.c
index e6eba2a6..385dee78 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -33,6 +33,7 @@ void init_Prefs(iPrefs *d) {
    d->accent            = cyan_ColorAccent;
    d->customFrame       = iFalse; /* needs some more work to be default */
    d->retainWindowSize  = iTrue;
+    d->uiAnimations      = iTrue;
    d->uiScale           = 1.0f; /* default set elsewhere */
    d->zoomPercent       = 100;
    d->sideIcon          = iTrue;
@@ -67,6 +68,7 @@ void init_Prefs(iPrefs *d) {
    init_String(&d->httpProxy);
    init_String(&d->downloadDir);
    init_String(&d->searchUrl);
+    init_String(&d->symbolFontPath);
    /* TODO: Add some platform-specific common locations? */
    if (fileExistsCStr_FileInfo("/etc/ssl/cert.pem")) { /* macOS */
        setCStr_String(&d->caFile, "/etc/ssl/cert.pem");
@@ -74,9 +76,15 @@ void init_Prefs(iPrefs *d) {
    if (fileExistsCStr_FileInfo("/etc/ssl/certs")) {
        setCStr_String(&d->caPath, "/etc/ssl/certs");
    }
+    /*
+#if defined (iPlatformAppleDesktop)
+    setCStr_String(&d->symbolFontPath, "/System/Library/Fonts/Apple Symbols.ttf");
+#endif
+     */
 }
 void deinit_Prefs(iPrefs *d) {
+    deinit_String(&d->symbolFontPath);
    deinit_String(&d->searchUrl);
    deinit_String(&d->geminiProxy);
    deinit_String(&d->gopherProxy);
diff --git a/src/prefs.h b/src/prefs.h
index 0f604ee2..7185c8f9 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -47,6 +47,7 @@ struct Impl_Prefs {
    enum iColorAccent accent;
    iBool            customFrame; /* when LAGRANGE_ENABLE_CUSTOM_FRAME is defined */
    iBool            retainWindowSize;
+    iBool            uiAnimations;
    float            uiScale;
    int              zoomPercent;
    iBool            sideIcon;
@@ -69,6 +70,7 @@ struct Impl_Prefs {
    iString          gopherProxy;
    iString          httpProxy;
    /* Style */
+    iString          symbolFontPath;
    enum iTextFont   font;
    enum iTextFont   headingFont;
    iBool            monospaceGemini;
diff --git a/src/ui/certimportwidget.c b/src/ui/certimportwidget.c
index fdc189db..6e818137 100644
--- a/src/ui/certimportwidget.c
+++ b/src/ui/certimportwidget.c
@@ -114,6 +114,7 @@ void init_CertImportWidget(iCertImportWidget *d) {
        setFlags_Widget(w,
                        mouseModal_WidgetFlag | keepOnTop_WidgetFlag | arrangeVertical_WidgetFlag |
                            arrangeSize_WidgetFlag | centerHorizontal_WidgetFlag |
+                            parentCannotResize_WidgetFlag |
                            overflowScrollable_WidgetFlag,
                        iTrue);
    }
@@ -214,11 +215,20 @@ static iBool processEvent_CertImportWidget_(iCertImportWidget *d, const SDL_Even
            return iTrue;
        }
    }
+    if (isCommand_UserEvent(ev, "input.paste")) {
+        if (!tryImportFromClipboard_CertImportWidget_(d)) {
+            makeSimpleMessage_Widget(uiTextCaution_ColorEscape "${heading.certimport.pasted}",
+                                     "${dlg.certimport.notfound}");
+        }
+        postRefresh_App();        
+        return iTrue;
+    }
    if (isCommand_UserEvent(ev, "certimport.paste")) {
        tryImportFromClipboard_CertImportWidget_(d);
        return iTrue;
    }
    if (isCommand_Widget(w, ev, "cancel")) {
+        setupSheetTransition_Mobile(w, iFalse);
        destroy_Widget(w);
        return iTrue;
    }
@@ -226,6 +236,7 @@ static iBool processEvent_CertImportWidget_(iCertImportWidget *d, const SDL_Even
        if (d->cert && !isEmpty_TlsCertificate(d->cert) && hasPrivateKey_TlsCertificate(d->cert)) {
            importIdentity_GmCerts(certs_App(), d->cert, text_InputWidget(d->notes));
            d->cert = NULL; /* taken */
+            setupSheetTransition_Mobile(w, iFalse);
            destroy_Widget(w);
            postCommand_App("idents.changed");
        }
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 94337f8d..29e264e8 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -222,6 +222,7 @@ enum iDocumentWidgetFlag {
    movingSelectMarkStart_DocumentWidgetFlag = iBit(10),
    movingSelectMarkEnd_DocumentWidgetFlag   = iBit(11),
    otherRootByDefault_DocumentWidgetFlag    = iBit(12), /* links open to other root by default */
+    urlChanged_DocumentWidgetFlag            = iBit(13),
 };
 enum iDocumentLinkOrdinalMode {
@@ -231,15 +232,41 @@ enum iDocumentLinkOrdinalMode {
 struct Impl_DocumentWidget {
    iWidget        widget;
-    enum iRequestState state;
-    iPersistentDocumentState mod;
    int            flags;
+    
+    /* User interface: */
    enum iDocumentLinkOrdinalMode ordinalMode;
    size_t         ordinalBase;
-    iString *      titleUser;
+    iRangecc       selectMark;
+    iRangecc       initialSelectMark; /* for word/line selection */
+    iRangecc       foundMark;
+    const iGmRun * grabbedPlayer; /* currently adjusting volume in a player */
+    float          grabbedStartVolume;
+    int            mediaTimer;
+    const iGmRun * hoverPre;    /* for clicking */
+    const iGmRun * hoverAltPre; /* for drawing alt text */
+    const iGmRun * hoverLink;
+    const iGmRun * contextLink;
+    iClick         click;
+    iInt2          contextPos; /* coordinates of latest right click */
+    int            pinchZoomInitial;
+    int            pinchZoomPosted;
+    iString        pendingGotoHeading;
+    
+    /* Network request: */
+    enum iRequestState state;
    iGmRequest *   request;
    iAtomicInt     isRequestUpdated; /* request has new content, need to parse it */
-    iObjectList *  media;
+    int            certFlags;
+    iBlock *       certFingerprint;
+    iDate          certExpiry;
+    iString *      certSubject;
+    int            redirectCount;
+    iObjectList *  media; /* inline media requests */
+    
+    /* Document: */
+    iPersistentDocumentState mod;
+    iString *      titleUser;
    enum iGmStatusCode sourceStatus;
    iString        sourceHeader;
    iString        sourceMime;
@@ -247,53 +274,36 @@ struct Impl_DocumentWidget {
    iTime          sourceTime;
    iGempub *      sourceGempub; /* NULL unless the page is Gempub content */
    iGmDocument *  doc;
-    int            certFlags;
+    
-    iBlock *       certFingerprint;
+    /* Rendering: */
-    iDate          certExpiry;
-    iString *      certSubject;
-    int            redirectCount;
-    iRangecc       selectMark;
-    iRangecc       initialSelectMark; /* for word/line selection */
-    iRangecc       foundMark;
    int            pageMargin;
+    float          initNormScrollY;
+    iSmoothScroll  scrollY;
+    iAnim          sideOpacity;
+    iAnim          altTextOpacity;
+    iGmRunRange    visibleRuns;
    iPtrArray      visibleLinks;
    iPtrArray      visiblePre;
+    iPtrArray      visibleMedia; /* currently playing audio / ongoing downloads */   
    iPtrArray      visibleWideRuns; /* scrollable blocks; TODO: merge into `visiblePre` */
    iArray         wideRunOffsets;
    iAnim          animWideRunOffset;
    uint16_t       animWideRunId;
    iGmRunRange    animWideRunRange;
-    iPtrArray      visibleMedia; /* currently playing audio / ongoing downloads */
+    iDrawBufs *    drawBufs; /* dynamic state for drawing */
-    const iGmRun * grabbedPlayer; /* currently adjusting volume in a player */
+    iVisBuf *      visBuf;    
-    float          grabbedStartVolume;
+    iVisBufMeta *  visBufMeta;
-    int            mediaTimer;
-    const iGmRun * hoverPre;    /* for clicking */
-    const iGmRun * hoverAltPre; /* for drawing alt text */
-    const iGmRun * hoverLink;
-    const iGmRun * contextLink;
-    iGmRunRange    visibleRuns;
    iGmRunRange    renderRuns;
-    iClick         click;
+    iPtrSet *      invalidRuns;
-    iInt2          contextPos; /* coordinates of latest right click */
+    
-    iString        pendingGotoHeading;
+    /* Widget structure: */    
-    float          initNormScrollY;
-//    iAnim          scrollY;
-//    int            overscroll;
-    iSmoothScroll  scrollY;
-    iAnim          sideOpacity;
-    iAnim          altTextOpacity;
    iScrollWidget *scroll;
+    iWidget *      footerButtons;
    iWidget *      menu;
    iWidget *      playerMenu;
    iWidget *      copyMenu;
-    iVisBuf *      visBuf;
-    iVisBufMeta *  visBufMeta;
-    iPtrSet *      invalidRuns;
-    iDrawBufs *    drawBufs; /* dynamic state for drawing */
    iTranslation * translation;
    iWidget *      phoneToolbar;
-    int            pinchZoomInitial;
-    int            pinchZoomPosted;
 };
 iDefineObjectConstruction(DocumentWidget)
@@ -308,6 +318,7 @@ void init_DocumentWidget(iDocumentWidget *d) {
    init_PersistentDocumentState(&d->mod);
    d->flags           = 0;
    d->phoneToolbar    = NULL;
+    d->footerButtons   = NULL;
    iZap(d->certExpiry);
    d->certFingerprint  = new_Block(0);
    d->certFlags        = 0;
@@ -321,7 +332,6 @@ void init_DocumentWidget(iDocumentWidget *d) {
    d->redirectCount    = 0;
    d->ordinalBase      = 0;
    d->initNormScrollY  = 0;
-    //init_Anim(&d->scrollY, 0);
    init_SmoothScroll(&d->scrollY, w, scrollBegan_DocumentWidget_);
    d->animWideRunId = 0;
    init_Anim(&d->animWideRunOffset, 0);
@@ -573,7 +583,8 @@ static float normScrollPos_DocumentWidget_(const iDocumentWidget *d) {
 static int scrollMax_DocumentWidget_(const iDocumentWidget *d) {
    const iWidget *w = constAs_Widget(d);
    int sm = size_GmDocument(d->doc).y - height_Rect(bounds_Widget(w)) +
-             (hasSiteBanner_GmDocument(d->doc) ? 1 : 2) * d->pageMargin * gap_UI;
+             (hasSiteBanner_GmDocument(d->doc) ? 1 : 2) * d->pageMargin * gap_UI +
+             height_Widget(d->footerButtons);
    if (d->phoneToolbar) {
        sm += size_Root(w->root).y -
              top_Rect(boundsWithoutVisualOffset_Widget(d->phoneToolbar));
@@ -809,6 +820,13 @@ static iRangecc currentHeading_DocumentWidget_(const iDocumentWidget *d) {
    return heading;
 }
+static int updateScrollMax_DocumentWidget_(iDocumentWidget *d) {
+    arrange_Widget(d->footerButtons); /* scrollMax depends on footer height */
+    const int scrollMax = scrollMax_DocumentWidget_(d);
+    setMax_SmoothScroll(&d->scrollY, scrollMax);
+    return scrollMax;
+}
 static void updateVisible_DocumentWidget_(iDocumentWidget *d) {
    iChangeFlags(d->flags,
                 centerVertically_DocumentWidgetFlag,
@@ -816,8 +834,26 @@ static void updateVisible_DocumentWidget_(iDocumentWidget *d) {
                     !isSuccess_GmStatusCode(d->sourceStatus));
    const iRangei visRange  = visibleRange_DocumentWidget_(d);
    const iRect   bounds    = bounds_Widget(as_Widget(d));
-    const int     scrollMax = scrollMax_DocumentWidget_(d);
+    const int     scrollMax = updateScrollMax_DocumentWidget_(d);
-    setMax_SmoothScroll(&d->scrollY, scrollMax);
+    /* Reposition the footer buttons as appropriate. */
+    /* TODO: You can just position `footerButtons` here completely without having to get
+       `Widget` involved with the offset in any way. */
+    if (d->footerButtons) {
+        const iRect bounds    = bounds_Widget(as_Widget(d));
+        const iRect docBounds = documentBounds_DocumentWidget_(d);
+        const int   hPad      = (width_Rect(bounds) - iMin(120 * gap_UI, width_Rect(docBounds))) / 2;
+        const int   vPad      = 3 * gap_UI;
+        setPadding_Widget(d->footerButtons, hPad, vPad, hPad, vPad);
+        d->footerButtons->animOffsetRef = (scrollMax > 0 ? &d->scrollY.pos : NULL);
+        if (scrollMax <= 0) {
+            d->footerButtons->animOffsetRef = NULL;
+            d->footerButtons->rect.pos.y = height_Rect(bounds) - height_Widget(d->footerButtons);
+        }
+        else {
+            d->footerButtons->animOffsetRef = &d->scrollY.pos;
+            d->footerButtons->rect.pos.y = size_GmDocument(d->doc).y + 2 * gap_UI * d->pageMargin;
+        }
+    }
    setRange_ScrollWidget(d->scroll, (iRangei){ 0, scrollMax });
    const int docSize = size_GmDocument(d->doc).y;
    setThumb_ScrollWidget(d->scroll,
@@ -1036,6 +1072,35 @@ static enum iGmDocumentBanner bannerType_DocumentWidget_(const iDocumentWidget *
    return siteDomain_GmDocumentBanner;
 }
+static void makeFooterButtons_DocumentWidget_(iDocumentWidget *d, const iMenuItem *items, size_t count) {
+    iWidget *w = as_Widget(d);
+    destroy_Widget(d->footerButtons);
+    d->footerButtons = NULL;
+    if (count == 0) {
+        return;
+    }
+    d->footerButtons = new_Widget();
+    setFlags_Widget(d->footerButtons,
+                    unhittable_WidgetFlag | arrangeVertical_WidgetFlag |
+                        resizeWidthOfChildren_WidgetFlag | arrangeHeight_WidgetFlag |
+                        fixedPosition_WidgetFlag | resizeToParentWidth_WidgetFlag,
+                    iTrue);
+    //setBackgroundColor_Widget(d->footerButtons, tmBackground_ColorId);
+    for (size_t i = 0; i < count; ++i) {
+        iLabelWidget *button = addChildFlags_Widget(
+            d->footerButtons,
+            iClob(newKeyMods_LabelWidget(
+                items[i].label, items[i].key, items[i].kmods, items[i].command)),
+            alignLeft_WidgetFlag | drawKey_WidgetFlag);
+        checkIcon_LabelWidget(button);
+        setFont_LabelWidget(button, uiContent_FontId);
+    }
+    addChild_Widget(as_Widget(d), iClob(d->footerButtons));
+    arrange_Widget(d->footerButtons);
+    arrange_Widget(w);
+    updateVisible_DocumentWidget_(d); /* final placement for the buttons */
+}
 static void showErrorPage_DocumentWidget_(iDocumentWidget *d, enum iGmStatusCode code,
                                          const iString *meta) {
    iString *src = collectNewCStr_String("# ");
@@ -1061,10 +1126,17 @@ static void showErrorPage_DocumentWidget_(iDocumentWidget *d, enum iGmStatusCode
                iString *key = collectNew_String();
                toString_Sym(SDLK_s, KMOD_PRIMARY, key);
                appendFormat_String(src, "\n```\n%s\n```\n", cstr_String(meta));
-                appendFormat_String(src,
+//                appendFormat_String(src,
-                                    cstr_Lang("error.unsupported.suggestsave"),
+//                                    cstr_Lang("error.unsupported.suggestsave"),
-                                    cstr_String(key),
+//                                    cstr_String(key),
-                                    saveToDownloads_Label);
+//                                    saveToDownloads_Label);
+                makeFooterButtons_DocumentWidget_(
+                    d,
+                    (iMenuItem[]){ { translateCStr_Lang(download_Icon " " saveToDownloads_Label),
+                                     0,
+                                     0,
+                                     "document.save" } },
+                    1);
                break;
            }
            case slowDown_GmStatusCode:
@@ -1072,9 +1144,19 @@ static void showErrorPage_DocumentWidget_(iDocumentWidget *d, enum iGmStatusCode
                                    cstr_String(meta));
                break;
            default:
+                if (!isEmpty_String(meta)) {
+                    appendFormat_String(src, "\n\n${error.server.msg}\n> %s", cstr_String(meta));
+                }
                break;
        }
    }
+    if (category_GmStatusCode(code) == categoryClientCertificate_GmStatus) {
+        makeFooterButtons_DocumentWidget_(
+            d,
+            (iMenuItem[]){ { leftHalf_Icon " ${menu.show.identities}", '4', KMOD_PRIMARY, "sidebar.mode arg:3 show:1" },
+                           { person_Icon " ${menu.identity.new}", newIdentity_KeyShortcut, "ident.new" } },
+            2);
+    }
    setBanner_GmDocument(d->doc, useBanner ? bannerType_DocumentWidget_(d) : none_GmDocumentBanner);
    setFormat_GmDocument(d->doc, gemini_SourceFormat);
    translate_Lang(src);
@@ -1159,11 +1241,102 @@ static void postProcessRequestContent_DocumentWidget_(iDocumentWidget *d, iBool
        }
    }
    if (d->sourceGempub) {
-        if (equal_String(d->mod.url, coverPageUrl_Gempub(d->sourceGempub)) &&
+        if (equal_String(d->mod.url, coverPageUrl_Gempub(d->sourceGempub))) {
-            preloadCoverImage_Gempub(d->sourceGempub, d->doc)) {
+            if (!isRemote_Gempub(d->sourceGempub)) {
+                iArray *items = collectNew_Array(sizeof(iMenuItem));
+                pushBack_Array(
+                    items,
+                    &(iMenuItem){ book_Icon " ${gempub.cover.view}",
+                                  0,
+                                  0,
+                                  format_CStr("!open url:%s",
+                                              cstr_String(indexPageUrl_Gempub(d->sourceGempub))) });
+                if (navSize_Gempub(d->sourceGempub) > 0) {
+                    pushBack_Array(
+                        items,
+                        &(iMenuItem){
+                            format_CStr(forwardArrow_Icon " %s",
+                                        cstr_String(navLinkLabel_Gempub(d->sourceGempub, 0))),
+                            SDLK_RIGHT,
+                            0,
+                            format_CStr("!open url:%s",
+                                        cstr_String(navLinkUrl_Gempub(d->sourceGempub, 0))) });
+                }
+                makeFooterButtons_DocumentWidget_(d, constData_Array(items), size_Array(items));
+            }
+            else {
+                makeFooterButtons_DocumentWidget_(
+                    d,
+                    (iMenuItem[]){ { book_Icon " ${menu.save.downloads.open}",
+                                     SDLK_s,
+                                     KMOD_PRIMARY | KMOD_SHIFT,
+                                     "document.save open:1" },
+                                   { download_Icon " " saveToDownloads_Label,
+                                     SDLK_s,
+                                     KMOD_PRIMARY,
+                                     "document.save" } },
+                    2);
+            }
+            if (preloadCoverImage_Gempub(d->sourceGempub, d->doc)) {
            redoLayout_GmDocument(d->doc);
            updateVisible_DocumentWidget_(d);
            invalidate_DocumentWidget_(d);
+            }
+        }
+        else if (equal_String(d->mod.url, indexPageUrl_Gempub(d->sourceGempub))) {
+            makeFooterButtons_DocumentWidget_(
+                d,
+                (iMenuItem[]){ { format_CStr(book_Icon " %s",
+                                             cstr_String(property_Gempub(d->sourceGempub,
+                                                                         title_GempubProperty))),
+                                 SDLK_LEFT,
+                                 0,
+                                 format_CStr("!open url:%s",
+                                             cstr_String(coverPageUrl_Gempub(d->sourceGempub))) } },
+                1);
+        }
+        else {
+            /* Navigation buttons. */
+            iArray *items = collectNew_Array(sizeof(iMenuItem));
+            const size_t navIndex = navIndex_Gempub(d->sourceGempub, d->mod.url);
+            if (navIndex != iInvalidPos) {
+                if (navIndex < navSize_Gempub(d->sourceGempub) - 1) {
+                    pushBack_Array(
+                        items,
+                        &(iMenuItem){
+                            format_CStr(forwardArrow_Icon " %s",
+                                        cstr_String(navLinkLabel_Gempub(d->sourceGempub, navIndex + 1))),
+                            SDLK_RIGHT,
+                            0,
+                            format_CStr("!open url:%s",
+                                        cstr_String(navLinkUrl_Gempub(d->sourceGempub, navIndex + 1))) });
+                }
+                if (navIndex > 0) {
+                    pushBack_Array(
+                        items,
+                        &(iMenuItem){
+                            format_CStr(backArrow_Icon " %s",
+                                        cstr_String(navLinkLabel_Gempub(d->sourceGempub, navIndex - 1))),
+                            SDLK_LEFT,
+                            0,
+                            format_CStr("!open url:%s",
+                                        cstr_String(navLinkUrl_Gempub(d->sourceGempub, navIndex - 1))) });
+                }
+                else if (!equalCase_String(d->mod.url, indexPageUrl_Gempub(d->sourceGempub))) {
+                    pushBack_Array(
+                        items,
+                        &(iMenuItem){
+                            format_CStr(book_Icon " %s",
+                                        cstr_String(property_Gempub(d->sourceGempub, title_GempubProperty))),
+                            SDLK_LEFT,
+                            0,
+                            format_CStr("!open url:%s",
+                                        cstr_String(coverPageUrl_Gempub(d->sourceGempub))) });
+                }
+            }
+            if (!isEmpty_Array(items)) {
+                makeFooterButtons_DocumentWidget_(d, constData_Array(items), size_Array(items));                
+            }
        }
        if (!isCached && prefs_App()->pinSplit &&
            equal_String(d->mod.url, indexPageUrl_Gempub(d->sourceGempub))) {
@@ -1227,7 +1400,9 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d,
                    setRange_String(&d->sourceMime, param);
                }
                else if (startsWith_Rangecc(param, "text/") ||
-                         equal_Rangecc(param, "application/json")) {
+                         equal_Rangecc(param, "application/json") ||
+                         equal_Rangecc(param, "application/x-pem-file") ||
+                         equal_Rangecc(param, "application/pem-certificate-chain")) {
                    docFormat = plainText_SourceFormat;
                    setRange_String(&d->sourceMime, param);
                }
@@ -1400,44 +1575,58 @@ static void cacheDocumentGlyphs_DocumentWidget_(const iDocumentWidget *d) {
    }
 }
+static void updateFromCachedResponse_DocumentWidget_(iDocumentWidget *d, float normScrollY,
+                                                     const iGmResponse *resp, iGmDocument *cachedDoc) {
+    setLinkNumberMode_DocumentWidget_(d, iFalse);
+    clear_ObjectList(d->media);
+    delete_Gempub(d->sourceGempub);
+    d->sourceGempub = NULL;
+    iRelease(d->doc);
+    destroy_Widget(d->footerButtons);
+    d->footerButtons = NULL;
+    d->doc = new_GmDocument();
+    resetWideRuns_DocumentWidget_(d);
+    d->state = fetching_RequestState;
+    /* Do the fetch. */ {
+        d->initNormScrollY = normScrollY;
+        /* Use the cached response data. */
+        updateTrust_DocumentWidget_(d, resp);
+        d->sourceTime   = resp->when;
+        d->sourceStatus = success_GmStatusCode;
+        format_String(&d->sourceHeader, cstr_Lang("pageinfo.header.cached"));
+        set_Block(&d->sourceContent, &resp->body);
+        updateDocument_DocumentWidget_(d, resp, cachedDoc, iTrue);
+        setCachedDocument_History(d->mod.history, d->doc);
+    }
+    d->state = ready_RequestState;
+    postProcessRequestContent_DocumentWidget_(d, iTrue);
+    init_Anim(&d->altTextOpacity, 0);
+    reset_SmoothScroll(&d->scrollY);
+    init_Anim(&d->scrollY.pos, d->initNormScrollY * size_GmDocument(d->doc).y);
+    updateSideOpacity_DocumentWidget_(d, iFalse);
+    updateVisible_DocumentWidget_(d);
+    moveSpan_SmoothScroll(&d->scrollY, 0, 0); /* clamp position to new max */
+    cacheDocumentGlyphs_DocumentWidget_(d);
+    d->drawBufs->flags |= updateTimestampBuf_DrawBufsFlag | updateSideBuf_DrawBufsFlag;
+    d->flags &= ~urlChanged_DocumentWidgetFlag;
+    postCommandf_Root(
+        as_Widget(d)->root, "document.changed doc:%p url:%s", d, cstr_String(d->mod.url));
+}
 static iBool updateFromHistory_DocumentWidget_(iDocumentWidget *d) {
-    const iRecentUrl *recent = findUrl_History(d->mod.history, d->mod.url);
+    const iRecentUrl *recent = findUrl_History(d->mod.history, withSpacesEncoded_String(d->mod.url));
    if (recent && recent->cachedResponse) {
-        const iGmResponse *resp = recent->cachedResponse;
+        updateFromCachedResponse_DocumentWidget_(
-        clear_ObjectList(d->media);
+            d, recent->normScrollY, recent->cachedResponse, recent->cachedDoc);
-        delete_Gempub(d->sourceGempub);
-        d->sourceGempub = NULL;
-        iRelease(d->doc);
-        d->doc = new_GmDocument();
-        resetWideRuns_DocumentWidget_(d);
-        d->state = fetching_RequestState;
-        /* Do the fetch. */ {
-            d->initNormScrollY = recent->normScrollY;
-            /* Use the cached response data. */
-            updateTrust_DocumentWidget_(d, resp);
-            d->sourceTime   = resp->when;
-            d->sourceStatus = success_GmStatusCode;
-            format_String(&d->sourceHeader, cstr_Lang("pageinfo.header.cached"));
-            set_Block(&d->sourceContent, &resp->body);
-            updateDocument_DocumentWidget_(d, resp, recent->cachedDoc, iTrue);
-            setCachedDocument_History(d->mod.history, d->doc);
-        }
-        d->state = ready_RequestState;
-        postProcessRequestContent_DocumentWidget_(d, iTrue);
-        init_Anim(&d->altTextOpacity, 0);
-        reset_SmoothScroll(&d->scrollY);
-        init_Anim(&d->scrollY.pos, d->initNormScrollY * size_GmDocument(d->doc).y);
-        updateSideOpacity_DocumentWidget_(d, iFalse);
-        updateVisible_DocumentWidget_(d);
-        moveSpan_SmoothScroll(&d->scrollY, 0, 0); /* clamp position to new max */
-        cacheDocumentGlyphs_DocumentWidget_(d);
-        d->drawBufs->flags |= updateTimestampBuf_DrawBufsFlag | updateSideBuf_DrawBufsFlag;
-        postCommandf_Root(as_Widget(d)->root, "document.changed doc:%p url:%s", d, cstr_String(d->mod.url));
        return iTrue;
    }
    else if (!isEmpty_String(d->mod.url)) {
        fetch_DocumentWidget_(d);
    }
+    if (recent) {
+        /* Retain scroll position in refetched content as well. */
+        d->initNormScrollY = recent->normScrollY;
+    }
    return iFalse;
 }
@@ -1674,11 +1863,16 @@ static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
                break;
            }
            case categorySuccess_GmStatusCode:
-                //reset_SmoothScroll(&d->scrollY);
+                if (d->flags & urlChanged_DocumentWidgetFlag) {
+                    /* Keep scroll position when reloading the same page. */
+                    reset_SmoothScroll(&d->scrollY);
+                }
                iRelease(d->doc); /* new content incoming */
                d->doc = new_GmDocument();
                delete_Gempub(d->sourceGempub);
                d->sourceGempub = NULL;
+                destroy_Widget(d->footerButtons);
+                d->footerButtons = NULL;
                resetWideRuns_DocumentWidget_(d);
                updateDocument_DocumentWidget_(d, resp, NULL, iTrue);
                break;
@@ -1902,7 +2096,8 @@ static iBool fetchNextUnfetchedImage_DocumentWidget_(iDocumentWidget *d) {
    return iFalse;
 }
-static void saveToDownloads_(const iString *url, const iString *mime, const iBlock *content) {
+static const iString *saveToDownloads_(const iString *url, const iString *mime, const iBlock *content,
+                                       iBool showDialog) {
    const iString *savePath = downloadPathForUrl_App(url, mime);
    /* Write the file. */ {
        iFile *f = new_File(savePath);
@@ -1914,17 +2109,22 @@ static void saveToDownloads_(const iString *url, const iString *mime, const iBlo
 #if defined (iPlatformAppleMobile)
            exportDownloadedFile_iOS(savePath);
 #else
+            if (showDialog) {
            const iMenuItem items[2] = {
                { "${dlg.save.opendownload}", 0, 0,
                    format_CStr("!open url:%s", cstrCollect_String(makeFileUrl_String(savePath))) },
                { "${dlg.message.ok}", 0, 0, "message.ok" },
            };
            makeMessage_Widget(uiHeading_ColorEscape "${heading.save}",
-                               format_CStr("%s\n${dlg.save.size} %.3f %s", cstr_String(path_File(f)),
+                                   format_CStr("%s\n${dlg.save.size} %.3f %s",
+                                               cstr_String(path_File(f)),
                                           isMega ? size / 1.0e6f : (size / 1.0e3f),
                                           isMega ? "${mb}" : "${kb}"),
-                               items, iElemCount(items));
+                                   items,
+                                   iElemCount(items));
+            }
 #endif
+            return savePath;
        }
        else {
            makeSimpleMessage_Widget(uiTextCaution_ColorEscape "${heading.save.error}",
@@ -1932,6 +2132,7 @@ static void saveToDownloads_(const iString *url, const iString *mime, const iBlo
        }
        iRelease(f);
    }
+    return collectNew_String();
 }
 static void addAllLinks_(void *context, const iGmRun *run) {
@@ -2061,6 +2262,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
        const iBool keepCenter = equal_Command(cmd, "font.changed");
        updateDocumentWidthRetainingScrollPosition_DocumentWidget_(d, keepCenter);
        d->drawBufs->flags |= updateSideBuf_DrawBufsFlag;
+        updateVisible_DocumentWidget_(d);
        invalidate_DocumentWidget_(d);
        dealloc_VisBuf(d->visBuf);
        updateWindowTitle_DocumentWidget_(d);
@@ -2214,7 +2416,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
        if (!isEmpty_Array(items)) {
            pushBack_Array(items, &(iMenuItem){ "---", 0, 0, 0 });
        }
-        pushBack_Array(items, &(iMenuItem){ "${dismiss}", 0, 0, "message.ok" });
+        pushBack_Array(items, &(iMenuItem){ "${close}", 0, 0, "message.ok" });
        iWidget *dlg = makeQuestion_Widget(uiHeading_ColorEscape "${heading.pageinfo}",
                                           cstr_String(msg),
                                           data_Array(items),
@@ -2334,6 +2536,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
        if (category_GmStatusCode(status_GmRequest(d->request)) == categorySuccess_GmStatusCode) {
            init_Anim(&d->scrollY.pos, d->initNormScrollY * size_GmDocument(d->doc).y); /* TODO: unless user already scrolled! */
        }
+        d->flags &= ~urlChanged_DocumentWidgetFlag;
        d->state = ready_RequestState;
        postProcessRequestContent_DocumentWidget_(d, iFalse);
        /* The response may be cached. */
@@ -2409,7 +2612,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
        const iMediaRequest *media  = findMediaRequest_DocumentWidget_(d, linkId);
        if (media) {
            saveToDownloads_(url_GmRequest(media->req), meta_GmRequest(media->req),
-                             body_GmRequest(media->req));
+                             body_GmRequest(media->req), iTrue);
        }
    }
    else if (equal_Command(cmd, "document.save") && document_App() == d) {
@@ -2418,7 +2621,13 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
                                     "${dlg.save.incomplete}");
        }
        else if (!isEmpty_Block(&d->sourceContent)) {
-            saveToDownloads_(d->mod.url, &d->sourceMime, &d->sourceContent);
+            const iBool    doOpen   = argLabel_Command(cmd, "open");
+            const iString *savePath = saveToDownloads_(d->mod.url, &d->sourceMime,
+                                                       &d->sourceContent, !doOpen);
+            if (!isEmpty_String(savePath) && doOpen) {
+                postCommandf_Root(
+                    w->root, "!open url:%s", cstrCollect_String(makeFileUrl_String(savePath)));
+            }
        }
        return iTrue;
    }
@@ -2528,6 +2737,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
        return iTrue;
    }
    else if (equal_Command(cmd, "scroll.bottom") && document_App() == d) {
+        updateScrollMax_DocumentWidget_(d); /* scrollY.max might not be fully updated */
        init_Anim(&d->scrollY.pos, d->scrollY.max);
        invalidate_VisBuf(d->visBuf);
        clampScroll_DocumentWidget_(d);
@@ -2835,7 +3045,7 @@ static size_t linkOrdinalFromKey_DocumentWidget_(const iDocumentWidget *d, int k
 static iChar linkOrdinalChar_DocumentWidget_(const iDocumentWidget *d, size_t ord) {
    if (d->ordinalMode == numbersAndAlphabet_DocumentLinkOrdinalMode) {
        if (ord < 9) {
-            return 0x278a + ord;
+            return '1' + ord;
        }
 #if defined (iPlatformApple)
        if (ord < 9 + 22) {
@@ -2844,17 +3054,17 @@ static iChar linkOrdinalChar_DocumentWidget_(const iDocumentWidget *d, size_t or
            if (key >= 'm') key++;
            if (key >= 'q') key++;
            if (key >= 'w') key++;
-            return 0x24b6 + key - 'a';
+            return 'A' + key - 'a';
        }
 #else
        if (ord < 9 + 26) {
-            return 0x24b6 + ord - 9;
+            return 'A' + ord - 9;
        }
 #endif
    }
    else {
        if (ord < iElemCount(homeRowKeys_)) {
-            return 0x24b6 + homeRowKeys_[ord] - 'a';
+            return 'A' + homeRowKeys_[ord] - 'a';
        }
    }
    return 0;
@@ -3041,6 +3251,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                iArray items;
                init_Array(&items, sizeof(iMenuItem));
                if (d->contextLink) {
+                    /* Context menu for a link. */
                    const iString *linkUrl  = linkUrl_GmDocument(d->doc, d->contextLink->linkId);
 //                    const int      linkFlags = linkFlags_GmDocument(d->doc, d->contextLink->linkId);
                    const iRangecc scheme   = urlScheme_String(linkUrl);
@@ -3675,6 +3886,7 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
                                 /* Preformatted runs can be scrolled. */
                                 runOffset_DocumentWidget_(d->widget, run));
    const iRect visRect = { visPos, run->visBounds.size };
+#if 0
    if (run->flags & footer_GmRunFlag) {
        iRect footerBack =
            (iRect){ visPos, init_I2(width_Rect(d->widgetBounds), run->visBounds.size.y) };
@@ -3682,6 +3894,7 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
        fillRect_Paint(&d->paint, footerBack, tmBackground_ColorId);
        return;
    }
+#endif
    /* Fill the background. */ {
        if (run->linkId && linkFlags & isOpen_GmLinkFlag) {
            /* Open links get a highlighted background. */
@@ -3743,10 +3956,19 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
                const iChar ordChar =
                    linkOrdinalChar_DocumentWidget_(d->widget, ord - d->widget->ordinalBase);
                if (ordChar) {
-                    drawString_Text(run->font,
+                    const char *circle = "\u25ef"; /* Large Circle */
-                                    init_I2(d->viewPos.x - gap_UI / 3, visPos.y),
+                    iRect nbArea = { init_I2(d->viewPos.x - gap_UI / 3, visPos.y),
+                                     init_I2(3.95f * gap_Text, 1.0f * lineHeight_Text(run->font)) };
+                    drawRange_Text(
+                        run->font, topLeft_Rect(nbArea), tmQuote_ColorId, range_CStr(circle));
+                    iRect circleArea = visualBounds_Text(run->font, range_CStr(circle));
+                    addv_I2(&circleArea.pos, topLeft_Rect(nbArea));
+                    drawCentered_Text(defaultContentSmall_FontId,
+                                      circleArea,
+                                      iTrue,
                                    tmQuote_ColorId,
-                                    collect_String(newUnicodeN_String(&ordChar, 1)));
+                                      "%lc",
+                                      (int) ordChar);
                    goto runDrawn;
                }
            }
@@ -4424,9 +4646,16 @@ void deserializeState_DocumentWidget(iDocumentWidget *d, iStream *ins) {
    updateFromHistory_DocumentWidget_(d);
 }
+static void setUrl_DocumentWidget_(iDocumentWidget *d, const iString *url) {
+    if (!equal_String(d->mod.url, url)) {
+        d->flags |= urlChanged_DocumentWidgetFlag;
+        set_String(d->mod.url, url);
+}    
+}
 void setUrlFromCache_DocumentWidget(iDocumentWidget *d, const iString *url, iBool isFromCache) {
    setLinkNumberMode_DocumentWidget_(d, iFalse);
-    set_String(d->mod.url, urlFragmentStripped_String(url));
+    setUrl_DocumentWidget_(d, urlFragmentStripped_String(url));
    /* See if there a username in the URL. */
    parseUser_DocumentWidget_(d);
    if (!isFromCache || !updateFromHistory_DocumentWidget_(d)) {
@@ -4434,6 +4663,20 @@ void setUrlFromCache_DocumentWidget(iDocumentWidget *d, const iString *url, iBoo
    }
 }
+void setUrlAndSource_DocumentWidget(iDocumentWidget *d, const iString *url, const iString *mime,
+                                    const iBlock *source) {
+    setLinkNumberMode_DocumentWidget_(d, iFalse);
+    setUrl_DocumentWidget_(d, url);
+    parseUser_DocumentWidget_(d);
+    iGmResponse *resp = new_GmResponse();
+    resp->statusCode = success_GmStatusCode;
+    initCurrent_Time(&resp->when);
+    set_String(&resp->meta, mime);
+    set_Block(&resp->body, source);
+    updateFromCachedResponse_DocumentWidget_(d, 0, resp);
+    delete_GmResponse(resp);
+}
 iDocumentWidget *duplicate_DocumentWidget(const iDocumentWidget *orig) {
    iDocumentWidget *d = new_DocumentWidget();
    delete_History(d->mod.history);
diff --git a/src/ui/documentwidget.h b/src/ui/documentwidget.h
index 12603437..c038f981 100644
--- a/src/ui/documentwidget.h
+++ b/src/ui/documentwidget.h
@@ -47,6 +47,7 @@ int                 documentWidth_DocumentWidget    (const iDocumentWidget *);
 void    setUrl_DocumentWidget           (iDocumentWidget *, const iString *url);
 void    setUrlFromCache_DocumentWidget  (iDocumentWidget *, const iString *url, iBool isFromCache);
+void    setUrlAndSource_DocumentWidget  (iDocumentWidget *, const iString *url, const iString *mime, const iBlock *source);
 void    setInitialScroll_DocumentWidget (iDocumentWidget *, float normScrollY); /* set after content received */
 void    setRedirectCount_DocumentWidget (iDocumentWidget *, int count);
 void    setSource_DocumentWidget        (iDocumentWidget *, const iString *sourceText);
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index 0257eda0..cf128017 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -547,7 +547,9 @@ void setText_InputWidget(iInputWidget *d, const iString *text) {
    }
    clearUndo_InputWidget_(d);
    clear_Array(&d->text);
-    iConstForEach(String, i, text) {
+    iString *nfcText = collect_String(copy_String(text));
+    normalize_String(nfcText);
+    iConstForEach(String, i, nfcText) {
        pushBack_Array(&d->text, &i.value);
    }
    if (isFocused_Widget(d)) {
diff --git a/src/ui/inputwidget.h b/src/ui/inputwidget.h
index 70553488..f8c5bf1e 100644
--- a/src/ui/inputwidget.h
+++ b/src/ui/inputwidget.h
@@ -65,6 +65,10 @@ void    setEatEscape_InputWidget        (iInputWidget *, iBool eatEscape);
 iInputWidgetContentPadding  contentPadding_InputWidget  (const iInputWidget *);
 const iString *             text_InputWidget            (const iInputWidget *);
+iLocalDef const char *cstrText_InputWidget(const iInputWidget *d) {
+    return cstr_String(text_InputWidget(d));
+}
 iLocalDef iInputWidget *newHint_InputWidget(size_t maxLen, const char *hint) {
    iInputWidget *d = new_InputWidget(maxLen);
    setHint_InputWidget(d, hint);
diff --git a/src/ui/keys.c b/src/ui/keys.c
index 42d0d613..9df505e0 100644
--- a/src/ui/keys.c
+++ b/src/ui/keys.c
@@ -188,6 +188,7 @@ static void clear_Keys_(iKeys *d) {
 enum iBindFlag {
    argRepeat_BindFlag  = iBit(1),
    argRelease_BindFlag = iBit(2),
+    noDirectTrigger_BindFlag = iBit(3), /* can only be triggered via LabelWidget */
 };
 /* TODO: This indirection could be used for localization, although all UI strings
@@ -227,7 +228,16 @@ static const struct { int id; iMenuItem bind; int flags; } defaultBindings_[] =
    { 81, { "${keys.tab.next}",             nextTab_KeyShortcut,            "tabs.next"                         }, 0 },
    { 90, { "${keys.split.menu}",           SDLK_j, KMOD_PRIMARY,           "splitmenu.open"                    }, 0 },
    { 91, { "${keys.split.next}",           SDLK_TAB, KMOD_CTRL,            "keyroot.next",                     }, 0 },
+    { 92, { "${keys.split.item} ${menu.split.merge}",           '1', 0,     "ui.split arg:0",                   }, noDirectTrigger_BindFlag },
+    { 93, { "${keys.split.item} ${menu.split.swap}",            SDLK_x, 0,  "ui.split swap:1",                  }, noDirectTrigger_BindFlag },
+    { 94, { "${keys.split.item} ${menu.split.horizontal}",      '3', 0,     "ui.split arg:3 axis:0",            }, noDirectTrigger_BindFlag },
+    { 95, { "${keys.split.item} ${menu.split.horizontal} 1:2",  SDLK_d, 0,  "ui.split arg:1 axis:0",            }, noDirectTrigger_BindFlag },
+    { 96, { "${keys.split.item} ${menu.split.horizontal} 2:1",  SDLK_e, 0,  "ui.split arg:2 axis:0",            }, noDirectTrigger_BindFlag },
+    { 97, { "${keys.split.item} ${menu.split.vertical}",        '2', 0,     "ui.split arg:3 axis:1",            }, noDirectTrigger_BindFlag },
+    { 98, { "${keys.split.item} ${menu.split.vertical} 1:2",    SDLK_f, 0,  "ui.split arg:1 axis:1",            }, noDirectTrigger_BindFlag },
+    { 99, { "${keys.split.item} ${menu.split.vertical} 2:1",    SDLK_r, 0,  "ui.split arg:2 axis:1",            }, noDirectTrigger_BindFlag },
    { 100,{ "${keys.hoverurl}",             '/', KMOD_PRIMARY,              "prefs.hoverlink.toggle"            }, 0 },
+    { 110,{ "${menu.save.downloads}",       SDLK_s, KMOD_PRIMARY,           "document.save"                     }, 0 },
    /* The following cannot currently be changed (built-in duplicates). */
 #if defined (iPlatformApple)
    { 1002, { NULL, SDLK_LEFTBRACKET, KMOD_PRIMARY,     "navigate.back"                 }, 0 },
@@ -301,7 +311,10 @@ static iBinding *findCommand_Keys_(iKeys *d, const char *command) {
 static void updateLookup_Keys_(iKeys *d) {
    clear_PtrSet(&d->lookup);
    iConstForEach(Array, i, &d->bindings) {
-        insert_PtrSet(&d->lookup, i.value);
+        const iBinding *bind = i.value;
+        if (~bind->flags & noDirectTrigger_BindFlag) {
+            insert_PtrSet(&d->lookup, i.value);
+        }
    }
 }
diff --git a/src/ui/keys.h b/src/ui/keys.h
index 4cbca3b7..6273027a 100644
--- a/src/ui/keys.h
+++ b/src/ui/keys.h
@@ -26,6 +26,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include <the_Foundation/ptrarray.h>
 #include <SDL_events.h>
+#define newIdentity_KeyShortcut         SDLK_n,             KMOD_PRIMARY | KMOD_SHIFT
 #if defined (iPlatformApple)
 #   define reload_KeyShortcut           SDLK_r,             KMOD_PRIMARY
 #   define newTab_KeyShortcut           SDLK_t,             KMOD_PRIMARY
diff --git a/src/ui/listwidget.c b/src/ui/listwidget.c
index a3406d48..f7c43a93 100644
--- a/src/ui/listwidget.c
+++ b/src/ui/listwidget.c
@@ -148,11 +148,16 @@ void updateVisible_ListWidget(iListWidget *d) {
    const int   contentSize = size_PtrArray(&d->items) * d->itemHeight;
    const iRect bounds      = innerBounds_Widget(as_Widget(d));
    const iBool wasVisible  = isVisible_Widget(d->scroll);
-    if (area_Rect(bounds) == 0) {
+    if (width_Rect(bounds) <= 0 || height_Rect(bounds) <= 0) {
        return;
    }
+    /* The scroll widget's visibility depends on it having a valid non-zero size.
+       However, this may be called during arrangement (sizeChanged_ListWidget_),
+       which means the child hasn't been arranged yet. The child cannot update
+       its visibility unless it knows its correct size. */
+    arrange_Widget(as_Widget(d->scroll));
    setMax_SmoothScroll(&d->scrollY, scrollMax_ListWidget_(d));
-    setRange_ScrollWidget(d->scroll, (iRangei){ 0, d->scrollY.max });
+    setRange_ScrollWidget(d->scroll, (iRangei){ 0, d->scrollY.max });    
    setThumb_ScrollWidget(d->scroll,
                          pos_SmoothScroll(&d->scrollY),
                          contentSize > 0 ? height_Rect(bounds_Widget(as_Widget(d->scroll))) *
@@ -369,6 +374,13 @@ static iBool processEvent_ListWidget_(iListWidget *d, const SDL_Event *ev) {
    return processEvent_Widget(w, ev);
 }
+iRect itemRect_ListWidget(const iListWidget *d, size_t index) {
+    const iRect bounds  = innerBounds_Widget(constAs_Widget(d));
+    const int   scrollY = pos_SmoothScroll(&d->scrollY);
+    return (iRect){ addY_I2(topLeft_Rect(bounds), d->itemHeight * (int) index - scrollY),
+                    init_I2(width_Rect(bounds), d->itemHeight) };
+}
 static void draw_ListWidget_(const iListWidget *d) {
    const iWidget *w      = constAs_Widget(d);
    const iRect    bounds = innerBounds_Widget(w);
diff --git a/src/ui/listwidget.h b/src/ui/listwidget.h
index 16adf664..314c183a 100644
--- a/src/ui/listwidget.h
+++ b/src/ui/listwidget.h
@@ -73,6 +73,7 @@ iAnyObject *        hoverItem_ListWidget        (iListWidget *);
 size_t              numItems_ListWidget         (const iListWidget *);
 int                 visCount_ListWidget         (const iListWidget *);
 size_t              itemIndex_ListWidget        (const iListWidget *, iInt2 pos);
+iRect               itemRect_ListWidget         (const iListWidget *, size_t index);
 const iAnyObject *  constItem_ListWidget        (const iListWidget *, size_t index);
 const iAnyObject *  constHoverItem_ListWidget   (const iListWidget *);
 size_t              hoverItemIndex_ListWidget   (const iListWidget *);
diff --git a/src/ui/lookupwidget.c b/src/ui/lookupwidget.c
index 3eafd4bd..254aad93 100644
--- a/src/ui/lookupwidget.c
+++ b/src/ui/lookupwidget.c
@@ -127,10 +127,11 @@ static void draw_LookupItem_(iLookupItem *d, iPaint *p, iRect rect, const iListW
        pos.y = bottom_Rect(rect) - lineHeight_Text(d->font);
    }
    if (!isEmpty_String(&d->icon)) {
-        const iRect iconRect = { pos, init_I2(gap_UI * 5, height_Rect(rect)) };
+        const iRect iconRect = { init_I2(pos.x, top_Rect(rect)),
-        const iInt2 iconSize = measureRange_Text(d->font, range_String(&d->icon));
+                                 init_I2(gap_UI * 5, height_Rect(rect)) };
+        const iRect iconVis = visualBounds_Text(d->font, range_String(&d->icon));
        drawRange_Text(d->font,
-                       addX_I2(pos, width_Rect(iconRect) / 2 - iconSize.x / 2),
+                       sub_I2(mid_Rect(iconRect), mid_Rect(iconVis)),
                       fg,
                       range_String(&d->icon));
        pos.x += width_Rect(iconRect) + gap_UI * 3 / 2;
@@ -301,7 +302,7 @@ static void searchIdentities_LookupJob_(iLookupJob *d) {
        iLookupResult *res = new_LookupResult();
        res->type = identity_LookupResultType;
        res->relevance = identityRelevance_LookupJob_(d, identity);
-        res->icon = identity->icon;
+        res->icon = 0x1f464; /* identity->icon; */
        iString *cn = subject_TlsCertificate(identity->cert);
        set_String(&res->label, cn);
        delete_String(cn);
@@ -701,6 +702,12 @@ static iBool processEvent_LookupWidget_(iLookupWidget *d, const SDL_Event *ev) {
        }
        return iTrue;
    }
+    if (ev->type == SDL_MOUSEMOTION) {
+        if (contains_Widget(w, init_I2(ev->motion.x, ev->motion.y))) {
+            setCursor_Window(get_Window(), SDL_SYSTEM_CURSOR_HAND);
+        }
+        return iFalse;
+    }
    if (ev->type == SDL_KEYDOWN) {
        const int mods = keyMods_Sym(ev->key.keysym.mod);
        const int key = ev->key.keysym.sym;
diff --git a/src/ui/mediaui.c b/src/ui/mediaui.c
index 24b29cb0..bc417fc3 100644
--- a/src/ui/mediaui.c
+++ b/src/ui/mediaui.c
@@ -86,7 +86,7 @@ static int drawSevenSegmentTime_(iInt2 pos, int color, int align, int seconds) {
    const int hours = seconds / 3600;
    const int mins  = (seconds / 60) % 60;
    const int secs  = seconds % 60;
-    const int font  = uiLabel_FontId;
+    const int font  = defaultBig_FontId;
    iString   num;
    init_String(&num);
    if (hours) {
@@ -102,7 +102,7 @@ static int drawSevenSegmentTime_(iInt2 pos, int color, int align, int seconds) {
    if (align == right_Alignment) {
        pos.x -= size.x;
    }
-    drawRange_Text(font, pos, color, range_String(&num));
+    drawRange_Text(font, addY_I2(pos, -gap_UI / 8), color, range_String(&num));
    deinit_String(&num);
    return size.x;
 }
@@ -123,7 +123,7 @@ void draw_PlayerUI(iPlayerUI *d, iPaint *p) {
        drawPlayerButton_(
            p, d->volumeRect, volumeChar_(volume_Player(d->player)), uiContentSymbols_FontId);
    }
-    const int   hgt       = lineHeight_Text(uiLabel_FontId);
+    const int   hgt       = lineHeight_Text(defaultBig_FontId);
    const int   yMid      = mid_Rect(d->scrubberRect).y;
    const float playTime  = time_Player(d->player);
    const float totalTime = duration_Player(d->player);
@@ -153,7 +153,8 @@ void draw_PlayerUI(iPlayerUI *d, iPaint *p) {
    const char *dot = "\u23fa";
    const int dotWidth = advance_Text(uiLabel_FontId, dot).x;
    draw_Text(uiLabel_FontId,
-              init_I2(s1 * (1.0f - normPos) + s2 * normPos - dotWidth / 2, yMid - hgt / 2),
+              init_I2(s1 * (1.0f - normPos) + s2 * normPos - dotWidth / 2,
+                      yMid - lineHeight_Text(uiLabel_FontId) / 2),
              isPaused_Player(d->player) ? dim : bright,
              dot);
    /* Volume adjustment. */
@@ -186,7 +187,8 @@ void draw_PlayerUI(iPlayerUI *d, iPaint *p) {
                        width_Rect(d->volumeSlider) - volPart,
                        dim);
        draw_Text(uiLabel_FontId,
-                  init_I2(left_Rect(d->volumeSlider) + volPart - dotWidth / 2, yMid - hgt / 2),
+                  init_I2(left_Rect(d->volumeSlider) + volPart - dotWidth / 2,
+                          yMid - lineHeight_Text(uiLabel_FontId) / 2),
                  volColor,
                  dot);
    }
diff --git a/src/ui/mobile.c b/src/ui/mobile.c
index 6c3a0b32..263fc141 100644
--- a/src/ui/mobile.c
+++ b/src/ui/mobile.c
@@ -381,22 +381,22 @@ void finalizeSheet_Mobile(iWidget *sheet) {
        }
        /* TODO: In portrait, top panel and detail stack are all stacked together.
         
-                 Landscape Layout                 Portrait Layout
+                 Landscape Layout                 Portrait Layout
-                                              
+                                              
-        ┌─────────┬──────Detail─Stack─────┐    ┌─────────┬ ─ ─ ─ ─ ┐
+        ┌─────────┬──────Detail─Stack─────┐    ┌─────────┬ ─ ─ ─ ─ ┐
-        │         │┌───────────────────┐  │    │         │Detail
+        │         │┌───────────────────┐  │    │         │Detail
-        │         ││┌──────────────────┴┐ │    │         │Stack    │
+        │         ││┌──────────────────┴┐ │    │         │Stack    │
-        │         │││┌──────────────────┴┐│    │         │┌──────┐
+        │         │││┌──────────────────┴┐│    │         │┌──────┐
-        │         ││││                   ││    │         ││┌─────┴┐│
+        │         ││││                   ││    │         ││┌─────┴┐│
-        │         ││││                   ││    │         │││      │
+        │         ││││                   ││    │         │││      │
-        │Top Panel││││                   ││    │Top Panel│││      ││
+        │Top Panel││││                   ││    │Top Panel│││      ││
-        │         ││││      Panels       ││    │         │││Panels│
+        │         ││││      Panels       ││    │         │││Panels│
-        │         ││││                   ││    │         │││      ││
+        │         ││││                   ││    │         │││      ││
-        │         │└┤│                   ││    │         │││      │
+        │         │└┤│                   ││    │         │││      │
-        │         │ └┤                   ││    │         │└┤      ││
+        │         │ └┤                   ││    │         │└┤      ││
-        │         │  └───────────────────┘│    │         │ └──────┘
+        │         │  └───────────────────┘│    │         │ └──────┘
-        └─────────┴───────────────────────┘    └─────────┴ ─ ─ ─ ─ ┘
+        └─────────┴───────────────────────┘    └─────────┴ ─ ─ ─ ─ ┘
-                                                          offscreen
+                                                          offscreen
        */
        /* Modify the top sheet to act as a fullscreen background. */
        setPadding1_Widget(sheet, 0);
@@ -759,6 +759,9 @@ void finalizeSheet_Mobile(iWidget *sheet) {
    else {
        arrange_Widget(sheet);
    }
+    if (!useMobileSheetLayout_()) {
+        setupSheetTransition_Mobile(sheet, iTrue);
+    }
    postRefresh_App();
 }
@@ -784,16 +787,28 @@ void setupMenuTransition_Mobile(iWidget *sheet, iBool isIncoming) {
 }
 void setupSheetTransition_Mobile(iWidget *sheet, iBool isIncoming) {
-    if (isSideBySideLayout_()) {
+    if (!useMobileSheetLayout_()) {
+        if (prefs_App()->uiAnimations) {
+            setFlags_Widget(sheet, horizontalOffset_WidgetFlag, iFalse);
+            if (isIncoming) {
+                setVisualOffset_Widget(sheet, -height_Widget(sheet), 0, 0);
+                setVisualOffset_Widget(sheet, 0, 200, easeOut_AnimFlag | softer_AnimFlag);
+            }
+            else {
+                setVisualOffset_Widget(sheet, -height_Widget(sheet), 200, easeIn_AnimFlag);
+            }
+        }
+        return;
+    }
+    if(isSideBySideLayout_()) {
        return;
    }
+    setFlags_Widget(sheet, horizontalOffset_WidgetFlag, iTrue);
    if (isIncoming) {
-        setFlags_Widget(sheet, horizontalOffset_WidgetFlag, iTrue);
        setVisualOffset_Widget(sheet, size_Root(sheet->root).x, 0, 0);
        setVisualOffset_Widget(sheet, 0, 200, easeOut_AnimFlag);
    }
    else {
-        setFlags_Widget(sheet, horizontalOffset_WidgetFlag, iTrue);
        const iBool wasDragged = iAbs(value_Anim(&sheet->visualOffset)) > 0;
        setVisualOffset_Widget(sheet, size_Root(sheet->root).x, wasDragged ? 100 : 200,
                               wasDragged ? 0 : easeIn_AnimFlag);
diff --git a/src/ui/root.c b/src/ui/root.c
index 9ed62711..15548e74 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -128,7 +128,7 @@ static const iMenuItem phoneNavMenuItems_[] = {
 static const iMenuItem identityButtonMenuItems_[] = {
    { "${menu.identity.notactive}", 0, 0, "ident.showactive" },
    { "---", 0, 0, NULL },
-    { add_Icon " ${menu.identity.new}", SDLK_n, KMOD_PRIMARY | KMOD_SHIFT, "ident.new" },
+    { add_Icon " ${menu.identity.new}", newIdentity_KeyShortcut, "ident.new" },
    { "${menu.identity.import}", SDLK_i, KMOD_PRIMARY | KMOD_SHIFT, "ident.import" },
    { "---", 0, 0, NULL },
    { person_Icon " ${menu.show.identities}", 0, 0, "toolbar.showident" },
@@ -138,7 +138,7 @@ static const iMenuItem identityButtonMenuItems_[] = {
    { "${menu.identity.notactive}", 0, 0, "ident.showactive" },
    { "---", 0, 0, NULL },
 # if !defined (iPlatformAppleDesktop)
-    { add_Icon " ${menu.identity.new}", SDLK_n, KMOD_PRIMARY | KMOD_SHIFT, "ident.new" },
+    { add_Icon " ${menu.identity.new}", newIdentity_KeyShortcut, "ident.new" },
    { "${menu.identity.import}", SDLK_i, KMOD_PRIMARY | KMOD_SHIFT, "ident.import" },
    { "---", 0, 0, NULL },
    { person_Icon " ${menu.show.identities}", '4', KMOD_PRIMARY, "sidebar.mode arg:3 show:1" },
@@ -156,10 +156,10 @@ static const char *pageMenuCStr_ = midEllipsis_Icon;
 /* TODO: A preference for these, maybe? */
 static const char *stopSeqCStr_[] = {
    /* Corners */
-    uiTextCaution_ColorEscape "\U0000230c",
+    uiTextCaution_ColorEscape "\U0000231c",
-    uiTextCaution_ColorEscape "\U0000230d",
+    uiTextCaution_ColorEscape "\U0000231d",
-    uiTextCaution_ColorEscape "\U0000230f",
+    uiTextCaution_ColorEscape "\U0000231f",
-    uiTextCaution_ColorEscape "\U0000230e",
+    uiTextCaution_ColorEscape "\U0000231e",
 #if 0
    /* Rotating arrow */
    uiTextCaution_ColorEscape "\U00002b62",
@@ -276,6 +276,9 @@ void destroyPending_Root(iRoot *d) {
        if (!isFinished_Anim(&widget->visualOffset)) {
            continue;
        }
+        if (widget->flags & keepOnTop_WidgetFlag) {
+            removeOne_PtrArray(onTop_Root(widget->root), widget);
+        }
        if (widget->parent) {
            removeChild_Widget(widget->parent, widget);
        }
@@ -435,11 +438,11 @@ static void updateNavBarIdentity_(iWidget *navBar) {
    setFlags_Widget(tool, selected_WidgetFlag, ident != NULL);
    /* Update menu. */
    iLabelWidget *idItem = child_Widget(findChild_Widget(button, "menu"), 0);
+    const iString *subjectName = ident ? name_GmIdentity(ident) : NULL;
    setTextCStr_LabelWidget(
        idItem,
-        ident ? format_CStr(uiTextAction_ColorEscape "%s",
+        subjectName ? format_CStr(uiTextAction_ColorEscape "%s", cstr_String(subjectName))
-                            cstrCollect_String(subject_TlsCertificate(ident->cert)))
+                    : "${menu.identity.notactive}");
-              : "${menu.identity.notactive}");
    setFlags_Widget(as_Widget(idItem), disabled_WidgetFlag, !ident);
 }
@@ -1046,7 +1049,7 @@ void createUserInterface_Root(iRoot *d) {
                                     moveToParentRightEdge_WidgetFlag);
            /* Feeds refresh indicator is inside the input field. */ {
                iLabelWidget *queryInd =
-                    new_LabelWidget(uiTextAction_ColorEscape "${status.query} \u21a9", NULL);
+                    new_LabelWidget(uiTextAction_ColorEscape "${status.query} " return_Icon, NULL);
                setId_Widget(as_Widget(queryInd), "input.indicator.search");
                setBackgroundColor_Widget(as_Widget(queryInd), uiBackground_ColorId);
                setFrameColor_Widget(as_Widget(queryInd), uiTextAction_ColorId);
@@ -1305,11 +1308,11 @@ void createUserInterface_Root(iRoot *d) {
            { "${menu.split.merge}", '1', 0, "ui.split arg:0" },
            { "${menu.split.swap}", SDLK_x, 0, "ui.split swap:1" },
            { "---", 0, 0, NULL },
-            { "${menu.split.horizontal}", '2', 0, "ui.split arg:3 axis:0" },
+            { "${menu.split.horizontal}", '3', 0, "ui.split arg:3 axis:0" },
            { "${menu.split.horizontal} 1:2", SDLK_d, 0, "ui.split arg:1 axis:0" },
            { "${menu.split.horizontal} 2:1", SDLK_e, 0, "ui.split arg:2 axis:0" },
            { "---", 0, 0, NULL },
-            { "${menu.split.vertical}", '3', 0, "ui.split arg:3 axis:1" },
+            { "${menu.split.vertical}", '2', 0, "ui.split arg:3 axis:1" },
            { "${menu.split.vertical} 1:2", SDLK_f, 0, "ui.split arg:1 axis:1" },
            { "${menu.split.vertical} 2:1", SDLK_r, 0, "ui.split arg:2 axis:1" },
        }, 10);
diff --git a/src/ui/scrollwidget.c b/src/ui/scrollwidget.c
index ff5144b2..0bab601a 100644
--- a/src/ui/scrollwidget.c
+++ b/src/ui/scrollwidget.c
@@ -54,7 +54,8 @@ struct Impl_ScrollWidget {
 };
 static void updateMetrics_ScrollWidget_(iScrollWidget *d) {
-    as_Widget(d)->rect.size.x = gap_UI * 3;
+    iWidget *w = as_Widget(d);
+    w->rect.size.x = gap_UI * 3;
 }
 static void animateOpacity_ScrollWidget_(void *ptr) {
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 86410d11..27646b22 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -148,6 +148,65 @@ static iLabelWidget *addActionButton_SidebarWidget_(iSidebarWidget *d, const cha
    return btn;
 }
+static iGmIdentity *menuIdentity_SidebarWidget_(const iSidebarWidget *d) {
+    if (d->mode == identities_SidebarMode) {
+        if (d->contextItem) {
+            return identity_GmCerts(certs_App(), d->contextItem->id);
+        }
+    }
+    return NULL;
+}
+static void updateContextMenu_SidebarWidget_(iSidebarWidget *d) {
+    if (d->mode != identities_SidebarMode) {
+        return;
+    }
+    iArray *items = collectNew_Array(sizeof(iMenuItem));
+    pushBackN_Array(items, (iMenuItem[]){
+        { person_Icon " ${ident.use}", 0, 0, "ident.use arg:1" },
+        { close_Icon " ${ident.stopuse}", 0, 0, "ident.use arg:0" },
+        { close_Icon " ${ident.stopuse.all}", 0, 0, "ident.use arg:0 clear:1" },
+        { "---", 0, 0, NULL },
+        { edit_Icon " ${menu.edit.notes}", 0, 0, "ident.edit" },
+        { "${ident.fingerprint}", 0, 0, "ident.fingerprint" },
+        { export_Icon " ${ident.export}", 0, 0, "ident.export" },
+        { "---", 0, 0, NULL },
+        { delete_Icon " " uiTextCaution_ColorEscape "${ident.delete}", 0, 0, "ident.delete confirm:1" },
+    }, 9);
+    /* Used URLs. */
+    const iGmIdentity *ident = menuIdentity_SidebarWidget_(d);
+    if (ident) {
+        size_t insertPos = 3;
+        if (!isEmpty_StringSet(ident->useUrls)) {
+            insert_Array(items, insertPos++, &(iMenuItem){ "---", 0, 0, NULL });
+        }
+        const iString *docUrl = url_DocumentWidget(document_App());
+        iBool usedOnCurrentPage = iFalse;
+        iConstForEach(StringSet, i, ident->useUrls) {            
+            const iString *url = i.value;
+            usedOnCurrentPage |= equalCase_String(docUrl, url);
+            iRangecc urlStr = range_String(url);
+            if (startsWith_Rangecc(urlStr, "gemini://")) {
+                urlStr.start += 9; /* omit the default scheme */
+            }
+            if (endsWith_Rangecc(urlStr, "/")) {
+                urlStr.end--; /* looks cleaner */
+            }
+            insert_Array(items,
+                         insertPos++,
+                         &(iMenuItem){ format_CStr(globe_Icon " %s", cstr_Rangecc(urlStr)),
+                                       0,
+                                       0,
+                                       format_CStr("!open url:%s", cstr_String(url)) });
+        }
+        if (!usedOnCurrentPage) {
+            remove_Array(items, 1);
+        }
+    }
+    destroy_Widget(d->menu);    
+    d->menu = makeMenu_Widget(as_Widget(d), data_Array(items), size_Array(items));    
+}
 static void updateItems_SidebarWidget_(iSidebarWidget *d) {
    clear_ListWidget(d->list);
    releaseChildren_Widget(d->blank);
@@ -375,13 +434,14 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
        }
        case identities_SidebarMode: {
            const iString *tabUrl = url_DocumentWidget(document_App());
+            const iRangecc tabHost = urlHost_String(tabUrl);
            isEmpty = iTrue;
            iConstForEach(PtrArray, i, identities_GmCerts(certs_App())) {
                const iGmIdentity *ident = i.ptr;
                iSidebarItem *item = new_SidebarItem();
                item->id = (uint32_t) index_PtrArrayConstIterator(&i);
-                item->icon = ident->icon;
+                item->icon = 0x1f464; /* person */
-                set_String(&item->label, collect_String(subject_TlsCertificate(ident->cert)));
+                set_String(&item->label, name_GmIdentity(ident));
                iDate until;
                validUntil_TlsCertificate(ident->cert, &until);
                const iBool isActive = isUsedOn_GmIdentity(ident, tabUrl);
@@ -406,6 +466,9 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
                                        cstr_String(&ident->notes));
                }
                item->listItem.isSelected = isActive;
+                if (isUsedOnDomain_GmIdentity(ident, tabHost)) {
+                    item->indent = 1; /* will be highlighted */
+                }
                addItem_ListWidget(d->list, item);
                iRelease(item);
                isEmpty = iFalse;
@@ -415,11 +478,11 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
                addActionButton_SidebarWidget_(d, add_Icon " ${sidebar.action.ident.new}", "ident.new", 0);
                addActionButton_SidebarWidget_(d, "${sidebar.action.ident.import}", "ident.import", 0);
            }
+            /*
            const iMenuItem menuItems[] = {
                { person_Icon " ${ident.use}", 0, 0, "ident.use arg:1" },
                { close_Icon " ${ident.stopuse}", 0, 0, "ident.use arg:0" },
                { close_Icon " ${ident.stopuse.all}", 0, 0, "ident.use arg:0 clear:1" },
-                { "${ident.showuse}", 0, 0, "ident.showuse" },
                { "---", 0, 0, NULL },
                { edit_Icon " ${menu.edit.notes}", 0, 0, "ident.edit" },
                { "${ident.fingerprint}", 0, 0, "ident.fingerprint" },
@@ -429,6 +492,7 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
                { delete_Icon " " uiTextCaution_ColorEscape "${ident.delete}", 0, 0, "ident.delete confirm:1" },
            };
            d->menu = makeMenu_Widget(as_Widget(d), menuItems, iElemCount(menuItems));
+            */
            break;
        }
        default:
@@ -697,20 +761,11 @@ static const iGmIdentity *constHoverIdentity_SidebarWidget_(const iSidebarWidget
    return NULL;
 }
-static iGmIdentity *menuIdentity_SidebarWidget_(const iSidebarWidget *d) {
-    if (d->mode == identities_SidebarMode) {
-        if (d->contextItem) {
-            return identity_GmCerts(certs_App(), d->contextItem->id);
-        }
-    }
-    return NULL;
-}
 static iGmIdentity *hoverIdentity_SidebarWidget_(const iSidebarWidget *d) {
    return iConstCast(iGmIdentity *, constHoverIdentity_SidebarWidget_(d));
 }
-static void itemClicked_SidebarWidget_(iSidebarWidget *d, const iSidebarItem *item) {
+static void itemClicked_SidebarWidget_(iSidebarWidget *d, iSidebarItem *item, size_t itemIndex) {
    setFocus_Widget(NULL);
    switch (d->mode) {
        case documentOutline_SidebarMode: {
@@ -735,17 +790,19 @@ static void itemClicked_SidebarWidget_(iSidebarWidget *d, const iSidebarItem *it
            break;
        }
        case identities_SidebarMode: {
-            iGmIdentity *ident = hoverIdentity_SidebarWidget_(d);
+            d->contextItem  = item;
-            if (ident) {
+            if (d->contextIndex != iInvalidPos) {
-                const iString *tabUrl = url_DocumentWidget(document_App());
+                invalidateItem_ListWidget(d->list, d->contextIndex);
-                if (isUsedOn_GmIdentity(ident, tabUrl)) {
+            }
-                    signOut_GmCerts(certs_App(), tabUrl);
+            d->contextIndex = itemIndex;
-                }
+            if (itemIndex < numItems_ListWidget(d->list)) {
-                else {
+                updateContextMenu_SidebarWidget_(d);
-                    signIn_GmCerts(certs_App(), ident, tabUrl);
+                arrange_Widget(d->menu);
-                }
+                openMenu_Widget(d->menu,
-                updateItems_SidebarWidget_(d);
+                                d->side == left_SideBarSide
-                updateMouseHover_ListWidget(d->list);
+                                    ? topRight_Rect(itemRect_ListWidget(d->list, itemIndex))
+                                    : addX_I2(topLeft_Rect(itemRect_ListWidget(d->list, itemIndex)),
+                                              -width_Widget(d->menu)));
            }
            break;
        }
@@ -848,6 +905,7 @@ iBool handleBookmarkEditorCommands_SidebarWidget_(iWidget *editor, const char *c
                                    isSelected_Widget(findChild_Widget(editor, "bmed.tag.linksplit")));
            postCommand_App("bookmarks.changed");
        }
+        setupSheetTransition_Mobile(editor, iFalse);
        destroy_Widget(editor);
        return iTrue;
    }
@@ -878,7 +936,8 @@ static iBool handleSidebarCommand_SidebarWidget_(iSidebarWidget *d, const char *
        if (arg_Command(cmd) && isVisible_Widget(w)) {
            return iTrue;
        }
-        const iBool isAnimated = argLabel_Command(cmd, "noanim") == 0 &&
+        const iBool isAnimated = prefs_App()->uiAnimations &&
+                                 argLabel_Command(cmd, "noanim") == 0 &&
                                 (deviceType_App() != phone_AppDeviceType);
        int visX = 0;
        if (isVisible_Widget(w)) {
@@ -1008,7 +1067,8 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
            return iTrue;
        }
        else if (isCommand_Widget(w, ev, "list.clicked")) {
-            itemClicked_SidebarWidget_(d, pointerLabel_Command(cmd, "item"));
+            itemClicked_SidebarWidget_(
+                d, pointerLabel_Command(cmd, "item"), argU32Label_Command(cmd, "arg"));
            return iTrue;
        }
        else if (isCommand_Widget(w, ev, "menu.closed")) {
@@ -1190,23 +1250,17 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                }
                else if (arg_Command(cmd)) {
                    signIn_GmCerts(certs_App(), ident, tabUrl);
+                    postCommand_App("navigate.reload");
                }
                else {
                    signOut_GmCerts(certs_App(), tabUrl);
+                    postCommand_App("navigate.reload");
                }
                saveIdentities_GmCerts(certs_App());
                updateItems_SidebarWidget_(d);
            }
            return iTrue;
        }
-        else if (isCommand_Widget(w, ev, "ident.showuse")) {
-            const iGmIdentity *ident = menuIdentity_SidebarWidget_(d);
-            if (ident) {
-                makeSimpleMessage_Widget(uiHeading_ColorEscape "${heading.ident.use}",
-                                         cstrCollect_String(joinCStr_StringSet(ident->useUrls, "\n")));
-            }
-            return iTrue;
-        }
        else if (isCommand_Widget(w, ev, "ident.edit")) {
            const iGmIdentity *ident = menuIdentity_SidebarWidget_(d);
            if (ident) {
@@ -1228,6 +1282,20 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
            }
            return iTrue;
        }
+        else if (isCommand_Widget(w, ev, "ident.export")) {
+            const iGmIdentity *ident = menuIdentity_SidebarWidget_(d);
+            if (ident) {
+                iString *pem = collect_String(pem_TlsCertificate(ident->cert));
+                append_String(pem, collect_String(privateKeyPem_TlsCertificate(ident->cert)));
+                iDocumentWidget *expTab = newTab_App(NULL, iTrue);
+                setUrlAndSource_DocumentWidget(
+                    expTab,
+                    collectNewFormat_String("file:%s.pem", cstr_String(name_GmIdentity(ident))),
+                    collectNewCStr_String("text/plain"),
+                    utf8_String(pem));
+            }
+            return iTrue;
+        }
        else if (isCommand_Widget(w, ev, "ident.setnotes")) {
            iGmIdentity *ident = pointerLabel_Command(cmd, "ident");
            if (ident) {
@@ -1336,20 +1404,21 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
            d->contextIndex = iInvalidPos;
        }
    }
-    if (d->menu && ev->type == SDL_MOUSEBUTTONDOWN) {
+    if ((d->menu || d->mode == identities_SidebarMode )&& ev->type == SDL_MOUSEBUTTONDOWN) {
        if (ev->button.button == SDL_BUTTON_RIGHT) {
            d->contextItem = NULL;
            if (!isVisible_Widget(d->menu)) {
                updateMouseHover_ListWidget(d->list);
            }
            if (constHoverItem_ListWidget(d->list) || isVisible_Widget(d->menu)) {
-                d->contextItem  = hoverItem_ListWidget(d->list);
+                d->contextItem = hoverItem_ListWidget(d->list);
                /* Context is drawn in hover state. */
                if (d->contextIndex != iInvalidPos) {
                    invalidateItem_ListWidget(d->list, d->contextIndex);
                }
                d->contextIndex = hoverItemIndex_ListWidget(d->list);
                /* Update menu items. */
+                updateContextMenu_SidebarWidget_(d);                
                /* TODO: Some callback-based mechanism would be nice for updating menus right
                   before they open? */
                if (d->mode == bookmarks_SidebarMode && d->contextItem) {
@@ -1407,11 +1476,13 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                                        (!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));
                            }
+                            */
                        }
                    }
                }
@@ -1423,10 +1494,7 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
        const int kmods = keyMods_Sym(ev->key.keysym.mod);
        /* Hide the sidebar when Escape is pressed. */
        if (kmods == 0 && key == SDLK_ESCAPE && isVisible_Widget(d)) {
-            setFlags_Widget(w, hidden_WidgetFlag, iTrue);
+            postCommand_Widget(d, "%s.toggle", cstr_String(id_Widget(w)));
-            arrange_Widget(w->parent);
-            updateSize_DocumentWidget(document_App());
-            refresh_Widget(w->parent);
            return iTrue;
        }
    }
@@ -1460,7 +1528,8 @@ static void draw_SidebarWidget_(const iSidebarWidget *d) {
    const iRect    bounds = bounds_Widget(w);
    iPaint p;
    init_Paint(&p);
-    if (flags_Widget(w) & visualOffset_WidgetFlag && isVisible_Widget(w)) {
+    if (flags_Widget(w) & visualOffset_WidgetFlag &&
+        flags_Widget(w) & horizontalOffset_WidgetFlag && isVisible_Widget(w)) {
        fillRect_Paint(&p, boundsWithoutVisualOffset_Widget(w), tmBackground_ColorId);
    }
    draw_Widget(w);
@@ -1493,6 +1562,7 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
    const int itemHeight     = height_Rect(itemRect);
    const int iconColor      = isHover ? (isPressing ? uiTextPressed_ColorId : uiIconHover_ColorId)
                                       : uiIcon_ColorId;
+    const int altIconColor   = isPressing ? uiTextPressed_ColorId : uiTextCaution_ColorId;
    const int font = sidebar->itemFonts[d->isBold ? 1 : 0];
    int bg         = uiBackgroundSidebar_ColorId;
    if (isHover) {
@@ -1611,7 +1681,7 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
                               : uiText_ColorId;
        iString str;
        init_String(&str);
-        appendChar_String(&str, d->icon ? d->icon : 0x1f588);
+        appendChar_String(&str, d->icon ? d->icon : 0x1f588);        
        const iRect iconArea = { addX_I2(pos, gap_UI),
                                 init_I2(1.75f * lineHeight_Text(font), itemHeight) };
        drawCentered_Text(font,
@@ -1625,9 +1695,13 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
        deinit_String(&str);
        const iInt2 textPos = addY_I2(topRight_Rect(iconArea), (itemHeight - lineHeight_Text(font)) / 2);
        drawRange_Text(font, textPos, fg, range_String(&d->label));
+        const int metaFont = default_FontId;
+        const int metaIconWidth = 4.5f * gap_UI;
        const iInt2 metaPos =
-            init_I2(right_Rect(itemRect) - advanceRange_Text(font, range_String(&d->meta)).x -
+            init_I2(right_Rect(itemRect) -
-                        2 * gap_UI - (scrollBarWidth ? scrollBarWidth - gap_UI : 0),
+                        length_String(&d->meta) *
+                            metaIconWidth
+                        - 2 * gap_UI - (blankWidth ? blankWidth - 1.5f * gap_UI : (gap_UI / 2)),
                    textPos.y);
        fillRect_Paint(p,
                       init_Rect(metaPos.x,
@@ -1635,10 +1709,22 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
                                 right_Rect(itemRect) - metaPos.x,
                                 height_Rect(itemRect)),
                       bg);
-        drawRange_Text(font,
+        iInt2 mpos = metaPos;
-                       metaPos,
+        iStringConstIterator iter;
-                       isHover && isPressing ? fg : uiTextCaution_ColorId,
+        init_StringConstIterator(&iter, &d->meta);
-                       range_String(&d->meta));
+        iRangecc range = { cstr_String(&d->meta), iter.pos };
+        while (iter.value) {
+            next_StringConstIterator(&iter);
+            range.end = iter.pos;
+            iRect iconArea = { mpos, init_I2(metaIconWidth, lineHeight_Text(metaFont)) };
+            iRect visBounds = visualBounds_Text(metaFont, range);
+            drawRange_Text(metaFont,
+                           sub_I2(mid_Rect(iconArea), mid_Rect(visBounds)),
+                           isHover && isPressing ? fg : uiTextCaution_ColorId,
+                           range);
+            mpos.x += metaIconWidth;
+            range.start = range.end;            
+        }        
    }
    else if (sidebar->mode == history_SidebarMode) {
        iBeginCollect();
@@ -1683,6 +1769,7 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
    else if (sidebar->mode == identities_SidebarMode) {
        const int fg = isHover ? (isPressing ? uiTextPressed_ColorId : uiTextFramelessHover_ColorId)
                               : uiTextStrong_ColorId;
+        const iBool isUsedOnDomain = (d->indent != 0);
        iString icon;
        initUnicodeN_String(&icon, &d->icon, 1);
        iInt2 cPos = topLeft_Rect(itemRect);
@@ -1694,8 +1781,21 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
        const int metaFg = isHover ? permanent_ColorId | (isPressing ? uiTextPressed_ColorId
                                                                     : uiTextFramelessHover_ColorId)
                                   : uiTextDim_ColorId;
-        drawRange_Text(
+        if (!d->listItem.isSelected && !isUsedOnDomain) {
-            font, cPos, d->listItem.isSelected ? iconColor : metaFg, range_String(&icon));
+            /* Draw an outline of the icon. */
+            for (int off = 0; off < 4; ++off) {
+                drawRange_Text(font,
+                               add_I2(cPos, init_I2(off % 2 == 0 ? -1 : 1, off / 2 == 0 ? -1 : 1)),
+                               metaFg,
+                               range_String(&icon));
+            }
+        }
+        drawRange_Text(font,
+                       cPos,
+                       d->listItem.isSelected ? iconColor
+                       : isUsedOnDomain       ? altIconColor
+                                              : uiBackgroundSidebar_ColorId,
+                       range_String(&icon));
        deinit_String(&icon);
        drawRange_Text(d->listItem.isSelected ? sidebar->itemFonts[1] : font,
                       add_I2(cPos, init_I2(indent, 0)),
diff --git a/src/ui/text.c b/src/ui/text.c
index 889aa2e4..ffe08fca 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include <the_Foundation/array.h>
 #include <the_Foundation/file.h>
+#include <the_Foundation/fileinfo.h>
 #include <the_Foundation/hash.h>
 #include <the_Foundation/math.h>
 #include <the_Foundation/stringlist.h>
@@ -124,10 +125,6 @@ struct Impl_Font {
    iBool          isMonospaced;
    iBool          manualKernOnly;
    enum iFontSize sizeId;  /* used to look up different fonts of matching size */
-//    enum iFontId
-//    enum iFontId   japaneseFont; /* font to use for Japanese glyphs */
-//    enum iFontId   chineseFont;  /* font to use for Simplified Chinese glyphs */
-//    enum iFontId   koreanFont;   /* font to use for Korean glyphs */
    uint32_t       indexTable[128 - 32]; /* quick ASCII lookup */
 };
@@ -155,13 +152,17 @@ static void init_Font(iFont *d, const iBlock *data, int height, float scale,
            d->xScale *= floorf(advance) / advance;
        }
    }
-    d->vertOffset   = height * (1.0f - scale) / 2;
+    d->baseline   = ascent * d->yScale;
-    d->baseline     = ascent * d->yScale;
+    d->vertOffset = height * (1.0f - scale) / 2;
-    d->sizeId       = sizeId;
+    /* Custom tweaks. */
-//    d->symbolsFont  = symbolsFont;
+    if (data == &fontNotoSansSymbolsRegular_Embedded ||
-//    d->japaneseFont = regularJapanese_FontId;
+        data == &fontNotoSansSymbols2Regular_Embedded) {
-//    d->chineseFont  = regularChinese_FontId;
+        d->vertOffset /= 2; 
-//    d->koreanFont   = regularKorean_FontId;
+    }
+    else if (data == &fontNotoEmojiRegular_Embedded) {
+        //d->vertOffset -= height / 30;
+    }
+    d->sizeId = sizeId;
    memset(d->indexTable, 0xff, sizeof(d->indexTable));
 }
@@ -215,7 +216,8 @@ struct Impl_Text {
    iRegExp *      ansiEscape;
 };
-static iText text_;
+static iText   text_;
+static iBlock *userFont_;
 static void initFonts_Text_(iText *d) {
    const float textSize = fontSize_UI * d->contentFontSize;
@@ -321,27 +323,31 @@ static void initFonts_Text_(iText *d) {
        { &fontIosevkaTermExtended_Embedded,  smallMonoSize,        1.0f,         contentMonoSmall_FontSize },
        { &fontIosevkaTermExtended_Embedded,  monoSize,             1.0f,         contentMono_FontSize },
        /* extra content fonts */
-        { &fontSourceSans3Regular_Embedded, textSize,             scaling, contentRegular_FontSize },
+        { &fontSourceSans3Regular_Embedded,   textSize,             scaling, contentRegular_FontSize },
-        { &fontIosevkaTermExtended_Embedded,  textSize,             0.866f,  contentRegular_FontSize },
+        { &fontSourceSans3Regular_Embedded,   textSize * 0.80f,     scaling, contentRegular_FontSize },
        /* symbols and scripts */
-#define DEFINE_FONT_SET(data) \
+#define DEFINE_FONT_SET(data, glyphScale) \
-        { &data, uiSize,            1.0f, uiNormal_FontSize }, \
+        { (data), uiSize,            glyphScale, uiNormal_FontSize }, \
-        { &data, uiSize * 1.125f,   1.0f, uiMedium_FontSize }, \
+        { (data), uiSize * 1.125f,   glyphScale, uiMedium_FontSize }, \
-        { &data, uiSize * 1.333f,   1.0f, uiBig_FontSize }, \
+        { (data), uiSize * 1.333f,   glyphScale, uiBig_FontSize }, \
-        { &data, uiSize * 1.666f,   1.0f, uiLarge_FontSize }, \
+        { (data), uiSize * 1.666f,   glyphScale, uiLarge_FontSize }, \
-        { &data, textSize,          1.0f, contentRegular_FontSize }, \
+        { (data), textSize,          glyphScale, contentRegular_FontSize }, \
-        { &data, textSize * 1.200f, 1.0f, contentMedium_FontSize }, \
+        { (data), textSize * 1.200f, glyphScale, contentMedium_FontSize }, \
-        { &data, textSize * 1.333f, 1.0f, contentBig_FontSize }, \
+        { (data), textSize * 1.333f, glyphScale, contentBig_FontSize }, \
-        { &data, textSize * 1.666f, 1.0f, contentLarge_FontSize }, \
+        { (data), textSize * 1.666f, glyphScale, contentLarge_FontSize }, \
-        { &data, textSize * 2.000f, 1.0f, contentHuge_FontSize }, \
+        { (data), textSize * 2.000f, glyphScale, contentHuge_FontSize }, \
-        { &data, smallMonoSize,     1.0f, contentMonoSmall_FontSize }, \
+        { (data), smallMonoSize,     glyphScale, contentMonoSmall_FontSize }, \
-        { &data, monoSize,          1.0f, contentMono_FontSize }
+        { (data), monoSize,          glyphScale, contentMono_FontSize }
-        DEFINE_FONT_SET(fontSymbola_Embedded),
+        DEFINE_FONT_SET(userFont_ ? userFont_ : &fontIosevkaTermExtended_Embedded, 1.0f),
-        DEFINE_FONT_SET(fontNotoEmojiRegular_Embedded),
+        DEFINE_FONT_SET(&fontIosevkaTermExtended_Embedded, 0.866f),
-        DEFINE_FONT_SET(fontNotoSansJPRegular_Embedded),
+        DEFINE_FONT_SET(&fontNotoSansSymbolsRegular_Embedded, 1.45f),
-        DEFINE_FONT_SET(fontNotoSansSCRegular_Embedded),
+        DEFINE_FONT_SET(&fontNotoSansSymbols2Regular_Embedded, 1.45f),
-        DEFINE_FONT_SET(fontNanumGothicRegular_Embedded), /* TODO: should use Noto Sans here, too */
+        DEFINE_FONT_SET(&fontSmolEmojiRegular_Embedded, 1.0f),
-        DEFINE_FONT_SET(fontNotoSansArabicUIRegular_Embedded),
+        DEFINE_FONT_SET(&fontNotoEmojiRegular_Embedded, 1.10f),
+        DEFINE_FONT_SET(&fontNotoSansJPRegular_Embedded, 1.0f),
+        DEFINE_FONT_SET(&fontNotoSansSCRegular_Embedded, 1.0f),
+        DEFINE_FONT_SET(&fontNanumGothicRegular_Embedded, 1.0f), /* TODO: should use Noto Sans here, too */
+        DEFINE_FONT_SET(&fontNotoSansArabicUIRegular_Embedded, 1.0f),
    };
    iForIndices(i, fontData) {
        iFont *font = &d->fonts[i];
@@ -401,8 +407,28 @@ static void deinitCache_Text_(iText *d) {
    SDL_DestroyTexture(d->cache);
 }
+void loadUserFonts_Text(void) {
+    if (userFont_) {
+        delete_Block(userFont_);
+        userFont_ = NULL;
+    }
+    /* Load the system font. */
+    const iPrefs *prefs = prefs_App();
+    if (!isEmpty_String(&prefs->symbolFontPath)) {
+        iFile *f = new_File(&prefs->symbolFontPath);
+        if (open_File(f, readOnly_FileMode)) {
+            userFont_ = readAll_File(f);
+        }
+        else {
+            fprintf(stderr, "[Text] failed to open: %s\n", cstr_String(&prefs->symbolFontPath));
+        }
+        iRelease(f);
+    }
+}
 void init_Text(SDL_Renderer *render) {
    iText *d = &text_;
+    loadUserFonts_Text();
    d->contentFont     = nunito_TextFont;
    d->headingFont     = nunito_TextFont;
    d->contentFontSize = contentScale_Text_;
@@ -542,14 +568,36 @@ static void allocate_Font_(iFont *d, iGlyph *glyph, int hoff) {
 }
 iLocalDef iFont *characterFont_Font_(iFont *d, iChar ch, uint32_t *glyphIndex) {
+    if (isVariationSelector_Char(ch)) {
+        return d;
+    }
+    /* Smol Emoji overrides all other fonts. */
+    if (ch != 0x20) {
+        iFont *smol = font_Text_(smolEmoji_FontId + d->sizeId);
+        if (smol != d && (*glyphIndex = glyphIndex_Font_(smol, ch)) != 0) {
+            return smol;
+        }
+    }
+    /* Manual exceptions. */ {
+        if (ch >= 0x2190 && ch <= 0x2193 /* arrows */) {
+            d = font_Text_(iosevka_FontId + d->sizeId);
+            *glyphIndex = glyphIndex_Font_(d, ch);
+            return d;
+        }
+    }
    if ((*glyphIndex = glyphIndex_Font_(d, ch)) != 0) {
        return d;
    }
-    /* Not defined in current font, try Noto Emoji (for selected characters). */
+    const int fallbacks[] = {
-    if ((ch >= 0x1f300 && ch < 0x1f600) || (ch >= 0x1f680 && ch <= 0x1f6c5)) {
+        notoEmoji_FontId,
-        iFont *emoji = font_Text_(emoji_FontId + d->sizeId);
+        symbols2_FontId,
-        if (emoji != d && (*glyphIndex = glyphIndex_Font_(emoji, ch)) != 0) {
+        symbols_FontId
-            return emoji;
+    };
+    /* First fallback is Smol Emoji. */
+    iForIndices(i, fallbacks) {
+        iFont *fallback = font_Text_(fallbacks[i] + d->sizeId);
+        if (fallback != d && (*glyphIndex = glyphIndex_Font_(fallback, ch)) != 0) {
+            return fallback;
        }
    }
    /* Try Simplified Chinese. */
@@ -584,17 +632,25 @@ iLocalDef iFont *characterFont_Font_(iFont *d, iChar ch, uint32_t *glyphIndex) {
    /* White up arrow is used for the Shift key on macOS. Symbola's glyph is not a great
       match to the other text, so use the UI font instead. */
    if ((ch == 0x2318 || ch == 0x21e7) && d == font_Text_(regular_FontId)) {
-        *glyphIndex = glyphIndex_Font_(d = font_Text_(defaultContentSized_FontId), ch);
+        *glyphIndex = glyphIndex_Font_(d = font_Text_(defaultContentRegular_FontId), ch);
        return d;
    }
 #endif
-    /* Fall back to Symbola for anything else. */
+    /* User's symbols font. */ {
-    iFont *font = font_Text_(symbols_FontId + d->sizeId);
+        iFont *sys = font_Text_(userSymbols_FontId + d->sizeId);
-    *glyphIndex = glyphIndex_Font_(font, ch);
+        if (sys != d && (*glyphIndex = glyphIndex_Font_(sys, ch)) != 0) {
-//    if (!*glyphIndex) {
+            return sys;
-//        fprintf(stderr, "failed to find %08x (%lc)\n", ch, ch); fflush(stderr);
+        }
-//    }
+    }
-    return font;
+    /* Final fallback. */
+    iFont *font = font_Text_(iosevka_FontId + d->sizeId);
+    if (d != font) {
+        *glyphIndex = glyphIndex_Font_(font, ch);
+    }
+    if (!*glyphIndex) {
+        fprintf(stderr, "failed to find %08x (%lc)\n", ch, (int)ch); fflush(stderr);
+    }
+    return d;
 }
 static iGlyph *glyph_Font_(iFont *d, iChar ch) {
@@ -1190,7 +1246,7 @@ iInt2 advanceN_Text(int fontId, const char *text, size_t n) {
    return init_I2(advance, lineHeight_Text(fontId));
 }
-static void drawBounded_Text_(int fontId, iInt2 pos, int xposBound, int color, iRangecc text) {
+static void drawBoundedN_Text_(int fontId, iInt2 pos, int xposBound, int color, iRangecc text, size_t maxLen) {
    iText *d    = &text_;
    iFont *font = font_Text_(fontId);
    const iColor clr = get_Color(color & mask_ColorId);
@@ -1201,11 +1257,16 @@ static void drawBounded_Text_(int fontId, iInt2 pos, int xposBound, int color, i
                                   (color & fillBackground_ColorId ? fillBackground_RunMode : 0) |
                                   runFlagsFromId_(fontId),
                           .text            = text,
+                           .maxLen          = maxLen,                           
                           .pos             = pos,
                           .xposLayoutBound = xposBound,
                           .color           = color & mask_ColorId });
 }
+static void drawBounded_Text_(int fontId, iInt2 pos, int xposBound, int color, iRangecc text) {
+    drawBoundedN_Text_(fontId, pos, xposBound, color, text, 0);
+}
 static void draw_Text_(int fontId, iInt2 pos, int color, iRangecc text) {
    drawBounded_Text_(fontId, pos, 0, color, text);
 }
@@ -1248,6 +1309,10 @@ void drawRange_Text(int fontId, iInt2 pos, int color, iRangecc text) {
    draw_Text_(fontId, pos, color, text);
 }
+void drawRangeN_Text(int fontId, iInt2 pos, int color, iRangecc text, size_t maxChars) {
+    drawBoundedN_Text_(fontId, pos, 0, color, text, maxChars);
+}
 iInt2 advanceWrapRange_Text(int fontId, int maxWidth, iRangecc text) {
    iInt2 size = zero_I2();
    const char *endp;
@@ -1285,13 +1350,16 @@ void drawCentered_Text(int fontId, iRect rect, iBool alignVisual, int color, con
        vprintf_Block(&chars, format, args);
        va_end(args);
    }
-    const iRangecc text       = range_Block(&chars);
+    drawCenteredRange_Text(fontId, rect, alignVisual, color, range_Block(&chars));
-    iRect          textBounds = alignVisual ? visualBounds_Text(fontId, text)
+    deinit_Block(&chars);
+}
+void drawCenteredRange_Text(int fontId, iRect rect, iBool alignVisual, int color, iRangecc text) {
+    iRect textBounds = alignVisual ? visualBounds_Text(fontId, text)
                                   : (iRect){ zero_I2(), advanceRange_Text(fontId, text) };
    textBounds.pos = sub_I2(mid_Rect(rect), mid_Rect(textBounds));
    textBounds.pos.x = iMax(textBounds.pos.x, left_Rect(rect)); /* keep left edge visible */
    draw_Text_(fontId, textBounds.pos, color, text);
-    deinit_Block(&chars);
 }
 SDL_Texture *glyphCache_Text(void) {
diff --git a/src/ui/text.h b/src/ui/text.h
index 044ddd32..2f2bcf3a 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -67,12 +67,16 @@ enum iFontId {
    monospaceSmall_FontId,
    monospace_FontId,
    /* extra content fonts */
-    defaultContentSized_FontId, /* UI font but sized to regular_FontId */
+    defaultContentRegular_FontId, /* UI font but sized to regular_FontId */
-    regularMonospace_FontId,
+    defaultContentSmall_FontId, /* UI font but sized smaller */
    /* symbols and scripts */
-    symbols_FontId,
+    userSymbols_FontId,
-    emoji_FontId             = symbols_FontId + max_FontSize,
+    iosevka_FontId           = userSymbols_FontId + max_FontSize,
-    japanese_FontId          = emoji_FontId + max_FontSize,
+    symbols_FontId           = iosevka_FontId + max_FontSize,
+    symbols2_FontId          = symbols_FontId + max_FontSize,
+    smolEmoji_FontId         = symbols2_FontId + max_FontSize,
+    notoEmoji_FontId         = smolEmoji_FontId + max_FontSize,
+    japanese_FontId          = notoEmoji_FontId + max_FontSize,
    chineseSimplified_FontId = japanese_FontId + max_FontSize,
    korean_FontId            = chineseSimplified_FontId + max_FontSize,
    arabic_FontId            = korean_FontId + max_FontSize,
@@ -91,7 +95,7 @@ enum iFontId {
    uiInput_FontId          = defaultMedium_FontId,
    uiContent_FontId        = defaultMedium_FontId,
    uiContentBold_FontId    = defaultMediumBold_FontId,
-    uiContentSymbols_FontId = symbols_FontId + uiMedium_FontSize,
+    uiContentSymbols_FontId = symbols_FontId + uiMedium_FontSize,    
    /* Document fonts: */
    paragraph_FontId         = regular_FontId,
    firstParagraph_FontId    = medium_FontId,
@@ -102,6 +106,7 @@ enum iFontId {
    heading2_FontId          = largeBold_FontId,
    heading3_FontId          = big_FontId,
    banner_FontId            = largeLight_FontId,
+    regularMonospace_FontId  = iosevka_FontId + contentRegular_FontSize    
 };
 iLocalDef iBool isJapanese_FontId(enum iFontId id) {
@@ -124,6 +129,8 @@ extern int gap_Text; /* affected by content font size */
 void    init_Text               (SDL_Renderer *);
 void    deinit_Text             (void);
+void    loadUserFonts_Text      (void); /* based on Prefs */
 void    setContentFont_Text     (enum iTextFont font);
 void    setHeadingFont_Text     (enum iTextFont font);
 void    setContentFontSize_Text (float fontSizeFactor); /* affects all except `default*` fonts */
@@ -151,13 +158,15 @@ void    setOpacity_Text     (float opacity);
 void    cache_Text          (int fontId, iRangecc text); /* pre-render glyphs */
-void    draw_Text           (int fontId, iInt2 pos, int color, const char *text, ...);
+void    draw_Text               (int fontId, iInt2 pos, int color, const char *text, ...);
-void    drawAlign_Text      (int fontId, iInt2 pos, int color, enum iAlignment align, const char *text, ...);
+void    drawAlign_Text          (int fontId, iInt2 pos, int color, enum iAlignment align, const char *text, ...);
-void    drawCentered_Text   (int fontId, iRect rect, iBool alignVisual, int color, const char *text, ...);
+void    drawCentered_Text       (int fontId, iRect rect, iBool alignVisual, int color, const char *text, ...);
-void    drawString_Text     (int fontId, iInt2 pos, int color, const iString *text);
+void    drawCenteredRange_Text  (int fontId, iRect rect, iBool alignVisual, int color, iRangecc text);
-void    drawRange_Text      (int fontId, iInt2 pos, int color, iRangecc text);
+void    drawString_Text         (int fontId, iInt2 pos, int color, const iString *text);
-void    drawBoundRange_Text (int fontId, iInt2 pos, int boundWidth, int color, iRangecc text); /* bound does not wrap */
+void    drawRange_Text          (int fontId, iInt2 pos, int color, iRangecc text);
-int     drawWrapRange_Text  (int fontId, iInt2 pos, int maxWidth, int color, iRangecc text); /* returns new Y */
+void    drawRangeN_Text         (int fontId, iInt2 pos, int color, iRangecc text, size_t maxLen);
+void    drawBoundRange_Text     (int fontId, iInt2 pos, int boundWidth, int color, iRangecc text); /* bound does not wrap */
+int     drawWrapRange_Text      (int fontId, iInt2 pos, int maxWidth, int color, iRangecc text); /* returns new Y */
 SDL_Texture *   glyphCache_Text     (void);
diff --git a/src/ui/translation.c b/src/ui/translation.c
index 4102fcb9..88edc48b 100644
--- a/src/ui/translation.c
+++ b/src/ui/translation.c
@@ -460,6 +460,7 @@ iBool handleCommand_Translation(iTranslation *d, const char *cmd) {
    if (equalWidget_Command(cmd, w, "translation.finished")) {
        if (!isFinished_Translation(d)) {
            if (processResult_Translation_(d)) {
+                setupSheetTransition_Mobile(d->dlg, iFalse);
                destroy_Widget(d->dlg);
                d->dlg = NULL;
            }
@@ -472,10 +473,11 @@ iBool handleCommand_Translation(iTranslation *d, const char *cmd) {
            updateTextCStr_LabelWidget(
                findMenuItem_Widget(findChild_Widget(d->dlg, "dialogbuttons"),
                                    "translation.cancel"),
-                "${dismiss}");
+                "${close}");
            cancel_TlsRequest(d->request);
        }
        else {
+            setupSheetTransition_Mobile(d->dlg, iFalse);
            destroy_Widget(d->dlg);
            d->dlg = NULL;
        }
diff --git a/src/ui/util.c b/src/ui/util.c
index 4b35f8f7..c4fb8886 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1176,6 +1176,7 @@ iBool valueInputHandler_(iWidget *dlg, const char *cmd) {
                postCommandf_App("valueinput.cancelled id:%s", cstr_String(id_Widget(dlg)));
                setId_Widget(dlg, ""); /* no further commands to emit */
            }
+            setupSheetTransition_Mobile(dlg, iFalse);
            destroy_Widget(dlg);
            return iTrue;
        }
@@ -1184,11 +1185,13 @@ 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 */
+        setupSheetTransition_Mobile(dlg, iFalse);
        destroy_Widget(dlg);
        return iTrue;
    }
    else if (equal_Command(cmd, "valueinput.accept")) {
        acceptValueInput_(dlg);
+        setupSheetTransition_Mobile(dlg, iFalse);        
        destroy_Widget(dlg);
        return iTrue;
    }
@@ -1324,6 +1327,7 @@ static iBool messageHandler_(iWidget *msg, const char *cmd) {
          equal_Command(cmd, "scrollbar.fade") ||
          equal_Command(cmd, "widget.overflow") ||
          startsWith_CStr(cmd, "window."))) {
+        setupSheetTransition_Mobile(msg, iFalse);
        destroy_Widget(msg);
    }
    return iFalse;
@@ -1521,6 +1525,7 @@ void updatePreferencesLayout_Widget(iWidget *prefs) {
    static const char *inputIds[] = {
        "prefs.searchurl",
        "prefs.downloads",
+        "prefs.userfont",
        "prefs.ca.file",
        "prefs.ca.path",
        "prefs.proxy.gemini",
@@ -1547,8 +1552,8 @@ void updatePreferencesLayout_Widget(iWidget *prefs) {
    }
 }
-static void addDialogInputWithHeading_(iWidget *headings, iWidget *values, const char *labelText,
+static void addDialogInputWithHeadingAndFlags_(iWidget *headings, iWidget *values, const char *labelText,
-                                       const char *inputId, iInputWidget *input) {
+                                               const char *inputId, iInputWidget *input, int64_t flags) {
    iLabelWidget *head = addChild_Widget(headings, iClob(makeHeading_Widget(labelText)));
 #if defined (iPlatformMobile)
    /* On mobile, inputs have 2 gaps of extra padding. */
@@ -1560,6 +1565,13 @@ static void addDialogInputWithHeading_(iWidget *headings, iWidget *values, const
        /* Ensure that the label has the same height as the input widget. */
        as_Widget(head)->sizeRef = as_Widget(input);
    }
+    setFlags_Widget(as_Widget(head), flags, iTrue);
+    setFlags_Widget(as_Widget(input), flags, iTrue);
+}
+static void addDialogInputWithHeading_(iWidget *headings, iWidget *values, const char *labelText,
+                                       const char *inputId, iInputWidget *input) {
+    addDialogInputWithHeadingAndFlags_(headings, values, labelText, inputId, input, 0);
 }
 iInputWidget *addTwoColumnDialogInputField_Widget(iWidget *headings, iWidget *values,
@@ -1686,6 +1698,8 @@ iWidget *makePreferences_Widget(void) {
        addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.customframe}")));
        addChild_Widget(values, iClob(makeToggle_Widget("prefs.customframe")));
 #endif
+        addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.animate}")));
+        addChild_Widget(values, iClob(makeToggle_Widget("prefs.animate")));
        makeTwoColumnHeading_("${heading.prefs.scrolling}", headings, values);
        addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.smoothscroll}")));
        addChild_Widget(values, iClob(makeToggle_Widget("prefs.smoothscroll")));
@@ -1775,6 +1789,7 @@ iWidget *makePreferences_Widget(void) {
                updateSize_LabelWidget((iLabelWidget *) tog);
            }
            addChildFlags_Widget(values, iClob(boldLink), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
+            addPrefsInputWithHeading_(headings, values, "prefs.userfont", iClob(new_InputWidget(0)));
        }
        makeTwoColumnHeading_("${heading.prefs.paragraph}", headings, values);
        addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.linewidth}")));
@@ -1834,7 +1849,7 @@ iWidget *makePreferences_Widget(void) {
    updatePreferencesLayout_Widget(dlg);
    addChild_Widget(dlg,
                    iClob(makeDialogButtons_Widget(
-                        (iMenuItem[]){ { "${dismiss}", SDLK_ESCAPE, 0, "prefs.dismiss" } }, 1)));
+                        (iMenuItem[]){ { "${close}", SDLK_ESCAPE, 0, "prefs.dismiss" } }, 1)));
    addChild_Widget(dlg->root->widget, iClob(dlg));
    finalizeSheet_Mobile(dlg);
    setupSheetTransition_Mobile(dlg, iTrue);
@@ -1908,6 +1923,7 @@ static iBool handleBookmarkCreationCommands_SidebarWidget_(iWidget *editor, cons
            }
            postCommand_App("bookmarks.changed");
        }
+        setupSheetTransition_Mobile(editor, iFalse);
        destroy_Widget(editor);
        return iTrue;
    }
@@ -1937,6 +1953,7 @@ iWidget *makeBookmarkCreation_Widget(const iString *url, const iString *title, i
 static iBool handleFeedSettingCommands_(iWidget *dlg, const char *cmd) {
    if (equal_Command(cmd, "cancel")) {
+        setupSheetTransition_Mobile(dlg, iFalse);
        destroy_Widget(dlg);
        return iTrue;
    }
@@ -1971,6 +1988,7 @@ static iBool handleFeedSettingCommands_(iWidget *dlg, const char *cmd) {
            }
        }
        postCommand_App("bookmarks.changed");
+        setupSheetTransition_Mobile(dlg, iFalse);
        destroy_Widget(dlg);
        return iTrue;
    }
@@ -2042,7 +2060,21 @@ iWidget *makeIdentityCreation_Widget(void) {
        page, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);
    iWidget *values = addChildFlags_Widget(
        page, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);
+    setId_Widget(headings, "headings");
+    setId_Widget(values, "values");
    iInputWidget *inputs[6];
+    /* Where will the new identity be active on? */ {
+        addChild_Widget(headings, iClob(makeHeading_Widget("${dlg.newident.scope}")));
+        const iMenuItem items[] = {
+            { "${dlg.newident.scope.domain}", 0, 0, "ident.scope arg:0" },
+            { "${dlg.newident.scope.page}",   0, 0, "ident.scope arg:1" },
+            { "${dlg.newident.scope.none}",   0, 0, "ident.scope arg:2" },
+        };
+        setId_Widget(addChild_Widget(values,
+                                     iClob(makeMenuButton_LabelWidget(
+                                         items[0].label, items, iElemCount(items)))),
+                     "ident.scope");
+    }
    addDialogInputWithHeading_(headings,
                               values,
                               "${dlg.newident.until}",
@@ -2059,32 +2091,35 @@ iWidget *makeIdentityCreation_Widget(void) {
        setFlags_Widget(tmpGroup, arrangeSize_WidgetFlag | arrangeHorizontal_WidgetFlag, iTrue);
        addChild_Widget(tmpGroup, iClob(makeToggle_Widget("ident.temp")));
        setId_Widget(
-            addChildFlags_Widget(
+            addChildFlags_Widget(tmpGroup,
-                tmpGroup,
+                                 iClob(new_LabelWidget(uiTextCaution_ColorEscape warning_Icon
-                iClob(new_LabelWidget(uiTextCaution_ColorEscape "\u26a0  ${dlg.newident.notsaved}", NULL)),
+                                                       "  ${dlg.newident.notsaved}",
-                hidden_WidgetFlag | frameless_WidgetFlag),
+                                                       NULL)),
+                                 hidden_WidgetFlag | frameless_WidgetFlag),
            "ident.temp.note");
        addChild_Widget(values, iClob(tmpGroup));
    }
-    addChild_Widget(headings, iClob(makePadding_Widget(gap_UI)));
+    addChildFlags_Widget(headings, iClob(makePadding_Widget(gap_UI)), collapse_WidgetFlag | hidden_WidgetFlag);
-    addChild_Widget(values, iClob(makePadding_Widget(gap_UI)));
+    addChildFlags_Widget(values, iClob(makePadding_Widget(gap_UI)), collapse_WidgetFlag | hidden_WidgetFlag);
-    addDialogInputWithHeading_(headings, values, "${dlg.newident.email}",   "ident.email",   iClob(inputs[1] = newHint_InputWidget(0, "${hint.newident.optional}")));
+    addDialogInputWithHeadingAndFlags_(headings, values, "${dlg.newident.email}",   "ident.email",   iClob(inputs[1] = newHint_InputWidget(0, "${hint.newident.optional}")), collapse_WidgetFlag | hidden_WidgetFlag);
-    addDialogInputWithHeading_(headings, values, "${dlg.newident.userid}",  "ident.userid",  iClob(inputs[2] = newHint_InputWidget(0, "${hint.newident.optional}")));
+    addDialogInputWithHeadingAndFlags_(headings, values, "${dlg.newident.userid}",  "ident.userid",  iClob(inputs[2] = newHint_InputWidget(0, "${hint.newident.optional}")), collapse_WidgetFlag | hidden_WidgetFlag);
-    addDialogInputWithHeading_(headings, values, "${dlg.newident.domain}",  "ident.domain",  iClob(inputs[3] = newHint_InputWidget(0, "${hint.newident.optional}")));
+    addDialogInputWithHeadingAndFlags_(headings, values, "${dlg.newident.domain}",  "ident.domain",  iClob(inputs[3] = newHint_InputWidget(0, "${hint.newident.optional}")), collapse_WidgetFlag | hidden_WidgetFlag);
-    addDialogInputWithHeading_(headings, values, "${dlg.newident.org}",     "ident.org",     iClob(inputs[4] = newHint_InputWidget(0, "${hint.newident.optional}")));
+    addDialogInputWithHeadingAndFlags_(headings, values, "${dlg.newident.org}",     "ident.org",     iClob(inputs[4] = newHint_InputWidget(0, "${hint.newident.optional}")), collapse_WidgetFlag | hidden_WidgetFlag);
-    addDialogInputWithHeading_(headings, values, "${dlg.newident.country}", "ident.country", iClob(inputs[5] = newHint_InputWidget(0, "${hint.newident.optional}")));
+    addDialogInputWithHeadingAndFlags_(headings, values, "${dlg.newident.country}", "ident.country", iClob(inputs[5] = newHint_InputWidget(0, "${hint.newident.optional}")), collapse_WidgetFlag | hidden_WidgetFlag);
    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;
    }
    addChild_Widget(dlg,
                    iClob(makeDialogButtons_Widget(
-                        (iMenuItem[]){ { "${cancel}", 0, 0, NULL },
+                        (iMenuItem[]){ { "${dlg.newident.more}", 0, 0, "ident.showmore" },
+                                       { "---", 0, 0, NULL },
+                                       { "${cancel}", SDLK_ESCAPE, 0, "ident.cancel" },
                                       { uiTextAction_ColorEscape "${dlg.newident.create}",
                                         SDLK_RETURN,
                                         KMOD_PRIMARY,
                                         "ident.accept" } },
-                        2)));
+                        4)));
    addChild_Widget(get_Root()->widget, iClob(dlg));
    finalizeSheet_Mobile(dlg);
    return dlg;
diff --git a/src/ui/widget.c b/src/ui/widget.c
index d31f7577..4eac7ecf 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -59,6 +59,7 @@ void init_Widget(iWidget *d) {
    d->minSize        = zero_I2();
    d->sizeRef        = NULL;
    d->offsetRef      = NULL;
+    d->animOffsetRef  = NULL;
    d->bgColor        = none_ColorId;
    d->frameColor     = none_ColorId;
    init_Anim(&d->visualOffset, 0.0f);
@@ -101,9 +102,6 @@ static void aboutToBeDestroyed_Widget_(iWidget *d) {
        setFocus_Widget(NULL);
        return;
    }
-    if (flags_Widget(d) & keepOnTop_WidgetFlag) {
-        removeOne_PtrArray(onTop_Root(d->root), d);
-    }
    remove_Periodic(periodic_App(), d);
    if (isHover_Widget(d)) {
        get_Window()->hover = NULL;
@@ -771,6 +769,9 @@ static void applyVisualOffset_Widget_(const iWidget *d, iInt2 *pos) {
            pos->y += off;
        }
    }
+    if (d->animOffsetRef) {
+        pos->y -= value_Anim(d->animOffsetRef);
+    }
    if (d->flags & refChildrenOffset_WidgetFlag) {
        iConstForEach(ObjectList, i, children_Widget(d->offsetRef)) {
            const iWidget *child = i.object;
@@ -843,6 +844,12 @@ iBool containsExpanded_Widget(const iWidget *d, iInt2 windowCoord, int expand) {
        addY_I2(d->rect.size,
                d->flags & drawBackgroundToBottom_WidgetFlag ? size_Root(d->root).y : 0)
    };
+    /* Apply the animated offset. (Visual offsets don't affect interaction.) */
+    for (const iWidget *w = d; w; w = w->parent) {
+        if (w->animOffsetRef) {
+            windowCoord.y += value_Anim(w->animOffsetRef);
+        }
+    }
    return contains_Rect(expand ? expanded_Rect(bounds, init1_I2(expand)) : bounds,
                         windowToInner_Widget(d, windowCoord));
 }
@@ -857,6 +864,9 @@ iLocalDef iBool isMouseEvent_(const SDL_Event *ev) {
 }
 static iBool filterEvent_Widget_(const iWidget *d, const SDL_Event *ev) {
+    if (d->flags & destroyPending_WidgetFlag) {
+        return iFalse; /* no more events handled */
+    }
    const iBool isKey   = isKeyboardEvent_(ev);
    const iBool isMouse = isMouseEvent_(ev);
    if ((d->flags & disabled_WidgetFlag) || (d->flags & hidden_WidgetFlag &&
@@ -1102,8 +1112,8 @@ void drawBackground_Widget(const iWidget *d) {
        drawSoftShadow_Paint(&p, bounds_Widget(d), 12 * gap_UI, black_ColorId, 30);
    }
    const iBool isFaded = fadeBackground &&
-                          ~d->flags & noFadeBackground_WidgetFlag &&
+                          ~d->flags & noFadeBackground_WidgetFlag;/* &&
-                          ~d->flags & destroyPending_WidgetFlag;
+                          ~d->flags & destroyPending_WidgetFlag;*/
    if (isFaded) {
        iPaint p;
        init_Paint(&p);
diff --git a/src/ui/widget.h b/src/ui/widget.h
index 79d45f23..8de62b7a 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -139,6 +139,7 @@ struct Impl_Widget {
    iInt2        minSize;
    iWidget *    sizeRef;
    iWidget *    offsetRef;
+    const iAnim *animOffsetRef;
    int          padding[4]; /* left, top, right, bottom */
    iAnim        visualOffset;
    int          bgColor;
diff --git a/src/ui/window.c b/src/ui/window.c
index 87db2f3e..96a22fee 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -858,6 +858,19 @@ iBool processEvent_Window(iWindow *d, const SDL_Event *ev) {
                const iInt2 pos = coord_Window(d, event.button.x, event.button.y);
                event.button.x = pos.x;
                event.button.y = pos.y;
+                if (event.type == SDL_MOUSEBUTTONDOWN) {
+                    /* Button clicks will change keyroot. */
+                    if (numRoots_Window(d) > 1) {
+                        const iInt2 click = init_I2(event.button.x, event.button.y);
+                        iForIndices(i, d->roots) {
+                            iRoot *root = d->roots[i];
+                            if (root != d->keyRoot && contains_Rect(rect_Root(root), click)) {
+                                setKeyRoot_Window(d, root);
+                                break;
+                            }
+                        }
+                    }
+                }
            }
            const iWidget *oldHover = d->hover;
            iBool wasUsed = iFalse;
@@ -889,7 +902,9 @@ iBool processEvent_Window(iWindow *d, const SDL_Event *ev) {
                    wasUsed = dispatchEvent_Window(d, &paste);
                }
                if (event.type == SDL_MOUSEBUTTONDOWN && event.button.button == SDL_BUTTON_RIGHT) {
-                    postContextClick_Window(d, &event.button);
+                    if (postContextClick_Window(d, &event.button)) {
+                        wasUsed = iTrue;
+                    }
                }
            }
            if (isMetricsChange_UserEvent(&event)) {