Merge branch 'dev' into work/typesetter

# Conflicts: # src/ui/documentwidget.c # src/ui/inputwidget.c
author: Jaakko Keränen <jaakko.keranen@iki.fi> 2021-05-18 07:04:27 +0300
committer: Jaakko Keränen <jaakko.keranen@iki.fi> 2021-05-18 07:04:27 +0300
commit: facc3abb7faafb323cb87e26ddba8dac01af02e9 (patch)
tree: 387aa23e03b029f516ecca6880131fd6523e1c3f
parent: ced855c338b78e05c66d38618373728ef946ebaa (diff)
parent: 5d517c2f790a38d7fe3c3cc59a1b39fd49e20280 (diff)
49 files changed, 3438 insertions, 1004 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 17fded2b..a1037b0c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,8 +22,11 @@ project (Lagrange
    DESCRIPTION "A Beautiful Gemini Client"
    LANGUAGES C
 )
-set (IOS_BUNDLE_VERSION 6)
 set (COPYRIGHT_YEAR 2021)
+if (IOS)
+    set (PROJECT_VERSION 1.4)  # pinned for TestFlight
+    set (IOS_BUNDLE_VERSION 7) # just increment this
+endif ()
 # Build configuration.
 option (ENABLE_IPC              "Use IPC to communicate between running instances" ON)
@@ -87,6 +90,7 @@ set (EMBED_RESOURCES
    res/lang/fr.bin
    res/lang/ia.bin
    res/lang/ie.bin
+    res/lang/pl.bin
    res/lang/ru.bin
    res/lang/sr.bin
    res/lang/tok.bin
@@ -176,6 +180,8 @@ set (SOURCES
    src/ui/root.h
    src/ui/mediaui.c
    src/ui/mediaui.h
+    src/ui/mobile.c
+    src/ui/mobile.h
    src/ui/scrollwidget.c
    src/ui/scrollwidget.h
    src/ui/sidebarwidget.c
diff --git a/po/compile.py b/po/compile.py
index 5cf403db..257f9b6f 100755
--- a/po/compile.py
+++ b/po/compile.py
@@ -6,7 +6,18 @@ import os, sys
 BUILD_LANGS = [
    'en', # base strings
-    'de', 'es', 'fi', 'fr', 'ia', 'ie', 'ru', 'sr', 'tok', 'zh_Hans', 'zh_Hant'
+    'de',
+    'es',
+    'fi',
+    'fr',
+    'ia',
+    'ie',
+    'pl',
+    'ru',
+    'sr',
+    'tok',
+    'zh_Hans',
+    'zh_Hant'
 ]
 MODE = 'compile'
 ESCAPES = {
diff --git a/po/en.po b/po/en.po
index 025600fc..60beade4 100644
--- a/po/en.po
+++ b/po/en.po
@@ -640,6 +640,9 @@ msgstr "Copy Fingerprint"
 msgid "dlg.input.prompt"
 msgstr "Please enter input for %s:"
+msgid "dlg.input.linebreak"
+msgstr "Line break"
 msgid "dlg.input.send"
 msgstr "Send"
@@ -885,6 +888,9 @@ msgstr "Italian"
 msgid "lang.ja"
 msgstr "Japanese"
+msgid "lang.pl"
+msgstr "Polish"
 msgid "lang.pt"
 msgstr "Portuguese"
diff --git a/po/fi.po b/po/fi.po
index e7885e02..60dfc33b 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-06 09:39+0000\n"
+"PO-Revision-Date: 2021-05-13 05:38+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"
@@ -1576,3 +1576,6 @@ msgstr "Aseta näkymän jakaus"
 msgid "keys.split.next"
 msgstr "Aktivoi seuraava jakaus"
+msgid "lang.pl"
+msgstr "Puola"
diff --git a/po/isv.po b/po/isv.po
new file mode 100644
index 00000000..b1ffdc84
--- /dev/null
+++ b/po/isv.po
@@ -0,0 +1,193 @@
+msgid ""
+msgstr ""
+"Report-Msgid-Bugs-To: jaakko.keranen@iki.fi\n"
+"PO-Revision-Date: 2021-05-13 04:58+0000\n"
+"Last-Translator: Waterrail <maksymiliankrol03@gmail.com>\n"
+"Language-Team: Interslavic <http://weblate.skyjake.fi/projects/lagrange/ui/"
+"isv/>\n"
+"Language: isv\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==1? 0 : n==2 ? 1 : 2;\n"
+"X-Generator: Weblate 4.5.1\n"
+msgid "doc.pre.nocaption"
+msgstr "Vvodno sformatovany napis bez opisa"
+# Inline download status message.
+msgid "media.download.warnclose"
+msgstr "Dostava bude odrěčeny pri zamknutju tutoj karticy."
+#, c-format
+msgid "feeds.list.counts"
+msgid_plural "feeds.list.counts.n"
+msgstr[0] "Jeste podpisyvani na %zu tasmě sodrživajučej %%s.\n"
+msgstr[1] "Jeste podpisyvani na %zu tasmu sodrživajuču %%s.\n"
+msgstr[2] "Jeste podpisyvani na %zu tasmah sodrživajučih %%s.\n"
+# Link download progress message.
+msgid "doc.fetching"
+msgstr "Dostavanje"
+#, c-format
+msgid "doc.archive"
+msgstr "%s je spakovany arhivom."
+msgid "doc.archive.view"
+msgstr "Prěgleděti sodržanje arhiva"
+# Inline download status message.
+msgid "media.download.complete"
+msgstr "Dostava ukončena."
+# Used in inline audio player metadata popup.
+msgid "audio.meta.title"
+msgstr "Nazva"
+# Used in inline audio player metadata popup.
+msgid "audio.meta.artist"
+msgstr "Artist"
+# Used in inline audio player metadata popup.
+msgid "audio.meta.date"
+msgstr "Data"
+# used as adjective, n is 8, 16, 24, 32, or 64
+#, c-format
+msgid "n.bit"
+msgstr "%d-bitny"
+msgid "numbertype.integer"
+msgstr "cělo"
+msgid "numbertype.float"
+msgstr "s plavajučeju komoju"
+# Hertz, unit for frequency values
+msgid "hz"
+msgstr "Hz"
+# Used in about:feeds.
+msgid "feeds.list.title"
+msgstr "Vpisy v tasmě"
+msgid "archive.exit"
+msgstr "Izhod iz arhiva"
+msgid "bookmark.delete"
+msgstr "Dodati zakladku"
+msgid "bookmark.tag.linksplit"
+msgstr "Linky otvarjane v děljenom oknom"
+msgid "bookmarks.reload"
+msgstr "Izsinhronizovati s žrlom zakladok"
+msgid "dir.empty"
+msgstr "Toj katalog je pusty."
+#, c-format
+msgid "dir.summary"
+msgid_plural "dir.summary.n"
+msgstr[0] "Toj katalog sodrživa %zu element."
+msgstr[1] "Toj katalog sodrživa %zu elementa."
+msgstr[2] "Toj katalog sodrživa %zu elementy."
+msgid "dlg.autoreload"
+msgstr "Izberite interval automatičnogo ponovnogo nakladanja toj karticy."
+msgid "dlg.bookmark.icon"
+msgstr "Ikona:"
+msgid "dlg.bookmark.save"
+msgstr "Zapisati zakladku"
+msgid "dlg.certimport.help"
+msgstr ""
+"Vstavite privatny ključ i/abo svědočstvo v formatu PEM,\n"
+"abo spustite fajl .crt/.key na oblast okna."
+# Alt-text of the preformatted logo.
+msgid "about.logo"
+msgstr "ASCII-art: rěč \"Lagrange\" natipkana velikym fontom"
+msgid "about.powered"
+msgstr "Ustanovjeny na SDL 2, OpenSSL i ☕️"
+msgid "about.tagline"
+msgstr "Krasny klient Gemini"
+msgid "about.version"
+msgstr "Versija"
+# Used in inline audio player metadata popup.
+msgid "audio.meta.genre"
+msgstr "Žanr"
+msgid "cancel"
+msgstr "Anulovati"
+#, c-format
+msgid "days.ago"
+msgid_plural "days.ago.n"
+msgstr[0] "%d dni nazad"
+msgstr[1] "%d dnja nazad"
+msgstr[2] "%d denj nazad"
+msgid "dismiss"
+msgstr "Zamknuti"
+msgid "bookmark.tag.home"
+msgstr "Upotrěbiti kako glavnu stranicu"
+msgid "bookmark.tag.remote"
+msgstr "Upotrěbiti kako žrlo zakladok"
+msgid "bookmark.tag.sub"
+msgstr "Podpiš tasmu"
+msgid "bookmark.untag.home"
+msgstr "Odstraniti glavnu stranicu"
+msgid "bookmark.untag.remote"
+msgstr "Odstraniti žrlo zakladok"
+msgid "bookmark.untag.sub"
+msgstr "Odrěči podpisku tasmy"
+msgid "dlg.cert.fingerprint"
+msgstr "Kopirovati odtisk prsta"
+msgid "dlg.cert.trust"
+msgstr "Dověrjati"
+msgid "dlg.certimport.import"
+msgstr "Importovati"
+msgid "dlg.certimport.nocert"
+msgstr "Nemaje svědočstva"
+msgid "dlg.certimport.nokey"
+msgstr "Nemaje privatnogo ključa"
+msgid "dlg.certimport.notes"
+msgstr "Zapisky:"
+msgid "dlg.certimport.notfound"
+msgstr "Svědočstvo abo privatny ključ ne najdeny."
+msgid "dlg.certimport.notfound.page"
+msgstr "Nemaje svědočstva/ključa na sejčasnoj stranici."
+msgid "bookmark.title.blank"
+msgstr "Pusta stranica"
+msgid "dlg.bookmark.title"
+msgstr "Nazva:"
+msgid "dlg.bookmark.tags"
+msgstr "Etikety:"
+msgid "dlg.bookmark.url"
+msgstr "URL:"
diff --git a/po/pl.po b/po/pl.po
new file mode 100644
index 00000000..01e295b8
--- /dev/null
+++ b/po/pl.po
@@ -0,0 +1,1629 @@
+msgid ""
+msgstr ""
+"Report-Msgid-Bugs-To: jaakko.keranen@iki.fi\n"
+"PO-Revision-Date: 2021-05-13 04:58+0000\n"
+"Last-Translator: Waterrail <maksymiliankrol03@gmail.com>\n"
+"Language-Team: Polish <http://weblate.skyjake.fi/projects/lagrange/ui/pl/>\n"
+"Language: pl\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==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.5.1\n"
+msgid "error.proxyrefusal.msg"
+msgstr ""
+"Żądanie dotyczyło zasobu w domenie, która nie jest obsługiwana przez serwer, "
+"a serwer nie akceptuje żądań proxy."
+msgid "gempub.cover.viewlocal"
+msgstr "Aby wyświetlić tę książkę Gempub, najpierw musisz ją pobrać."
+msgid "gempub.meta.revdate"
+msgstr "Data korekty"
+# Link download progress message.
+msgid "doc.fetching"
+msgstr "Pobieram"
+#, c-format
+msgid "doc.archive"
+msgstr "%s jest archiwum skompresowanym."
+# Inline download status message.
+msgid "media.download.complete"
+msgstr "Ukończono pobieranie."
+# Used in inline audio player metadata popup.
+msgid "audio.meta.title"
+msgstr "Tytuł"
+# Used in inline audio player metadata popup.
+msgid "audio.meta.artist"
+msgstr "Artysta"
+# Used in inline audio player metadata popup.
+msgid "audio.meta.genre"
+msgstr "Gatunek"
+# used as adjective, n is 8, 16, 24, 32, or 64
+#, c-format
+msgid "n.bit"
+msgstr "%d-bitowy"
+msgid "numbertype.integer"
+msgstr "całkowita"
+msgid "numbertype.float"
+msgstr "zmiennoprzecinkowa"
+# Hertz, unit for frequency values
+msgid "hz"
+msgstr "Hz"
+# Used in about:feeds.
+msgid "feeds.list.title"
+msgstr "Wpisy kanału"
+#, c-format
+msgid "feeds.list.entrycount"
+msgid_plural "feeds.list.entrycount.n"
+msgstr[0] "łącznie %zu wpis"
+msgstr[1] "łącznie %zu wpisy"
+msgstr[2] "łącznie %zu wpisów"
+msgid "feeds.list.refreshtime.now"
+msgstr "Ostatnie odświeżenie miało miejsce przed chwilą."
+#, c-format
+msgid "feeds.list.refreshtime"
+msgstr "Ostatnie odświeżenie miało miejsce %s."
+#, c-format
+msgid "minutes.ago"
+msgid_plural "minutes.ago.n"
+msgstr[0] "minutę temu"
+msgstr[1] "%d minuty temu"
+msgstr[2] "%d minut temu"
+msgid "about.tagline"
+msgstr "Piękny klient Gemini"
+msgid "about.version"
+msgstr "Wersja"
+msgid "about.powered"
+msgstr "Oparty na SDL 2, OpenSSL oraz ☕️"
+msgid "cancel"
+msgstr "Anuluj"
+msgid "menu.title.edit"
+msgstr "Edytuj"
+msgid "menu.title.view"
+msgstr "Podgląd"
+msgid "menu.title.bookmarks"
+msgstr "Zakładki"
+msgid "menu.title.identity"
+msgstr "Tożsamość"
+msgid "dismiss"
+msgstr "Zamknij"
+msgid "dlg.message.ok"
+msgstr "Kontynuuj"
+msgid "dlg.default"
+msgstr " OK "
+msgid "toggle.yes"
+msgstr "TAK"
+msgid "toggle.no"
+msgstr "NIE"
+msgid "menu.newtab"
+msgstr "Nowa karta"
+msgid "menu.closetab"
+msgstr "Zamknij kartę"
+msgid "menu.closetab.left"
+msgstr "Zamknij karty po lewej"
+msgid "menu.closetab.right"
+msgstr "Zamknij karty po prawej"
+msgid "menu.duptab"
+msgstr "Powiel kartę"
+msgid "menu.split.merge"
+msgstr "Scal karty"
+msgid "menu.split.swap"
+msgstr "Zamień karty miejscami"
+msgid "menu.split.horizontal"
+msgstr "Poziomo"
+msgid "menu.openlocation"
+msgstr "Otwórz lokalizację…"
+msgid "menu.downloads"
+msgstr "Pokaż folder pobranych"
+msgid "menu.find"
+msgstr "Znajdź na stronie"
+msgid "macos.menu.find"
+msgstr "Znajdź"
+# Used on desktop operating systems. "Downloads" refers to the user's configured downloads directory.
+msgid "menu.save.downloads"
+msgstr "Zapisz w Pobranych"
+msgid "menu.sidebar"
+msgstr "Przełącz pasek boczny"
+msgid "menu.sidebar.left"
+msgstr "Przełącz lewy panel boczny"
+msgid "menu.sidebar.right"
+msgstr "Przełącz prawy panel boczny"
+msgid "menu.zoom.in"
+msgstr "Powiększ"
+msgid "menu.zoom.out"
+msgstr "Pomniejsz"
+msgid "menu.zoom.reset"
+msgstr "Resetuj powiększenie"
+msgid "macos.menu.bookmarks.list"
+msgstr "Pokaż wszystkie"
+msgid "menu.view.split"
+msgstr "Widok dzielony…"
+msgid "macos.menu.bookmarks.bytag"
+msgstr "Sortuj według tagu"
+msgid "macos.menu.bookmarks.bytime"
+msgstr "Sortuj według daty utworzenia"
+msgid "menu.feeds.entrylist"
+msgstr "Pokaż wpisy kanału"
+msgid "menu.help"
+msgstr "Pomoc"
+msgid "menu.releasenotes"
+msgstr "Informacje o wydaniu"
+msgid "menu.quit"
+msgstr "Wyjdź z Lagrange"
+msgid "menu.preferences"
+msgstr "Opcje…"
+msgid "menu.copy"
+msgstr "Kopiuj"
+msgid "menu.paste"
+msgstr "Wklej"
+msgid "menu.select.clear"
+msgstr "Wyczyść zaznaczenie"
+# Used in the View menu on macOS. Shows sidebar and switches sidebar tab.
+msgid "menu.show.bookmarks"
+msgstr "Pokaż zakładki"
+# Used in the View menu on macOS. Shows sidebar and switches sidebar tab.
+msgid "menu.show.feeds"
+msgstr "Pokaż kanały"
+# Used in the View menu on macOS. Shows sidebar and switches sidebar tab.
+msgid "menu.show.history"
+msgstr "Pokaż historię"
+# Used in the View menu on macOS. Shows sidebar and switches sidebar tab.
+msgid "menu.show.identities"
+msgstr "Pokaż tożsamości"
+msgid "menu.back"
+msgstr "Wstecz"
+msgid "menu.forward"
+msgstr "Dalej"
+msgid "menu.parent"
+msgstr "Przejdź do katalogu nadrzędnego"
+msgid "menu.root"
+msgstr "Przejdź do katalogu głównego"
+msgid "menu.reload"
+msgstr "Odśwież stronę"
+msgid "menu.autoreload"
+msgstr "Ustaw autoodświeżanie…"
+msgid "menu.page.bookmark"
+msgstr "Dodaj stronę do zakładek…"
+msgid "menu.aboutpages"
+msgstr "Strony z informacjami"
+msgid "menu.about"
+msgstr "O Lagrange"
+msgid "panel.back"
+msgstr "Wstecz"
+msgid "menu.debug"
+msgstr "Informacje debugowania"
+msgid "menu.page.import"
+msgstr "Importuj linki jako zakładki…"
+msgid "menu.page.translate"
+msgstr "Przetłumacz…"
+msgid "menu.page.copyurl"
+msgstr "Kopiuj adres strony"
+msgid "menu.page.copysource"
+msgstr "Kopiuj źródło strony"
+msgid "menu.feeds.refresh"
+msgstr "Odśwież kanały"
+msgid "menu.identity.new"
+msgstr "Nowa tożsamość…"
+msgid "menu.identity.import"
+msgstr "Importuj…"
+msgid "sidebar.bookmarks"
+msgstr "Zakładki"
+msgid "sidebar.history"
+msgstr "Historia"
+msgid "sidebar.identities"
+msgstr "Tożsamości"
+msgid "sidebar.outline"
+msgstr "Konspekt"
+msgid "sidebar.action.feeds.showunread"
+msgstr "Nieprzeczytane"
+msgid "sidebar.action.ident.new"
+msgstr "Nowa…"
+msgid "toolbar.outline"
+msgstr "Konspekt strony"
+msgid "hint.findtext"
+msgstr "Znajdź tekst na stronie"
+msgid "status.query"
+msgstr "Zapytanie wyszukiwania"
+msgid "status.feeds"
+msgstr "Aktualizuję kanały"
+# megabytes, used as the unit after a number
+msgid "mb"
+msgstr "MB"
+msgid "mb.per.sec"
+msgstr "MB/s"
+# kilobytes, used as the unit after a number
+msgid "kb"
+msgstr "KB"
+msgid "num.bytes"
+msgid_plural "num.bytes.n"
+msgstr[0] "%zu bajt"
+msgstr[1] "%zu bajty"
+msgstr[2] "%zu bajtów"
+# strftime() formatted, split on two lines
+#, c-format
+msgid "page.timestamp"
+msgstr ""
+"Otrzymano %d.%m.%Y\n"
+"o %H:%M"
+# strftime() formatted
+#, c-format
+msgid "sidebar.date.thisyear"
+msgstr "%d %B"
+# strftime() formatted
+#, c-format
+msgid "sidebar.date.otheryear"
+msgstr "%d.%m.%Y"
+msgid "feeds.today"
+msgstr "Dziś"
+msgid "feeds.entry.newtab"
+msgstr "Otwórz wpis w nowej karcie"
+msgid "feeds.entry.markread"
+msgstr "Oznacz jako przeczytane"
+msgid "sidebar.entry.bookmark"
+msgstr "Dodaj zakładkę…"
+msgid "feeds.entry.bookmark"
+msgstr "Dodaj zakładkę…"
+msgid "feeds.unsubscribe"
+msgstr "Anuluj subskrypcję…"
+msgid "feeds.markallread"
+msgstr "Oznacz wszystko jako przeczytane"
+msgid "feeds.refresh"
+msgstr "Odśwież kanały"
+msgid "menu.opentab"
+msgstr "Otwórz w nowej karcie"
+msgid "menu.opentab.background"
+msgstr "Otwórz w nowej karcie w tle"
+msgid "menu.edit"
+msgstr "Edytuj…"
+msgid "menu.dup"
+msgstr "Powiel…"
+msgid "menu.forgeturl"
+msgstr "Zapomnij adres URL"
+msgid "history.clear"
+msgstr "Wyczyść historię…"
+msgid "heading.history.clear"
+msgstr "CZYSZCZENIE HISTORII"
+msgid "dlg.history.clear"
+msgstr "Wyczyść historię"
+msgid "bookmark.tag.home"
+msgstr "Użyj jako strony głównej"
+msgid "bookmark.tag.sub"
+msgstr "Subskrybuj kanał"
+msgid "bookmark.tag.remote"
+msgstr "Użyj jako źródła zakładek"
+msgid "bookmark.untag.home"
+msgstr "Usuń stronę główną"
+msgid "bookmark.untag.sub"
+msgstr "Anuluj subskrypcję kanału"
+msgid "bookmark.tag.linksplit"
+msgstr "Linki otwierane w podzielonym oknie"
+msgid "bookmark.delete"
+msgstr "Usuń zakładkę"
+msgid "bookmarks.reload"
+msgstr "Odśwież zewnętrzne zakładki"
+msgid "ident.notused"
+msgstr "Nieużywana"
+#, c-format
+msgid "ident.usedonurls"
+msgid_plural "ident.usedonurls.n"
+msgstr[0] "Używana w %zu adresie URL"
+msgstr[1] "Używana w %zu adresach URL"
+msgstr[2] "Używana w %zu adresach URL"
+msgid "ident.temporary"
+msgstr "Tymczasowa"
+msgid "ident.stopuse.all"
+msgstr "Nie używaj nigdzie"
+msgid "ident.use"
+msgstr "Używaj na tej stronie"
+msgid "ident.stopuse"
+msgstr "Nie używaj na tej stronie"
+msgid "ident.showuse"
+msgstr "Pokaż użycie"
+msgid "heading.ident.use"
+msgstr "UŻYCIE TOŻSAMOŚCI"
+msgid "menu.edit.notes"
+msgstr "Edytuj adnotacje…"
+msgid "heading.ident.notes"
+msgstr "ADNOTACJE TOŻSAMOŚCI"
+# %s refers to name of an identity.
+#, c-format
+msgid "dlg.ident.notes"
+msgstr "Adnotacje na temat tożsamości %s:"
+msgid "ident.fingerprint"
+msgstr "Kopiuj odcisk palca"
+msgid "ident.delete"
+msgstr "Usuń tożsamość…"
+msgid "heading.ident.delete"
+msgstr "USUWANIE TOŻSAMOŚCI"
+msgid "dlg.ident.delete"
+msgstr "Usuń tożsamość i pliki"
+#, c-format
+msgid "dlg.confirm.unsub"
+msgstr ""
+"Czy na pewno chcesz anulować subskrypcję kanału\n"
+"„%s”?"
+msgid "dlg.unsub"
+msgstr "Anuluj subskrypcję"
+#, c-format
+msgid "error.unsupported.suggestsave"
+msgstr ""
+"Możesz zapisać go jako plik w folderze Pobrane: naciśnij %s lub wybierz „%s” "
+"z menu."
+msgid "heading.pageinfo"
+msgstr "INFORMACJE NA TEMAT STRONY"
+msgid "pageinfo.header.cached"
+msgstr "(zawartość pamięci podręcznej)"
+msgid "heading.unsub"
+msgstr "ANULOWANIE SUBSKRYPCJI"
+msgid "pageinfo.cert.ca.unverified"
+msgstr "Niezweryfikowany przez CA"
+msgid "pageinfo.cert.notexpired"
+msgstr "Niewygasły"
+msgid "pageinfo.cert.expired"
+msgstr "Wygasły"
+msgid "pageinfo.cert.trusted"
+msgstr "Zaufany"
+msgid "pageinfo.cert.untrusted"
+msgstr "Niezaufany"
+msgid "pageinfo.domain.match"
+msgstr "Pasująca nazwa domeny"
+msgid "pageinfo.domain.mismatch"
+msgstr "Niepasująca nazwa domeny"
+msgid "dlg.cert.trust"
+msgstr "Ufaj"
+msgid "dlg.cert.fingerprint"
+msgstr "Kopiuj odcisk palca"
+#, c-format
+msgid "dlg.input.prompt"
+msgstr "Wprowadź dane dla %s:"
+msgid "dlg.input.send"
+msgstr "Wyślij"
+msgid "heading.save"
+msgstr "ZAPISANO PLIK"
+msgid "heading.save.incomplete"
+msgstr "STRONA NIEKOMPLETNA"
+msgid "dlg.save.incomplete"
+msgstr "Zawartość strony jest nadal pobierana."
+msgid "dlg.save.size"
+msgstr "Rozmiar:"
+msgid "dlg.save.opendownload"
+msgstr "Otwórz pobrany plik"
+msgid "heading.save.error"
+msgstr "BŁĄD ZAPISYWANIA PLIKU"
+msgid "heading.import.bookmarks"
+msgstr "IMPORTUJ ZAKŁADKI"
+#, c-format
+msgid "dlg.import.add"
+msgid_plural "dlg.import.add.n"
+msgstr[0] "%sDodaj zakładkę"
+msgstr[1] "%sDodaj %d zakładki"
+msgstr[2] "%sDodaj %d zakładek"
+msgid "dlg.import.notnew"
+msgstr "Wszystkie linki na tej stronie są już oznaczone zakładką."
+msgid "heading.autoreload"
+msgstr "AUTOODŚWIEŻANIE"
+msgid "dlg.autoreload"
+msgstr "Wybierz interwał autoodświeżania tej karty."
+msgid "reload.never"
+msgstr "Nigdy"
+msgid "reload.onceperday"
+msgstr "Raz dziennie"
+#, c-format
+msgid "num.hours"
+msgid_plural "num.hours.n"
+msgstr[0] "%d godzina"
+msgstr[1] "%d godziny"
+msgstr[2] "%d godzin"
+msgid "link.newtab"
+msgstr "Otwórz link w nowej karcie"
+msgid "link.browser"
+msgstr "Otwórz link w domyślnej przeglądarce"
+msgid "link.noproxy"
+msgstr "Otwórz bez użycia proxy"
+msgid "link.copy"
+msgstr "Kopiuj link"
+msgid "link.bookmark"
+msgstr "Dodaj link do zakładek…"
+msgid "link.side"
+msgstr "Otwórz link w innym oknie"
+msgid "link.side.newtab"
+msgstr "Otwórz link w nowym oknie"
+msgid "heading.openlink"
+msgstr "OTWARCIE LINKU"
+#, c-format
+msgid "dlg.openlink.confirm"
+msgstr ""
+"Otworzyć link w przeglądarce domyślnej?\n"
+"%s%s"
+msgid "dlg.openlink"
+msgstr "Otwórz link"
+msgid "heading.certwarn"
+msgstr "NIEZAUFANY CERTYFIKAT"
+msgid "dlg.certwarn.different"
+msgstr ""
+"Otrzymany certyfikat jest ważny, ale różni się od tego zaufanego przez nas."
+msgid "dlg.certwarn.domain.expired"
+msgstr "Otrzymany certyfikat zarówno wygasł, jak i dotyczy niewłaściwej domeny."
+msgid "heading.certimport"
+msgstr "IMPORT TOŻSAMOŚCI"
+msgid "dlg.certimport.help"
+msgstr ""
+"Wklej klucz prywatny i/lub certyfikat w formacie PEM,\n"
+"albo upuść plik .crt/.key na obszar okna."
+msgid "heading.certimport.pasted"
+msgstr "WKLEJONO ZE SCHOWKA"
+msgid "heading.certimport.dropped"
+msgstr "UPUSZCZONO PLIK"
+msgid "dlg.certimport.import"
+msgstr "Importuj"
+msgid "dlg.certimport.notes"
+msgstr "Adnotacje:"
+msgid "hint.certimport.description"
+msgstr "opis"
+msgid "dlg.certimport.nokey"
+msgstr "Brak prywatnego klucza"
+msgid "link.hint.audio"
+msgstr "Odtwórz dźwięk"
+msgid "link.hint.image"
+msgstr "Wyświetl obraz"
+msgid "bookmark.title.blank"
+msgstr "Pusta strona"
+# Interpret as "Results from bookmarks..."
+msgid "heading.lookup.bookmarks"
+msgstr "ZAKŁADKI"
+# Interpret as "Results from feeds..."
+msgid "heading.lookup.feeds"
+msgstr "KANAŁY"
+# Interpret as "Results from history..."
+msgid "heading.lookup.history"
+msgstr "HISTORIA"
+# Interpret as "Results from page content..."
+msgid "heading.lookup.pagecontent"
+msgstr "ZAWARTOŚĆ STRONY"
+msgid "heading.translate"
+msgstr "TŁUMACZENIE STRONY"
+msgid "dlg.translate.unavail"
+msgstr "Usługa niedostępna"
+msgid "dlg.translate"
+msgstr "Tłumacz"
+msgid "lang.ar"
+msgstr "arabski"
+msgid "lang.zh"
+msgstr "chiński"
+msgid "lang.zh.hans"
+msgstr "chiński (uproszczony)"
+msgid "dlg.translate.from"
+msgstr "Język strony:"
+msgid "dlg.translate.to"
+msgstr "Język docelowy:"
+msgid "lang.zh.hant"
+msgstr "chiński (tradycyjny)"
+msgid "lang.de"
+msgstr "niemiecki"
+msgid "lang.en"
+msgstr "angielski"
+msgid "lang.ia"
+msgstr "interlingua"
+msgid "lang.ie"
+msgstr "interlingue"
+msgid "lang.fi"
+msgstr "fiński"
+msgid "lang.fr"
+msgstr "francuski"
+msgid "lang.hi"
+msgstr "hindi"
+msgid "lang.it"
+msgstr "włoski"
+msgid "lang.ja"
+msgstr "japoński"
+msgid "lang.ru"
+msgstr "rosyjski"
+msgid "lang.es"
+msgstr "hiszpański"
+msgid "lang.sr"
+msgstr "serbski"
+msgid "lang.tok"
+msgstr "toki pona"
+msgid "heading.newident"
+msgstr "NOWA TOŻSAMOŚĆ"
+msgid "dlg.newident.until"
+msgstr "Data ważności:"
+msgid "hint.newident.date"
+msgstr "RRRR-MM-DD GG:MM:SS"
+msgid "dlg.newident.commonname"
+msgstr "Nazwa zwyczajowa:"
+msgid "dlg.newident.temp"
+msgstr "Tymczasowo:"
+msgid "dlg.newident.notsaved"
+msgstr "nie zapisano na dysku"
+msgid "hint.newident.optional"
+msgstr "pole opcjonalne"
+msgid "dlg.newident.userid"
+msgstr "Identyfikator użytkownika:"
+msgid "dlg.newident.domain"
+msgstr "Domena:"
+msgid "dlg.newident.org"
+msgstr "Organizacja:"
+msgid "dlg.newident.country"
+msgstr "Kraj:"
+msgid "heading.newident.missing"
+msgstr "BRAKUJĄCE DANE"
+msgid "dlg.newindent.missing.commonname"
+msgstr "Podaj nazwę zwyczajową."
+msgid "heading.newident.date.bad"
+msgstr "NIEWŁAŚCIWA DATA"
+msgid "dlg.newident.date.past"
+msgstr "Data wygaśnięcia musi przypadać w przyszłości."
+msgid "heading.feedcfg"
+msgstr "USTAWIENIA KANAŁU"
+msgid "heading.subscribe"
+msgstr "SUBSKRYBOWANIE STRONY"
+msgid "dlg.feed.title"
+msgstr "Tytuł:"
+msgid "dlg.feed.type.gemini"
+msgstr "Linki RRRR-MM-DD"
+msgid "dlg.feed.type.headings"
+msgstr "Nowe nagłówki"
+msgid "dlg.feed.save"
+msgstr "Zapisz ustawienia"
+msgid "dlg.feed.sub"
+msgstr "Subskrybuj"
+msgid "heading.bookmark.edit"
+msgstr "EDYCJA ZAKŁADKI"
+msgid "dlg.bookmark.save"
+msgstr "Zapisz zakładkę"
+msgid "dlg.bookmark.title"
+msgstr "Tytuł:"
+msgid "dlg.bookmark.url"
+msgstr "Adres:"
+msgid "dlg.bookmark.icon"
+msgstr "Ikona:"
+msgid "heading.prefs"
+msgstr "OPCJE"
+msgid "heading.prefs.certs"
+msgstr "CERTYFIKATY"
+msgid "heading.prefs.fonts"
+msgstr "CZCIONKI"
+# tab button
+msgid "heading.prefs.interface"
+msgstr "Interfejs"
+# tab button
+msgid "heading.prefs.keys"
+msgstr "Klawisze"
+# tab button
+msgid "heading.prefs.network"
+msgstr "Sieć"
+msgid "heading.prefs.paragraph"
+msgstr "PARAGRAF"
+msgid "heading.prefs.pagecontent"
+msgstr "ZAWARTOŚĆ STRON"
+msgid "heading.prefs.proxies"
+msgstr "PROXY"
+msgid "heading.prefs.scrolling"
+msgstr "PRZEWIJANIE"
+msgid "heading.prefs.sizing"
+msgstr "ROZMIAR"
+msgid "heading.prefs.widelayout"
+msgstr "SZEROKI UKŁAD"
+# tab button
+msgid "heading.prefs.style"
+msgstr "Styl"
+# tab button
+msgid "heading.prefs.userinterface"
+msgstr "Interfejs użytkownika"
+msgid "prefs.downloads"
+msgstr "Folder pobranych plików:"
+msgid "prefs.hoverlink"
+msgstr "Pokazuj adres po najechaniu kursorem:"
+msgid "prefs.centershort"
+msgstr "Wyrównanie w pionie:"
+# 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 "Otwieraj indeksy archiwum:"
+msgid "prefs.pinsplit"
+msgstr "Otwieraj linki w widoku dzielonym:"
+msgid "prefs.pinsplit.none"
+msgstr "W tym samym oknie"
+msgid "prefs.pinsplit.left"
+msgstr "w oknie z prawej"
+msgid "prefs.pinsplit.right"
+msgstr "w oknie z lewej"
+msgid "prefs.smoothscroll"
+msgstr "Gładkie przewijanie:"
+msgid "prefs.hidetoolbarscroll"
+msgstr "Ukryj pasek narzędzi przy przewijaniu:"
+msgid "prefs.theme"
+msgstr "Motyw:"
+msgid "prefs.theme.black"
+msgstr "Czarny"
+msgid "prefs.theme.dark"
+msgstr "Ciemny"
+msgid "prefs.theme.light"
+msgstr "Jasny"
+msgid "prefs.theme.white"
+msgstr "Biały"
+msgid "prefs.uilang"
+msgstr "Język:"
+msgid "prefs.uiscale"
+msgstr "Współczynnik skalowania interfejsu:"
+msgid "prefs.customframe"
+msgstr "Niestandardowa ramka okna:"
+msgid "prefs.retainwindow"
+msgstr "Utrzymuj położenie:"
+msgid "prefs.sideicon"
+msgstr "Ikona kapsułki:"
+msgid "prefs.doctheme.light"
+msgstr "Jasny motyw:"
+msgid "prefs.doctheme.name.colorfuldark"
+msgstr "Kolorowy ciemny"
+msgid "prefs.doctheme.name.black"
+msgstr "Czarny"
+msgid "prefs.doctheme.name.gray"
+msgstr "Szary"
+msgid "prefs.doctheme.name.white"
+msgstr "Biały"
+msgid "prefs.doctheme.name.sepia"
+msgstr "Sepia"
+msgid "prefs.doctheme.name.highcontrast"
+msgstr "Wysoki kontrast"
+msgid "prefs.font"
+msgstr "Czcionka treści:"
+msgid "prefs.mono"
+msgstr "Tekst o stałej szerokości:"
+msgid "prefs.mono.gemini"
+msgstr "Gemini"
+msgid "prefs.mono.gopher"
+msgstr "Gopher"
+msgid "prefs.boldlink"
+msgstr "Pogrubione linki:"
+# Interpretation: (Bold links) on light (background).
+msgid "prefs.boldlink.light"
+msgstr "Na jasnym"
+msgid "prefs.linewidth"
+msgstr "Szerokość linii:"
+msgid "prefs.linewidth.normal"
+msgstr "Normalna"
+msgid "prefs.linewidth.fill"
+msgstr "Pełna"
+msgid "prefs.quoteicon"
+msgstr "Wskaźnik cytatu:"
+msgid "prefs.quoteicon.icon"
+msgstr "Ikona \""
+msgid "prefs.quoteicon.line"
+msgstr "Linia"
+msgid "prefs.biglede"
+msgstr "Duży 1. paragraf:"
+msgid "prefs.decodeurls"
+msgstr "Dekoduj adresy URL:"
+msgid "prefs.cachesize"
+msgstr "Rozmiar buforu:"
+msgid "prefs.ca.file"
+msgstr "Plik CA:"
+msgid "archive.exit"
+msgstr "Wyjdź z archiwum"
+msgid "dir.empty"
+msgstr "Ten katalog jest pusty."
+msgid "prefs.proxy.gemini"
+msgstr "Proxy Gemini:"
+msgid "prefs.proxy.gopher"
+msgstr "Proxy Gopher:"
+msgid "prefs.proxy.http"
+msgstr "Proxy HTTP:"
+#, c-format
+msgid "dir.summary"
+msgid_plural "dir.summary.n"
+msgstr[0] "Ten katalog zawiera %zu element."
+msgstr[1] "Ten katalog zawiera %zu elementy."
+msgstr[2] "Ten katalog zawiera %zu elementów."
+msgid "menu.binding.reset"
+msgstr "Przywróć domyślne"
+msgid "keys.top"
+msgstr "Przejdź na szczyt"
+msgid "keys.bottom"
+msgstr "Przejdź na spód"
+msgid "keys.scroll.up"
+msgstr "Przewiń w górę"
+msgid "keys.scroll.down"
+msgstr "Przewiń w dół"
+msgid "keys.scroll.page.down"
+msgstr "Przewiń o całą stronę w dół"
+msgid "keys.scroll.page.up"
+msgstr "Przewiń o całą stronę w górę"
+msgid "keys.scroll.halfpage.up"
+msgstr "Przewiń o pół strony w górę"
+msgid "keys.back"
+msgstr "Wstecz"
+msgid "keys.forward"
+msgstr "Dalej"
+msgid "keys.root"
+msgstr "Przejdź do korzenia kapsułki"
+msgid "keys.reload"
+msgstr "Odśwież stronę"
+msgid "keys.link.homerow"
+msgstr "Otwórz link za pomocą klawisza wiersza głównego"
+msgid "keys.link.homerow.hover"
+msgstr "Najedź kursorem na link za pomocą klawisza wiersza głównego"
+msgid "keys.link.homerow.next"
+msgstr "Następny zestaw linków klawiszy wiersza głównego"
+msgid "keys.bookmark.add"
+msgstr "Dodaj zakładkę"
+msgid "keys.findtext"
+msgstr "Znajdź tekst na stronie"
+msgid "keys.zoom.in"
+msgstr "Powiększ"
+msgid "keys.zoom.out"
+msgstr "Pomniejsz"
+msgid "keys.zoom.reset"
+msgstr "Resetuj powiększenie"
+msgid "keys.tab.new"
+msgstr "Nowa karta"
+msgid "keys.tab.close"
+msgstr "Zamknij kartę"
+msgid "error.badstatus"
+msgstr "Nieznany kod statusu"
+msgid "keys.tab.close.other"
+msgstr "Zamknij resztę kart"
+msgid "keys.tab.prev"
+msgstr "Poprzednia karta"
+msgid "keys.tab.next"
+msgstr "Następna karta"
+msgid "keys.split.menu"
+msgstr "Dostosuj tryb widoku dzielonego"
+msgid "keys.split.next"
+msgstr "Skoncentruj się na następnym oknie"
+msgid "keys.hoverurl"
+msgstr "Pokaż adres URL po najechaniu kursorem"
+msgid "error.openfile"
+msgstr "Nie można otworzyć pliku"
+msgid "error.openfile.msg"
+msgstr "Żądany plik nie istnieje bądź jest niedostępny. Sprawdź ścieżkę pliku."
+msgid "error.unsupported.media"
+msgstr "Nieobsługiwany rodzaj treści"
+msgid "error.badredirect"
+msgstr "Nieprawidłowe przekierowanie"
+msgid "error.unsupported.media.msg"
+msgstr "Nie można wyświetlić otrzymanej treści za pomocą tej aplikacji."
+msgid "error.unsupported.protocol"
+msgstr "Nieobsługiwany protokół"
+msgid "error.unsupported.protocol.msg"
+msgstr "Żądany protokół jest nieobsługiwany przez tę aplikację."
+msgid "error.manyredirects"
+msgstr "Zbyt wiele przekierowań"
+msgid "error.schemeredirect"
+msgstr "Przekierowanie ze zmianą schematu"
+msgid "error.tls"
+msgstr "Błąd sieci/TLS"
+msgid "error.tls.msg"
+msgstr "Nie można nawiązać połączenia z serwerem. Oto treść błędu:"
+msgid "error.temporary"
+msgstr "Tymczasowy błąd"
+msgid "error.temporary.msg"
+msgstr ""
+"Żądanie nie powiodło się, ale może się powieść, jeśli spróbujesz ponownie w "
+"przyszłości."
+msgid "error.unavail"
+msgstr "Serwer niedostępny"
+msgid "error.proxy"
+msgstr "Błąd proxy"
+msgid "error.slowdown"
+msgstr "Zwolnij"
+msgid "error.slowdown.msg"
+msgstr "Serwer ogranicza liczbę żądań. Proszę czekać…"
+msgid "error.gone"
+msgstr "Usunięto"
+msgid "error.notfound"
+msgstr "Nie znaleziono"
+msgid "error.permanent"
+msgstr "Błąd permanentny"
+msgid "error.permanent.msg"
+msgstr ""
+"Twoje żądanie nie powiodło się i nie powiedzie się również w przyszłości, "
+"jeśli zostanie powtórzone."
+msgid "error.proxyrefusal"
+msgstr "Żądanie odrzucone przez serwer proxy"
+msgid "error.cert.auth"
+msgstr "Nieautoryzowany certyfikat"
+msgid "error.cert.invalid"
+msgstr "Nieprawidłowy certyfikat"
+msgid "error.cert.invalid.msg"
+msgstr "Podany certyfikat klienta stracił ważność lub jest nieprawidłowy."
+msgid "error.cert.needed"
+msgstr "Wymagany certyfikat"
+msgid "error.cert.needed.msg"
+msgstr ""
+"Dostęp do żądanego zasobu wymaga identyfikacji za pomocą certyfikatu klienta."
+msgid "gempub.cover.untitled"
+msgstr "Książka bez tytułu"
+msgid "gempub.cover.aboutbook"
+msgstr "O tej książce"
+msgid "gempub.cover.view"
+msgstr "Wyświetl zawartość Gempub"
+msgid "gempub.cover.image"
+msgstr "Grafika okładki"
+msgid "gempub.meta.author"
+msgstr "Autor"
+msgid "gempub.meta.version"
+msgstr "Wersja"
+msgid "gempub.meta.pub"
+msgstr "Rok publikacji"
+msgid "gempub.meta.pubdate"
+msgstr "Data publikacji"
+msgid "gempub.meta.lang"
+msgstr "Język"
+msgid "gempub.meta.license"
+msgstr "Licencja"
+msgid "doc.pre.nocaption"
+msgstr "Wstępnie sformatowany tekst bez opisu"
+msgid "doc.archive.view"
+msgstr "Wyświetl zawartość archiwum"
+# Inline download status message.
+msgid "media.download.warnclose"
+msgstr "Pobieranie zostanie anulowane po zamknięciu tej karty."
+# Used in inline audio player metadata popup.
+msgid "audio.meta.date"
+msgstr "Data"
+#, c-format
+msgid "feeds.list.counts"
+msgid_plural "feeds.list.counts.n"
+msgstr[0] "Subskrybujesz %zu kanał zawierający %%s.\n"
+msgstr[1] "Subskrybujesz %zu kanały zawierające %%s.\n"
+msgstr[2] "Subskrybujesz %zu kanałów zawierających %%s.\n"
+msgid "menu.title.file"
+msgstr "Plik"
+msgid "menu.title.help"
+msgstr "Pomoc"
+msgid "menu.closetab.other"
+msgstr "Zamknij resztę kart"
+msgid "menu.split.vertical"
+msgstr "Pionowo"
+# Used on iOS. "Files" refers to Apple's iOS app where you can pick an iCloud folder.
+msgid "menu.save.files"
+msgstr "Zapisz w Plikach"
+msgid "menu.bookmarks.list"
+msgstr "Pokaż wszystkie zakładki"
+msgid "menu.bookmarks.bytag"
+msgstr "Sortuj zakładki według tagu"
+msgid "menu.bookmarks.bytime"
+msgstr "Sortuj zakładki według daty utworzenia"
+msgid "menu.cut"
+msgstr "Wytnij"
+# Used in the Edit menu on macOS. Note: could be replaced with menu.page.copyurl.
+msgid "menu.copy.pagelink"
+msgstr "Kopiuj link do strony"
+# Used in the View menu on macOS. Shows sidebar and switches sidebar tab.
+msgid "menu.show.outline"
+msgstr "Pokaż konspekt strony"
+msgid "menu.page.subscribe"
+msgstr "Zasubskrybuj stronę…"
+msgid "menu.import.links"
+msgstr "Importuj wszystkie linki ze strony…"
+msgid "menu.bookmarks.refresh"
+msgstr "Odśwież zewnętrzne zakładki"
+msgid "menu.identity.notactive"
+msgstr "Brak aktywnych tożsamości"
+msgid "sidebar.feeds"
+msgstr "Kanały"
+msgid "sidebar.action.feeds.showall"
+msgstr "Wszystkie"
+msgid "sidebar.action.ident.import"
+msgstr "Importuj…"
+# Usage: "(count) Unread" in the sidebar tab title, referring to feed entries.
+msgid "sidebar.unread"
+msgid_plural "sidebar.unread.n"
+msgstr[0] "nieprzeczytany"
+msgstr[1] "nieprzeczytane"
+msgstr[2] "nieprzeczytanych"
+msgid "feeds.entry.markunread"
+msgstr "Oznacz jako nieprzeczytane"
+msgid "feeds.entry.openfeed"
+msgstr "Otwórz stronę kanału"
+msgid "feeds.edit"
+msgstr "Edytuj kanał…"
+msgid "menu.copyurl"
+msgstr "Kopiuj adres URL"
+msgid "dlg.confirm.history.clear"
+msgstr "Czy na pewno chcesz wyczyścić historię wszystkich odwiedzonych witryn?"
+#, c-format
+msgid "hours.ago"
+msgid_plural "hours.ago.n"
+msgstr[0] "godzinę temu"
+msgstr[1] "%d godziny temu"
+msgstr[2] "%d godzin temu"
+#, c-format
+msgid "days.ago"
+msgid_plural "days.ago.n"
+msgstr[0] "dzień temu"
+msgstr[1] "%d dni temu"
+msgstr[2] "%d dni temu"
+# Alt-text of the preformatted logo.
+msgid "about.logo"
+msgstr "ASCII-Art: wyraz „Lagrange” napisany dużą czcionką"
+msgid "bookmark.untag.remote"
+msgstr "Usuń źródło zakładki"
+msgid "ident.using"
+msgstr "Używana na tej stronie"
+# strftime() formatted
+#, c-format
+msgid "ident.expiry"
+msgstr "Wygasa %d.%m.%Y"
+#, c-format
+msgid "dlg.confirm.ident.delete"
+msgstr ""
+"Czy na pewno chcesz usunąć tożsamość\n"
+"%s%s%s\n"
+"wraz z jej certyfikatem i plikami kluczy prywatnych?"
+msgid "sidebar.empty.idents"
+msgstr "Brak tożsamości"
+# The %s format characters are used to highlight the word "Help" and must be used in the translation in same way as here.
+#, c-format
+msgid "ident.gotohelp"
+msgstr ""
+"Więcej informacji na temat certyfikatów klienta TLS można uzyskać w dziale "
+"%sPomoc%s."
+msgid "pageinfo.cert.status"
+msgstr "Status certyfikatu:"
+msgid "pageinfo.cert.ca.verified"
+msgstr "Zweryfikowany przez CA"
+#, c-format
+msgid "dlg.import.found"
+msgid_plural "dlg.import.found.n"
+msgstr[0] "Znaleziono nowy link na tej stronie."
+msgstr[1] "Znaleziono %d nowe linki na tej stronie."
+msgstr[2] "Znaleziono %d nowych linków na tej stronie."
+#, c-format
+msgid "num.minutes"
+msgid_plural "num.minutes.n"
+msgstr[0] "%d minuta"
+msgstr[1] "%d minuty"
+msgstr[2] "%d minut"
+msgid "link.newtab.background"
+msgstr "Otwórz link w karcie w tle"
+msgid "link.download"
+msgstr "Pobierz plik"
+#, c-format
+msgid "dlg.certwarn.mayberenewed"
+msgid_plural "dlg.certwarn.mayberenewed.n"
+msgstr[0] ""
+"Otrzymany certyfikat mógł zostać niedawno odnowiony — dotyczy właściwej "
+"domeny i jeszcze nie wygasł. Aktualny zaufany certyfikat wygaśnie %s, w "
+"ciągu jednego dnia."
+msgstr[1] ""
+"Otrzymany certyfikat mógł zostać niedawno odnowiony — dotyczy właściwej "
+"domeny i jeszcze nie wygasł. Aktualny zaufany certyfikat wygaśnie %s, za %-d "
+"dni."
+msgstr[2] ""
+"Otrzymany certyfikat mógł zostać niedawno odnowiony — dotyczy właściwej "
+"domeny i jeszcze nie wygasł. Aktualny zaufany certyfikat wygaśnie %s, za %-d "
+"dni."
+#, c-format
+msgid "dlg.certwarn.expired"
+msgstr "Otrzymany certyfikat wygasł %s."
+msgid "dlg.certwarn.domain"
+msgstr ""
+"Otrzymany certyfikat dotyczy niewłaściwej domeny (%s). Problem może wynikać "
+"z konfiguracji serwera."
+msgid "dlg.certimport.notfound"
+msgstr "Nie znaleziono certyfikatu lub klucza prywatnego."
+msgid "dlg.certimport.notfound.page"
+msgstr "Nie znaleziono certyfikatu/klucza na obecnej stronie."
+msgid "dlg.certimport.nocert"
+msgstr "Brak certyfikatu"
+# Interpret as "Results from identitites..."
+msgid "heading.lookup.identities"
+msgstr "TOŻSAMOŚCI"
+# Interpret as "Other results..."
+msgid "heading.lookup.other"
+msgstr "INNY"
+msgid "dlg.translate.fail"
+msgstr "Żądanie nie powiodło się"
+msgid "lang.pt"
+msgstr "portugalski"
+msgid "dlg.newident.rsa.selfsign"
+msgstr "Tworzenie samodzielnie podpisanego 2048-bitowego certyfikatu RSA."
+msgid "dlg.newident.email"
+msgstr "Adres e-mail:"
+msgid "dlg.newident.create"
+msgstr "Utwórz tożsamość"
+msgid "dlg.newident.date.example"
+msgstr ""
+"Sprawdź datę wygaśnięcia. Przykładowo:\n"
+"• 2030\n"
+"• 2025-06-30\n"
+"• 2021-12-31 23:59:59"
+msgid "menu.binding.clear"
+msgstr "Usuń"
+#, c-format
+msgid "archive.summary"
+msgid_plural "archive.summary.n"
+msgstr[0] ""
+"To archiwum zawiera %zu element, a jego rozmiar po kompresji wynosi %.1f MB."
+msgstr[1] ""
+"To archiwum zawiera %zu elementy, a jego rozmiar po kompresji wynosi %.1f MB."
+msgstr[2] ""
+"To archiwum zawiera %zu elementów, a jego rozmiar po kompresji wynosi %.1f "
+"MB."
+msgid "dlg.feed.entrytype"
+msgstr "Rodzaj wpisu:"
+msgid "heading.bookmark.add"
+msgstr "DODAWANIE ZAKŁADKI"
+msgid "dlg.bookmark.tags"
+msgstr "Etykiety:"
+# tab button
+msgid "heading.prefs.colors"
+msgstr "Kolorystyka"
+# tab button
+msgid "heading.prefs.general"
+msgstr "Ogólne"
+msgid "prefs.searchurl"
+msgstr "URL wyszukiwania:"
+msgid "prefs.collapsepreonload"
+msgstr "Zwijaj wstępnie sformatowany tekst:"
+msgid "prefs.imageloadscroll"
+msgstr "Ładuj obraz przy przewijaniu:"
+msgid "prefs.ostheme"
+msgstr "Używaj motywu systemu:"
+msgid "prefs.accent"
+msgstr "Kolor akcentu:"
+msgid "prefs.accent.teal"
+msgstr "Turkusowy"
+msgid "prefs.accent.orange"
+msgstr "Pomarańczowy"
+msgid "prefs.plaintext.wrap"
+msgstr "Zawijaj zwykły tekst:"
+msgid "prefs.saturation"
+msgstr "Nasycenie:"
+msgid "error.badheader"
+msgstr "Niewłaściwy nagłówek"
+msgid "error.badheader.msg"
+msgstr ""
+"Otrzymany nagłówek nie jest zgodny ze specyfikacją protokołu Gemini. Może to "
+"być wynikiem usterki serwera, bądź próby skontaktowania się z serwerem innym "
+"niż Gemini."
+msgid "error.badredirect.msg"
+msgstr ""
+"Serwer odpowiedział przekierowaniem, ale nie podał poprawnego docelowego "
+"adresu URL. Może to być wynikiem usterki serwera."
+msgid "error.badrequest"
+msgstr "Nieprawidłowe żądanie"
+msgid "error.badrequest.msg"
+msgstr "Serwer nie zrozumiał Twojego żądania."
+msgid "error.badresource"
+msgstr "Nieprawidłowy zasób"
+msgid "error.badresource.msg"
+msgstr "Żądany zasób nie istnieje."
+msgid "error.badstatus.msg"
+msgstr ""
+"Serwer odpowiedział kodem statusu, którego nie ma w specyfikacji protokołu "
+"Gemini. Może serwer pochodzi z przyszłości? Albo po prostu uległ awarii."
+msgid "error.cert.auth.msg"
+msgstr ""
+"Podany certyfikat klienta jest ważny, ale nie ma uprawnień dostępu do "
+"żądanego zasobu."
+msgid "error.cgi"
+msgstr "Błąd CGI"
+msgid "error.cgi.msg"
+msgstr ""
+"Awaria podczas generowania dynamicznej zawartości na serwerze. Może to być "
+"spowodowane nieprawidłowym działaniem oprogramowania po stronie serwera."
+msgid "error.gone.msg"
+msgstr "Żądany zasób nie jest już dostępny."
+msgid "error.manyredirects.msg"
+msgstr ""
+"Być może znajdujesz się w pętli przekierowań. Następny przekierowany adres "
+"URL znajduje się poniżej, jeśli chcesz kontynuować ręcznie."
+msgid "error.notfound.msg"
+msgstr "Żądany zasób nie może być znaleziony w tym czasie."
+msgid "prefs.doctheme.dark"
+msgstr "Ciemny motyw:"
+msgid "prefs.doctheme.name.colorfullight"
+msgstr "Kolorowy jasny"
+msgid "prefs.headingfont"
+msgstr "Czcionka nagłówka:"
+# Interpretation: (Bold links) on dark (background).
+msgid "prefs.boldlink.dark"
+msgstr "Na ciemnym"
+msgid "prefs.ca.path"
+msgstr "Ścieżka CA:"
+msgid "keys.scroll.halfpage.down"
+msgstr "Przewiń o pół strony w dół"
+msgid "keys.parent"
+msgstr "Przejdź do katalogu nadrzędnego"
+msgid "keys.link.modkey"
+msgstr "Otwórz link za pomocą klucza modyfikującego"
+msgid "keys.link.homerow.newtab"
+msgstr "Otwórz link w nowej karcie za pomocą klawisza wiersza głównego"
+msgid "keys.subscribe"
+msgstr "Subskrybuj stronę"
+msgid "keys.fullscreen"
+msgstr "Przełącz tryb pełnoekranowy"
+msgid "error.schemeredirect.msg"
+msgstr ""
+"Serwer próbował przekierować nas na adres URL o innym schemacie niż "
+"pierwotny adres URL. Oto link, za pomocą którego możesz go ręcznie otworzyć."
+msgid "error.unavail.msg"
+msgstr ""
+"Serwer jest niedostępny z powodu przeciążenia lub konserwacji. Sprawdź "
+"ponownie później."
+msgid "error.proxy.msg"
+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ą."
diff --git a/po/tok.po b/po/tok.po
index 13845f9e..79d31fd1 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-06 09:39+0000\n"
+"PO-Revision-Date: 2021-05-10 06:26+0000\n"
 "Last-Translator: jan Anja <cyber@sysrq.in>\n"
 "Language-Team: Toki Pona <http://weblate.skyjake.fi/projects/lagrange/ui/tok/"
 ">\n"
@@ -119,7 +119,7 @@ msgid "menu.closetab.other"
 msgstr "o pini e poki ante"
 msgid "menu.closetab.right"
-msgstr "o pini e poki sinpin"
+msgstr "o pini e poki lon sinpin"
 msgid "menu.duptab"
 msgstr "o pali e poki sama"
@@ -147,7 +147,7 @@ msgid "menu.sidebar.right"
 msgstr "o len ala len e poki poka tu?"
 msgid "menu.zoom.in"
-msgstr "o mute"
+msgstr "o suli"
 msgid "menu.zoom.out"
 msgstr "o lili"
@@ -789,7 +789,7 @@ msgid "prefs.searchurl"
 msgstr "nimi tawa tan lukin e nimi:"
 msgid "prefs.hoverlink"
-msgstr "tawa la sina lukin e nimi tawa:"
+msgstr "tawa la o lukin e nimi tawa:"
 msgid "prefs.collapsepreonload"
 msgstr "o len e sitelen namako:"
@@ -798,7 +798,7 @@ msgid "prefs.smoothscroll"
 msgstr "tawa suwi:"
 msgid "prefs.imageloadscroll"
-msgstr "tawa la sina lukin e sitelen:"
+msgstr "tawa la o lukin e sitelen:"
 msgid "prefs.hidetoolbarscroll"
 msgstr "tawa la mi len e ijo sewi:"
@@ -1186,7 +1186,7 @@ msgid "prefs.linewidth.normal"
 msgstr "nasa ala"
 msgid "prefs.decodeurls"
-msgstr "sina lukin pona e nimi tawa:"
+msgstr "o pona lukin e nimi tawa:"
 msgid "prefs.ca.file"
 msgstr "ijo tawa ilo CA:"
@@ -1211,7 +1211,7 @@ msgid "dlg.message.ok"
 msgstr "o awen pali"
 msgid "menu.closetab.left"
-msgstr "o pini e poki monsi"
+msgstr "o pini e poki lon monsi"
 msgid "macos.menu.find"
 msgstr "o lukin e nimi"
@@ -1444,7 +1444,7 @@ msgid "menu.view.split"
 msgstr "o tu e poki..."
 msgid "menu.split.vertical"
-msgstr "poka"
+msgstr "sewi en anpa"
 msgid "menu.split.merge"
 msgstr "o wan e poki"
@@ -1465,7 +1465,7 @@ msgid "gempub.cover.viewlocal"
 msgstr "sina awen e lipu tawa ilo sona la sina ken lukin e lipu Kempu."
 msgid "menu.split.horizontal"
-msgstr "sewi en anpa"
+msgstr "poka"
 msgid "dlg.newident.date.example"
 msgstr ""
diff --git a/res/about/version.gmi b/res/about/version.gmi
index e261cb25..23eeebef 100644
--- a/res/about/version.gmi
+++ b/res/about/version.gmi
@@ -7,10 +7,11 @@
 # Release notes
 ## 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 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.
+* Fixed issue with sidebars sometimes becoming unresponsive.
 * Fixed font used for visited monospace Gopher links.
-* Fixed incorrectly shown pinning indicator (◧) for the current tab.
+* Fixed incorrectly shown/hidden ◧ indicator.
 * Fixed scrollbar in Preferences > Keys being hidden until the list is scrolled.
 ## 1.4
diff --git a/res/fi.skyjake.Lagrange.appdata.xml b/res/fi.skyjake.Lagrange.appdata.xml
index 308a2164..e3b75771 100644
--- a/res/fi.skyjake.Lagrange.appdata.xml
+++ b/res/fi.skyjake.Lagrange.appdata.xml
@@ -45,6 +45,24 @@
    <update_contact>jaakko.keranen@iki.fi</update_contact>
    <releases>
+        <release version="1.4.1" date="2021-05-13">
+            <description>
+                <p>Bug fixes:</p>
+                <ul>
+                    <li>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.</li>
+                    <li>Tab merging when unsplitting the window: keep the currently 
+                        active tab open.</li>
+                    <li>Sidebars sometimes become unresponsive.</li>
+                    <li>Incorrect font was used for visited monospace Gopher links.</li>
+                    <li>Incorrectly shown/hidden tab pinning indicator.</li>
+                    <li>Scrollbar in Preferences &gt; Keys was hidden until the list 
+                        was scrolled.</li>
+                </ul>
+            </description>
+            <url>https://github.com/skyjake/lagrange/releases/tag/v1.4.1</url>
+        </release>
        <release version="1.4" date="2021-05-07">
            <description>
                <p>This release introduces a split view mode, support for Gempub
diff --git a/res/lang/de.bin b/res/lang/de.bin
index 61769bdb..45c01abd 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 f6ccec4b..0a9a3c0f 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 5842d4c4..0d3e80c7 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 6fada58c..00039ebd 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 d4734f50..139f8e51 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 3f1f65e4..e7607899 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 4741ff24..79b517df 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
new file mode 100644
index 00000000..e208f3ba
--- /dev/null
+++ b/res/lang/pl.bin
Binary files differ
diff --git a/res/lang/ru.bin b/res/lang/ru.bin
index f8676f61..4e775c94 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 13159229..19408d1a 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 76304d49..2d8017cb 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 75245b7b..171bd2a8 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 8a48e087..6518c7bf 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 a50a4553..cc172139 100644
--- a/src/app.c
+++ b/src/app.c
@@ -146,6 +146,7 @@ iDeclareType(Ticker)
 struct Impl_Ticker {
    iAny *context;
+    iRoot *root;
    void (*callback)(iAny *);
 };
@@ -411,15 +412,17 @@ static iBool loadState_App_(iApp *d) {
                const uint8_t rootIndex = bits & 0xff;
                const uint8_t flags     = bits >> 8;
                iRoot *root = d->window->roots[rootIndex];
-                if (root && deviceType_App() != phone_AppDeviceType) {
+                if (root) {
                    iSidebarWidget *sidebar  = findChild_Widget(root->widget, "sidebar");
                    iSidebarWidget *sidebar2 = findChild_Widget(root->widget, "sidebar2");
-                    setWidth_SidebarWidget(sidebar,  widths[0]);
-                    setWidth_SidebarWidget(sidebar2, widths[1]);
                    postCommandf_Root(root, "sidebar.mode arg:%u", modes & 0xf);
                    postCommandf_Root(root, "sidebar2.mode arg:%u", modes >> 4);
-                    if (flags & 1) postCommand_Root(root, "sidebar.toggle");
+                    if (deviceType_App() != phone_AppDeviceType) {
-                    if (flags & 2) postCommand_Root(root, "sidebar2.toggle");
+                        setWidth_SidebarWidget(sidebar,  widths[0]);
+                        setWidth_SidebarWidget(sidebar2, widths[1]);
+                        if (flags & 1) postCommand_Root(root, "sidebar.toggle noanim:1");
+                        if (flags & 2) postCommand_Root(root, "sidebar2.toggle noanim:1");
+                    }
                }
            }
            else if (!memcmp(magic, magicTabDocument_App_, 4)) {
@@ -776,6 +779,10 @@ static void init_App_(iApp *d, int argc, char **argv) {
        iRelease(openCmds);
    }
    fetchRemote_Bookmarks(d->bookmarks);
+    if (deviceType_App() != desktop_AppDeviceType) {
+        /* HACK: Force a resize so widgets update their state. */
+        resize_Window(d->window, -1, -1);
+    }
 }
 static void deinit_App(iApp *d) {
@@ -1061,7 +1068,14 @@ void processEvents_App(enum iAppEventMode eventMode) {
                    }
                    continue;
                }
-                else if (ev.type == SDL_USEREVENT && ev.user.code == arrange_UserEventCode) {
+                d->lastEventTime = SDL_GetTicks();
+                if (d->isIdling) {
+//                    printf("[App] ...woke up\n");
+//                    fflush(stdout);
+                }
+                d->isIdling = iFalse;
+#endif
+                if (ev.type == SDL_USEREVENT && ev.user.code == arrange_UserEventCode) {
                    printf("[App] rearrange\n");
                    resize_Window(d->window, -1, -1);
                    iForIndices(i, d->window->roots) {
@@ -1078,13 +1092,6 @@ void processEvents_App(enum iAppEventMode eventMode) {
 //                    postRefresh_App();
                    continue;
                }
-                d->lastEventTime = SDL_GetTicks();
-                if (d->isIdling) {
-//                    printf("[App] ...woke up\n");
-//                    fflush(stdout);
-                }
-                d->isIdling = iFalse;
-#endif
                gotEvents = iTrue;
                /* Keyboard modifier mapping. */
                if (ev.type == SDL_KEYDOWN || ev.type == SDL_KEYUP) {
@@ -1187,7 +1194,7 @@ static void runTickers_App_(iApp *d) {
    iConstForEach(Array, i, &pending->values) {
        const iTicker *ticker = i.value;
        if (ticker->callback) {
-            setCurrent_Root(findRoot_Window(d->window, ticker->context)); /* root might be NULL */
+            setCurrent_Root(ticker->root); /* root might be NULL */
            ticker->callback(ticker->context);
        }
    }
@@ -1418,13 +1425,19 @@ iAny *findWidget_App(const char *id) {
 void addTicker_App(iTickerFunc ticker, iAny *context) {
    iApp *d = &app_;
-    insert_SortedArray(&d->tickers, &(iTicker){ context, ticker });
+    insert_SortedArray(&d->tickers, &(iTicker){ context, get_Root(), ticker });
+    postRefresh_App();
+}
+void addTickerRoot_App(iTickerFunc ticker, iRoot *root, iAny *context) {
+    iApp *d = &app_;
+    insert_SortedArray(&d->tickers, &(iTicker){ context, root, ticker });
    postRefresh_App();
 }
 void removeTicker_App(iTickerFunc ticker, iAny *context) {
    iApp *d = &app_;
-    remove_SortedArray(&d->tickers, &(iTicker){ context, ticker });
+    remove_SortedArray(&d->tickers, &(iTicker){ context, NULL, ticker });
 }
 iMimeHooks *mimeHooks_App(void) {
@@ -1507,6 +1520,7 @@ static void updateFontButton_(iLabelWidget *button, int font) {
 static iBool handlePrefsCommands_(iWidget *d, const char *cmd) {
    if (equal_Command(cmd, "prefs.dismiss") || equal_Command(cmd, "preferences")) {
+        setupSheetTransition_Mobile(d, iFalse);
        setUiScale_Window(get_Window(),
                          toFloat_String(text_InputWidget(findChild_Widget(d, "prefs.uiscale"))));
 #if defined (LAGRANGE_ENABLE_DOWNLOAD_EDIT)
@@ -2381,7 +2395,7 @@ iBool handleCommand_App(const char *cmd) {
        iCertImportWidget *imp = new_CertImportWidget();
        setPageContent_CertImportWidget(imp, sourceContent_DocumentWidget(document_App()));
        addChild_Widget(get_Root()->widget, iClob(imp));
-        finalizeSheet_Widget(as_Widget(imp));
+        finalizeSheet_Mobile(as_Widget(imp));
        postRefresh_App();
        return iTrue;
    }
diff --git a/src/app.h b/src/app.h
index aa647bfb..0fb6be29 100644
--- a/src/app.h
+++ b/src/app.h
@@ -110,6 +110,7 @@ typedef void (*iTickerFunc)(iAny *);
 iAny *      findWidget_App      (const char *id);
 void        addTicker_App       (iTickerFunc ticker, iAny *context);
+void        addTickerRoot_App   (iTickerFunc ticker, iRoot *root, iAny *context);
 void        removeTicker_App    (iTickerFunc ticker, iAny *context);
 void        postRefresh_App     (void);
 void        postImmediateRefresh_App(void);
diff --git a/src/defs.h b/src/defs.h
index cc485ed1..71719f7a 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -66,6 +66,7 @@ enum iFileVersion {
 #define ballotCheck_Icon    "\U0001f5f9"
 #define inbox_Icon          "\U0001f4e5"
 #define book_Icon           "\U0001f56e"
+#define bookmark_Icon       "\U0001f516"
 #define folder_Icon         "\U0001f4c1"
 #define openTab_Icon        "\u2750"
 #define openTabBg_Icon      "\u2b1a"
@@ -90,6 +91,16 @@ enum iFileVersion {
 #define globe_Icon          "\U0001f310"
 #define magnifyingGlass_Icon "\U0001f50d"
 #define midEllipsis_Icon    "\u00b7\u00b7\u00b7"
+#define return_Icon         "\u21a9"
+#if defined (iPlatformApple)
+#   define shift_Icon       "\u21e7"
+#   define shiftReturn_Icon shift_Icon return_Icon
+#else
+#   define shift_Icon       "Shift"
+#   define shiftReturn_Icon shift_Icon " " return_Icon
+#endif
 /* UI labels that depend on the platform */
diff --git a/src/gmdocument.c b/src/gmdocument.c
index 3daa4714..67adb9cc 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -716,12 +716,25 @@ static void doLayout_GmDocument_(iGmDocument *d) {
                meta->flags |= topLeft_GmPreMetaFlag;
            }
        }
-        /* Visited links are never bold. */
+        float lineHeightReduction = 0.0f;
-        if (!isMono && run.linkId && linkFlags_GmDocument(d, run.linkId) & visited_GmLinkFlag) {
+        if (!isMono) {
-            run.font = paragraph_FontId;
+            /* Upper-level headings are typeset a bit tighter. */
+            if (type == heading1_GmLineType) {
+                lineHeightReduction = 0.10f;
+            }
+            else if (type == heading2_GmLineType) {
+                lineHeightReduction = 0.05f;
+            }
+            /* Visited links are never bold. */
+            if (run.linkId && linkFlags_GmDocument(d, run.linkId) & visited_GmLinkFlag) {
+                run.font = paragraph_FontId;
+            }
        }
        iAssert(!isEmpty_Range(&runLine)); /* must have something at this point */
        while (!isEmpty_Range(&runLine)) {
+            if (~run.flags & startOfLine_GmRunFlag && lineHeightReduction > 0.0f) {
+                pos.y -= lineHeightReduction * lineHeight_Text(run.font);
+            }
            run.bounds.pos = addX_I2(pos, indent * gap_Text);
            const int wrapAvail = d->size.x - run.bounds.pos.x - rightMargin * gap_Text;
            const int avail = isWordWrapped ? wrapAvail : 0;
diff --git a/src/ios.m b/src/ios.m
index 6e2fa64b..a1654df2 100644
--- a/src/ios.m
+++ b/src/ios.m
@@ -196,7 +196,7 @@ didPickDocumentsAtURLs:(NSArray<NSURL *> *)urls {
    CGRect keyboardFrame = [view convertRect:rawFrame fromView:nil];
 //    NSLog(@"keyboardFrame: %@", NSStringFromCGRect(keyboardFrame));
    iWindow *window = get_Window();
-    const iInt2 rootSize = rootSize_Window(window);
+    const iInt2 rootSize = size_Root(window->roots[0]);
    const int keyTop = keyboardFrame.origin.y * window->pixelRatio;
    setKeyboardHeight_Window(window, rootSize.y - keyTop);
 }
@@ -302,6 +302,24 @@ iBool processEvent_iOS(const SDL_Event *ev) {
                postCommandf_App("os.theme.changed dark:%d contrast:1", isSystemDarkMode_ ? 1 : 0);
            }
        }
+        else if (equal_Command(cmd, "theme.changed")) {
+            if (@available(iOS 13.0, *)) {
+                /* SDL doesn't expose this as a setting, so we'll rely on a hack.
+                   Adding an SDL hint for this would be a cleaner solution than calling
+                   a private method. */
+                UIViewController *vc = viewController_(get_Window());
+                SEL sel = NSSelectorFromString(@"setStatusStyle:"); /* custom method */
+                if ([vc respondsToSelector:sel]) {
+                    NSInvocation *call = [NSInvocation invocationWithMethodSignature:
+                                          [NSMethodSignature signatureWithObjCTypes:"v@:i"]];
+                    [call setSelector:sel];
+                    int style = isDark_ColorTheme(colorTheme_App()) ?
+                        UIStatusBarStyleLightContent : UIStatusBarStyleDarkContent;
+                    [call setArgument:&style atIndex:2];
+                    [call invokeWithTarget:vc];
+                }
+            }
+        }
    }
    return iFalse; /* allow normal processing */
 }
diff --git a/src/lang.c b/src/lang.c
index cd5d3120..4c05647c 100644
--- a/src/lang.c
+++ b/src/lang.c
@@ -44,6 +44,7 @@ int cmp_MsgStr_(const void *e1, const void *e2) {
 enum iPluralType {
    none_PluralType,
    notEqualToOne_PluralType,
+    polish_PluralType,
    slavic_PluralType,
 };
@@ -58,6 +59,10 @@ static size_t pluralIndex_Lang_(const iLang *d, int n) {
    switch (d->pluralType) {
        case notEqualToOne_PluralType:
            return n != 1;
+        case polish_PluralType:
+            return n == 1                                                          ? 0
+                   : n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 10 || n % 100 >= 20) ? 1
+                                                                                   : 2;
        case slavic_PluralType:
            return n % 10 == 1 && n % 100 != 11                                    ? 0
                   : n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 10 || n % 100 >= 20) ? 1
@@ -81,6 +86,7 @@ static void load_Lang_(iLang *d, const char *id) {
                       : equal_CStr(id, "de")      ? &blobDe_Embedded
                       : equal_CStr(id, "ia")      ? &blobIa_Embedded
                       : equal_CStr(id, "ie")      ? &blobIe_Embedded
+                       : equal_CStr(id, "pl")      ? &blobPl_Embedded
                       : equal_CStr(id, "sr")      ? &blobSr_Embedded
                       : equal_CStr(id, "tok")     ? &blobTok_Embedded
                       : equal_CStr(id, "zh_Hans") ? &blobZh_Hans_Embedded
@@ -89,6 +95,9 @@ static void load_Lang_(iLang *d, const char *id) {
    if (data == &blobRu_Embedded || data == &blobSr_Embedded) {
        d->pluralType = slavic_PluralType;
    }
+    else if (data == &blobPl_Embedded) {
+        d->pluralType = polish_PluralType;
+    }
    else if (data == &blobZh_Hans_Embedded || data == &blobZh_Hant_Embedded ||
             data == &blobTok_Embedded) {
        d->pluralType = none_PluralType;
diff --git a/src/ui/color.c b/src/ui/color.c
index 0a177a8a..6c51bc06 100644
--- a/src/ui/color.c
+++ b/src/ui/color.c
@@ -305,7 +305,7 @@ void setThemePalette_Color(enum iColorTheme theme) {
                                                0.4f));
    uiPalette_[uiMarked_ColorId  ].a = 128;
    uiPalette_[uiMatching_ColorId].a = 128;
-    if (deviceType_App() == phone_AppDeviceType) {
+    if (deviceType_App() != desktop_AppDeviceType) {
        copy_(uiInputBackground_ColorId, uiBackgroundSidebar_ColorId);
        copy_(uiInputFrame_ColorId, uiBackgroundSidebar_ColorId);
        copy_(uiInputFrameFocused_ColorId, uiBackgroundSidebar_ColorId);
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index d23e95a6..5dcdace6 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1466,7 +1466,8 @@ static void scrollBegan_DocumentWidget_(iAnyObject *any, int offset, uint32_t du
    }
    /* Show and hide toolbar on scroll. */
    if (deviceType_App() == phone_AppDeviceType) {
-        if (prefs_App()->hideToolbarOnScroll && iAbs(offset) > 5) {
+        const float normPos = normScrollPos_DocumentWidget_(d);
+        if (prefs_App()->hideToolbarOnScroll && iAbs(offset) > 5 && normPos >= 0) {
            showToolbars_Root(as_Widget(d)->root, offset < 0);
        }
    }
@@ -1606,6 +1607,7 @@ static void inputQueryValidator_(iInputWidget *input, void *context) {
                             avail < 128 ? uiTextStrong_ColorId
                                         : uiTextDim_ColorId);
    delete_String(url);
+    arrange_Widget(findChild_Widget(dlg, "dialogbuttons"));
 }
 static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
@@ -1637,10 +1639,28 @@ static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
                        : cstr_String(&resp->meta),
                    uiTextCaution_ColorEscape "${dlg.input.send}",
                    format_CStr("!document.input.submit doc:%p", d));
-                setId_Widget(addChildPosFlags_Widget(findChild_Widget(dlg, "dialogbuttons"),
+                iWidget *buttons = findChild_Widget(dlg, "dialogbuttons");
+                iLabelWidget *lineBreak;
+                /* The line break and URL length counters are positioned differently on mobile. */
+                if (deviceType_App() == desktop_AppDeviceType) {
+                    lineBreak = new_LabelWidget("${dlg.input.linebreak}"
+                                                uiTextAction_ColorEscape
+                                                "  " shiftReturn_Icon,
+                                                NULL);
+                    insertChildAfter_Widget(buttons, iClob(lineBreak), 0);
+                }
+                else {
+                    lineBreak = new_LabelWidget("${dlg.input.linebreak}", "text.insert arg:10");
+                }
+                setFlags_Widget(as_Widget(lineBreak), frameless_WidgetFlag, iTrue);
+                setTextColor_LabelWidget(lineBreak, uiTextDim_ColorId);
+                setId_Widget(addChildPosFlags_Widget(buttons,
                                                     iClob(new_LabelWidget("", NULL)),
                                                     front_WidgetAddPos, frameless_WidgetFlag),
                             "valueinput.counter");
+                if (deviceType_App() != desktop_AppDeviceType) {
+                    addChildPos_Widget(buttons, iClob(lineBreak), front_WidgetAddPos);
+                }
                setValidator_InputWidget(findChild_Widget(dlg, "input"), inputQueryValidator_, d);
                setSensitiveContent_InputWidget(findChild_Widget(dlg, "input"),
                                                statusCode == sensitiveInput_GmStatusCode);
@@ -1653,7 +1673,7 @@ static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
                break;
            }
            case categorySuccess_GmStatusCode:
-                reset_SmoothScroll(&d->scrollY);
+                //reset_SmoothScroll(&d->scrollY);
                iRelease(d->doc); /* new content incoming */
                d->doc = new_GmDocument();
                delete_Gempub(d->sourceGempub);
@@ -2310,7 +2330,9 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
        }
        updateFetchProgress_DocumentWidget_(d);
        checkResponse_DocumentWidget_(d);
-        init_Anim(&d->scrollY.pos, d->initNormScrollY * size_GmDocument(d->doc).y); /* TODO: unless user already scrolled! */
+        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->state = ready_RequestState;
        postProcessRequestContent_DocumentWidget_(d, iFalse);
        /* The response may be cached. */
@@ -3081,7 +3103,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                    pushBackN_Array(&items,
                                    (iMenuItem[]){ { "---", 0, 0, NULL },
                                                   { "${link.copy}", 0, 0, "document.copylink" },
-                                                   { pin_Icon " ${link.bookmark}",
+                                                   { bookmark_Icon " ${link.bookmark}",
                                                     0,
                                                     0,
                                                     format_CStr("!bookmark.add title:%s url:%s",
@@ -3126,7 +3148,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                            { reload_Icon " ${menu.reload}", reload_KeyShortcut, "navigate.reload" },
                            { timer_Icon " ${menu.autoreload}", 0, 0, "document.autoreload.menu" },
                            { "---", 0, 0, NULL },
-                            { pin_Icon " ${menu.page.bookmark}", SDLK_d, KMOD_PRIMARY, "bookmark.add" },
+                            { bookmark_Icon " ${menu.page.bookmark}", SDLK_d, KMOD_PRIMARY, "bookmark.add" },
                            { star_Icon " ${menu.page.subscribe}", subscribeToPage_KeyModifier, "feeds.subscribe" },
                            { "---", 0, 0, NULL },
                            { book_Icon " ${menu.page.import}", 0, 0, "bookmark.links confirm:1" },
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index 6719fb40..784fabdd 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -42,8 +42,12 @@ static const size_t maxUndo_InputWidget_         = 64;
 static void enableEditorKeysInMenus_(iBool enable) {
 #if defined (iPlatformAppleDesktop)
-    enableMenuItemsByKey_MacOS(SDLK_LEFT, KMOD_PRIMARY, enable);
+    enableMenuItemsByKey_MacOS(SDLK_LEFT,  KMOD_PRIMARY, enable);
    enableMenuItemsByKey_MacOS(SDLK_RIGHT, KMOD_PRIMARY, enable);
+    enableMenuItemsByKey_MacOS(SDLK_UP,    KMOD_PRIMARY, enable);
+    enableMenuItemsByKey_MacOS(SDLK_DOWN,  KMOD_PRIMARY, enable);
+    enableMenuItemsByKey_MacOS(SDLK_UP,    KMOD_PRIMARY | KMOD_SHIFT, enable);
+    enableMenuItemsByKey_MacOS(SDLK_DOWN,  KMOD_PRIMARY | KMOD_SHIFT, enable);
 #else
    iUnused(enable);
 #endif
@@ -84,6 +88,7 @@ iDeclareType(InputLine)
    
 struct Impl_InputLine {
    size_t offset; /* character position from the beginning */
+    size_t len;    /* length as characters */
    iString text; /* UTF-8 */
 };
@@ -109,6 +114,7 @@ struct Impl_InputWidget {
    iArray          text;    /* iChar[] */
    iArray          oldText; /* iChar[] */
    iArray          lines;
+    int             lastUpdateWidth;
    iString         hint;
    iString         srcHint;
    int             leftPadding;
@@ -138,7 +144,26 @@ static void clearUndo_InputWidget_(iInputWidget *d) {
    clear_Array(&d->undoStack);
 }
+iLocalDef iInt2 padding_(void) {
+    return init_I2(gap_UI / 2, gap_UI / 2);
+}
+static iRect contentBounds_InputWidget_(const iInputWidget *d) {
+    const iWidget *w         = constAs_Widget(d);
+    //    const iRect widgetBounds = bounds_Widget(w);
+    iRect          bounds = adjusted_Rect(bounds_Widget(w),
+                                 addX_I2(padding_(), d->leftPadding),
+                                 neg_I2(addX_I2(padding_(), d->rightPadding)));
+    shrink_Rect(&bounds, init_I2(gap_UI * (flags_Widget(w) & tight_WidgetFlag ? 1 : 2), 0));
+    bounds.pos.y += padding_().y / 2;
+    if (flags_Widget(w) & extraPadding_WidgetFlag) {
+        bounds.pos.y += gap_UI;
+    }
+    return bounds;
+}
 static void updateCursorLine_InputWidget_(iInputWidget *d) {
+    iWidget *w = as_Widget(d);
    d->cursorLine = 0;
    iConstForEach(Array, i, &d->lines) {
        const iInputLine *line = i.value;
@@ -147,6 +172,20 @@ static void updateCursorLine_InputWidget_(iInputWidget *d) {
        }
        d->cursorLine = index_ArrayConstIterator(&i);
    }
+    /* May need to scroll to keep the cursor visible. */
+    iWidget *flow = findOverflowScrollable_Widget(w);
+    if (flow) {
+        const iRect rootRect = { rect_Root(w->root).pos, visibleSize_Root(w->root) };
+        int         yCursor  = contentBounds_InputWidget_(d).pos.y +
+                               lineHeight_Text(d->font) * (int) d->cursorLine;
+        const int margin = lineHeight_Text(d->font) * 3;
+        if (yCursor < top_Rect(rootRect) + margin) {
+            scrollOverflow_Widget(flow, top_Rect(rootRect) + margin - yCursor);
+        }
+        else if (yCursor > bottom_Rect(rootRect) - margin * 3 / 2) {
+            scrollOverflow_Widget(flow, bottom_Rect(rootRect) - margin * 3 / 2 - yCursor);
+        }
+    }
 }
 static void showCursor_InputWidget_(iInputWidget *d) {
@@ -161,21 +200,6 @@ static void invalidateBuffered_InputWidget_(iInputWidget *d) {
    }
 }
-iLocalDef iInt2 padding_(void) {
-    return init_I2(gap_UI / 2, gap_UI / 2);
-}
-static iRect contentBounds_InputWidget_(const iInputWidget *d) {
-    const iWidget *w         = constAs_Widget(d);
-    const iRect widgetBounds = bounds_Widget(w);
-    iRect          bounds = adjusted_Rect(bounds_Widget(w),
-                                          addX_I2(padding_(), d->leftPadding),
-                                          neg_I2(addX_I2(padding_(), d->rightPadding)));
-    shrink_Rect(&bounds, init_I2(gap_UI * (flags_Widget(w) & tight_WidgetFlag ? 1 : 2), 0));
-    bounds.pos.y += padding_().y / 2;
-    return bounds;
-}
 static void updateSizeForFixedLength_InputWidget_(iInputWidget *d) {
    if (d->maxLen) {
        /* Set a fixed size based on maximum possible width of the text. */
@@ -219,6 +243,7 @@ static void clearLines_InputWidget_(iInputWidget *d) {
 }
 static void updateLines_InputWidget_(iInputWidget *d) {
+    d->lastUpdateWidth = d->widget.rect.size.x;
    clearLines_InputWidget_(d);
    if (d->maxLen) {
        /* Everything on a single line. */
@@ -226,6 +251,7 @@ static void updateLines_InputWidget_(iInputWidget *d) {
        init_InputLine(&line);
        iString *u8 = visText_InputWidget_(d);
        set_String(&line.text, u8);
+        line.len = length_String(u8);
        delete_String(u8);
        pushBack_Array(&d->lines, &line);
        updateCursorLine_InputWidget_(d);
@@ -249,14 +275,16 @@ static void updateLines_InputWidget_(iInputWidget *d) {
        init_InputLine(&line);
        setRange_String(&line.text, part);
        line.offset = charPos;
+        line.len    = length_String(&line.text);
        pushBack_Array(&d->lines, &line);
-        charPos += length_String(&line.text);
+        charPos += line.len;
        content.start = endPos;        
    }
    if (isEmpty_Array(&d->lines) || endsWith_String(u8, "\n")) {
        /* Always at least one empty line. */
        iInputLine line;
        init_InputLine(&line);
+        line.offset = charPos;
        pushBack_Array(&d->lines, &line);
    }
    else {
@@ -278,7 +306,7 @@ static void updateMetrics_InputWidget_(iInputWidget *d) {
    iWidget *w = as_Widget(d);
    updateSizeForFixedLength_InputWidget_(d);
    /* Caller must arrange the width, but the height is fixed. */
-    w->rect.size.y = contentHeight_InputWidget_(d, iTrue) + 3 * padding_().y; /* TODO: Why 3x? */
+    w->rect.size.y = contentHeight_InputWidget_(d, iTrue) + 3.0f * padding_().y; /* TODO: Why 3x? */
    if (flags_Widget(w) & extraPadding_WidgetFlag) {
        w->rect.size.y += 2 * gap_UI;
    }
@@ -316,6 +344,7 @@ void init_InputWidget(iInputWidget *d, size_t maxLen) {
    d->cursor       = 0;
    d->lastCursor   = 0;
    d->cursorLine   = 0;
+    d->lastUpdateWidth = 0;
    d->verticalMoveX = -1; /* TODO: Use this. */
    d->inFlags      = eatEscape_InputWidgetFlag | enterKeyEnabled_InputWidgetFlag;
    iZap(d->mark);
@@ -455,31 +484,46 @@ void setContentPadding_InputWidget(iInputWidget *d, int left, int right) {
    refresh_Widget(d);
 }
+static iBool isHintVisible_InputWidget_(const iInputWidget *d) {
+    return !isEmpty_String(&d->hint) && size_Array(&d->lines) == 1 &&
+           isEmpty_String(&line_InputWidget_(d, 0)->text);
+}
 static void updateBuffered_InputWidget_(iInputWidget *d) {
    invalidateBuffered_InputWidget_(d);
-    iString *bufText = NULL;
+    if (isHintVisible_InputWidget_(d)) {
+        d->buffered = new_TextBuf(d->font, uiAnnotation_ColorId, cstr_String(&d->hint));                
+    }
+    else {
+        iString *bufText = NULL;
 #if 0
-    if (d->inFlags & isUrl_InputWidgetFlag && as_Widget(d)->root == win->keyRoot) {
+        if (d->inFlags & isUrl_InputWidgetFlag && as_Widget(d)->root == win->keyRoot) {
-        /* TODO: Move this omitting to `updateLines_`? */
+            /* TODO: Move this omitting to `updateLines_`? */
-        /* Highlight the host name. */
+            /* Highlight the host name. */
-        iUrl parts;
+            iUrl parts;
-        const iString *text = collect_String(utf32toUtf8_InputWidget_(d));
+            const iString *text = collect_String(utf32toUtf8_InputWidget_(d));
-        init_Url(&parts, text);
+            init_Url(&parts, text);
-        if (!isEmpty_Range(&parts.host)) {
+            if (!isEmpty_Range(&parts.host)) {
-            bufText = new_String();
+                bufText = new_String();
-            appendRange_String(bufText, (iRangecc){ constBegin_String(text), parts.host.start });
+                appendRange_String(bufText, (iRangecc){ constBegin_String(text), parts.host.start });
-            appendCStr_String(bufText, uiTextStrong_ColorEscape);
+                appendCStr_String(bufText, uiTextStrong_ColorEscape);
-            appendRange_String(bufText, parts.host);
+                appendRange_String(bufText, parts.host);
-            appendCStr_String(bufText, restore_ColorEscape);
+                appendCStr_String(bufText, restore_ColorEscape);
-            appendRange_String(bufText, (iRangecc){ parts.host.end, constEnd_String(text) });
+                appendRange_String(bufText, (iRangecc){ parts.host.end, constEnd_String(text) });
+            }
        }
-    }
 #endif
-    if (!bufText) {
+        if (!bufText) {
-        bufText = visText_InputWidget_(d);
+            bufText = visText_InputWidget_(d);
+        }
+        const int   maxWidth = contentBounds_InputWidget_(d).size.x;
+        const int   fg       = uiInputText_ColorId;
+        const char *text     = cstr_String(bufText);
+        d->buffered =
+            (d->inFlags & isUrl_InputWidgetFlag ? newBound_TextBuf(d->font, fg, maxWidth, text)
+                                                : newWrap_TextBuf (d->font, fg, maxWidth, text));
+        delete_String(bufText);
    }
-    d->buffered = new_TextBuf(d->font, uiInputText_ColorId, cstr_String(bufText));
-    delete_String(bufText);
    d->inFlags &= ~needUpdateBuffer_InputWidgetFlag;
 }
@@ -563,7 +607,11 @@ void begin_InputWidget(iInputWidget *d) {
    }
    updateCursorLine_InputWidget_(d);
    SDL_StartTextInput();
-    setFlags_Widget(w, selected_WidgetFlag | keepOnTop_WidgetFlag, iTrue);
+    setFlags_Widget(w, selected_WidgetFlag, iTrue);
+    if (d->maxLayoutLines != iInvalidSize) {
+        /* This will extend beyond the arranged region. */
+        setFlags_Widget(w, keepOnTop_WidgetFlag, iTrue);
+    }
    showCursor_InputWidget_(d);
    refresh_Widget(w);
    d->timer = SDL_AddTimer(refreshInterval_InputWidget_, cursorTimer_, d);
@@ -657,6 +705,10 @@ void setCursor_InputWidget(iInputWidget *d, size_t pos) {
    showCursor_InputWidget_(d);
 }
+iLocalDef iBool isLastLine_InputWidget_(const iInputWidget *d, const iInputLine *line) {
+    return (const void *) line == constAt_Array(&d->lines, size_Array(&d->lines) - 1);
+}
 static size_t indexForRelativeX_InputWidget_(const iInputWidget *d, int x, const iInputLine *line) {
    size_t index = line->offset;
    if (x <= 0) {
@@ -665,7 +717,7 @@ static size_t indexForRelativeX_InputWidget_(const iInputWidget *d, int x, const
    const char *endPos;
    tryAdvanceNoWrap_Text(d->font, range_String(&line->text), x, &endPos);
    if (endPos == constEnd_String(&line->text)) {
-        index += length_String(&line->text);
+        index += line->len;
    }
    else {
        /* Need to know the actual character index. */
@@ -675,6 +727,9 @@ static size_t indexForRelativeX_InputWidget_(const iInputWidget *d, int x, const
            index++;
        }
    }
+    if (!isLastLine_InputWidget_(d, line) && index == line->offset + line->len) {
+        index = iMax(index - 1, line->offset);
+    }
    return index;
 }
@@ -690,11 +745,6 @@ static iBool moveCursorByLine_InputWidget_(iInputWidget *d, int dir) {
        newCursor = indexForRelativeX_InputWidget_(d, xPos, ++line);
    }
    if (newCursor != iInvalidPos) {
-        /* Clamp it to the current line. */
-        newCursor = iMin(newCursor, line->offset + length_String(&line->text) -
-                         /* last line is allowed to go to the cursorMax */
-                         ((const void *) line < constAt_Array(&d->lines, numLines - 1) ? 1 : 0));
-        newCursor = iMax(newCursor, line->offset);
        setCursor_InputWidget(d, newCursor);
        return iTrue;
    }
@@ -707,6 +757,7 @@ void setSensitiveContent_InputWidget(iInputWidget *d, iBool isSensitive) {
 void setUrlContent_InputWidget(iInputWidget *d, iBool isUrl) {
    iChangeFlags(d->inFlags, isUrl_InputWidgetFlag, isUrl);
+    d->inFlags |= needUpdateBuffer_InputWidgetFlag;
 }
 void setSelectAllOnFocus_InputWidget(iInputWidget *d, iBool selectAllOnFocus) {
@@ -826,7 +877,8 @@ static iInt2 textOrigin_InputWidget_(const iInputWidget *d) { //}, const char *v
 static size_t coordIndex_InputWidget_(const iInputWidget *d, iInt2 coord) {
    const iInt2 pos = sub_I2(coord, contentBounds_InputWidget_(d).pos);
-    const size_t lineNumber = iMin(pos.y / lineHeight_Text(d->font), (int) size_Array(&d->lines) - 1);
+    const size_t lineNumber = iMin(iMax(0, pos.y) / lineHeight_Text(d->font),
+                                   (int) size_Array(&d->lines) - 1);
    const iInputLine *line = line_InputWidget_(d, lineNumber);
    const char *endPos;
    tryAdvanceNoWrap_Text(d->font, range_String(&line->text), pos.x, &endPos);
@@ -880,7 +932,7 @@ static iRanges lineRange_InputWidget_(const iInputWidget *d) {
        return (iRanges){ 0, 0 };
    }
    const iInputLine *line = line_InputWidget_(d, d->cursorLine);
-    return (iRanges){ line->offset, line->offset + length_String(&line->text) };
+    return (iRanges){ line->offset, line->offset + line->len };
 }
 static void extendRange_InputWidget_(iInputWidget *d, size_t *pos, int dir) {
@@ -907,6 +959,9 @@ static iRect bounds_InputWidget_(const iInputWidget *d) {
        return bounds;
    }
    bounds.size.y = contentHeight_InputWidget_(d, iFalse) + 3 * padding_().y;
+    if (w->flags & extraPadding_WidgetFlag) {
+        bounds.size.y += 2 * gap_UI;
+    }
    return bounds;
 }
@@ -958,11 +1013,19 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
        }
        return iFalse;
    }
+    else if (isCommand_UserEvent(ev, "text.insert")) {
+        pushUndo_InputWidget_(d);
+        deleteMarked_InputWidget_(d);
+        insertChar_InputWidget_(d, arg_Command(command_UserEvent(ev)));
+        contentsWereChanged_InputWidget_(d);
+        return iTrue;
+    }
    else if (isMetricsChange_UserEvent(ev)) {
        updateMetrics_InputWidget_(d);
        updateLinesAndResize_InputWidget_(d);
    }
-    else if (isResize_UserEvent(ev)) {
+    else if (isResize_UserEvent(ev) || d->lastUpdateWidth != w->rect.size.x) {
+        d->inFlags |= needUpdateBuffer_InputWidgetFlag;
        if (d->inFlags & isUrl_InputWidgetFlag) {
            /* Restore/omit the default scheme if necessary. */
            setText_InputWidget(d, text_InputWidget(d));
@@ -1077,6 +1140,17 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
                    return iTrue;
            }
        }
+#if defined (iPlatformApple)
+        if (mods == KMOD_PRIMARY || mods == (KMOD_PRIMARY | KMOD_SHIFT)) {
+            switch (key) {
+                case SDLK_UP:
+                case SDLK_DOWN:
+                    setCursor_InputWidget(d, key == SDLK_UP ? 0 : curMax);
+                    refresh_Widget(d);
+                    return iTrue;
+            }
+        }
+#endif        
        d->lastCursor = d->cursor;
        switch (key) {
            case SDLK_INSERT:
@@ -1086,7 +1160,8 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
                return iTrue;
            case SDLK_RETURN:
            case SDLK_KP_ENTER:
-                if (mods == KMOD_SHIFT) {
+                if (mods == KMOD_SHIFT || (~d->inFlags & isUrl_InputWidgetFlag &&
+                                           deviceType_App() != desktop_AppDeviceType)) {
                    pushUndo_InputWidget_(d);
                    deleteMarked_InputWidget_(d);
                    insertChar_InputWidget_(d, '\n');
@@ -1170,7 +1245,12 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
                break;
            case SDLK_HOME:
            case SDLK_END:
-                setCursor_InputWidget(d, key == SDLK_HOME ? lineFirst : lineLast);
+                if (mods == KMOD_PRIMARY || mods == (KMOD_PRIMARY | KMOD_SHIFT)) {
+                    setCursor_InputWidget(d, key == SDLK_HOME ? 0 : curMax);
+                }
+                else {
+                    setCursor_InputWidget(d, key == SDLK_HOME ? lineFirst : lineLast);
+                }
                refresh_Widget(w);
                return iTrue;
            case SDLK_a:
@@ -1216,19 +1296,20 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
                /* Allow focus switching. */
                return processEvent_Widget(as_Widget(d), ev);
            case SDLK_UP:
-                if (moveCursorByLine_InputWidget_(d, -1)) {
-                    refresh_Widget(d);
-                    return iTrue;
-                }
-                /* For moving to lookup from url entry. */
-                return processEvent_Widget(as_Widget(d), ev);
            case SDLK_DOWN:
-                if (moveCursorByLine_InputWidget_(d, +1)) {
+                if (moveCursorByLine_InputWidget_(d, key == SDLK_UP ? -1 : +1)) {
                    refresh_Widget(d);
                    return iTrue;
                }
                /* For moving to lookup from url entry. */
                return processEvent_Widget(as_Widget(d), ev);
+            case SDLK_PAGEUP:
+            case SDLK_PAGEDOWN:
+                for (int count = 0; count < 5; count++) {
+                    moveCursorByLine_InputWidget_(d, key == SDLK_PAGEUP ? -1 : +1);
+                }
+                refresh_Widget(d);
+                return iTrue;        
        }
        if (mods & (KMOD_PRIMARY | KMOD_SECONDARY)) {
            return iFalse;
@@ -1248,6 +1329,7 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
    return processEvent_Widget(w, ev);
 }
+#if 0
 static iBool isWhite_(const iString *str) {
    iConstForEach(String, i, str) {
        if (!isSpace_Char(i.value)) {
@@ -1256,11 +1338,12 @@ static iBool isWhite_(const iString *str) {
    }
    return iTrue;
 }
+#endif
 static void draw_InputWidget_(const iInputWidget *d) {
    const iWidget *w         = constAs_Widget(d);
    iRect          bounds    = adjusted_Rect(bounds_InputWidget_(d), padding_(), neg_I2(padding_()));
-    iBool          isHint    = iFalse;
+    iBool          isHint    = isHintVisible_InputWidget_(d);
    const iBool    isFocused = isFocused_Widget(w);
    const iBool    isHover   = isHover_Widget(w) &&
                               contains_InputWidget_(d, mouseCoord_Window(get_Window()));
@@ -1283,40 +1366,52 @@ static void draw_InputWidget_(const iInputWidget *d) {
                            isFocused ? gap_UI / 4 : 1,
                            isFocused ? uiInputFrameFocused_ColorId
                                      : isHover ? uiInputFrameHover_ColorId : uiInputFrame_ColorId);
-    setClip_Paint(&p, adjusted_Rect(bounds, init_I2(d->leftPadding, 0), init_I2(-d->rightPadding, 0)));
+    setClip_Paint(&p, adjusted_Rect(bounds, init_I2(d->leftPadding, 0),
+                                    init_I2(-d->rightPadding, w->flags & extraPadding_WidgetFlag ? -gap_UI / 2 : 0)));
    const iRect contentBounds = contentBounds_InputWidget_(d);
 //    const iInt2 textOrigin = textOrigin_InputWidget_(d); //, cstr_String(text));
    iInt2       drawPos    = topLeft_Rect(contentBounds);
    const int   fg         = isHint                                  ? uiAnnotation_ColorId
                             : isFocused && !isEmpty_Array(&d->text) ? uiInputTextFocused_ColorId
                                                                     : uiInputText_ColorId;
-    /* TODO: If buffered, just draw the buffered copy. */
+    /* If buffered, just draw the buffered copy. */
-    iConstForEach(Array, i, &d->lines) {
+    if (d->buffered && !isFocused) { //&& !isFocused/* && !isHint*/) {
-        const iInputLine *line      = i.value;
+        /* Most input widgets will use this, since only one is focused at a time. */
-        const iBool       isLast    = index_ArrayConstIterator(&i) == size_Array(&d->lines) - 1;
+        draw_TextBuf(d->buffered, topLeft_Rect(contentBounds), white_ColorId);
-        const iInputLine *nextLine  = isLast ? NULL : (line + 1);
+    }
-        const iRanges     lineRange = { line->offset,
+    else if (isHint) {
-                                        nextLine ? nextLine->offset : size_Array(&d->text) };
+        drawRange_Text(d->font, topLeft_Rect(contentBounds), uiAnnotation_ColorId,
-        if (isFocused && !isEmpty_Range(&d->mark)) {
+                       range_String(&d->hint));
-            /* Draw the selected range. */
+    }
-            const iRanges mark = mark_InputWidget_(d);
+    else {
-            if (mark.start < lineRange.end && mark.end > lineRange.start) {
+        iConstForEach(Array, i, &d->lines) {
-                const int m1 = advanceN_Text(d->font,
+            const iInputLine *line      = i.value;
-                                             cstr_String(&line->text),
+            const iBool       isLast    = index_ArrayConstIterator(&i) == size_Array(&d->lines) - 1;
-                                             iMax(lineRange.start, mark.start) - line->offset)
+            const iInputLine *nextLine  = isLast ? NULL : (line + 1);
-                                   .x;
+            const iRanges     lineRange = { line->offset,
-                const int m2 = advanceN_Text(d->font,
+                                            nextLine ? nextLine->offset : size_Array(&d->text) };
-                                             cstr_String(&line->text),
+            if (isFocused && !isEmpty_Range(&d->mark)) {
-                                             iMin(lineRange.end, mark.end) - line->offset)
+                /* Draw the selected range. */
-                                   .x;
+                const iRanges mark = mark_InputWidget_(d);
-                fillRect_Paint(&p,
+                if (mark.start < lineRange.end && mark.end > lineRange.start) {
-                               (iRect){ addX_I2(drawPos, iMin(m1, m2)),
+                    const int m1 = advanceN_Text(d->font,
-                                        init_I2(iMax(gap_UI / 3, iAbs(m2 - m1)), lineHeight_Text(d->font)) },
+                                                 cstr_String(&line->text),
-                               uiMarked_ColorId);
+                                                 iMax(lineRange.start, mark.start) - line->offset)
+                                       .x;
+                    const int m2 = advanceN_Text(d->font,
+                                                 cstr_String(&line->text),
+                                                 iMin(lineRange.end, mark.end) - line->offset)
+                                       .x;
+                    fillRect_Paint(&p,
+                                   (iRect){ addX_I2(drawPos, iMin(m1, m2)),
+                                            init_I2(iMax(gap_UI / 3, iAbs(m2 - m1)),
+                                                    lineHeight_Text(d->font)) },
+                                   uiMarked_ColorId);
+                }
            }
+            drawRange_Text(d->font, drawPos, fg, range_String(&line->text));
+            drawPos.y += lineHeight_Text(d->font);
        }
-        drawRange_Text(d->font, drawPos, fg, range_String(&line->text));
-        drawPos.y += lineHeight_Text(d->font);
    }
 //    if (d->buffered && !isFocused && !isHint) {
 //        /* Most input widgets will use this, since only one is focused at a time. */
@@ -1378,13 +1473,7 @@ static void draw_InputWidget_(const iInputWidget *d) {
    drawChildren_Widget(w);
 }
-//static void sizeChanged_InputWidget_(iInputWidget *d) {
-//    printf("[InputWidget] %p: size changed, updating layout\n", d);
-//    updateLinesAndResize_InputWidget_(d, iFalse);
-//}
 iBeginDefineSubclass(InputWidget, Widget)
    .processEvent = (iAny *) processEvent_InputWidget_,
    .draw         = (iAny *) draw_InputWidget_,
-//    .sizeChanged  = (iAny *) sizeChanged_InputWidget_,
 iEndDefineSubclass(InputWidget)
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index a7aa6391..a940b0cb 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -28,6 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "app.h"
 #include "util.h"
 #include "keys.h"
+#include "touch.h"
 struct Impl_LabelWidget {
    iWidget widget;
@@ -46,6 +47,15 @@ struct Impl_LabelWidget {
    } flags;
 };
+static iBool isHover_LabelWidget_(const iLabelWidget *d) {
+#if defined (iPlatformMobile)
+    if (!isHovering_Touch()) {
+        return iFalse;
+    }
+#endif
+    return isHover_Widget(d);
+}
 static iInt2 padding_LabelWidget_(const iLabelWidget *d, int corner) {
    const iWidget *w = constAs_Widget(d);
    const int64_t flags = flags_Widget(w);
@@ -199,7 +209,7 @@ static void getColors_LabelWidget_(const iLabelWidget *d, int *bg, int *fg, int
    if (startsWith_String(&d->label, "\v")) {
        colorEscape = cstr_String(&d->label)[1] - asciiBase_ColorEscape; /* TODO: can be two bytes long */
    }
-    if (isHover_Widget(w)) {
+    if (isHover_LabelWidget_(d)) {
        if (isFrameless) {
            *bg = uiBackgroundFramelessHover_ColorId;
            *fg = uiTextFramelessHover_ColorId;
@@ -257,7 +267,7 @@ static void draw_LabelWidget_(const iLabelWidget *d) {
    const int64_t flags    = flags_Widget(w);
    const iRect   bounds   = bounds_Widget(w);
    iRect         rect     = bounds;
-    const iBool   isHover  = isHover_Widget(w);
+    const iBool   isHover  = isHover_LabelWidget_(d);
    if (isButton) {
        shrink_Rect(&rect, divi_I2(gap2_UI, 4));
        adjustEdges_Rect(&rect, gap_UI / 8, 0, -gap_UI / 8, 0);
diff --git a/src/ui/listwidget.c b/src/ui/listwidget.c
index 95be44a0..a3406d48 100644
--- a/src/ui/listwidget.c
+++ b/src/ui/listwidget.c
@@ -414,7 +414,7 @@ static void draw_ListWidget_(const iListWidget *d) {
                                        init_I2(blankWidth, d->itemHeight) };
            iConstForEach(IntSet, v, &d->invalidItems) {
                const size_t index = *v.value;
-                if (contains_Range(&drawItems, index)) {
+                if (contains_Range(&drawItems, index) && index < size_PtrArray(&d->items)) {
                    const iListItem *item = constAt_PtrArray(&d->items, index);
                    const iRect      itemRect = { init_I2(0, index * d->itemHeight - buf->origin),
                                                  init_I2(d->visBuf->texSize.x, d->itemHeight) };
diff --git a/src/ui/lookupwidget.c b/src/ui/lookupwidget.c
index b06523f9..3eafd4bd 100644
--- a/src/ui/lookupwidget.c
+++ b/src/ui/lookupwidget.c
@@ -662,7 +662,7 @@ static iBool processEvent_LookupWidget_(iLookupWidget *d, const SDL_Event *ev) {
            setPos_Widget(w, windowToLocal_Widget(w, bottomLeft_Rect(bounds_Widget(url))));
 #if defined (iPlatformAppleMobile)
            /* Adjust height based on keyboard size. */ {
-                w->rect.size.y = visibleRootSize_Window(window).y - top_Rect(bounds_Widget(w));
+                w->rect.size.y = visibleSize_Root(root).y - top_Rect(bounds_Widget(w));
                if (deviceType_App() == phone_AppDeviceType) {
                    float l, r;
                    safeAreaInsets_iOS(&l, NULL, &r, NULL);
diff --git a/src/ui/mobile.c b/src/ui/mobile.c
new file mode 100644
index 00000000..1f5e9758
--- /dev/null
+++ b/src/ui/mobile.c
@@ -0,0 +1,795 @@
+/* Copyright 2021 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+#include "mobile.h"
+#include "app.h"
+#include "command.h"
+#include "defs.h"
+#include "inputwidget.h"
+#include "labelwidget.h"
+#include "root.h"
+#include "text.h"
+#include "widget.h"
+#include "window.h"
+#if defined (iPlatformAppleMobile)
+#   include "ios.h"
+#endif
+static iBool useMobileSheetLayout_(void) {
+    return deviceType_App() != desktop_AppDeviceType;
+}
+static iBool isSideBySideLayout_(void) {
+    if (deviceType_App() == phone_AppDeviceType) {
+        return isLandscape_App();
+    }
+    return numRoots_Window(get_Window()) == 1;
+}
+static enum iFontId labelFont_(void) {
+    return deviceType_App() == phone_AppDeviceType ? defaultBig_FontId : defaultMedium_FontId;
+}
+static enum iFontId labelBoldFont_(void) {
+    return deviceType_App() == phone_AppDeviceType ? defaultBigBold_FontId : defaultMediumBold_FontId;
+}
+static void updatePanelSheetMetrics_(iWidget *sheet) {
+    iWidget *navi       = findChild_Widget(sheet, "panel.navi");
+    iWidget *naviPad    = child_Widget(navi, 0);
+    int      naviHeight = lineHeight_Text(labelFont_()) + 4 * gap_UI;
+#if defined (iPlatformAppleMobile)
+    float left, right, top, bottom;
+    safeAreaInsets_iOS(&left, &top, &right, &bottom);
+    setPadding_Widget(sheet, left, 0, right, 0);
+    navi->rect.pos = init_I2(left, top);
+    iConstForEach(PtrArray, i, findChildren_Widget(sheet, "panel.toppad")) {
+        iWidget *pad = *i.value;
+        setFixedSize_Widget(pad, init1_I2(naviHeight));
+    }
+#endif
+    setFixedSize_Widget(navi, init_I2(-1, naviHeight));
+}
+static iWidget *findDetailStack_(iWidget *topPanel) {
+    return findChild_Widget(parent_Widget(topPanel), "detailstack");
+}
+static void unselectAllPanelButtons_(iWidget *topPanel) {
+    iForEach(ObjectList, i, children_Widget(topPanel)) {
+        if (isInstance_Object(i.object, &Class_LabelWidget)) {
+            iLabelWidget *label = i.object;
+            if (!cmp_String(command_LabelWidget(label), "panel.open")) {
+                setFlags_Widget(i.object, selected_WidgetFlag, iFalse);
+            }
+        }
+    }
+}
+static iBool mainDetailSplitHandler_(iWidget *mainDetailSplit, const char *cmd) {
+    if (equal_Command(cmd, "window.resized")) {
+        const iBool isPortrait = (deviceType_App() == phone_AppDeviceType && isPortrait_App());
+        const iRect safeRoot   = safeRect_Root(mainDetailSplit->root);
+        setPos_Widget(mainDetailSplit, topLeft_Rect(safeRoot));
+        setFixedSize_Widget(mainDetailSplit, safeRoot.size);
+        iWidget *    sheet        = parent_Widget(mainDetailSplit);
+        iWidget *    navi         = findChild_Widget(sheet, "panel.navi");
+        iWidget *    detailStack  = findChild_Widget(mainDetailSplit, "detailstack");
+        const size_t numPanels    = childCount_Widget(detailStack);
+        const iBool  isSideBySide = isSideBySideLayout_() && numPanels > 0;
+        setFlags_Widget(mainDetailSplit, arrangeHorizontal_WidgetFlag, isSideBySide);
+        setFlags_Widget(detailStack, expand_WidgetFlag, isSideBySide);
+        setFlags_Widget(detailStack, hidden_WidgetFlag, numPanels == 0);
+        iWidget *topPanel = findChild_Widget(mainDetailSplit, "panel.top");
+        const int pad = isPortrait ? 0 : 3 * gap_UI;
+        if (isSideBySide) {
+            iAssert(topPanel);
+            topPanel->rect.size.x = (deviceType_App() == phone_AppDeviceType ?
+                                     safeRoot.size.x * 2 / 5 : (safeRoot.size.x / 3));
+        }
+        if (deviceType_App() == tablet_AppDeviceType) {
+            setPadding_Widget(topPanel, pad, 0, pad, pad);
+            if (numPanels == 0) {
+                setFlags_Widget(sheet, centerHorizontal_WidgetFlag, iTrue);
+                const int sheetWidth = iMin(safeRoot.size.x, safeRoot.size.y);
+                mainDetailSplit->rect.size.x = sheetWidth;
+                setFixedSize_Widget(sheet, init_I2(sheetWidth, -1));
+                setFixedSize_Widget(navi, init_I2(sheetWidth, -1));
+            }
+        }
+        iForEach(ObjectList, i, children_Widget(detailStack)) {
+            iWidget *panel = i.object;
+            setFlags_Widget(panel, edgeDraggable_WidgetFlag, !isSideBySide);
+            if (isSideBySide) {
+                setVisualOffset_Widget(panel, 0, 0, 0);
+            }
+            setPadding_Widget(panel, pad, 0, pad, pad);
+        }
+        arrange_Widget(mainDetailSplit);
+    }
+    return iFalse;
+}
+static iBool topPanelHandler_(iWidget *topPanel, const char *cmd) {
+    const iBool isPortrait = !isSideBySideLayout_();
+    if (equal_Command(cmd, "panel.open")) {
+        iWidget *button = pointer_Command(cmd);
+        iWidget *panel = userData_Object(button);
+//        openMenu_Widget(panel, innerToWindow_Widget(panel, zero_I2()));
+//        setFlags_Widget(panel, hidden_WidgetFlag, iFalse);
+        unselectAllPanelButtons_(topPanel);
+        iForEach(ObjectList, i, children_Widget(findDetailStack_(topPanel))) {
+            iWidget *child = i.object;
+            setFlags_Widget(child, hidden_WidgetFlag | disabled_WidgetFlag, child != panel);
+            /* Animate the current panel in. */
+            if (child == panel && isPortrait) {
+                setupSheetTransition_Mobile(panel, iTrue);
+            }
+        }
+        setFlags_Widget(button, selected_WidgetFlag, iTrue);
+        return iTrue;
+    }
+    if (equal_Command(cmd, "mouse.clicked") && arg_Command(cmd) &&
+        argLabel_Command(cmd, "button") == SDL_BUTTON_X1) {
+        postCommand_App("panel.close");
+        return iTrue;
+    }
+    if (equal_Command(cmd, "panel.close")) {
+        iBool wasClosed = iFalse;
+        if (isPortrait) {
+            iForEach(ObjectList, i, children_Widget(findDetailStack_(topPanel))) {
+                iWidget *child = i.object;
+                if (!cmp_String(id_Widget(child), "panel") && isVisible_Widget(child)) {
+    //                closeMenu_Widget(child);
+                    setupSheetTransition_Mobile(child, iFalse);
+                    setFlags_Widget(child, hidden_WidgetFlag | disabled_WidgetFlag, iTrue);
+                    setFocus_Widget(NULL);
+                    updateTextCStr_LabelWidget(findWidget_App("panel.back"), "Back");
+                    wasClosed = iTrue;
+                }
+            }
+        }
+        unselectAllPanelButtons_(topPanel);
+        if (!wasClosed) {
+            postCommand_App("prefs.dismiss");
+        }
+        return iTrue;
+    }
+    if (equal_Command(cmd, "document.changed")) {
+        postCommand_App("prefs.dismiss");
+        return iFalse;
+    }
+    if (equal_Command(cmd, "window.resized")) {
+        // sheet > mdsplit > panel.top
+        updatePanelSheetMetrics_(parent_Widget(parent_Widget(topPanel)));
+    }
+    return iFalse;
+}
+static iBool isTwoColumnPage_(iWidget *d) {
+    if (cmp_String(id_Widget(d), "dialogbuttons") == 0 ||
+        cmp_String(id_Widget(d), "prefs.tabs") == 0) {
+        return iFalse;
+    }
+    if (class_Widget(d) == &Class_Widget && childCount_Widget(d) == 2) {
+        return class_Widget(child_Widget(d, 0)) == &Class_Widget &&
+               class_Widget(child_Widget(d, 1)) == &Class_Widget;
+    }
+    return iFalse;
+}
+static iBool isOmittedPref_(const iString *id) {
+    static const char *omittedPrefs[] = {
+        "prefs.smoothscroll",
+        "prefs.imageloadscroll",
+        "prefs.pinsplit",
+        "prefs.retainwindow",
+        "prefs.ca.file",
+        "prefs.ca.path",
+    };
+    iForIndices(i, omittedPrefs) {
+        if (cmp_String(id, omittedPrefs[i]) == 0) {
+            return iTrue;
+        }
+    }
+    return iFalse;
+}
+enum iPrefsElement {
+    panelTitle_PrefsElement,
+    heading_PrefsElement,
+    toggle_PrefsElement,
+    dropdown_PrefsElement,
+    radioButton_PrefsElement,
+    textInput_PrefsElement,
+};
+static iAnyObject *addPanelChild_(iWidget *panel, iAnyObject *child, int64_t flags,
+                                  enum iPrefsElement elementType,
+                                  enum iPrefsElement precedingElementType) {
+    /* Erase redundant/unused headings. */
+    if (precedingElementType == heading_PrefsElement &&
+        (!child || (elementType == heading_PrefsElement || elementType == radioButton_PrefsElement))) {
+        iRelease(removeChild_Widget(panel, lastChild_Widget(panel)));
+        if (!cmp_String(id_Widget(constAs_Widget(lastChild_Widget(panel))), "padding")) {
+            iRelease(removeChild_Widget(panel, lastChild_Widget(panel)));
+        }
+    }
+    if (child) {
+        /* Insert padding between different element types. */
+        if (precedingElementType != panelTitle_PrefsElement) {
+            if (elementType == heading_PrefsElement ||
+                (elementType == toggle_PrefsElement &&
+                 precedingElementType != toggle_PrefsElement &&
+                 precedingElementType != heading_PrefsElement) ||
+                (elementType == dropdown_PrefsElement &&
+                 precedingElementType != dropdown_PrefsElement &&
+                 precedingElementType != heading_PrefsElement) ||
+                (elementType == textInput_PrefsElement &&
+                 precedingElementType != textInput_PrefsElement &&
+                 precedingElementType != heading_PrefsElement)) {
+                addChild_Widget(panel, iClob(makePadding_Widget(lineHeight_Text(labelFont_()))));
+            }
+        }
+        if ((elementType == toggle_PrefsElement && precedingElementType != toggle_PrefsElement) ||
+            (elementType == textInput_PrefsElement && precedingElementType != textInput_PrefsElement)) {
+            flags |= borderTop_WidgetFlag;
+        }
+        return addChildFlags_Widget(panel, child, flags);
+    }
+    return NULL;
+}
+static void stripTrailingColon_(iLabelWidget *label) {
+    const iString *text = text_LabelWidget(label);
+    if (endsWith_String(text, ":")) {
+        iString *mod = copy_String(text);
+        removeEnd_String(mod, 1);
+        updateText_LabelWidget(label, mod);
+        delete_String(mod);
+    }
+}
+static iLabelWidget *makePanelButton_(const char *text, const char *command) {
+    iLabelWidget *btn = new_LabelWidget(text, command);
+    setFlags_Widget(as_Widget(btn),
+                    borderBottom_WidgetFlag | alignLeft_WidgetFlag |
+                    frameless_WidgetFlag | extraPadding_WidgetFlag,
+                    iTrue);
+    checkIcon_LabelWidget(btn);
+    setFont_LabelWidget(btn, labelFont_());
+    setTextColor_LabelWidget(btn, uiTextStrong_ColorId);
+    setBackgroundColor_Widget(as_Widget(btn), uiBackgroundSidebar_ColorId);
+    return btn;
+}
+static iWidget *makeValuePadding_(iWidget *value) {
+    iInputWidget *input = isInstance_Object(value, &Class_InputWidget) ? (iInputWidget *) value : NULL;
+    if (input) {
+        setFont_InputWidget(input, labelFont_());
+        setContentPadding_InputWidget(input, 3 * gap_UI, 3 * gap_UI);
+    }
+    iWidget *pad = new_Widget();
+    setBackgroundColor_Widget(pad, uiBackgroundSidebar_ColorId);
+    setPadding_Widget(pad, 0, 1 * gap_UI, 0, 1 * gap_UI);
+    addChild_Widget(pad, iClob(value));
+    setFlags_Widget(pad,
+                    borderBottom_WidgetFlag |
+                    arrangeVertical_WidgetFlag |
+                    resizeToParentWidth_WidgetFlag |
+                    resizeWidthOfChildren_WidgetFlag |
+                    arrangeHeight_WidgetFlag,
+                    iTrue);
+    return pad;
+}
+static iWidget *makeValuePaddingWithHeading_(iLabelWidget *heading, iWidget *value) {
+    iWidget *div = new_Widget();
+    setFlags_Widget(div,
+                    borderBottom_WidgetFlag | arrangeHeight_WidgetFlag |
+                    resizeWidthOfChildren_WidgetFlag |
+                    arrangeHorizontal_WidgetFlag, iTrue);
+    setBackgroundColor_Widget(div, uiBackgroundSidebar_ColorId);
+    setPadding_Widget(div, gap_UI, gap_UI, 4 * gap_UI, gap_UI);
+    addChildFlags_Widget(div, iClob(heading), 0);
+    //setFixedSize_Widget(as_Widget(heading), init_I2(-1, height_Widget(value)));
+    setFont_LabelWidget(heading, labelFont_());
+    setTextColor_LabelWidget(heading, uiTextStrong_ColorId);
+    if (isInstance_Object(value, &Class_InputWidget)) {
+        addChildFlags_Widget(div, iClob(value), expand_WidgetFlag);
+    }
+    else if (isInstance_Object(value, &Class_LabelWidget) &&
+             cmp_String(command_LabelWidget((iLabelWidget *) value), "toggle")) {
+        addChildFlags_Widget(div, iClob(value), expand_WidgetFlag);
+        /* TODO: This doesn't work? */
+//        setCommand_LabelWidget(heading,
+//                               collectNewFormat_String("!%s ptr:%p",
+//                                           cstr_String(command_LabelWidget((iLabelWidget *) value)),
+//                                           value));
+    }
+    else {
+        addChildFlags_Widget(div, iClob(new_Widget()), expand_WidgetFlag);
+        addChild_Widget(div, iClob(value));
+    }
+    return div;
+}
+static iWidget *addChildPanel_(iWidget *parent, iLabelWidget *panelButton,
+                               const iString *titleText) {
+    iWidget *panel = new_Widget();
+    setId_Widget(panel, "panel");
+    setUserData_Object(panelButton, panel);
+    setBackgroundColor_Widget(panel, uiBackground_ColorId);
+    setId_Widget(addChild_Widget(panel, iClob(makePadding_Widget(0))), "panel.toppad");
+    if (titleText) {
+        iLabelWidget *title =
+            addChildFlags_Widget(panel,
+                                 iClob(new_LabelWidget(cstr_String(titleText), NULL)),
+                                 alignLeft_WidgetFlag | frameless_WidgetFlag);
+        setFont_LabelWidget(title, uiLabelLargeBold_FontId);
+        setTextColor_LabelWidget(title, uiHeading_ColorId);
+    }
+    addChildFlags_Widget(parent,
+                         iClob(panel),
+                         focusRoot_WidgetFlag | hidden_WidgetFlag | disabled_WidgetFlag |
+                             arrangeVertical_WidgetFlag | resizeWidthOfChildren_WidgetFlag |
+                             arrangeHeight_WidgetFlag | overflowScrollable_WidgetFlag |
+                             drawBackgroundToBottom_WidgetFlag |
+                             horizontalOffset_WidgetFlag | commandOnClick_WidgetFlag);
+    return panel;
+}
+void finalizeSheet_Mobile(iWidget *sheet) {
+    /* The sheet contents are completely rearranged and restyled on a phone.
+       We'll set up a linear fullscreen arrangement of the widgets. Sheets are already
+       scrollable so they can be taller than the display. In hindsight, it may have been
+       easier to create phone versions of each dialog, but at least this works with any
+       future changes to the UI (..."works"). At least this way it is possible to enforce
+       a consistent styling. */
+    if (useMobileSheetLayout_() && parent_Widget(sheet) == root_Widget(sheet)) {
+        if (~flags_Widget(sheet) & keepOnTop_WidgetFlag) {
+            /* Already finalized. */
+            arrange_Widget(sheet);
+            postRefresh_App();
+            return;
+        }
+        /*       Landscape Layout                 Portrait Layout
+                                              
+        ┌─────────┬──────Detail─Stack─────┐    ┌─────────┬ ─ ─ ─ ─ ┐
+        │         │┌───────────────────┐  │    │         │Detail
+        │         ││┌──────────────────┴┐ │    │         │Stack    │
+        │         │││┌──────────────────┴┐│    │         │┌──────┐
+        │         ││││                   ││    │         ││┌─────┴┐│
+        │         ││││                   ││    │         │││      │
+        │Top Panel││││                   ││    │Top Panel│││      ││
+        │         ││││      Panels       ││    │         │││Panels│
+        │         ││││                   ││    │         │││      ││
+        │         │└┤│                   ││    │         │││      │
+        │         │ └┤                   ││    │         │└┤      ││
+        │         │  └───────────────────┘│    │         │ └──────┘
+        └─────────┴───────────────────────┘    └─────────┴ ─ ─ ─ ─ ┘
+                                                          offscreen
+        */
+        /* Modify the top sheet to act as a fullscreen background. */
+        setPadding1_Widget(sheet, 0);
+        setBackgroundColor_Widget(sheet, uiBackground_ColorId);
+        setFlags_Widget(sheet,
+                        keepOnTop_WidgetFlag |
+                        parentCannotResize_WidgetFlag |
+                        arrangeSize_WidgetFlag |
+                        centerHorizontal_WidgetFlag |
+                        arrangeVertical_WidgetFlag |
+                        arrangeHorizontal_WidgetFlag |
+                        overflowScrollable_WidgetFlag,
+                        iFalse);
+        setFlags_Widget(sheet,
+                        frameless_WidgetFlag |
+                        //resizeWidthOfChildren_WidgetFlag |
+                        edgeDraggable_WidgetFlag |
+                        commandOnClick_WidgetFlag,
+                        iTrue);
+        iPtrArray *   contents         = collect_PtrArray(new_PtrArray()); /* two-column pages */
+        iPtrArray *   panelButtons     = collect_PtrArray(new_PtrArray());
+        iWidget *     prefsTabs        = findChild_Widget(sheet, "prefs.tabs");
+        iWidget *     dialogHeading    = (prefsTabs ? NULL : child_Widget(sheet, 0));
+        const iBool   isPrefs          = (prefsTabs != NULL);
+        const int64_t panelButtonFlags = borderBottom_WidgetFlag | alignLeft_WidgetFlag |
+                                         frameless_WidgetFlag | extraPadding_WidgetFlag;
+        iWidget *mainDetailSplit = makeHDiv_Widget();
+        setCommandHandler_Widget(mainDetailSplit, mainDetailSplitHandler_);
+        setFlags_Widget(mainDetailSplit, resizeHeightOfChildren_WidgetFlag, iFalse);
+        setId_Widget(mainDetailSplit, "mdsplit");
+        iWidget *topPanel = new_Widget(); {
+            setId_Widget(topPanel, "panel.top");
+            setCommandHandler_Widget(topPanel, topPanelHandler_);
+            setFlags_Widget(topPanel,
+                            arrangeVertical_WidgetFlag |
+                            resizeWidthOfChildren_WidgetFlag |
+                            arrangeHeight_WidgetFlag |
+                            overflowScrollable_WidgetFlag |
+                            commandOnClick_WidgetFlag,
+                            iTrue);
+            addChild_Widget(mainDetailSplit, iClob(topPanel));
+        }
+        iWidget *detailStack = new_Widget(); {
+            setId_Widget(detailStack, "detailstack");
+            setFlags_Widget(detailStack, collapse_WidgetFlag | resizeWidthOfChildren_WidgetFlag, iTrue);
+            addChild_Widget(mainDetailSplit, iClob(detailStack));
+        }
+        addChild_Widget(topPanel, iClob(makePadding_Widget(lineHeight_Text(labelFont_()))));
+        /* Slide top panel with detail panels. */ {
+            setFlags_Widget(topPanel, refChildrenOffset_WidgetFlag, iTrue);
+            topPanel->offsetRef = detailStack;
+        }
+        if (prefsTabs) {
+            iRelease(removeChild_Widget(sheet, child_Widget(sheet, 0))); /* heading */
+            iRelease(removeChild_Widget(sheet, findChild_Widget(sheet, "dialogbuttons")));
+            /* Pull out the pages and make them panels. */
+            iWidget *pages = findChild_Widget(prefsTabs, "tabs.pages");
+            size_t pageCount = tabCount_Widget(prefsTabs);
+            for (size_t i = 0; i < pageCount; i++) {
+                iString *text = copy_String(text_LabelWidget(tabPageButton_Widget(prefsTabs, tabPage_Widget(prefsTabs, 0))));
+                iWidget *page = removeTabPage_Widget(prefsTabs, 0);
+                iWidget *pageContent = child_Widget(page, 1); /* surrounded by padding widgets */
+                pushBack_PtrArray(contents, ref_Object(pageContent));
+                iLabelWidget *panelButton;
+                pushBack_PtrArray(panelButtons,
+                                  addChildFlags_Widget(topPanel,
+                                                       iClob(panelButton = makePanelButton_(
+                                                             i == 1 ? "${heading.prefs.userinterface}" : cstr_String(text),
+                                                             "panel.open")),
+                                                       (i == 0 ? borderTop_WidgetFlag : 0) |
+                                                       chevron_WidgetFlag));
+                const iChar icons[] = {
+                    0x02699, /* gear */
+                    0x1f4f1, /* mobile phone */
+                    0x1f3a8, /* palette */
+                    0x1f523,
+                    0x1f5a7, /* computer network */
+                };
+                setIcon_LabelWidget(panelButton, icons[i]);
+//                setFont_LabelWidget(panelButton, labelFont_());
+//                setBackgroundColor_Widget(as_Widget(panelButton), uiBackgroundSidebar_ColorId);
+                iRelease(page);
+                delete_String(text);
+            }
+            destroy_Widget(prefsTabs);
+        }
+        iForEach(ObjectList, i, children_Widget(sheet)) {
+            iWidget *child = i.object;
+            if (isTwoColumnPage_(child)) {
+                pushBack_PtrArray(contents, removeChild_Widget(sheet, child));
+            }
+            else {
+                removeChild_Widget(sheet, child);
+                addChild_Widget(topPanel, child);
+                iRelease(child);
+            }
+        }
+        const iBool useSlidePanels = (size_PtrArray(contents) == size_PtrArray(panelButtons));
+        addChild_Widget(sheet, iClob(mainDetailSplit));
+        iForEach(PtrArray, j, contents) {
+            iWidget *owner = topPanel;
+            if (useSlidePanels) {
+                /* Create a new child panel. */
+                iLabelWidget *button = at_PtrArray(panelButtons, index_PtrArrayIterator(&j));
+                owner = addChildPanel_(detailStack, button,
+                                       collect_String(upper_String(text_LabelWidget(button))));
+            }
+            iWidget *pageContent = j.ptr;
+            iWidget *headings = child_Widget(pageContent, 0);
+            iWidget *values   = child_Widget(pageContent, 1);
+            enum iPrefsElement prevElement = panelTitle_PrefsElement;
+            /* Identify the types of controls in the dialog and restyle/organize them. */
+            while (!isEmpty_ObjectList(children_Widget(headings))) {
+                iWidget *heading = child_Widget(headings, 0);
+                iWidget *value   = child_Widget(values, 0);
+                removeChild_Widget(headings, heading);
+                removeChild_Widget(values, value);
+                /* Can we ignore these widgets? */
+                if (isOmittedPref_(id_Widget(value)) ||
+                    (class_Widget(heading) == &Class_Widget &&
+                     class_Widget(value) == &Class_Widget) /* just padding */) {
+                    iRelease(heading);
+                    iRelease(value);
+                    continue;
+                }
+                enum iPrefsElement element = toggle_PrefsElement;
+                iLabelWidget *headingLabel = NULL;
+                iLabelWidget *valueLabel = NULL;
+                iInputWidget *valueInput = NULL;
+                const iBool isMenuButton = findChild_Widget(value, "menu") != NULL;
+                if (isInstance_Object(heading, &Class_LabelWidget)) {
+                    headingLabel = (iLabelWidget *) heading;
+                    stripTrailingColon_(headingLabel);
+                }
+                if (isInstance_Object(value, &Class_LabelWidget)) {
+                    valueLabel = (iLabelWidget *) value;
+                    setFont_LabelWidget(valueLabel, labelFont_());
+                }
+                if (isInstance_Object(value, &Class_InputWidget)) {
+                    valueInput = (iInputWidget *) value;
+                    setFlags_Widget(value, borderBottom_WidgetFlag, iFalse);
+                    element = textInput_PrefsElement;
+                }
+                if (childCount_Widget(value) >= 2) {
+                    if (isInstance_Object(child_Widget(value, 0), &Class_InputWidget)) {
+                        element = textInput_PrefsElement;
+                        setPadding_Widget(value, 0, 0, gap_UI, 0);
+                        valueInput = child_Widget(value, 0);
+                    }
+                }
+                if (valueInput) {
+                    setFont_InputWidget(valueInput, labelFont_());
+                    setContentPadding_InputWidget(valueInput, 3 * gap_UI, 0);
+                }
+                /* Toggles have the button on the right. */
+                if (valueLabel && cmp_String(command_LabelWidget(valueLabel), "toggle") == 0) {
+                    element = toggle_PrefsElement;
+                    addPanelChild_(owner,
+                                   iClob(makeValuePaddingWithHeading_(headingLabel, value)),
+                                   0,
+                                   element,
+                                   prevElement);
+                }
+                else if (valueLabel && isEmpty_String(text_LabelWidget(valueLabel))) {
+                    element = heading_PrefsElement;
+                    iRelease(value);
+                    addPanelChild_(owner, iClob(heading), 0, element, prevElement);
+                    setFont_LabelWidget(headingLabel, uiLabel_FontId);
+                }
+                else if (isMenuButton) {
+                    element = dropdown_PrefsElement;
+                    setFlags_Widget(value,
+                                    alignRight_WidgetFlag | noBackground_WidgetFlag |
+                                    frameless_WidgetFlag, iTrue);
+                    setFlags_Widget(value, alignLeft_WidgetFlag, iFalse);
+                    iWidget *pad = addPanelChild_(owner, iClob(makeValuePaddingWithHeading_(headingLabel, value)), 0,
+                                                  element, prevElement);
+                    pad->padding[2] = gap_UI;
+                }
+                else if (valueInput) {
+                    addPanelChild_(owner, iClob(makeValuePaddingWithHeading_(headingLabel, value)), 0,
+                                       element, prevElement);
+                }
+                else {
+                    if (childCount_Widget(value) >= 2) {
+                        element = radioButton_PrefsElement;
+                        /* Always padding before radio buttons. */
+                        addChild_Widget(owner, iClob(makePadding_Widget(lineHeight_Text(labelFont_()))));
+                    }
+                    addChildFlags_Widget(owner, iClob(heading), borderBottom_WidgetFlag);
+                    if (headingLabel) {
+                        setTextColor_LabelWidget(headingLabel, uiSubheading_ColorId);
+                        setText_LabelWidget(headingLabel,
+                                            collect_String(upper_String(text_LabelWidget(headingLabel))));
+                    }
+                    addPanelChild_(owner, iClob(value), 0, element, prevElement);
+                    /* Radio buttons expand to fill the space. */
+                    if (element == radioButton_PrefsElement) {
+                        setBackgroundColor_Widget(value, uiBackgroundSidebar_ColorId);
+                        setPadding_Widget(value, 4 * gap_UI, 2 * gap_UI, 4 * gap_UI, 2 * gap_UI);
+                        setFlags_Widget(value, arrangeWidth_WidgetFlag, iFalse);
+                        setFlags_Widget(value,
+                                        borderBottom_WidgetFlag |
+                                        resizeToParentWidth_WidgetFlag |
+                                        resizeWidthOfChildren_WidgetFlag,
+                                        iTrue);
+                        iForEach(ObjectList, sub, children_Widget(value)) {
+                            if (isInstance_Object(sub.object, &Class_LabelWidget)) {
+                                iLabelWidget *opt = sub.object;
+                                setFont_LabelWidget(opt, defaultMedium_FontId);
+                                setFlags_Widget(as_Widget(opt), noBackground_WidgetFlag, iTrue);
+                            }
+                        }
+                    }
+                }
+                prevElement = element;
+            }
+            addPanelChild_(owner, NULL, 0, 0, prevElement);
+            destroy_Widget(pageContent);
+        }
+        destroyPending_Root(sheet->root);
+        /* Additional elements for preferences. */
+        if (isPrefs) {
+            addChild_Widget(topPanel, iClob(makePadding_Widget(lineHeight_Text(labelFont_()))));
+            iLabelWidget *aboutButton = addChildFlags_Widget(topPanel,
+                                 iClob(makePanelButton_(planet_Icon " ${menu.about}", "panel.open")),
+                                 chevron_WidgetFlag);
+            addChildFlags_Widget(topPanel,
+                                 iClob(makePanelButton_(info_Icon " ${menu.help}", "!open url:about:help")),
+                                 borderTop_WidgetFlag);
+            /* The About panel. */ {
+                iWidget *panel = addChildPanel_(detailStack, aboutButton, NULL);
+                iString *msg = collectNew_String();
+                setCStr_String(msg, "Lagrange " LAGRANGE_APP_VERSION);
+#if defined (iPlatformAppleMobile)
+                appendCStr_String(msg, " (" LAGRANGE_IOS_VERSION ")");
+#endif
+                addChildFlags_Widget(panel, iClob(new_LabelWidget(cstr_String(msg), NULL)),
+                                     frameless_WidgetFlag);
+                addChildFlags_Widget(panel,
+                                     iClob(makePanelButton_(globe_Icon " By @jk@skyjake.fi",
+                                                            "!open url:https://skyjake.fi/@jk")),
+                                     borderTop_WidgetFlag);
+                addChildFlags_Widget(panel,
+                                     iClob(makePanelButton_(clock_Icon " ${menu.releasenotes}",
+                                                            "!open url:about:version")),
+                                     0);
+                addChildFlags_Widget(panel,
+                                     iClob(makePanelButton_(info_Icon " ${menu.aboutpages}",
+                                                            "!open url:about:about")),
+                                     0);
+                addChildFlags_Widget(panel,
+                                     iClob(makePanelButton_(bug_Icon " ${menu.debug}",
+                                                            "!open url:about:debug")),
+                                     0);
+            }
+        }
+        else {
+            setFlags_Widget(topPanel, overflowScrollable_WidgetFlag, iTrue);
+            /* Update heading style. */
+            setFont_LabelWidget((iLabelWidget *) dialogHeading, uiLabelLargeBold_FontId);
+            setFlags_Widget(dialogHeading, alignLeft_WidgetFlag, iTrue);
+        }
+        if (findChild_Widget(sheet, "valueinput.prompt")) {
+            iWidget *prompt = findChild_Widget(sheet, "valueinput.prompt");
+            setFlags_Widget(prompt, alignLeft_WidgetFlag, iTrue);
+            iInputWidget *input = findChild_Widget(sheet, "input");
+            removeChild_Widget(parent_Widget(input), input);
+            addChild_Widget(topPanel, iClob(makeValuePadding_(as_Widget(input))));
+        }
+        /* Top padding for each panel, to account for the overlaid navbar. */ {
+            setId_Widget(addChildPos_Widget(topPanel,
+                                            iClob(makePadding_Widget(0)), front_WidgetAddPos),
+                         "panel.toppad");
+        }
+        /* Navbar. */ {
+            iWidget *navi = new_Widget();
+            setId_Widget(navi, "panel.navi");
+            setBackgroundColor_Widget(navi, uiBackground_ColorId);
+            addChild_Widget(navi, iClob(makePadding_Widget(0)));
+            iLabelWidget *back = addChildFlags_Widget(navi,
+                                                      iClob(new_LabelWidget(leftAngle_Icon " ${panel.back}", "panel.close")),
+                                                      noBackground_WidgetFlag | frameless_WidgetFlag |
+                                                      alignLeft_WidgetFlag | extraPadding_WidgetFlag);
+            checkIcon_LabelWidget(back);
+            setId_Widget(as_Widget(back), "panel.back");
+            setFont_LabelWidget(back, labelFont_());
+            if (!isPrefs) {
+                /* Pick up the dialog buttons for the navbar. */
+                iWidget *buttons = findChild_Widget(sheet, "dialogbuttons");
+                iLabelWidget *cancel = findMenuItem_Widget(buttons, "cancel");
+//                if (!cancel) {
+//                    cancel = findMenuItem_Widget(buttons, "translation.cancel");
+//                }
+                if (cancel) {
+                    updateText_LabelWidget(back, text_LabelWidget(cancel));
+                    setCommand_LabelWidget(back, command_LabelWidget(cancel));
+                }
+                iLabelWidget *def = (iLabelWidget *) lastChild_Widget(buttons);
+                if (def && !cancel) {
+                    updateText_LabelWidget(back, text_LabelWidget(def));
+                    setCommand_LabelWidget(back, command_LabelWidget(def));
+                    setFlags_Widget(as_Widget(back), alignLeft_WidgetFlag, iFalse);
+                    setFlags_Widget(as_Widget(back), alignRight_WidgetFlag, iTrue);
+                    setIcon_LabelWidget(back, 0);
+                    setFont_LabelWidget(back, labelBoldFont_());
+                }
+                else if (def != cancel) {
+                    removeChild_Widget(buttons, def);
+                    setFont_LabelWidget(def, labelBoldFont_());
+                    setFlags_Widget(as_Widget(def),
+                                    frameless_WidgetFlag | extraPadding_WidgetFlag |
+                                    noBackground_WidgetFlag, iTrue);
+                    addChildFlags_Widget(as_Widget(back), iClob(def), moveToParentRightEdge_WidgetFlag);
+                    updateSize_LabelWidget(def);
+                }
+                /* Action buttons are added in the bottom as extra buttons. */ {
+                    iBool isFirstAction = iTrue;
+                    iForEach(ObjectList, i, children_Widget(buttons)) {
+                        if (isInstance_Object(i.object, &Class_LabelWidget) &&
+                            i.object != cancel && i.object != def) {
+                            iLabelWidget *item = i.object;
+                            setBackgroundColor_Widget(i.object, uiBackgroundSidebar_ColorId);
+                            setFont_LabelWidget(item, labelFont_());
+                            removeChild_Widget(buttons, item);
+                            addChildFlags_Widget(topPanel, iClob(item), panelButtonFlags |
+                                                 (isFirstAction ? borderTop_WidgetFlag : 0));
+                            updateSize_LabelWidget(item);
+                            isFirstAction = iFalse;
+                        }
+                    }
+                }
+                iRelease(removeChild_Widget(parent_Widget(buttons), buttons));
+                /* Styling for remaining elements. */
+                iForEach(ObjectList, i, children_Widget(topPanel)) {
+                    if (isInstance_Object(i.object, &Class_LabelWidget) &&
+                        isEmpty_String(command_LabelWidget(i.object)) &&
+                        isEmpty_String(id_Widget(i.object))) {
+                        setFlags_Widget(i.object, alignLeft_WidgetFlag, iTrue);
+                        if (font_LabelWidget(i.object) == uiLabel_FontId) {
+                            setFont_LabelWidget(i.object, uiContent_FontId);
+                        }
+                    }
+                }
+            }
+            addChildFlags_Widget(sheet, iClob(navi),
+                                 drawBackgroundToVerticalSafeArea_WidgetFlag |
+                                 arrangeHeight_WidgetFlag | resizeWidthOfChildren_WidgetFlag |
+                                 resizeToParentWidth_WidgetFlag | arrangeVertical_WidgetFlag);
+        }
+        if (isPrefs && isSideBySideLayout_()) {
+            /* Show the General panel. */
+            postCommand_Widget(at_PtrArray(panelButtons, 0), "panel.open");
+        }
+        mainDetailSplitHandler_(mainDetailSplit, "window.resized"); /* make it resize the split */
+        updatePanelSheetMetrics_(sheet);
+        iAssert(sheet->parent);
+        arrange_Widget(sheet->parent);
+        postCommand_App("widget.overflow"); /* with the correct dimensions */
+    }
+    else {
+        arrange_Widget(sheet);
+    }
+    postRefresh_App();
+}
+void setupMenuTransition_Mobile(iWidget *sheet, iBool isIncoming) {
+    if (!useMobileSheetLayout_()) {
+        return;    
+    }
+    const iBool isSlidePanel = (flags_Widget(sheet) & horizontalOffset_WidgetFlag) != 0;
+    if (isSlidePanel && isLandscape_App()) {
+        return;
+    }
+    if (isIncoming) {
+        setVisualOffset_Widget(sheet, isSlidePanel ? width_Widget(sheet) : height_Widget(sheet), 0, 0);
+        setVisualOffset_Widget(sheet, 0, 330, easeOut_AnimFlag | softer_AnimFlag);
+    }
+    else {
+        const iBool wasDragged = iAbs(value_Anim(&sheet->visualOffset) - 0) > 1;
+        setVisualOffset_Widget(sheet,
+                               isSlidePanel ? width_Widget(sheet) : height_Widget(sheet),
+                               wasDragged ? 100 : 200,
+                               wasDragged ? 0 : easeIn_AnimFlag | softer_AnimFlag);
+    }
+}
+void setupSheetTransition_Mobile(iWidget *sheet, iBool isIncoming) {
+    if (isSideBySideLayout_()) {
+        return;
+    }
+    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/mobile.h b/src/ui/mobile.h
new file mode 100644
index 00000000..44134389
--- /dev/null
+++ b/src/ui/mobile.h
@@ -0,0 +1,32 @@
+/* Copyright 2021 Jaakko Keränen <jaakko.keranen@iki.fi>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+#pragma once
+#include <the_Foundation/defs.h>
+iDeclareType(Widget)
+void        setupMenuTransition_Mobile          (iWidget *menu, iBool isIncoming);
+void        setupSheetTransition_Mobile         (iWidget *sheet, iBool isIncoming);
+void        finalizeSheet_Mobile        (iWidget *sheet);
diff --git a/src/ui/paint.c b/src/ui/paint.c
index faaf403d..c575d5fc 100644
--- a/src/ui/paint.c
+++ b/src/ui/paint.c
@@ -62,20 +62,19 @@ void endTarget_Paint(iPaint *d) {
 }
 void setClip_Paint(iPaint *d, iRect rect) {
-    if (rect.pos.y < 0) {
+    rect = intersect_Rect(rect, rect_Root(get_Root()));
-        const int off = rect.pos.y;
+    if (isEmpty_Rect(rect)) {
-        rect.pos.y -= off;
+        rect = init_Rect(0, 0, 1, 1);
-        rect.size.y = iMax(0, rect.size.y + off);
-    }
-    if (rect.pos.x < 0) {
-        const int off = rect.pos.x;
-        rect.pos.x -= off;
-        rect.size.x = iMax(0, rect.size.x + off);
    }
    SDL_RenderSetClipRect(renderer_Paint_(d), (const SDL_Rect *) &rect);
 }
 void unsetClip_Paint(iPaint *d) {
+    if (numRoots_Window(get_Window()) > 1) {
+        const iRect rect = rect_Root(get_Root());
+        SDL_RenderSetClipRect(renderer_Paint_(d), (const SDL_Rect *) &rect);
+        return;
+    }
 #if SDL_VERSION_ATLEAST(2, 0, 12)
    SDL_RenderSetClipRect(renderer_Paint_(d), NULL);
 #else
diff --git a/src/ui/root.c b/src/ui/root.c
index 76ef05c4..6cf3f424 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -269,6 +269,7 @@ iAnyObject *findWidget_Root(const char *id) {
 }
 void destroyPending_Root(iRoot *d) {
+    iRoot *oldRoot = current_Root();
    setCurrent_Root(d);
    iForEach(PtrSet, i, d->pendingDestruction) {
        iWidget *widget = *i.value;
@@ -282,7 +283,7 @@ void destroyPending_Root(iRoot *d) {
        iRelease(widget);
        remove_PtrSetIterator(&i);
    }
-    setCurrent_Root(NULL);
+    setCurrent_Root(oldRoot);
 }
 void postArrange_Root(iRoot *d) {
@@ -349,6 +350,7 @@ static iBool handleRootCommands_(iWidget *root, const char *cmd) {
    }
    else if (equal_Command(cmd, "input.resized")) {
        /* No parent handled this, so do a full rearrangement. */
+        /* TODO: Defer this and do a single rearrangement later. */
        arrange_Widget(root);
        postRefresh_App();
        return iTrue;
@@ -414,6 +416,7 @@ static iBool handleRootCommands_(iWidget *root, const char *cmd) {
        else {
            addChildPos_Widget(findChild_Widget(root, "stack"), iClob(sidebar), back_WidgetAddPos);
            setWidth_SidebarWidget(sidebar, (float) width_Widget(root) / (float) gap_UI);
+            setWidth_SidebarWidget(sidebar2, (float) width_Widget(root) / (float) gap_UI);
        }
        return iFalse;
    }
@@ -466,11 +469,11 @@ static void setReloadLabel_Root_(iRoot *d, iBool animating) {
    const iBool isMobile = deviceType_App() != desktop_AppDeviceType;
    iLabelWidget *label = findChild_Widget(d->widget, "reload");
    updateTextCStr_LabelWidget(
-        label, animating ? loadAnimationCStr_() : (isMobile ? pageMenuCStr_ : reloadCStr_));
+        label, animating ? loadAnimationCStr_() : (/*isMobile ? pageMenuCStr_ :*/ reloadCStr_));
-    if (isMobile) {
+//    if (isMobile) {
-        setCommand_LabelWidget(label,
+//        setCommand_LabelWidget(label,
-                               collectNewCStr_String(animating ? "navigate.reload" : "menu.open"));
+//                               collectNewCStr_String(animating ? "navigate.reload" : "menu.open"));
-    }
+//    }
 }
 static void checkLoadAnimation_Root_(iRoot *d) {
@@ -536,9 +539,12 @@ static iBool willPerformSearchQuery_(const iString *userInput) {
 static void updateUrlInputContentPadding_(iWidget *navBar) {
    iInputWidget *url = findChild_Widget(navBar, "url");
-    const iWidget *indicators = findChild_Widget(navBar, "url.rightembed");
+    const int lockWidth = width_Widget(findChild_Widget(navBar, "navbar.lock"));
-    setContentPadding_InputWidget(url, -1,
+    const int indicatorsWidth = width_Widget(findChild_Widget(navBar, "url.rightembed"));
-                                  width_Widget(indicators));
+    /* The indicators widget has a padding that covers the urlButtons area. */
+    setContentPadding_InputWidget(url,
+                                  lockWidth - 2 * gap_UI, // * 0.75f,
+                                  indicatorsWidth);
 }
 static void showSearchQueryIndicator_(iBool show) {
@@ -585,17 +591,17 @@ static void updateNavBarSize_(iWidget *navBar) {
                updateSize_LabelWidget(label);
            }
        }
+        updateUrlInputContentPadding_(navBar);
        /* Note that InputWidget uses the `tight` flag to adjust its inner padding. */
-        /* TODO: Is this redundant? See `updateMetrics_Window_()`. */
+//        const int embedButtonWidth = width_Widget(findChild_Widget(navBar, "navbar.lock"));
-        const int embedButtonWidth = width_Widget(findChild_Widget(navBar, "navbar.lock"));
+//        setContentPadding_InputWidget(findChild_Widget(navBar, "url"),
-        setContentPadding_InputWidget(findChild_Widget(navBar, "url"),
+//                                      embedButtonWidth * 0.75f,
-                                      embedButtonWidth * 0.75f,
+//                                      embedButtonWidth * 0.75f);
-                                      embedButtonWidth * 0.75f);
    }
    if (isPhone) {
        static const char *buttons[] = { "navbar.back",  "navbar.forward", "navbar.sidebar",
                                         "navbar.ident", "navbar.home",    "navbar.menu" };
-        iWidget *toolBar = findWidget_App("toolbar");
+        iWidget *toolBar = findWidget_Root("toolbar");
        setVisualOffset_Widget(toolBar, 0, 0, 0);
        setFlags_Widget(toolBar, hidden_WidgetFlag, isLandscape_App());
        iForIndices(i, buttons) {
@@ -901,15 +907,19 @@ void updateMetrics_Root(iRoot *d) {
    iWidget *url        = findChild_Widget(d->widget, "url");
    iWidget *rightEmbed = findChild_Widget(navBar, "url.rightembed");
    iWidget *embedPad   = findChild_Widget(navBar, "url.embedpad");
+    iWidget *urlButtons = findChild_Widget(navBar, "url.buttons");
    setPadding_Widget(as_Widget(url), 0, gap_UI, 0, gap_UI);
    navBar->rect.size.y = 0; /* recalculate height based on children (FIXME: shouldn't be needed) */
-    updateSize_LabelWidget((iLabelWidget *) lock);
+//    updateSize_LabelWidget((iLabelWidget *) lock);
-    setFixedSize_Widget(embedPad, init_I2(width_Widget(lock) + gap_UI / 2, 1));
+//    updateSize_LabelWidget((iLabelWidget *) findChild_Widget(navBar, "reload"));
-    setContentPadding_InputWidget((iInputWidget *) url, width_Widget(lock) * 0.75,
+//    arrange_Widget(urlButtons);
-                                  width_Widget(lock) * 0.75);
+    setFixedSize_Widget(embedPad, init_I2(width_Widget(urlButtons) + gap_UI / 2, 1));
+//    setContentPadding_InputWidget((iInputWidget *) url, width_Widget(lock) * 0.75,
+//                                  width_Widget(lock) * 0.75);
    rightEmbed->rect.pos.y = gap_UI;
    updatePadding_Root(d);
    arrange_Widget(d->widget);
+    updateUrlInputContentPadding_(navBar);
    postRefresh_App();
 }
@@ -1057,7 +1067,7 @@ void createUserInterface_Root(iRoot *d) {
                setNoAutoMinHeight_LabelWidget(fprog, iTrue);
                addChildFlags_Widget(rightEmbed,
                                     iClob(fprog),
-                                     collapse_WidgetFlag | frameless_WidgetFlag | hidden_WidgetFlag);
+                                     collapse_WidgetFlag | hidden_WidgetFlag | frameless_WidgetFlag);
            }
            /* Download progress indicator is also inside the input field, but hidden normally. */ {
                iLabelWidget *progress = new_LabelWidget(uiTextCaution_ColorEscape "00.000 ${mb}", NULL);
@@ -1066,7 +1076,7 @@ void createUserInterface_Root(iRoot *d) {
                setAlignVisually_LabelWidget(progress, iTrue);
                setNoAutoMinHeight_LabelWidget(progress, iTrue);
                addChildFlags_Widget(
-                    rightEmbed, iClob(progress), collapse_WidgetFlag);
+                    rightEmbed, iClob(progress), collapse_WidgetFlag | hidden_WidgetFlag);
            }
            /* Pinning indicator. */ {
                iLabelWidget *pin = new_LabelWidget(uiTextAction_ColorEscape leftHalf_Icon, NULL);
@@ -1076,39 +1086,44 @@ void createUserInterface_Root(iRoot *d) {
                setNoAutoMinHeight_LabelWidget(pin, iTrue);
                addChildFlags_Widget(rightEmbed,
                                     iClob(pin),
-                                     collapse_WidgetFlag | tight_WidgetFlag | frameless_WidgetFlag);
+                                     collapse_WidgetFlag | hidden_WidgetFlag | tight_WidgetFlag | frameless_WidgetFlag);
+            }
+            iWidget *urlButtons = new_Widget();
+            setId_Widget(urlButtons, "url.buttons");
+            setFlags_Widget(urlButtons, embedFlags | arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
+            /* Mobile page menu. */
+            if (deviceType_App() != desktop_AppDeviceType) {
+                iLabelWidget *pageMenuButton;
+                /* In a mobile layout, the reload button is replaced with the Page/Ellipsis menu. */
+                pageMenuButton = makeMenuButton_LabelWidget(pageMenuCStr_,
+                    (iMenuItem[]){
+                        { upArrow_Icon " ${menu.parent}", navigateParent_KeyShortcut, "navigate.parent" },
+                        { upArrowBar_Icon " ${menu.root}", navigateRoot_KeyShortcut, "navigate.root" },
+                        { timer_Icon " ${menu.autoreload}", 0, 0, "document.autoreload.menu" },
+                        { "---", 0, 0, NULL },
+                        { bookmark_Icon " ${menu.page.bookmark}", SDLK_d, KMOD_PRIMARY, "bookmark.add" },
+                        { star_Icon " ${menu.page.subscribe}", subscribeToPage_KeyModifier, "feeds.subscribe" },
+                        { book_Icon " ${menu.page.import}", 0, 0, "bookmark.links confirm:1" },
+                        { globe_Icon " ${menu.page.translate}", 0, 0, "document.translate" },
+                        { "---", 0, 0, NULL },
+                        { "${menu.page.copyurl}", 0, 0, "document.copylink" },
+                        { "${menu.page.copysource}", 'c', KMOD_PRIMARY, "copy" },
+                        { download_Icon " " saveToDownloads_Label, SDLK_s, KMOD_PRIMARY, "document.save" } },
+                    12);
+                setId_Widget(as_Widget(pageMenuButton), "pagemenubutton");
+                setFont_LabelWidget(pageMenuButton, uiContentBold_FontId);
+                setAlignVisually_LabelWidget(pageMenuButton, iTrue);
+                addChildFlags_Widget(urlButtons, iClob(pageMenuButton), embedFlags);
+                updateSize_LabelWidget(pageMenuButton);
            }
            /* Reload button. */ {
-                iLabelWidget *reload;
+                iLabelWidget *reload = newIcon_LabelWidget(reloadCStr_, 0, 0, "navigate.reload");
-                if (deviceType_App() == desktop_AppDeviceType) {
-                    reload = newIcon_LabelWidget(reloadCStr_, 0, 0, "navigate.reload");
-                }
-                else {
-                    /* In a mobile layout, the reload button is replaced with the Page/Ellipsis menu. */
-                    reload = makeMenuButton_LabelWidget(pageMenuCStr_,
-                                                        (iMenuItem[]){
-                                                            { reload_Icon " ${menu.reload}", reload_KeyShortcut, "navigate.reload" },
-                                                            { timer_Icon " ${menu.autoreload}", 0, 0, "document.autoreload.menu" },
-                                                            { "---", 0, 0, NULL },
-                                                            { upArrow_Icon " ${menu.parent}", navigateParent_KeyShortcut, "navigate.parent" },
-                                                            { upArrowBar_Icon " ${menu.root}", navigateRoot_KeyShortcut, "navigate.root" },
-                                                            { "---", 0, 0, NULL },
-                                                            { pin_Icon " ${menu.page.bookmark}", SDLK_d, KMOD_PRIMARY, "bookmark.add" },
-                                                            { star_Icon " ${menu.page.subscribe}", subscribeToPage_KeyModifier, "feeds.subscribe" },
-                                                            { book_Icon " ${menu.page.import}", 0, 0, "bookmark.links confirm:1" },
-                                                            { globe_Icon " ${menu.page.translate}", 0, 0, "document.translate" },
-                                                            { "---", 0, 0, NULL },
-                                                            { "${menu.page.copyurl}", 0, 0, "document.copylink" },
-                                                            { "${menu.page.copysource}", 'c', KMOD_PRIMARY, "copy" },
-                                                            { download_Icon " " saveToDownloads_Label, SDLK_s, KMOD_PRIMARY, "document.save" } },
-                                                        14);
-                    setFont_LabelWidget((iLabelWidget *) reload, uiContentBold_FontId);
-                    setAlignVisually_LabelWidget((iLabelWidget *) reload, iTrue);
-                }
                setId_Widget(as_Widget(reload), "reload");
-                addChildFlags_Widget(as_Widget(url), iClob(reload), embedFlags | moveToParentRightEdge_WidgetFlag);
+                addChildFlags_Widget(urlButtons, iClob(reload), embedFlags);
                updateSize_LabelWidget(reload);
            }
+            addChildFlags_Widget(as_Widget(url), iClob(urlButtons), moveToParentRightEdge_WidgetFlag);
+            arrange_Widget(urlButtons);
            setId_Widget(addChild_Widget(rightEmbed, iClob(makePadding_Widget(0))), "url.embedpad");
        }
        if (deviceType_App() != desktop_AppDeviceType) {
@@ -1216,7 +1231,9 @@ void createUserInterface_Root(iRoot *d) {
        setFlags_Widget(toolBar, moveToParentBottomEdge_WidgetFlag |
                                     parentCannotResizeHeight_WidgetFlag |
                                     resizeWidthOfChildren_WidgetFlag |
-                                     arrangeHeight_WidgetFlag | arrangeHorizontal_WidgetFlag, iTrue);
+                                     arrangeHeight_WidgetFlag | arrangeHorizontal_WidgetFlag |
+                                     commandOnClick_WidgetFlag |
+                                     drawBackgroundToBottom_WidgetFlag, iTrue);
        setBackgroundColor_Widget(toolBar, tmBannerBackground_ColorId);
        setId_Widget(addChildFlags_Widget(toolBar,
                                          iClob(newLargeIcon_LabelWidget("\U0001f870", "navigate.back")),
@@ -1231,7 +1248,7 @@ void createUserInterface_Root(iRoot *d) {
                                          frameless_WidgetFlag),
                     "toolbar.ident");
        setId_Widget(addChildFlags_Widget(toolBar,
-                                          iClob(newLargeIcon_LabelWidget("\U0001f588", "toolbar.showview arg:-1")),
+                                          iClob(newLargeIcon_LabelWidget(book_Icon, "toolbar.showview arg:-1")),
                                          frameless_WidgetFlag | commandOnClick_WidgetFlag),
                     "toolbar.view");
        iLabelWidget *menuButton = makeMenuButton_LabelWidget("\U0001d362", phoneNavMenuItems_,
@@ -1244,17 +1261,17 @@ void createUserInterface_Root(iRoot *d) {
            setFlags_Widget(i.object, noBackground_WidgetFlag, iTrue);
            setTextColor_LabelWidget(i.object, tmBannerIcon_ColorId);
            //            setBackgroundColor_Widget(i.object, tmBannerSideTitle_ColorId);
-            }
+        }
        const iMenuItem items[] = {
-            { pin_Icon " ${sidebar.bookmarks}", 0, 0, "toolbar.showview arg:0" },
+            { book_Icon " ${sidebar.bookmarks}", 0, 0, "toolbar.showview arg:0" },
            { star_Icon " ${sidebar.feeds}", 0, 0, "toolbar.showview arg:1" },
            { clock_Icon " ${sidebar.history}", 0, 0, "toolbar.showview arg:2" },
            { page_Icon " ${toolbar.outline}", 0, 0, "toolbar.showview arg:4" },
-            };
+        };
        iWidget *menu = makeMenu_Widget(findChild_Widget(toolBar, "toolbar.view"),
                                        items, iElemCount(items));
        setId_Widget(menu, "toolbar.menu"); /* view menu */
-        }
+    }
 #endif
    updatePadding_Root(d);
    /* Global context menus. */ {
@@ -1319,6 +1336,11 @@ void createUserInterface_Root(iRoot *d) {
    }
    updateMetrics_Root(d);
    updateNavBarSize_(navBar);
+    if (deviceType_App() == phone_AppDeviceType) {
+        const float sidebarWidth = width_Widget(root) / (float) gap_UI;
+        setWidth_SidebarWidget(findChild_Widget(root, "sidebar"), sidebarWidth);
+        setWidth_SidebarWidget(findChild_Widget(root, "sidebar2"), sidebarWidth);
+    }
 }
 void showToolbars_Root(iRoot *d, iBool show) {
diff --git a/src/ui/scrollwidget.c b/src/ui/scrollwidget.c
index 32b57c69..ff5144b2 100644
--- a/src/ui/scrollwidget.c
+++ b/src/ui/scrollwidget.c
@@ -108,7 +108,7 @@ static void unfade_ScrollWidget_(iScrollWidget *d, float opacity) {
    d->fadeStart = SDL_GetTicks() + 1000;
    if (targetValue_Anim(&d->opacity) < opacity) {
        setValue_Anim(&d->opacity, opacity, 66);
-        addTicker_App(animateOpacity_ScrollWidget_, d);
+        addTickerRoot_App(animateOpacity_ScrollWidget_, as_Widget(d)->root, d);
    }
    if (!d->willCheckFade && d->fadeEnabled) {
        d->willCheckFade = iTrue;
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index eae0432f..cb6dab65 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -106,7 +106,8 @@ struct Impl_SidebarWidget {
    size_t            numUnreadEntries;
    iWidget *         resizer;
    iWidget *         menu;
-    iSidebarItem *    contextItem; /* list item accessed in the context menu */
+    iSidebarItem *    contextItem;  /* list item accessed in the context menu */
+    size_t            contextIndex; /* index of list item accessed in the context menu */
 };
 iDefineObjectConstructionArgs(SidebarWidget, (enum iSidebarSide side), side)
@@ -239,7 +240,7 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
                as_Widget(d),
                (iMenuItem[]){ { openTab_Icon " ${feeds.entry.newtab}", 0, 0, "feed.entry.opentab" },
                               { circle_Icon " ${feeds.entry.markread}", 0, 0, "feed.entry.toggleread" },
-                               { pin_Icon " ${feeds.entry.bookmark}", 0, 0, "feed.entry.bookmark" },
+                               { bookmark_Icon " ${feeds.entry.bookmark}", 0, 0, "feed.entry.bookmark" },
                               { "---", 0, 0, NULL },
                               { page_Icon " ${feeds.entry.openfeed}", 0, 0, "feed.entry.openfeed" },
                               { edit_Icon " ${feeds.edit}", 0, 0, "feed.entry.edit" },
@@ -364,7 +365,7 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
                as_Widget(d),
                (iMenuItem[]){
                    { "${menu.copyurl}", 0, 0, "history.copy" },
-                    { pin_Icon " ${sidebar.entry.bookmark}", 0, 0, "history.addbookmark" },
+                    { bookmark_Icon " ${sidebar.entry.bookmark}", 0, 0, "history.addbookmark" },
                    { "---", 0, 0, NULL },
                    { close_Icon " ${menu.forgeturl}", 0, 0, "history.delete" },
                    { "---", 0, 0, NULL },
@@ -373,10 +374,6 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
            break;
        }
        case identities_SidebarMode: {
-            /* Actions. */ {
-                addActionButton_SidebarWidget_(d, add_Icon " ${sidebar.action.ident.new}", "ident.new", 0);
-                addActionButton_SidebarWidget_(d, "${sidebar.action.ident.import}", "ident.import", 0);
-            }
            const iString *tabUrl = url_DocumentWidget(document_App());
            isEmpty = iTrue;
            iConstForEach(PtrArray, i, identities_GmCerts(certs_App())) {
@@ -413,6 +410,11 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
                iRelease(item);
                isEmpty = iFalse;
            }
+            /* Actions. */
+            if (!isEmpty) {
+                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" },
@@ -520,15 +522,15 @@ float width_SidebarWidget(const iSidebarWidget *d) {
 }
 static const char *normalModeLabels_[max_SidebarMode] = {
-    pin_Icon " ${sidebar.bookmarks}",
+    book_Icon   " ${sidebar.bookmarks}",
-    star_Icon " ${sidebar.feeds}",
+    star_Icon   " ${sidebar.feeds}",
-    clock_Icon " ${sidebar.history}",
+    clock_Icon  " ${sidebar.history}",
    person_Icon " ${sidebar.identities}",
-    page_Icon " ${sidebar.outline}",
+    page_Icon   " ${sidebar.outline}",
 };
 static const char *tightModeLabels_[max_SidebarMode] = {
-    pin_Icon,
+    book_Icon,
    star_Icon,
    clock_Icon,
    person_Icon,
@@ -576,11 +578,11 @@ void init_SidebarWidget(iSidebarWidget *d, enum iSidebarSide side) {
    d->itemFonts[0] = uiContent_FontId;
    d->itemFonts[1] = uiContentBold_FontId;
 #if defined (iPlatformAppleMobile)
-    d->widthAsGaps = 73;
    if (deviceType_App() == phone_AppDeviceType) {
        d->itemFonts[0] = defaultBig_FontId;
        d->itemFonts[1] = defaultBigBold_FontId;
    }
+    d->widthAsGaps = 73;
 #else
    d->widthAsGaps = 60;
 #endif
@@ -644,6 +646,7 @@ void init_SidebarWidget(iSidebarWidget *d, enum iSidebarSide side) {
                 "actions");
    setBackgroundColor_Widget(d->actions, uiBackgroundSidebar_ColorId);
    d->contextItem = NULL;
+    d->contextIndex = iInvalidPos;
    d->blank = new_Widget();
    addChildFlags_Widget(content, iClob(d->blank), resizeChildren_WidgetFlag);
    addChildFlags_Widget(vdiv, iClob(content), expand_WidgetFlag);
@@ -770,6 +773,7 @@ static void checkModeButtonLayout_SidebarWidget_(iSidebarWidget *d) {
    for (int i = 0; i < max_SidebarMode; i++) {
        iLabelWidget *button = d->modeButtons[i];
        if (!button) continue;
+        setAlignVisually_LabelWidget(button, isTight);
        setFlags_Widget(as_Widget(button), tight_WidgetFlag, isTight);
        if (i == feeds_SidebarMode && d->numUnreadEntries) {
            updateText_LabelWidget(
@@ -803,7 +807,7 @@ void setWidth_SidebarWidget(iSidebarWidget *d, float widthAsGaps) {
    if (isVisible_Widget(w)) {
        w->rect.size.x = width;
    }
-    arrange_Widget(findWidget_App("stack"));
+    arrange_Widget(findWidget_Root("stack"));
    checkModeButtonLayout_SidebarWidget_(d);
    updateItemHeight_SidebarWidget_(d);
    if (!isFixedWidth && !isRefreshPending_App()) {
@@ -844,7 +848,6 @@ iBool handleBookmarkEditorCommands_SidebarWidget_(iWidget *editor, const char *c
                                    isSelected_Widget(findChild_Widget(editor, "bmed.tag.linksplit")));
            postCommand_App("bookmarks.changed");
        }
-        setFlags_Widget(as_Widget(d), disabled_WidgetFlag, iFalse);
        destroy_Widget(editor);
        return iTrue;
    }
@@ -875,10 +878,33 @@ 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 &&
+                                 (deviceType_App() != phone_AppDeviceType);
+        int visX = 0;
+        if (isVisible_Widget(w)) {
+            visX = left_Rect(bounds_Widget(w)) - left_Rect(w->root->widget->rect);
+        }
        setFlags_Widget(w, hidden_WidgetFlag, isVisible_Widget(w));
        if (isVisible_Widget(w)) {
+            setFlags_Widget(w, keepOnTop_WidgetFlag, iFalse);
            w->rect.size.x = d->widthAsGaps * gap_UI;
            invalidate_ListWidget(d->list);
+            if (isAnimated) {
+                setFlags_Widget(w, horizontalOffset_WidgetFlag, iTrue);
+                setVisualOffset_Widget(w, (d->side == left_SideBarSide ? -1 : 1) * w->rect.size.x, 0, 0);
+                setVisualOffset_Widget(w, 0, 300, easeOut_AnimFlag | softer_AnimFlag);
+            }
+        }
+        else if (isAnimated) {
+            setFlags_Widget(w, horizontalOffset_WidgetFlag, iTrue);
+            if (d->side == right_SideBarSide) {
+                setVisualOffset_Widget(w, visX, 0, 0);
+                setVisualOffset_Widget(w, visX + w->rect.size.x, 300, easeOut_AnimFlag | softer_AnimFlag);
+            }
+            else {
+                setFlags_Widget(w, keepOnTop_WidgetFlag, iTrue);
+                setVisualOffset_Widget(w, -w->rect.size.x, 300, easeOut_AnimFlag | softer_AnimFlag);
+            }
        }
        arrange_Widget(w->parent);
        /* BUG: Rearranging because the arrange above didn't fully resolve the height. */
@@ -985,11 +1011,8 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
            itemClicked_SidebarWidget_(d, pointerLabel_Command(cmd, "item"));
            return iTrue;
        }
-        else if (isCommand_Widget(w, ev, "menu.opened")) {
-            setFlags_Widget(as_Widget(d->list), disabled_WidgetFlag, iTrue);
-        }
        else if (isCommand_Widget(w, ev, "menu.closed")) {
-            setFlags_Widget(as_Widget(d->list), disabled_WidgetFlag, iFalse);
+         //   invalidateItem_ListWidget(d->list, d->contextIndex);
        }
        else if (isCommand_Widget(w, ev, "bookmark.open")) {
            const iSidebarItem *item = d->contextItem;
@@ -1010,7 +1033,6 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
        else if (isCommand_Widget(w, ev, "bookmark.edit")) {
            const iSidebarItem *item = d->contextItem;
            if (d->mode == bookmarks_SidebarMode && item) {
-                setFlags_Widget(w, disabled_WidgetFlag, iTrue);
                iWidget *dlg = makeBookmarkEditor_Widget();
                setId_Widget(dlg, format_CStr("bmed.%s", cstr_String(id_Widget(w))));
                iBookmark *bm = get_Bookmarks(bookmarks_App(), item->id);
@@ -1038,7 +1060,6 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
        else if (isCommand_Widget(w, ev, "bookmark.dup")) {
            const iSidebarItem *item = d->contextItem;
            if (d->mode == bookmarks_SidebarMode && item) {
-                setFlags_Widget(w, disabled_WidgetFlag, iTrue);
                iBookmark *bm = get_Bookmarks(bookmarks_App(), item->id);
                const iBool isRemote = hasTag_Bookmark(bm, remote_BookmarkTag);
                iChar icon = isRemote ? 0x1f588 : bm->icon;
@@ -1131,7 +1152,6 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                        return iTrue;
                    }
                    if (isCommand_Widget(w, ev, "feed.entry.edit")) {
-                        setFlags_Widget(w, disabled_WidgetFlag, iTrue);
                        makeFeedSettings_Widget(id_Bookmark(feedBookmark));
                        return iTrue;
                    }
@@ -1307,6 +1327,10 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                setCursor_Window(get_Window(), SDL_SYSTEM_CURSOR_ARROW);
            }
        }
+        if (d->contextIndex != iInvalidPos) {
+            invalidateItem_ListWidget(d->list, d->contextIndex);
+            d->contextIndex = iInvalidPos;
+        }
    }
    if (d->menu && ev->type == SDL_MOUSEBUTTONDOWN) {
        if (ev->button.button == SDL_BUTTON_RIGHT) {
@@ -1315,7 +1339,12 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                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. */
                /* TODO: Some callback-based mechanism would be nice for updating menus right
                   before they open? */
@@ -1427,18 +1456,30 @@ 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)) {
+        fillRect_Paint(&p, boundsWithoutVisualOffset_Widget(w), tmBackground_ColorId);
+    }
    draw_Widget(w);
-    drawVLine_Paint(
+    if (isVisible_Widget(w)) {
-        &p, addX_I2(topRight_Rect(bounds), -1), height_Rect(bounds), uiSeparator_ColorId);
+        drawVLine_Paint(
+            &p,
+            addX_I2(d->side == left_SideBarSide ? topRight_Rect(bounds) : topLeft_Rect(bounds), -1),
+            height_Rect(bounds),
+            uiSeparator_ColorId);
+    }
 }
 static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
                              const iListWidget *list) {
    const iSidebarWidget *sidebar = findParentClass_Widget(constAs_Widget(list),
                                                           &Class_SidebarWidget);
+    const iBool isMenuVisible = isVisible_Widget(sidebar->menu);
    const iBool isPressing   = isMouseDown_ListWidget(list);
-    const iBool isHover      = isHover_Widget(constAs_Widget(list)) &&
+    const iBool isHover      =
-                               constHoverItem_ListWidget(list) == d;
+            (!isMenuVisible &&
+            isHover_Widget(constAs_Widget(list)) &&
+            constHoverItem_ListWidget(list) == d) ||
+            (isMenuVisible && sidebar->contextItem == d);
    const int scrollBarWidth = scrollBarWidth_ListWidget(list);
 #if defined (iPlatformApple)
    const int blankWidth     = 0;
@@ -1652,7 +1693,7 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
        drawRange_Text(
            font, cPos, d->listItem.isSelected ? iconColor : metaFg, range_String(&icon));
        deinit_String(&icon);
-        drawRange_Text(d->listItem.isSelected ? uiContentBold_FontId : font,
+        drawRange_Text(d->listItem.isSelected ? sidebar->itemFonts[1] : font,
                       add_I2(cPos, init_I2(indent, 0)),
                       fg,
                       range_String(&d->label));
diff --git a/src/ui/text.c b/src/ui/text.c
index 9838fb00..889aa2e4 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -781,6 +781,7 @@ enum iRunMode {
    permanentColorFlag_RunMode      = iBit(11),
    alwaysVariableWidthFlag_RunMode = iBit(12),
    fillBackground_RunMode          = iBit(13),
+    stopAtNewline_RunMode           = iBit(14), /* don't advance past \n, consider it a wrap pos */
 };
 static enum iFontId fontId_Text_(const iFont *font) {
@@ -923,7 +924,7 @@ static iRect run_Font_(iFont *d, const iRunArgs *args) {
            }
            /* TODO: Check out if `uc_wordbreak_property()` from libunistring can be used here. */
            if (ch == '\n') {
-                if (args->xposLimit > 0 && ~mode & noWrapFlag_RunMode) {
+                if (args->xposLimit > 0 && mode & stopAtNewline_RunMode) {
                    /* Stop the line here, this is a hard warp. */
                    if (args->continueFrom_out) {
                        *args->continueFrom_out = chPos;
@@ -1148,7 +1149,8 @@ iInt2 advanceRange_Text(int fontId, iRangecc text) {
 iInt2 tryAdvance_Text(int fontId, iRangecc text, int width, const char **endPos) {
    int advance;
    const int height = run_Font_(font_Text_(fontId),
-                                 &(iRunArgs){ .mode = measure_RunMode | runFlagsFromId_(fontId),
+                                 &(iRunArgs){ .mode = measure_RunMode | stopAtNewline_RunMode |
+                                                      runFlagsFromId_(fontId),
                                              .text = text,
                                              .xposLimit        = width,
                                              .continueFrom_out = endPos,
@@ -1161,6 +1163,7 @@ iInt2 tryAdvanceNoWrap_Text(int fontId, iRangecc text, int width, const char **e
    int advance;
    const int height = run_Font_(font_Text_(fontId),
                                 &(iRunArgs){ .mode = measure_RunMode | noWrapFlag_RunMode |
+                                                      stopAtNewline_RunMode |
                                                      runFlagsFromId_(fontId),
                                              .text             = text,
                                              .xposLimit        = width,
@@ -1269,7 +1272,7 @@ int drawWrapRange_Text(int fontId, iInt2 pos, int maxWidth, int color, iRangecc
        const iInt2 adv = tryAdvance_Text(fontId, text, maxWidth, &endp);
        drawRange_Text(fontId, pos, color, (iRangecc){ text.start, endp });
        text.start = endp;
-        pos.y += adv.y;
+        pos.y += iMax(adv.y, lineHeight_Text(fontId));
    }
    return pos.y;
 }
@@ -1404,9 +1407,21 @@ iString *renderBlockChars_Text(const iBlock *fontData, int height, enum iTextBlo
 iDefineTypeConstructionArgs(TextBuf, (int font, int color, const char *text), font, color, text)
-void init_TextBuf(iTextBuf *d, int font, int color, const char *text) {
+static void initWrap_TextBuf_(iTextBuf *d, int font, int color, int maxWidth, iBool doWrap, const char *text) {
    SDL_Renderer *render = text_.render;
-    d->size    = advance_Text(font, text);
+    if (maxWidth == 0) {
+        d->size = advance_Text(font, text);
+    }
+    else {
+        d->size = zero_I2();
+        iRangecc content = range_CStr(text);
+        while (!isEmpty_Range(&content)) {
+            const iInt2 size = (doWrap ? tryAdvance_Text(font, content, maxWidth, &content.start)
+                                 : tryAdvanceNoWrap_Text(font, content, maxWidth, &content.start));
+            d->size.x = iMax(d->size.x, size.x);
+            d->size.y += iMax(size.y, lineHeight_Text(font));
+        }
+    }
    SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "0");
    if (d->size.x * d->size.y) {
        d->texture = SDL_CreateTexture(render,
@@ -1424,17 +1439,50 @@ void init_TextBuf(iTextBuf *d, int font, int color, const char *text) {
        SDL_SetTextureBlendMode(text_.cache, SDL_BLENDMODE_NONE); /* blended when TextBuf is drawn */
        SDL_SetRenderDrawColor(text_.render, 0, 0, 0, 0);
        SDL_RenderClear(text_.render);
-        draw_Text_(font, zero_I2(), color | fillBackground_ColorId, range_CStr(text));
+        const int fg    = color | fillBackground_ColorId;
+        iRangecc  range = range_CStr(text);
+        if (maxWidth == 0) {
+            draw_Text_(font, zero_I2(), fg, range);
+        }
+        else if (doWrap) {
+            drawWrapRange_Text(font, zero_I2(), maxWidth, fg, range);
+        }
+        else {
+            iInt2 pos = zero_I2();
+            while (!isEmpty_Range(&range)) {
+                const char *endp;
+                tryAdvanceNoWrap_Text(font, range, maxWidth, &endp);
+                draw_Text_(font, pos, fg, (iRangecc){ range.start, endp });
+                range.start = endp;
+                pos.y += lineHeight_Text(font);
+            }
+        }
        SDL_SetTextureBlendMode(text_.cache, SDL_BLENDMODE_BLEND);
        SDL_SetRenderTarget(render, oldTarget);
        SDL_SetTextureBlendMode(d->texture, SDL_BLENDMODE_BLEND);
    }
 }
+void init_TextBuf(iTextBuf *d, int font, int color, const char *text) {
+    initWrap_TextBuf_(d, font, color, 0, iFalse, text);
+}
 void deinit_TextBuf(iTextBuf *d) {
    SDL_DestroyTexture(d->texture);
 }
+iTextBuf *newBound_TextBuf(int font, int color, int boundWidth, const char *text) {
+    iTextBuf *d = iMalloc(TextBuf);
+    initWrap_TextBuf_(d, font, color, boundWidth, iFalse, text);
+    return d;
+}
+iTextBuf *newWrap_TextBuf(int font, int color, int wrapWidth, const char *text) {
+    iTextBuf *d = iMalloc(TextBuf);
+    initWrap_TextBuf_(d, font, color, wrapWidth, iTrue, text);
+    return d;
+}
 void draw_TextBuf(const iTextBuf *d, iInt2 pos, int color) {
    const iColor clr = get_Color(color);
    SDL_SetTextureColorMod(d->texture, clr.r, clr.g, clr.b);
diff --git a/src/ui/text.h b/src/ui/text.h
index c6091599..044ddd32 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -170,10 +170,13 @@ iString *   renderBlockChars_Text   (const iBlock *fontData, int height, enum iT
 iDeclareType(TextBuf)
 iDeclareTypeConstructionArgs(TextBuf, int font, int color, const char *text)
+    
 struct Impl_TextBuf {
    SDL_Texture *texture;
    iInt2        size;
 };
-void    draw_TextBuf        (const iTextBuf *, iInt2 pos, int color);
+iTextBuf *  newBound_TextBuf(int font, int color, int boundWidth, const char *text); /* does not word wrap */
+iTextBuf *  newWrap_TextBuf (int font, int color, int wrapWidth, const char *text);
+void        draw_TextBuf    (const iTextBuf *, iInt2 pos, int color);
diff --git a/src/ui/touch.c b/src/ui/touch.c
index b2c52526..74a22baf 100644
--- a/src/ui/touch.c
+++ b/src/ui/touch.c
@@ -227,7 +227,7 @@ static void dispatchButtonUp_Touch_(iFloat3 pos) {
 static void dispatchNotification_Touch_(const iTouch *d, int code) {
    if (d->affinity) {
-        iRoot *oldRoot = get_Root();
+        iRoot *oldRoot = current_Root();
        setCurrent_Root(d->affinity->root);
        dispatchEvent_Widget(d->affinity, (SDL_Event *) &(SDL_UserEvent){
            .type = SDL_USEREVENT,
@@ -318,6 +318,8 @@ static void update_TouchState_(void *ptr) {
            if (pixels.x || pixels.y) {
                subv_F3(&mom->accum, initI2_F3(pixels));
                dispatchMotion_Touch_(mom->pos, 0);
+                iAssert(mom->affinity);
+                setCurrent_Root(mom->affinity->root);
                dispatchEvent_Widget(mom->affinity, (SDL_Event *) &(SDL_MouseWheelEvent){
                                                        .type = SDL_MOUSEWHEEL,
                                                        .timestamp = nowTime,
@@ -334,26 +336,13 @@ static void update_TouchState_(void *ptr) {
    }
    /* Keep updating if interaction is still ongoing. */
    if (!isEmpty_Array(d->touches) || !isEmpty_Array(d->moms)) {
-        addTicker_App(update_TouchState_, ptr);
+        addTickerRoot_App(update_TouchState_, NULL, ptr);
    }
 }
-static iWidget *findOverflowScrollable_Widget_(iWidget *d) {
-    const iInt2 rootSize = size_Root(d->root);
-    for (iWidget *w = d; w; w = parent_Widget(w)) {
-        if (flags_Widget(w) & overflowScrollable_WidgetFlag) {
-            if (height_Widget(w) > rootSize.y && !hasVisibleChildOnTop_Widget(w)) {
-                return w;
-            }
-            return NULL;
-        }
-    }
-    return NULL;
-}
 static iWidget *findSlidePanel_Widget_(iWidget *d) {
    for (iWidget *w = d; w; w = parent_Widget(w)) {
-        if (isVisible_Widget(w) && flags_Widget(w) & horizontalOffset_WidgetFlag) {
+        if (isVisible_Widget(w) && flags_Widget(w) & edgeDraggable_WidgetFlag) {
            return w;
        }
    }
@@ -466,6 +455,8 @@ iBool processEvent_Touch(const SDL_Event *ev) {
        if (edge == left_TouchEdge) {
            dragging = findSlidePanel_Widget_(aff);
            if (dragging) {
+//                printf("Selected for dragging: ");
+//                identify_Widget(dragging);
                setFlags_Widget(dragging, dragged_WidgetFlag, iTrue);
            }
        }
@@ -492,7 +483,7 @@ iBool processEvent_Touch(const SDL_Event *ev) {
        }
        /* This may begin a pinch. */
        checkNewPinch_TouchState_(d, back_Array(d->touches));
-        addTicker_App(update_TouchState_, d);
+        addTickerRoot_App(update_TouchState_, NULL, d);
    }
    else if (ev->type == SDL_FINGERMOTION) {
        iTouch *touch = find_TouchState_(d, fing->fingerId);
@@ -544,7 +535,7 @@ iBool processEvent_Touch(const SDL_Event *ev) {
                    divvf_F3(&touch->accum, 6);
                    divfv_I2(&pixels, 6);
                    /* Allow scrolling a scrollable widget. */
-                    iWidget *flow = findOverflowScrollable_Widget_(touch->affinity);
+                    iWidget *flow = findOverflowScrollable_Widget(touch->affinity);
                    if (flow) {
                        touch->affinity = flow;
                    }
@@ -567,7 +558,7 @@ iBool processEvent_Touch(const SDL_Event *ev) {
            }
            /* Edge swipe aborted? */
            if (touch->edge == left_TouchEdge) {
-                if (fing->dx < 0) {
+                if (fing->dx < 0 && x_F3(touch->pos[0]) < tapRadiusPt_ * window->pixelRatio) {
                    touch->edge = none_TouchEdge;
                    if (touch->edgeDragging) {
                        setFlags_Widget(touch->edgeDragging, dragged_WidgetFlag, iFalse);
@@ -598,6 +589,7 @@ iBool processEvent_Touch(const SDL_Event *ev) {
            if (pixels.x || pixels.y) {
                setFocus_Widget(NULL);
                dispatchMotion_Touch_(touch->pos[0], 0);
+                setCurrent_Root(touch->affinity->root);
                dispatchEvent_Widget(touch->affinity, (SDL_Event *) &(SDL_MouseWheelEvent){
                    .type = SDL_MOUSEWHEEL,
                    .timestamp = SDL_GetTicks(),
@@ -642,17 +634,19 @@ iBool processEvent_Touch(const SDL_Event *ev) {
                continue;
            }
            /* Edge swipes do not generate momentum. */
+            const size_t lastIndex = iMin(touch->posCount - 1, lastIndex_Touch_);
            const uint32_t duration = nowTime - touch->startTime;
-            const iFloat3 gestureVector = sub_F3(pos, touch->startPos);
+            const iFloat3 gestureVector = sub_F3(pos, touch->pos[lastIndex]);
            iFloat3 velocity = zero_F3();
            if (touch->edge && fabsf(2 * x_F3(gestureVector)) > fabsf(y_F3(gestureVector)) &&
                !isStationary_Touch_(touch)) {
-                dispatchClick_Touch_(touch, touch->edge == left_TouchEdge ? SDL_BUTTON_X1
+                const int swipeDir = x_F3(gestureVector) > 0 ? +1 : -1;
-                                                                          : SDL_BUTTON_X2);
+                dispatchClick_Touch_(touch,
+                                     touch->edge == left_TouchEdge  && swipeDir > 0 ? SDL_BUTTON_X1 :
+                                     touch->edge == right_TouchEdge && swipeDir < 0 ? SDL_BUTTON_X2 : 0);
                setHover_Widget(NULL);
            }
            else {
-                const size_t lastIndex = iMin(touch->posCount - 1, lastIndex_Touch_);
                const uint32_t elapsed = fing->timestamp - touch->posTime[lastIndex];
                const float minVelocity = 400.0f;
                if (elapsed < 150) {
@@ -758,6 +752,20 @@ iInt2 latestPosition_Touch(void) {
    return touchState_()->currentTouchPos;
 }
+iBool isHovering_Touch(void) {
+    iTouchState *d = touchState_();
+    if (numFingers_Touch() == 1) {
+        const iTouch *touch = constFront_Array(d->touches);
+        if (touch->isTapBegun && isStationary_Touch_(touch)) {
+            return iTrue;
+        }
+        if (touch->isTapAndHold) {
+            return iTrue;
+        }
+    }
+    return iFalse;
+}
 size_t numFingers_Touch(void) {
    return size_Array(touchState_()->touches);
 }
diff --git a/src/ui/touch.h b/src/ui/touch.h
index 1a6fb350..e048224a 100644
--- a/src/ui/touch.h
+++ b/src/ui/touch.h
@@ -41,4 +41,5 @@ enum iWidgetTouchMode   widgetMode_Touch            (const iWidget *widget);
 void                    widgetDestroyed_Touch       (iWidget *widget);
 iInt2   latestPosition_Touch    (void); /* valid during processing of current event */
+iBool   isHovering_Touch        (void); /* stationary touch or a long-press drag ongoing */
 size_t  numFingers_Touch        (void);
diff --git a/src/ui/util.c b/src/ui/util.c
index 04cdf27f..4b35f8f7 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -80,7 +80,7 @@ void toString_Sym(int key, int kmods, iString *str) {
        appendChar_String(str, 0x2325);
    }
    if (kmods & KMOD_SHIFT) {
-        appendChar_String(str, 0x21e7);
+        appendCStr_String(str, shift_Icon);
    }
    if (kmods & KMOD_GUI) {
        appendChar_String(str, 0x2318);
@@ -93,7 +93,7 @@ void toString_Sym(int key, int kmods, iString *str) {
        appendCStr_String(str, "Alt+");
    }
    if (kmods & KMOD_SHIFT) {
-        appendCStr_String(str, "Shift+");
+        appendCStr_String(str, shift_Icon "+");
    }
    if (kmods & KMOD_GUI) {
        appendCStr_String(str, "Meta+");
@@ -138,7 +138,7 @@ void toString_Sym(int key, int kmods, iString *str) {
    }
    else if (key == SDLK_RETURN) {
        removePlus_(str);
-        appendChar_String(str, 0x21a9); /* Leftwards arrow with a hook */
+        appendCStr_String(str, return_Icon); /* Leftwards arrow with a hook */
    }
    else {
        appendCStr_String(str, SDL_GetKeyName(key));
@@ -837,10 +837,7 @@ void openMenuFlags_Widget(iWidget *d, iInt2 windowCoord, iBool postCommands) {
    if (postCommands) {
        postCommand_Widget(d, "menu.opened");
    }
-    if (isPortraitPhone) {
+    setupMenuTransition_Mobile(d, iTrue);
-        setVisualOffset_Widget(d, isSlidePanel ? width_Widget(d) : height_Widget(d), 0, 0);
-        setVisualOffset_Widget(d, 0, 330, easeOut_AnimFlag | softer_AnimFlag);
-    }
 }
 void closeMenu_Widget(iWidget *d) {
@@ -851,14 +848,7 @@ void closeMenu_Widget(iWidget *d) {
    setFlags_Widget(findChild_Widget(d, "menu.cancel"), disabled_WidgetFlag, iTrue);
    postRefresh_App();
    postCommand_Widget(d, "menu.closed");
-    if (isPortrait_App() && deviceType_App() == phone_AppDeviceType) {
+    setupMenuTransition_Mobile(d, iFalse);
-        const iBool wasDragged = iAbs(value_Anim(&d->visualOffset) - 0) > 1;
-        setVisualOffset_Widget(d,
-                               flags_Widget(d) & horizontalOffset_WidgetFlag ?
-                                 width_Widget(d) : height_Widget(d),
-                               wasDragged ? 100 : 200,
-                               wasDragged ? 0 : easeIn_AnimFlag | softer_AnimFlag);
-    }
 }
 iLabelWidget *findMenuItem_Widget(iWidget *menu, const char *command) {
@@ -904,7 +894,7 @@ static iBool isTabPage_Widget_(const iWidget *tabs, const iWidget *page) {
 static void unfocusFocusInsideTabPage_(const iWidget *page) {
    iWidget *focus = focus_Widget();
    if (page && focus && hasParent_Widget(focus, page)) {
-        printf("unfocus inside page: %p\n", focus);
+//        printf("unfocus inside page: %p\n", focus);
        setFocus_Widget(NULL);
    }
 }
@@ -1127,46 +1117,6 @@ size_t tabCount_Widget(const iWidget *tabs) {
 /*-----------------------------------------------------------------------------------------------*/
-static void acceptFilePath_(iWidget *dlg) {
-    iInputWidget *input = findChild_Widget(dlg, "input");
-    iString *path = makeAbsolute_Path(text_InputWidget(input));
-    postCommandf_App("%s path:%s", cstr_String(id_Widget(dlg)), cstr_String(path));
-    destroy_Widget(dlg);
-    delete_String(path);
-}
-iBool filePathHandler_(iWidget *dlg, const char *cmd) {
-    iWidget *ptr = as_Widget(pointer_Command(cmd));
-    if (equal_Command(cmd, "input.ended")) {
-        if (hasParent_Widget(ptr, dlg)) {
-            if (arg_Command(cmd)) {
-                acceptFilePath_(dlg);
-            }
-            else {
-                destroy_Widget(dlg);
-            }
-            return iTrue;
-        }
-        return iFalse;
-    }
-    else if (ptr && !hasParent_Widget(ptr, dlg)) {
-        /* Command from outside the dialog, so dismiss the dialog. */
-        if (!equal_Command(cmd, "focus.lost")) {
-            destroy_Widget(dlg);
-        }
-        return iFalse;
-    }
-    else if (equal_Command(cmd, "filepath.cancel")) {
-        end_InputWidget(findChild_Widget(dlg, "input"), iFalse);
-        destroy_Widget(dlg);
-        return iTrue;
-    }
-    else if (equal_Command(cmd, "filepath.accept")) {
-        acceptFilePath_(dlg);
-        return iTrue;
-    }
-    return iFalse;
-}
 iWidget *makeSheet_Widget(const char *id) {
    iWidget *sheet = new_Widget();
@@ -1183,609 +1133,6 @@ iWidget *makeSheet_Widget(const char *id) {
    return sheet;
 }
-static void updateSheetPanelMetrics_(iWidget *sheet) {
-    iWidget *navi       = findChild_Widget(sheet, "panel.navi");
-    iWidget *naviPad    = child_Widget(navi, 0);
-    int      naviHeight = lineHeight_Text(defaultBig_FontId) + 4 * gap_UI;
-#if defined (iPlatformAppleMobile)
-    float left, right, top, bottom;
-    safeAreaInsets_iOS(&left, &top, &right, &bottom);
-    setPadding_Widget(sheet, left, 0, right, 0);
-    navi->rect.pos = init_I2(left, top);
-    iConstForEach(PtrArray, i, findChildren_Widget(sheet, "panel.toppad")) {
-        iWidget *pad = *i.value;
-        setFixedSize_Widget(pad, init1_I2(naviHeight));
-    }
-#endif
-    setFixedSize_Widget(navi, init_I2(-1, naviHeight));
-}
-static iBool slidePanelHandler_(iWidget *d, const char *cmd) {
-    if (equal_Command(cmd, "panel.open")) {
-        iWidget *button = pointer_Command(cmd);
-        iWidget *panel = userData_Object(button);
-        openMenu_Widget(panel, innerToWindow_Widget(panel, zero_I2()));
-        setFlags_Widget(panel, disabled_WidgetFlag, iFalse);
-//        updateTextCStr_LabelWidget(findWidget_App("panel.back"), );
-        return iTrue;
-    }
-    if (equal_Command(cmd, "mouse.clicked") && arg_Command(cmd) &&
-        argLabel_Command(cmd, "button") == SDL_BUTTON_X1) {
-        postCommand_App("panel.close");
-        return iTrue;
-    }
-    if (equal_Command(cmd, "panel.close")) {
-        iBool wasClosed = iFalse;
-        iForEach(ObjectList, i, children_Widget(parent_Widget(d))) {
-            iWidget *child = i.object;
-            if (!cmp_String(id_Widget(child), "panel") && isVisible_Widget(child)) {
-                closeMenu_Widget(child);
-                setFlags_Widget(child, disabled_WidgetFlag, iTrue);
-                setFocus_Widget(NULL);
-                updateTextCStr_LabelWidget(findWidget_App("panel.back"), "Back");
-                wasClosed = iTrue;
-            }
-        }
-        if (!wasClosed) {
-            postCommand_App("prefs.dismiss");
-        }
-        return iTrue;
-    }
-    if (equal_Command(cmd, "document.changed")) {
-        postCommand_App("prefs.dismiss");
-        return iFalse;
-    }
-    if (equal_Command(cmd, "window.resized")) {
-        updateSheetPanelMetrics_(parent_Widget(d));
-    }
-    return iFalse;
-}
-static iBool isTwoColumnPage_(iWidget *d) {
-    if (cmp_String(id_Widget(d), "dialogbuttons") == 0 ||
-        cmp_String(id_Widget(d), "prefs.tabs") == 0) {
-        return iFalse;
-    }
-    if (class_Widget(d) == &Class_Widget && childCount_Widget(d) == 2) {
-        return class_Widget(child_Widget(d, 0)) == &Class_Widget &&
-               class_Widget(child_Widget(d, 1)) == &Class_Widget;
-    }
-    return iFalse;
-}
-static iBool isOmittedPref_(const iString *id) {
-    static const char *omittedPrefs[] = {
-        "prefs.smoothscroll",
-        "prefs.imageloadscroll",
-        "prefs.retainwindow",
-        "prefs.ca.file",
-        "prefs.ca.path",
-    };
-    iForIndices(i, omittedPrefs) {
-        if (cmp_String(id, omittedPrefs[i]) == 0) {
-            return iTrue;
-        }
-    }
-    return iFalse;
-}
-enum iPrefsElement {
-    panelTitle_PrefsElement,
-    heading_PrefsElement,
-    toggle_PrefsElement,
-    dropdown_PrefsElement,
-    radioButton_PrefsElement,
-    textInput_PrefsElement,
-};
-static iAnyObject *addPanelChild_(iWidget *panel, iAnyObject *child, int64_t flags,
-                                  enum iPrefsElement elementType,
-                                  enum iPrefsElement precedingElementType) {
-    /* Erase redundant/unused headings. */
-    if (precedingElementType == heading_PrefsElement &&
-        (!child || (elementType == heading_PrefsElement || elementType == radioButton_PrefsElement))) {
-        iRelease(removeChild_Widget(panel, lastChild_Widget(panel)));
-        if (!cmp_String(id_Widget(constAs_Widget(lastChild_Widget(panel))), "padding")) {
-            iRelease(removeChild_Widget(panel, lastChild_Widget(panel)));
-        }
-    }
-    if (child) {
-        /* Insert padding between different element types. */
-        if (precedingElementType != panelTitle_PrefsElement) {
-            if (elementType == heading_PrefsElement ||
-                (elementType == toggle_PrefsElement &&
-                 precedingElementType != toggle_PrefsElement &&
-                 precedingElementType != heading_PrefsElement) ||
-                (elementType == dropdown_PrefsElement &&
-                 precedingElementType != dropdown_PrefsElement &&
-                 precedingElementType != heading_PrefsElement) ||
-                (elementType == textInput_PrefsElement &&
-                 precedingElementType != textInput_PrefsElement &&
-                 precedingElementType != heading_PrefsElement)) {
-                addChild_Widget(panel, iClob(makePadding_Widget(lineHeight_Text(defaultBig_FontId))));
-            }
-        }
-        if ((elementType == toggle_PrefsElement && precedingElementType != toggle_PrefsElement) ||
-            (elementType == textInput_PrefsElement && precedingElementType != textInput_PrefsElement)) {
-            flags |= borderTop_WidgetFlag;
-        }
-        return addChildFlags_Widget(panel, child, flags);
-    }
-    return NULL;
-}
-static void stripTrailingColon_(iLabelWidget *label) {
-    const iString *text = text_LabelWidget(label);
-    if (endsWith_String(text, ":")) {
-        iString *mod = copy_String(text);
-        removeEnd_String(mod, 1);
-        updateText_LabelWidget(label, mod);
-        delete_String(mod);
-    }
-}
-static iLabelWidget *makePanelButton_(const char *text, const char *command) {
-    iLabelWidget *btn = new_LabelWidget(text, command);
-    setFlags_Widget(as_Widget(btn),
-                    borderBottom_WidgetFlag | alignLeft_WidgetFlag |
-                    frameless_WidgetFlag | extraPadding_WidgetFlag,
-                    iTrue);
-    checkIcon_LabelWidget(btn);
-    setFont_LabelWidget(btn, defaultBig_FontId);
-    setTextColor_LabelWidget(btn, uiTextStrong_ColorId);
-    setBackgroundColor_Widget(as_Widget(btn), uiBackgroundSidebar_ColorId);
-    return btn;
-}
-static iWidget *makeValuePadding_(iWidget *value) {
-    iInputWidget *input = isInstance_Object(value, &Class_InputWidget) ? (iInputWidget *) value : NULL;
-    if (input) {
-        setFont_InputWidget(input, defaultBig_FontId);
-        setContentPadding_InputWidget(input, 3 * gap_UI, 3 * gap_UI);
-    }
-    iWidget *pad = new_Widget();
-    setBackgroundColor_Widget(pad, uiBackgroundSidebar_ColorId);
-    setPadding_Widget(pad, 0, 1 * gap_UI, 0, 1 * gap_UI);
-    addChild_Widget(pad, iClob(value));
-    setFlags_Widget(pad,
-                    borderBottom_WidgetFlag |
-                    arrangeVertical_WidgetFlag |
-                    resizeToParentWidth_WidgetFlag |
-                    resizeWidthOfChildren_WidgetFlag |
-                    arrangeHeight_WidgetFlag,
-                    iTrue);
-    return pad;
-}
-static iWidget *makeValuePaddingWithHeading_(iLabelWidget *heading, iWidget *value) {
-    iWidget *div = new_Widget();
-    setFlags_Widget(div,
-                    borderBottom_WidgetFlag | arrangeHeight_WidgetFlag |
-                    resizeWidthOfChildren_WidgetFlag |
-                    arrangeHorizontal_WidgetFlag, iTrue);
-    setBackgroundColor_Widget(div, uiBackgroundSidebar_ColorId);
-    setPadding_Widget(div, gap_UI, gap_UI, 4 * gap_UI, gap_UI);
-    addChildFlags_Widget(div, iClob(heading), 0);
-    //setFixedSize_Widget(as_Widget(heading), init_I2(-1, height_Widget(value)));
-    setFont_LabelWidget(heading, defaultBig_FontId);
-    setTextColor_LabelWidget(heading, uiTextStrong_ColorId);
-    if (isInstance_Object(value, &Class_InputWidget)) {
-        addChildFlags_Widget(div, iClob(value), expand_WidgetFlag);
-    }
-    else {
-        addChildFlags_Widget(div, iClob(new_Widget()), expand_WidgetFlag);
-        addChild_Widget(div, iClob(value));
-    }
-    return div;
-}
-static iWidget *addChildPanel_(iWidget *sheet, iLabelWidget *panelButton,
-                               const iString *titleText) {
-    iWidget *owner = new_Widget();
-    setId_Widget(owner, "panel");
-    setUserData_Object(panelButton, owner);
-    setBackgroundColor_Widget(owner, uiBackground_ColorId);
-    setId_Widget(addChild_Widget(owner, iClob(makePadding_Widget(0))), "panel.toppad");
-    if (titleText) {
-        iLabelWidget *title =
-            addChildFlags_Widget(owner,
-                                 iClob(new_LabelWidget(cstr_String(titleText), NULL)),
-                                 alignLeft_WidgetFlag | frameless_WidgetFlag);
-        setFont_LabelWidget(title, uiLabelLargeBold_FontId);
-        setTextColor_LabelWidget(title, uiHeading_ColorId);
-    }
-    addChildFlags_Widget(sheet,
-                         iClob(owner),
-                         focusRoot_WidgetFlag | hidden_WidgetFlag | disabled_WidgetFlag |
-                             arrangeVertical_WidgetFlag | resizeWidthOfChildren_WidgetFlag |
-                             arrangeHeight_WidgetFlag | overflowScrollable_WidgetFlag |
-                             horizontalOffset_WidgetFlag | commandOnClick_WidgetFlag);
-    return owner;
-}
-void finalizeSheet_Widget(iWidget *sheet) {
-    /* The sheet contents are completely rearranged and restyled on a phone.
-       We'll set up a linear fullscreen arrangement of the widgets. Sheets are already
-       scrollable so they can be taller than the display. In hindsight, it may have been
-       easier to create phone versions of each dialog, but at least this works with any
-       future changes to the UI (..."works"). At least this way it is possible to enforce
-       a consistent styling. */
-    if (deviceType_App() == phone_AppDeviceType && parent_Widget(sheet) == root_Widget(sheet)) {
-        if (~flags_Widget(sheet) & keepOnTop_WidgetFlag) {
-            /* Already finalized. */
-            arrange_Widget(sheet);
-            postRefresh_App();
-            return;
-        }
-        /* Modify the top sheet to act as a fullscreen background. */
-        setPadding1_Widget(sheet, 0);
-        setBackgroundColor_Widget(sheet, uiBackground_ColorId);
-        setFlags_Widget(sheet,
-                        keepOnTop_WidgetFlag |
-                        parentCannotResize_WidgetFlag |
-                        arrangeSize_WidgetFlag |
-                        centerHorizontal_WidgetFlag |
-                        arrangeVertical_WidgetFlag |
-                        arrangeHorizontal_WidgetFlag |
-                        overflowScrollable_WidgetFlag,
-                        iFalse);
-        setFlags_Widget(sheet,
-                        commandOnClick_WidgetFlag |
-                        frameless_WidgetFlag |
-                        resizeWidthOfChildren_WidgetFlag,
-                        iTrue);
-        iPtrArray *   contents         = collect_PtrArray(new_PtrArray()); /* two-column pages */
-        iPtrArray *   panelButtons     = collect_PtrArray(new_PtrArray());
-        iWidget *     prefsTabs        = findChild_Widget(sheet, "prefs.tabs");
-        iWidget *     dialogHeading    = (prefsTabs ? NULL : child_Widget(sheet, 0));
-        const iBool   isPrefs          = (prefsTabs != NULL);
-        const int64_t panelButtonFlags = borderBottom_WidgetFlag | alignLeft_WidgetFlag |
-                                         frameless_WidgetFlag | extraPadding_WidgetFlag;
-        iWidget *topPanel = new_Widget();
-        setId_Widget(topPanel, "panel.top");
-        addChild_Widget(topPanel, iClob(makePadding_Widget(lineHeight_Text(defaultBig_FontId))));
-        if (prefsTabs) {
-            iRelease(removeChild_Widget(sheet, child_Widget(sheet, 0))); /* heading */
-            iRelease(removeChild_Widget(sheet, findChild_Widget(sheet, "dialogbuttons")));
-            /* Pull out the pages and make them panels. */
-            iWidget *pages = findChild_Widget(prefsTabs, "tabs.pages");
-            size_t pageCount = tabCount_Widget(prefsTabs);
-            for (size_t i = 0; i < pageCount; i++) {
-                iString *text = copy_String(text_LabelWidget(tabPageButton_Widget(prefsTabs, tabPage_Widget(prefsTabs, 0))));
-                iWidget *page = removeTabPage_Widget(prefsTabs, 0);
-                iWidget *pageContent = child_Widget(page, 1); /* surrounded by padding widgets */
-                pushBack_PtrArray(contents, ref_Object(pageContent));
-                iLabelWidget *panelButton;
-                pushBack_PtrArray(panelButtons,
-                                  addChildFlags_Widget(topPanel,
-                                                       iClob(panelButton = makePanelButton_(
-                                                             i == 1 ? "${heading.prefs.userinterface}" : cstr_String(text),
-                                                             "panel.open")),
-                                                       (i == 0 ? borderTop_WidgetFlag : 0) |
-                                                       chevron_WidgetFlag));
-                const iChar icons[] = {
-                    0x02699, /* gear */
-                    0x1f4f1, /* mobile phone */
-                    0x1f3a8, /* palette */
-                    0x1f523,
-                    0x1f5a7, /* computer network */
-                };
-                setIcon_LabelWidget(panelButton, icons[i]);
-//                setFont_LabelWidget(panelButton, defaultBig_FontId);
-//                setBackgroundColor_Widget(as_Widget(panelButton), uiBackgroundSidebar_ColorId);
-                iRelease(page);
-                delete_String(text);
-            }
-            destroy_Widget(prefsTabs);
-        }
-        iForEach(ObjectList, i, children_Widget(sheet)) {
-            iWidget *child = i.object;
-            if (isTwoColumnPage_(child)) {
-                pushBack_PtrArray(contents, removeChild_Widget(sheet, child));
-            }
-            else {
-                removeChild_Widget(sheet, child);
-                addChild_Widget(topPanel, child);
-                iRelease(child);
-            }
-        }
-        const iBool useSlidePanels = (size_PtrArray(contents) == size_PtrArray(panelButtons));
-        addChildFlags_Widget(sheet, iClob(topPanel),
-                             arrangeVertical_WidgetFlag |
-                             resizeWidthOfChildren_WidgetFlag | arrangeHeight_WidgetFlag |
-                             overflowScrollable_WidgetFlag |
-                             commandOnClick_WidgetFlag);
-        setCommandHandler_Widget(topPanel, slidePanelHandler_);
-        iForEach(PtrArray, j, contents) {
-            iWidget *owner = topPanel;
-            if (useSlidePanels) {
-                /* Create a new child panel. */
-                iLabelWidget *button = at_PtrArray(panelButtons, index_PtrArrayIterator(&j));
-                owner = addChildPanel_(sheet, button,
-                                       collect_String(upper_String(text_LabelWidget(button))));
-            }
-            iWidget *pageContent = j.ptr;
-            iWidget *headings = child_Widget(pageContent, 0);
-            iWidget *values   = child_Widget(pageContent, 1);
-            enum iPrefsElement prevElement = panelTitle_PrefsElement;
-            /* Identify the types of controls in the dialog and restyle/organize them. */
-            while (!isEmpty_ObjectList(children_Widget(headings))) {
-                iWidget *heading = child_Widget(headings, 0);
-                iWidget *value   = child_Widget(values, 0);
-                removeChild_Widget(headings, heading);
-                removeChild_Widget(values, value);
-                /* Can we ignore these widgets? */
-                if (isOmittedPref_(id_Widget(value)) ||
-                    (class_Widget(heading) == &Class_Widget &&
-                     class_Widget(value) == &Class_Widget) /* just padding */) {
-                    iRelease(heading);
-                    iRelease(value);
-                    continue;
-                }
-                enum iPrefsElement element = toggle_PrefsElement;
-                iLabelWidget *headingLabel = NULL;
-                iLabelWidget *valueLabel = NULL;
-                iInputWidget *valueInput = NULL;
-                const iBool isMenuButton = findChild_Widget(value, "menu") != NULL;
-                if (isInstance_Object(heading, &Class_LabelWidget)) {
-                    headingLabel = (iLabelWidget *) heading;
-                    stripTrailingColon_(headingLabel);
-                }
-                if (isInstance_Object(value, &Class_LabelWidget)) {
-                    valueLabel = (iLabelWidget *) value;
-                    setFont_LabelWidget(valueLabel, defaultBig_FontId);
-                }
-                if (isInstance_Object(value, &Class_InputWidget)) {
-                    valueInput = (iInputWidget *) value;
-                    setFlags_Widget(value, borderBottom_WidgetFlag, iFalse);
-                    element = textInput_PrefsElement;
-                }
-                if (childCount_Widget(value) >= 2) {
-                    if (isInstance_Object(child_Widget(value, 0), &Class_InputWidget)) {
-                        element = textInput_PrefsElement;
-                        setPadding_Widget(value, 0, 0, gap_UI, 0);
-                        valueInput = child_Widget(value, 0);
-                    }
-                }
-                if (valueInput) {
-                    setFont_InputWidget(valueInput, defaultBig_FontId);
-                    setContentPadding_InputWidget(valueInput, 3 * gap_UI, 0);
-                }
-                /* Toggles have the button on the right. */
-                if (valueLabel && cmp_String(command_LabelWidget(valueLabel), "toggle") == 0) {
-                    element = toggle_PrefsElement;
-                    addPanelChild_(owner,
-                                   iClob(makeValuePaddingWithHeading_(headingLabel, value)),
-                                   0,
-                                   element,
-                                   prevElement);
-                }
-                else if (valueLabel && isEmpty_String(text_LabelWidget(valueLabel))) {
-                    element = heading_PrefsElement;
-                    iRelease(value);
-                    addPanelChild_(owner, iClob(heading), 0, element, prevElement);
-                    setFont_LabelWidget(headingLabel, uiLabel_FontId);
-                }
-                else if (isMenuButton) {
-                    element = dropdown_PrefsElement;
-                    setFlags_Widget(value,
-                                    alignRight_WidgetFlag | noBackground_WidgetFlag |
-                                    frameless_WidgetFlag, iTrue);
-                    setFlags_Widget(value, alignLeft_WidgetFlag, iFalse);
-                    iWidget *pad = addPanelChild_(owner, iClob(makeValuePaddingWithHeading_(headingLabel, value)), 0,
-                                                  element, prevElement);
-                    pad->padding[2] = gap_UI;
-                }
-                else if (valueInput) {
-                    addPanelChild_(owner, iClob(makeValuePaddingWithHeading_(headingLabel, value)), 0,
-                                       element, prevElement);
-                }
-                else {
-                    if (childCount_Widget(value) >= 2) {
-                        element = radioButton_PrefsElement;
-                        /* Always padding before radio buttons. */
-                        addChild_Widget(owner, iClob(makePadding_Widget(lineHeight_Text(defaultBig_FontId))));
-                    }
-                    addChildFlags_Widget(owner, iClob(heading), borderBottom_WidgetFlag);
-                    if (headingLabel) {
-                        setTextColor_LabelWidget(headingLabel, uiSubheading_ColorId);
-                        setText_LabelWidget(headingLabel,
-                                            collect_String(upper_String(text_LabelWidget(headingLabel))));
-                    }
-                    addPanelChild_(owner, iClob(value), 0, element, prevElement);
-                    /* Radio buttons expand to fill the space. */
-                    if (element == radioButton_PrefsElement) {
-                        setBackgroundColor_Widget(value, uiBackgroundSidebar_ColorId);
-                        setPadding_Widget(value, 4 * gap_UI, 2 * gap_UI, 4 * gap_UI, 2 * gap_UI);
-                        setFlags_Widget(value,
-                                        borderBottom_WidgetFlag |
-                                        resizeToParentWidth_WidgetFlag |
-                                        resizeWidthOfChildren_WidgetFlag,
-                                        iTrue);
-                        iForEach(ObjectList, sub, children_Widget(value)) {
-                            if (isInstance_Object(sub.object, &Class_LabelWidget)) {
-                                iLabelWidget *opt = sub.object;
-                                setFont_LabelWidget(opt, defaultMedium_FontId);
-                                setFlags_Widget(as_Widget(opt), noBackground_WidgetFlag, iTrue);
-                            }
-                        }
-                    }
-                }
-                prevElement = element;
-            }
-            addPanelChild_(owner, NULL, 0, 0, prevElement);
-            destroy_Widget(pageContent);
-            setFlags_Widget(owner, drawBackgroundToBottom_WidgetFlag, iTrue);
-        }
-        destroyPending_Root(sheet->root);
-        /* Additional elements for preferences. */
-        if (isPrefs) {
-            addChild_Widget(topPanel, iClob(makePadding_Widget(lineHeight_Text(defaultBig_FontId))));
-            addChildFlags_Widget(topPanel,
-                                 iClob(makePanelButton_(info_Icon " ${menu.help}", "!open url:about:help")),
-                                 borderTop_WidgetFlag);
-            iLabelWidget *aboutButton = addChildFlags_Widget(topPanel,
-                                 iClob(makePanelButton_(planet_Icon " ${menu.about}", "panel.open")),
-                                 chevron_WidgetFlag);
-            /* The About panel. */ {
-                iWidget *panel = addChildPanel_(sheet, aboutButton, NULL);
-                iString *msg = collectNew_String();
-                setCStr_String(msg, "Lagrange " LAGRANGE_APP_VERSION);
-#if defined (iPlatformAppleMobile)
-                appendCStr_String(msg, " (" LAGRANGE_IOS_VERSION ")");
-#endif
-                addChild_Widget(panel, iClob(new_LabelWidget(cstr_String(msg), NULL)));
-                addChildFlags_Widget(panel,
-                                     iClob(makePanelButton_(globe_Icon " By @jk@skyjake.fi",
-                                                            "!open url:https://skyjake.fi/@jk")),
-                                     borderTop_WidgetFlag);
-                addChildFlags_Widget(panel,
-                                     iClob(makePanelButton_(clock_Icon " ${menu.releasenotes}",
-                                                            "!open url:about:version")),
-                                     0);
-                addChildFlags_Widget(panel,
-                                     iClob(makePanelButton_(info_Icon " ${menu.aboutpages}",
-                                                            "!open url:about:about")),
-                                     0);
-                addChildFlags_Widget(panel,
-                                     iClob(makePanelButton_(bug_Icon " ${menu.debug}",
-                                                            "!open url:about:debug")),
-                                     0);
-            }
-        }
-        else {
-            setFlags_Widget(topPanel, overflowScrollable_WidgetFlag, iTrue);
-            /* Update heading style. */
-            setFont_LabelWidget((iLabelWidget *) dialogHeading, uiLabelLargeBold_FontId);
-            setFlags_Widget(dialogHeading, alignLeft_WidgetFlag, iTrue);
-        }
-        if (findChild_Widget(sheet, "valueinput.prompt")) {
-            iWidget *prompt = findChild_Widget(sheet, "valueinput.prompt");
-            setFlags_Widget(prompt, alignLeft_WidgetFlag, iTrue);
-            iInputWidget *input = findChild_Widget(sheet, "input");
-            removeChild_Widget(parent_Widget(input), input);
-            addChild_Widget(topPanel, iClob(makeValuePadding_(as_Widget(input))));
-        }
-        /* Top padding for each panel, to account for the overlaid navbar. */ {
-            setId_Widget(addChildPos_Widget(topPanel,
-                                            iClob(makePadding_Widget(0)), front_WidgetAddPos),
-                         "panel.toppad");
-        }
-        /* Navbar. */ {
-            iWidget *navi = new_Widget();
-            setId_Widget(navi, "panel.navi");
-            setBackgroundColor_Widget(navi, uiBackground_ColorId);
-            addChild_Widget(navi, iClob(makePadding_Widget(0)));
-            iLabelWidget *back = addChildFlags_Widget(navi,
-                                                      iClob(new_LabelWidget(leftAngle_Icon " ${panel.back}", "panel.close")),
-                                                      noBackground_WidgetFlag | frameless_WidgetFlag |
-                                                      alignLeft_WidgetFlag | extraPadding_WidgetFlag);
-            checkIcon_LabelWidget(back);
-            setId_Widget(as_Widget(back), "panel.back");
-            setFont_LabelWidget(back, defaultBig_FontId);
-            if (!isPrefs) {
-                /* Pick up the dialog buttons for the navbar. */
-                iWidget *buttons = findChild_Widget(sheet, "dialogbuttons");
-                iLabelWidget *cancel = findMenuItem_Widget(buttons, "cancel");
-//                if (!cancel) {
-//                    cancel = findMenuItem_Widget(buttons, "translation.cancel");
-//                }
-                if (cancel) {
-                    updateText_LabelWidget(back, text_LabelWidget(cancel));
-                    setCommand_LabelWidget(back, command_LabelWidget(cancel));
-                }
-                iLabelWidget *def = (iLabelWidget *) lastChild_Widget(buttons);
-                if (def && !cancel) {
-                    updateText_LabelWidget(back, text_LabelWidget(def));
-                    setCommand_LabelWidget(back, command_LabelWidget(def));
-                    setFlags_Widget(as_Widget(back), alignLeft_WidgetFlag, iFalse);
-                    setFlags_Widget(as_Widget(back), alignRight_WidgetFlag, iTrue);
-                    setIcon_LabelWidget(back, 0);
-                    setFont_LabelWidget(back, defaultBigBold_FontId);
-                }
-                else if (def != cancel) {
-                    removeChild_Widget(buttons, def);
-                    setFont_LabelWidget(def, defaultBigBold_FontId);
-                    setFlags_Widget(as_Widget(def),
-                                    frameless_WidgetFlag | extraPadding_WidgetFlag |
-                                    noBackground_WidgetFlag, iTrue);
-                    addChildFlags_Widget(as_Widget(back), iClob(def), moveToParentRightEdge_WidgetFlag);
-                    updateSize_LabelWidget(def);
-                }
-                /* Action buttons are added in the bottom as extra buttons. */ {
-                    iBool isFirstAction = iTrue;
-                    iForEach(ObjectList, i, children_Widget(buttons)) {
-                        if (isInstance_Object(i.object, &Class_LabelWidget) &&
-                            i.object != cancel && i.object != def) {
-                            iLabelWidget *item = i.object;
-                            setBackgroundColor_Widget(i.object, uiBackgroundSidebar_ColorId);
-                            setFont_LabelWidget(item, defaultBig_FontId);
-                            removeChild_Widget(buttons, item);
-                            addChildFlags_Widget(topPanel, iClob(item), panelButtonFlags |
-                                                 (isFirstAction ? borderTop_WidgetFlag : 0));
-                            updateSize_LabelWidget(item);
-                            isFirstAction = iFalse;
-                        }
-                    }
-                }
-                iRelease(removeChild_Widget(parent_Widget(buttons), buttons));
-                /* Styling for remaining elements. */
-                iForEach(ObjectList, i, children_Widget(topPanel)) {
-                    if (isInstance_Object(i.object, &Class_LabelWidget) &&
-                        isEmpty_String(command_LabelWidget(i.object)) &&
-                        isEmpty_String(id_Widget(i.object))) {
-                        setFlags_Widget(i.object, alignLeft_WidgetFlag, iTrue);
-                        if (font_LabelWidget(i.object) == uiLabel_FontId) {
-                            setFont_LabelWidget(i.object, uiContent_FontId);
-                        }
-                    }
-                }
-            }
-            addChildFlags_Widget(sheet, iClob(navi),
-                                 drawBackgroundToVerticalSafeArea_WidgetFlag |
-                                 arrangeHeight_WidgetFlag | resizeWidthOfChildren_WidgetFlag |
-                                 resizeToParentWidth_WidgetFlag | arrangeVertical_WidgetFlag);
-        }
-        updateSheetPanelMetrics_(sheet);
-        iAssert(sheet->parent);
-        arrange_Widget(sheet->parent);
-        postCommand_App("widget.overflow"); /* with the correct dimensions */
-//        printTree_Widget(sheet);
-    }
-    else {
-        arrange_Widget(sheet);
-    }
-    postRefresh_App();
-}
-void makeFilePath_Widget(iWidget *      parent,
-                         const iString *initialPath,
-                         const char *   title,
-                         const char *   acceptLabel,
-                         const char *   command) {
-    setFocus_Widget(NULL);
-//    processEvents_App(postedEventsOnly_AppEventMode);
-    iWidget *dlg = makeSheet_Widget(command);
-    setCommandHandler_Widget(dlg, filePathHandler_);
-    addChild_Widget(parent, iClob(dlg));
-    addChildFlags_Widget(dlg, iClob(new_LabelWidget(title, NULL)), frameless_WidgetFlag);
-    iInputWidget *input = addChild_Widget(dlg, iClob(new_InputWidget(0)));
-    if (initialPath) {
-        setText_InputWidget(input, collect_String(makeRelative_Path(initialPath)));
-    }
-    setId_Widget(as_Widget(input), "input");
-    as_Widget(input)->rect.size.x = dlg->rect.size.x;
-    addChild_Widget(dlg, iClob(makePadding_Widget(gap_UI)));
-    iWidget *div = new_Widget(); {
-        setFlags_Widget(div, arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
-        addChild_Widget(div, iClob(newKeyMods_LabelWidget("${cancel}", SDLK_ESCAPE, 0, "filepath.cancel")));
-        addChild_Widget(div, iClob(newKeyMods_LabelWidget(acceptLabel, SDLK_RETURN, 0, "filepath.accept")));
-    }
-    addChild_Widget(dlg, iClob(div));
-    finalizeSheet_Widget(dlg);
-    setFocus_Widget(as_Widget(input));
-}
 static void acceptValueInput_(iWidget *dlg) {
    const iInputWidget *input = findChild_Widget(dlg, "input");
    if (!isEmpty_String(id_Widget(dlg))) {
@@ -1806,7 +1153,8 @@ static void updateValueInputWidth_(iWidget *dlg) {
        dlg->rect.size.x = rootSize.x;
    }
    else {
-        dlg->rect.size.x = iMaxi(iMaxi(rootSize.x / 2, title->rect.size.x), prompt->rect.size.x);
+        dlg->rect.size.x =
+            iMin(rootSize.x, iMaxi(iMaxi(100 * gap_UI, title->rect.size.x), prompt->rect.size.x));
    }
 }
@@ -1880,6 +1228,12 @@ iWidget *makeDialogButtons_Widget(const iMenuItem *actions, size_t numActions) {
        if (*label == '*' || *label == '&') {
            continue; /* Special value selection items for a Question dialog. */
        }
+        if (startsWith_CStr(label, "```")) {
+            /* Annotation. */
+            iLabelWidget *annotation = addChild_Widget(div, iClob(new_LabelWidget(label + 3, NULL)));
+            setTextColor_LabelWidget(annotation, uiTextAction_ColorId);
+            continue;
+        }
        if (!iCmpStr(label, "---")) {
            /* Separator.*/
            addChildFlags_Widget(div, iClob(new_Widget()), expand_WidgetFlag);
@@ -1945,7 +1299,7 @@ iWidget *makeValueInput_Widget(iWidget *parent, const iString *initialValue, con
        iClob(makeDialogButtons_Widget(
            (iMenuItem[]){ { "${cancel}", 0, 0, NULL }, { acceptLabel, 0, 0, "valueinput.accept" } },
            2)));
-    finalizeSheet_Widget(dlg);
+    finalizeSheet_Mobile(dlg);
    if (parent) {
        setFocus_Widget(as_Widget(input));
    }
@@ -2002,13 +1356,17 @@ iWidget *makeQuestion_Widget(const char *title, const char *msg,
        const iMenuItem *item = &items[i];
        const char first = item->label[0];
        if (first == '*' || first == '&') {
-            addChildFlags_Widget(dlg,
+            iLabelWidget *option =
+                addChildFlags_Widget(dlg,
                                 iClob(newKeyMods_LabelWidget(item->label + 1,
                                                              item->key,
                                                              item->kmods,
                                                              item->command)),
                                 resizeToParentWidth_WidgetFlag |
                                 (first == '&' ? selected_WidgetFlag : 0));
+            if (deviceType_App() != desktop_AppDeviceType) {
+                setFont_LabelWidget(option, defaultBig_FontId);
+            }
        }
    }
    addChild_Widget(dlg, iClob(makePadding_Widget(gap_UI)));
@@ -2016,7 +1374,7 @@ iWidget *makeQuestion_Widget(const char *title, const char *msg,
    addChild_Widget(dlg->root->widget, iClob(dlg));
    arrange_Widget(dlg); /* BUG: This extra arrange shouldn't be needed but the dialog won't
                            be arranged correctly unless it's here. */
-    finalizeSheet_Widget(dlg);
+    finalizeSheet_Mobile(dlg);
    return dlg;
 }
@@ -2155,7 +1513,7 @@ static int cmp_MenuItem_(const void *e1, const void *e2) {
 #endif
 void updatePreferencesLayout_Widget(iWidget *prefs) {
-    if (!prefs || deviceType_App() == phone_AppDeviceType) {
+    if (!prefs || deviceType_App() != desktop_AppDeviceType) {
        return;
    }
    /* Doing manual layout here because the widget arranging logic isn't sophisticated enough. */
@@ -2248,14 +1606,16 @@ iWidget *makePreferences_Widget(void) {
        addChild_Widget(values, iClob(makeToggle_Widget("prefs.hoverlink")));
        addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.archive.openindex}")));
        addChild_Widget(values, iClob(makeToggle_Widget("prefs.archive.openindex")));
-        addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.pinsplit}")));
+        if (deviceType_App() != phone_AppDeviceType) {
-        iWidget *pinSplit = new_Widget();
+            addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.pinsplit}")));
-        /* Split mode document pinning. */ {
+            iWidget *pinSplit = new_Widget();
-            addRadioButton_(pinSplit, "prefs.pinsplit.0", "${prefs.pinsplit.none}", "pinsplit.set arg:0");
+            /* Split mode document pinning. */ {
-            addRadioButton_(pinSplit, "prefs.pinsplit.1", "${prefs.pinsplit.left}", "pinsplit.set arg:1");
+                addRadioButton_(pinSplit, "prefs.pinsplit.0", "${prefs.pinsplit.none}", "pinsplit.set arg:0");
-            addRadioButton_(pinSplit, "prefs.pinsplit.2", "${prefs.pinsplit.right}", "pinsplit.set arg:2");
+                addRadioButton_(pinSplit, "prefs.pinsplit.1", "${prefs.pinsplit.left}", "pinsplit.set arg:1");
-        }
+                addRadioButton_(pinSplit, "prefs.pinsplit.2", "${prefs.pinsplit.right}", "pinsplit.set arg:2");
-        addChildFlags_Widget(values, iClob(pinSplit), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
+            }
+            addChildFlags_Widget(values, iClob(pinSplit), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
+        }
        addChild_Widget(headings, iClob(makePadding_Widget(bigGap)));
        addChild_Widget(values, iClob(makePadding_Widget(bigGap)));
        /* UI languages. */ {
@@ -2268,6 +1628,7 @@ iWidget *makePreferences_Widget(void) {
                { "${lang.fr} - fr", 0, 0, "uilang id:fr" },
                { "${lang.ia} - ia", 0, 0, "uilang id:ia" },
                { "${lang.ie} - ie", 0, 0, "uilang id:ie" },
+                { "${lang.pl} - pl", 0, 0, "uilang id:pl" },
                { "${lang.ru} - ru", 0, 0, "uilang id:ru" },
                { "${lang.sr} - sr", 0, 0, "uilang id:sr" },
                { "${lang.tok} - tok", 0, 0, "uilang id:tok" },
@@ -2475,7 +1836,8 @@ iWidget *makePreferences_Widget(void) {
                    iClob(makeDialogButtons_Widget(
                        (iMenuItem[]){ { "${dismiss}", SDLK_ESCAPE, 0, "prefs.dismiss" } }, 1)));
    addChild_Widget(dlg->root->widget, iClob(dlg));
-    finalizeSheet_Widget(dlg);
+    finalizeSheet_Mobile(dlg);
+    setupSheetTransition_Mobile(dlg, iTrue);
 //    printTree_Widget(dlg);
    return dlg;
 }
@@ -2519,15 +1881,10 @@ iWidget *makeBookmarkEditor_Widget(void) {
                                                  "bmed.accept" } },
                                 2)));
    addChild_Widget(get_Root()->widget, iClob(dlg));
-    finalizeSheet_Widget(dlg);
+    finalizeSheet_Mobile(dlg);
    return dlg;
 }
-static void enableSidebars_(void) {
-    setFlags_Widget(findWidget_App("sidebar"), disabled_WidgetFlag, iFalse);
-    setFlags_Widget(findWidget_App("sidebar2"), disabled_WidgetFlag, iFalse);
-}
 static iBool handleBookmarkCreationCommands_SidebarWidget_(iWidget *editor, const char *cmd) {
    if (equal_Command(cmd, "bmed.accept") || equal_Command(cmd, "cancel")) {
        if (equal_Command(cmd, "bmed.accept")) {
@@ -2552,8 +1909,6 @@ static iBool handleBookmarkCreationCommands_SidebarWidget_(iWidget *editor, cons
            postCommand_App("bookmarks.changed");
        }
        destroy_Widget(editor);
-        /* Sidebars are disabled when a dialog is opened. */
-        enableSidebars_();
        return iTrue;
    }
    return iFalse;
@@ -2583,8 +1938,6 @@ iWidget *makeBookmarkCreation_Widget(const iString *url, const iString *title, i
 static iBool handleFeedSettingCommands_(iWidget *dlg, const char *cmd) {
    if (equal_Command(cmd, "cancel")) {
        destroy_Widget(dlg);
-        /* Sidebars are disabled when a dialog is opened. */
-        enableSidebars_();
        return iTrue;
    }
    if (equal_Command(cmd, "feedcfg.accept")) {
@@ -2619,8 +1972,6 @@ static iBool handleFeedSettingCommands_(iWidget *dlg, const char *cmd) {
        }
        postCommand_App("bookmarks.changed");
        destroy_Widget(dlg);
-        /* Sidebars are disabled when a dialog is opened. */
-        enableSidebars_();
        return iTrue;
    }
    return iFalse;
@@ -2659,7 +2010,7 @@ iWidget *makeFeedSettings_Widget(uint32_t bookmarkId) {
    arrange_Widget(dlg);
    as_Widget(input)->rect.size.x = 100 * gap_UI - headings->rect.size.x;
    addChild_Widget(get_Root()->widget, iClob(dlg));
-    finalizeSheet_Widget(dlg);
+    finalizeSheet_Mobile(dlg);
    /* Initialize. */ {
        const iBookmark *bm  = bookmarkId ? get_Bookmarks(bookmarks_App(), bookmarkId) : NULL;
        setText_InputWidget(findChild_Widget(dlg, "feedcfg.title"),
@@ -2735,7 +2086,7 @@ iWidget *makeIdentityCreation_Widget(void) {
                                         "ident.accept" } },
                        2)));
    addChild_Widget(get_Root()->widget, iClob(dlg));
-    finalizeSheet_Widget(dlg);
+    finalizeSheet_Mobile(dlg);
    return dlg;
 }
@@ -2786,6 +2137,7 @@ int languageIndex_CStr(const char *langId) {
 iWidget *makeTranslation_Widget(iWidget *parent) {
    iWidget *dlg = makeSheet_Widget("xlt");
    setFlags_Widget(dlg, keepOnTop_WidgetFlag, iFalse);
+    dlg->minSize.x = 70 * gap_UI;
    setCommandHandler_Widget(dlg, translationHandler_);
    addChildFlags_Widget(dlg,
                         iClob(new_LabelWidget(uiHeading_ColorEscape "${heading.translate}", NULL)),
@@ -2831,6 +2183,6 @@ iWidget *makeTranslation_Widget(iWidget *parent) {
            2)));
    addChild_Widget(parent, iClob(dlg));
    arrange_Widget(dlg);
-    finalizeSheet_Widget(dlg);
+    finalizeSheet_Mobile(dlg);
    return dlg;
 }
diff --git a/src/ui/util.h b/src/ui/util.h
index 50845280..43aeb172 100644
--- a/src/ui/util.h
+++ b/src/ui/util.h
@@ -22,6 +22,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #pragma once
+#include "mobile.h"
 #include <the_Foundation/string.h>
 #include <the_Foundation/rect.h>
 #include <the_Foundation/vec2.h>
@@ -255,9 +257,8 @@ size_t          tabCount_Widget         (const iWidget *tabs);
 /*-----------------------------------------------------------------------------------------------*/
-iWidget *   makeSheet_Widget        (const char *id);
+iWidget *   makeSheet_Widget            (const char *id);
-void        finalizeSheet_Widget    (iWidget *sheet);
+iWidget *   makeDialogButtons_Widget    (const iMenuItem *actions, size_t numActions);
-iWidget *   makeDialogButtons_Widget(const iMenuItem *actions, size_t numActions);
 iInputWidget *addTwoColumnDialogInputField_Widget(iWidget *headings, iWidget *values,
                                                  const char *labelText, const char *inputId,
diff --git a/src/ui/widget.c b/src/ui/widget.c
index c1c920d2..3439fb1b 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -23,6 +23,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "widget.h"
 #include "app.h"
+#include "periodic.h"
 #include "touch.h"
 #include "command.h"
 #include "paint.h"
@@ -39,6 +40,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #   include "../ios.h"
 #endif
+static void printInfo_Widget_(const iWidget *);
 void releaseChildren_Widget(iWidget *d) {
    iForEach(ObjectList, i, d->children) {
        ((iWidget *) i.object)->parent = NULL; /* the actual reference being held */
@@ -55,6 +58,7 @@ void init_Widget(iWidget *d) {
    d->rect           = zero_Rect();
    d->minSize        = zero_I2();
    d->sizeRef        = NULL;
+    d->offsetRef      = NULL;
    d->bgColor        = none_ColorId;
    d->frameColor     = none_ColorId;
    init_Anim(&d->visualOffset, 0.0f);
@@ -92,6 +96,7 @@ void deinit_Widget(iWidget *d) {
 }
 static void aboutToBeDestroyed_Widget_(iWidget *d) {
+    d->flags |= destroyPending_WidgetFlag;
    if (isFocused_Widget(d)) {
        setFocus_Widget(NULL);
        return;
@@ -99,6 +104,7 @@ static void aboutToBeDestroyed_Widget_(iWidget *d) {
    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;
    }
@@ -149,6 +155,11 @@ void setFlags_Widget(iWidget *d, int64_t flags, iBool set) {
                removeOne_PtrArray(onTop, d);
            }
        }
+        if (d->flags & arrangeWidth_WidgetFlag &&
+            d->flags & resizeToParentWidth_WidgetFlag) {
+            printf("[Widget] Conflicting flags for ");
+            identify_Widget(d);
+        }
    }
 }
@@ -208,7 +219,7 @@ void setVisualOffset_Widget(iWidget *d, int value, uint32_t span, int animFlags)
    else {
        setValue_Anim(&d->visualOffset, value, span);
        d->visualOffset.flags = animFlags;
-        addTicker_App(visualOffsetAnimation_Widget_, d);
+        addTickerRoot_App(visualOffsetAnimation_Widget_, d->root, d);
    }
 }
@@ -364,10 +375,13 @@ iRect innerBounds_Widget(const iWidget *d) {
    return ib;
 }
-//iLocalDef iBool isArranged_Widget_(const iWidget *d) {
+iRect innerBoundsWithoutVisualOffset_Widget(const iWidget *d) {
-//    return !isCollapsed_Widget_(d) && ~d->flags & fixedPosition_WidgetFlag;
+    iRect ib = adjusted_Rect(boundsWithoutVisualOffset_Widget(d),
-//}
+                             init_I2(d->padding[0], d->padding[1]),
+                             init_I2(-d->padding[2], -d->padding[3]));
+    ib.size = max_I2(zero_I2(), ib.size);
+    return ib;
+}
 static size_t numArrangedChildren_Widget_(const iWidget *d) {
    size_t count = 0;
@@ -469,12 +483,19 @@ static void arrange_Widget_(iWidget *d) {
    const int expCount = numExpandingChildren_Widget_(d);
    TRACE(d, "%d expanding children", expCount);
    /* Resize children to fill the parent widget. */
+    iAssert((d->flags & (resizeToParentWidth_WidgetFlag | arrangeWidth_WidgetFlag)) !=
+            (resizeToParentWidth_WidgetFlag | arrangeWidth_WidgetFlag));
    if (d->flags & resizeChildren_WidgetFlag) {
        const iInt2 dirs = init_I2((d->flags & resizeWidthOfChildren_WidgetFlag) != 0,
                                   (d->flags & resizeHeightOfChildren_WidgetFlag) != 0);
 #if !defined (NDEBUG)
        /* Check for conflicting flags. */
-        if (dirs.x) iAssert(~d->flags & arrangeWidth_WidgetFlag);
+        if (dirs.x) {
+            if (d->flags & arrangeWidth_WidgetFlag) {
+                identify_Widget(d);
+            }
+            iAssert(~d->flags & arrangeWidth_WidgetFlag);
+        }
        if (dirs.y) iAssert(~d->flags & arrangeHeight_WidgetFlag);
 #endif
        TRACE(d, "resize children, x:%d y:%d (own size: %dx%d)", dirs.x, dirs.y,
@@ -697,26 +718,32 @@ static void arrange_Widget_(iWidget *d) {
    TRACE(d, "END");
 }
-#if 0
+static void resetArrangement_Widget_(iWidget *d) {
-void resetSize_Widget(iWidget *d) {
-    if (~d->flags & fixedWidth_WidgetFlag) {
-        d->rect.size.x = d->minSize.x;
-    }
-    if (~d->flags & fixedHeight_WidgetFlag) {
-        d->rect.size.y = d->minSize.y;
-    }
    iForEach(ObjectList, i, children_Widget(d)) {
        iWidget *child = as_Widget(i.object);
-        if (isArrangedSize_Widget_(child)) {
+        resetArrangement_Widget_(child);
-            resetSize_Widget(child);
+        if (isArrangedPos_Widget_(child)) {
+            if (d->flags & arrangeHorizontal_WidgetFlag) {
+                child->rect.pos.x = 0;
+            }
+            if (d->flags & resizeWidthOfChildren_WidgetFlag && child->flags & expand_WidgetFlag) {
+                child->rect.size.x = 0;
+            }
+            if (d->flags & arrangeVertical_WidgetFlag) {
+                child->rect.pos.y = 0;
+            }
+            if (d->flags & resizeHeightOfChildren_WidgetFlag && child->flags & expand_WidgetFlag) {
+                child->rect.size.y = 0;
+            }
        }
    }
 }
-#endif
 void arrange_Widget(iWidget *d) {
-    //resetSize_Widget_(d); /* back to initial default sizes */
+    if (d) {
-    arrange_Widget_(d);
+        resetArrangement_Widget_(d); /* back to initial default sizes */
+        arrange_Widget_(d);
+    }
 }
 static void applyVisualOffset_Widget_(const iWidget *d, iInt2 *pos) {
@@ -729,6 +756,16 @@ static void applyVisualOffset_Widget_(const iWidget *d, iInt2 *pos) {
            pos->y += off;
        }
    }
+    if (d->flags & refChildrenOffset_WidgetFlag) {
+        iConstForEach(ObjectList, i, children_Widget(d->offsetRef)) {
+            const iWidget *child = i.object;
+            if (child == d) continue;
+            if (child->flags & (visualOffset_WidgetFlag | dragged_WidgetFlag)) {
+                const int invOff = size_Root(d->root).x - iRound(value_Anim(&child->visualOffset));
+                pos->x -= invOff / 4;
+            }
+        }
+    }
 }
 iRect bounds_Widget(const iWidget *d) {
@@ -919,18 +956,23 @@ iBool dispatchEvent_Widget(iWidget *d, const SDL_Event *ev) {
            }
        }
        if (class_Widget(d)->processEvent(d, ev)) {
+            iAssert(get_Root() == d->root);
            return iTrue;
        }
    }
+    iAssert(get_Root() == d->root);
    return iFalse;
 }
-static iBool scrollOverflow_Widget_(iWidget *d, int delta) {
+iBool scrollOverflow_Widget(iWidget *d, int delta) {
-    iRect bounds = bounds_Widget(d);
+    iRect       bounds   = boundsWithoutVisualOffset_Widget(d);
    const iInt2 rootSize = size_Root(d->root);
-    const iRect winRect = safeRect_Root(d->root);
+    const iRect winRect  = safeRect_Root(d->root);
-    const int yTop = top_Rect(winRect);
+    const int   yTop     = top_Rect(winRect);
-    const int yBottom = bottom_Rect(winRect);
+    const int   yBottom  = bottom_Rect(winRect);
+    if (top_Rect(bounds) >= yTop && bottom_Rect(bounds) < yBottom) {
+        return iFalse; /* fits inside just fine */
+    }
    //const int safeBottom = rootSize.y - yBottom;
    bounds.pos.y += delta;
    const iRangei range = { bottom_Rect(winRect) - height_Rect(bounds), yTop };
@@ -978,7 +1020,7 @@ iBool processEvent_Widget(iWidget *d, const SDL_Event *ev) {
        if (!isPerPixel_MouseWheelEvent(&ev->wheel)) {
            step *= lineHeight_Text(uiLabel_FontId);
        }
-        if (scrollOverflow_Widget_(d, step)) {
+        if (scrollOverflow_Widget(d, step)) {
            return iTrue;
        }
    }
@@ -987,10 +1029,11 @@ iBool processEvent_Widget(iWidget *d, const SDL_Event *ev) {
            if (d->flags & overflowScrollable_WidgetFlag &&
                ~d->flags & visualOffset_WidgetFlag &&
                isCommand_UserEvent(ev, "widget.overflow")) {
-                scrollOverflow_Widget_(d, 0); /* check bounds */
+                scrollOverflow_Widget(d, 0); /* check bounds */
            }
            if (ev->user.code == command_UserEventCode && d->commandHandler &&
                d->commandHandler(d, ev->user.data1)) {
+                iAssert(get_Root() == d->root);
                return iTrue;
            }
            break;
@@ -1043,11 +1086,18 @@ void drawBackground_Widget(const iWidget *d) {
        init_Paint(&p);
        drawSoftShadow_Paint(&p, bounds_Widget(d), 12 * gap_UI, black_ColorId, 30);
    }
-    
+    const iBool isFaded = fadeBackground &&
-    if (fadeBackground && ~d->flags & noFadeBackground_WidgetFlag) {
+                          ~d->flags & noFadeBackground_WidgetFlag &&
+                          ~d->flags & destroyPending_WidgetFlag;
+    if (isFaded) {
        iPaint p;
        init_Paint(&p);
        p.alpha = 0x50;
+        if (flags_Widget(d) & (visualOffset_WidgetFlag | dragged_WidgetFlag)) {
+            const float area = d->rect.size.x * d->rect.size.y;
+            const float visibleArea = area_Rect(intersect_Rect(bounds_Widget(d), rect_Root(d->root)));
+            p.alpha *= (area > 0 ? visibleArea / area : 0.0f);
+        }
        SDL_SetRenderDrawBlendMode(renderer_Window(get_Window()), SDL_BLENDMODE_BLEND);
        int fadeColor;
        switch (colorTheme_App()) {
@@ -1061,9 +1111,7 @@ void drawBackground_Widget(const iWidget *d) {
                fadeColor = gray50_ColorId;
                break;
        }
-        fillRect_Paint(&p,
+        fillRect_Paint(&p, rect_Root(d->root), fadeColor);
-                       rect_Root(d->root),
-                       fadeColor);
        SDL_SetRenderDrawBlendMode(renderer_Window(get_Window()), SDL_BLENDMODE_NONE);
    }
    if (d->bgColor >= 0 || d->frameColor >= 0) {
@@ -1319,6 +1367,22 @@ iAny *findParentClass_Widget(const iWidget *d, const iAnyClass *class) {
    return i;
 }
+iAny *findOverflowScrollable_Widget(iWidget *d) {
+    const iRect rootRect = rect_Root(d->root);
+    for (iWidget *w = d; w; w = parent_Widget(w)) {
+        if (flags_Widget(w) & overflowScrollable_WidgetFlag) {
+            const iRect bounds = boundsWithoutVisualOffset_Widget(w);
+            if ((bottom_Rect(bounds) > bottom_Rect(rootRect) ||
+                 top_Rect(bounds) < top_Rect(rootRect)) &&
+                !hasVisibleChildOnTop_Widget(w)) {
+                return w;
+            }
+            return NULL;
+        }
+    }
+    return NULL;
+}
 size_t childCount_Widget(const iWidget *d) {
    if (!d->children) return 0;
    return size_ObjectList(d->children);
@@ -1567,7 +1631,8 @@ static void printInfo_Widget_(const iWidget *d) {
               cstr_String(text_LabelWidget((const iLabelWidget *) d)),
               cstr_String(command_LabelWidget((const iLabelWidget *) d)));
    }
-    printf("size:%dx%d {min:%dx%d} [%d..%d %d:%d] flags:%08llx%s%s%s%s%s\n",
+    printf("pos:%d,%d size:%dx%d {min:%dx%d} [%d..%d %d:%d] flags:%08llx%s%s%s%s%s%s%s\n",
+           d->rect.pos.x, d->rect.pos.y,
           d->rect.size.x, d->rect.size.y,
           d->minSize.x, d->minSize.y,
           d->padding[0], d->padding[2],
@@ -1577,7 +1642,9 @@ static void printInfo_Widget_(const iWidget *d) {
           d->flags & tight_WidgetFlag ? " tight" : "",
           d->flags & fixedWidth_WidgetFlag ? " fixW" : "",
           d->flags & fixedHeight_WidgetFlag ? " fixH" : "",
-           d->flags & resizeToParentWidth_WidgetFlag ? " rsPrnW" : "");
+           d->flags & resizeToParentWidth_WidgetFlag ? " prnW" : "",
+           d->flags & arrangeWidth_WidgetFlag ? " aW" : "",
+           d->flags & resizeWidthOfChildren_WidgetFlag ? " rsWChild" : "");
 }
 static void printTree_Widget_(const iWidget *d, int indent) {
diff --git a/src/ui/widget.h b/src/ui/widget.h
index 5c05e917..79d45f23 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -117,6 +117,9 @@ enum iWidgetFlag {
 #define parentCannotResizeHeight_WidgetFlag iBit64(58)
 #define ignoreForParentWidth_WidgetFlag     iBit64(59)
 #define noFadeBackground_WidgetFlag         iBit64(60)
+#define destroyPending_WidgetFlag           iBit64(61) /* TODO: needed? */
+#define edgeDraggable_WidgetFlag            iBit64(62)
+#define refChildrenOffset_WidgetFlag        iBit64(63) /* visual offset determined by the offset of referenced children */
 enum iWidgetAddPos {
    back_WidgetAddPos,
@@ -135,13 +138,14 @@ struct Impl_Widget {
    iRect        rect;
    iInt2        minSize;
    iWidget *    sizeRef;
+    iWidget *    offsetRef;
    int          padding[4]; /* left, top, right, bottom */
    iAnim        visualOffset;
    int          bgColor;
    int          frameColor;
    iObjectList *children;
    iWidget *    parent;
-    iBool (*commandHandler)(iWidget *, const char *);
+    iBool      (*commandHandler)(iWidget *, const char *);
    iRoot *      root;
 };
@@ -193,6 +197,7 @@ iAny *  findChild_Widget                (const iWidget *, const char *id);
 const iPtrArray *findChildren_Widget    (const iWidget *, const char *id);
 iAny *  findParentClass_Widget          (const iWidget *, const iAnyClass *class);
 iAny *  findFocusable_Widget            (const iWidget *startFrom, enum iWidgetFocusDir focusDir);
+iAny *  findOverflowScrollable_Widget   (iWidget *);
 size_t  childCount_Widget               (const iWidget *);
 void    draw_Widget                     (const iWidget *);
 void    drawBackground_Widget           (const iWidget *);
@@ -262,6 +267,7 @@ iAny *  child_Widget                (iWidget *, size_t index); /* O(n) */
 size_t  childIndex_Widget           (const iWidget *, const iAnyObject *child); /* O(n) */
 void    arrange_Widget              (iWidget *);
 void    resetSize_Widget            (iWidget *);
+iBool   scrollOverflow_Widget       (iWidget *, int delta); /* moves the widget */
 iBool   dispatchEvent_Widget        (iWidget *, const SDL_Event *);
 iBool   processEvent_Widget         (iWidget *, const SDL_Event *);
 void    postCommand_Widget          (const iAnyObject *, const char *cmd, ...);
diff --git a/src/ui/window.c b/src/ui/window.c
index 99430a05..abdc363d 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -171,19 +171,6 @@ int numRoots_Window(const iWindow *d) {
    return num;
 }
-static void setupUserInterface_Window(iWindow *d) {
-#if defined (iPlatformAppleDesktop)
-    insertMacMenus_();
-#endif
-    /* One root is created by default. */
-    d->roots[0] = new_Root();
-    setCurrent_Root(d->roots[0]);
-    createUserInterface_Root(d->roots[0]);
-    setCurrent_Root(NULL);
-    /* One of the roots always has keyboard input focus. */
-    d->keyRoot = d->roots[0];
-}
 static void windowSizeChanged_Window_(iWindow *d) {
    const int numRoots = numRoots_Window(d);
    const iInt2 rootSize = d->size;
@@ -214,6 +201,19 @@ static void windowSizeChanged_Window_(iWindow *d) {
    }
 }
+static void setupUserInterface_Window(iWindow *d) {
+#if defined (iPlatformAppleDesktop)
+    insertMacMenus_();
+#endif
+    /* One root is created by default. */
+    d->roots[0] = new_Root();
+    setCurrent_Root(d->roots[0]);
+    createUserInterface_Root(d->roots[0]);
+    setCurrent_Root(NULL);
+    /* One of the roots always has keyboard input focus. */
+    d->keyRoot = d->roots[0];
+}
 static void updateSize_Window_(iWindow *d, iBool notifyAlways) {
    iInt2 *size = &d->size;
    const iInt2 oldSize = *size;
@@ -515,15 +515,15 @@ void init_Window(iWindow *d, iRect rect) {
 void deinit_Window(iWindow *d) {
    iRecycle();
-    if (theWindow_ == d) {
-        theWindow_ = NULL;
-    }
    iForIndices(i, d->roots) {
        if (d->roots[i]) {
            setCurrent_Root(d->roots[i]);
            deinit_Root(d->roots[i]);
        }
    }
+    if (theWindow_ == d) {
+        theWindow_ = NULL;
+    }
    setCurrent_Root(NULL);
    delete_String(d->pendingSplitUrl);
    deinit_Text();
@@ -761,7 +761,7 @@ static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
 #if defined (iPlatformMobile)
        case SDL_WINDOWEVENT_RESIZED:
            /* On mobile, this occurs when the display is rotated. */
-            invalidate_Window_(d);
+            invalidate_Window(d);
            postRefresh_App();
            return iTrue;
 #endif
@@ -772,7 +772,7 @@ static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
            d->isExposed = iTrue;
 #if defined (iPlatformMobile)
            /* Returned to foreground, may have lost buffered content. */
-            invalidate_Window_(d);
+            invalidate_Window(d);
            postCommand_App("window.unfreeze");
 #endif
            return iFalse;
@@ -995,7 +995,7 @@ void draw_Window(iWindow *d) {
    /* Check if root needs resizing. */ {
        iInt2 renderSize;
        SDL_GetRendererOutputSize(d->render, &renderSize.x, &renderSize.y);
-        if (!isEqual_I2(renderSize, d->root->rect.size)) {
+        if (!isEqual_I2(renderSize, d->size)) {
            updateSize_Window_(d, iTrue);
            processEvents_App(postedEventsOnly_AppEventMode);
        }
@@ -1007,8 +1007,13 @@ void draw_Window(iWindow *d) {
    init_Paint(&p);
    /* Clear the window. The clear color is visible as a border around the window
       when the custom frame is being used. */ {
+        setCurrent_Root(d->roots[0]);
 #if defined (iPlatformAppleMobile)
-        const iColor back = get_Color(tmBackground_ColorId);
+       iColor back = get_Color(uiBackground_ColorId);
+       if (deviceType_App() == phone_AppDeviceType) {
+           /* Page background extends to safe area, so fill it completely. */
+           back = get_Color(tmBackground_ColorId);
+       }
 #else
        const iColor back = get_Color(gotFocus && d->place.snap != maximized_WindowSnap &&
                                              ~winFlags & SDL_WINDOW_FULLSCREEN_DESKTOP
author	Jaakko Keränen <jaakko.keranen@iki.fi>	2021-05-18 07:04:27 +0300
committer	Jaakko Keränen <jaakko.keranen@iki.fi>	2021-05-18 07:04:27 +0300
commit	facc3abb7faafb323cb87e26ddba8dac01af02e9 (patch)
tree	387aa23e03b029f516ecca6880131fd6523e1c3f
parent	ced855c338b78e05c66d38618373728ef946ebaa (diff)
parent	5d517c2f790a38d7fe3c3cc59a1b39fd49e20280 (diff)