32 files changed, 341 insertions, 363 deletions

diff --git a/po/en.po b/po/en.po
index 526a723d..51bd66b2 100644
--- a/po/en.po
+++ b/po/en.po
@@ -448,6 +448,16 @@ msgid_plural "num.bytes.n"
 msgstr[0] "%zu byte"
 msgstr[1] "%zu bytes"
 
+msgid "num.files"
+msgid_plural "num.files.n"
+msgstr[0] "%zu file"
+msgstr[1] "%zu files"
+
+msgid "num.fonts"
+msgid_plural "num.fonts.n"
+msgstr[0] "%zu font"
+msgstr[1] "%zu fonts"
+
 # strftime() formatted, split on two lines
 #, c-format
 msgid "page.timestamp"
@@ -1869,4 +1879,61 @@ msgid "gempub.meta.lang"
 msgstr "Language"
 
 msgid "gempub.meta.license"
-msgstr "License"
\ No newline at end of file
+msgstr "License"
+
+msgid "heading.fontpack.meta"
+msgstr "Fonts"
+
+msgid "heading.fontpack.meta.enabled"
+msgstr "Enabled fontpacks"
+
+msgid "heading.fontpack.meta.disabled"
+msgstr "Disabled fontpacks"
+
+# Action label
+msgid "fontpack.meta.viewfile"
+msgstr "View file"
+
+#, c-format
+msgid "fontpack.meta.version"
+msgstr "Version %d"
+
+msgid "fontpack.meta.installed"
+msgstr "Installed"
+
+msgid "fontpack.meta.notinstalled"
+msgstr "Not installed"
+
+msgid "fontpack.meta.disabled"
+msgstr ", disabled"
+
+#, c-format
+msgid "fontpack.enable"
+msgstr "Enable \"%s\""
+
+#, c-format
+msgid "fontpack.disable"
+msgstr "Disable \"%s\""
+
+#, c-format
+msgid "fontpack.install"
+msgstr "Install \"%s\""
+
+#, c-format
+msgid "fontpack.upgrade"
+msgstr "Upgrade \"%s\" to version %d"
+
+#, c-format
+msgid "fontpack.delete"
+msgstr "Permanently delete \"%s\""
+
+msgid "heading.fontpack.delete"
+msgstr "DELETE FONTPACK"
+
+#, c-format
+msgid "dlg.fontpack.delete.confirm"
+msgstr "Do you really want to permanently delete\nthe fontpack \"%s\"?"
+
+msgid "dlg.fontpack.delete"
+msgstr "Delete Fontpack"
+
diff --git a/res/lang/de.bin b/res/lang/de.bin
index 17a2d191..332da0e3 100644
--- a/res/lang/de.bin
+++ b/res/lang/de.bin
diff --git a/res/lang/en.bin b/res/lang/en.bin
index 51b9a10d..429b639f 100644
--- a/res/lang/en.bin
+++ b/res/lang/en.bin
diff --git a/res/lang/eo.bin b/res/lang/eo.bin
index 7b83b77f..2c4b98fc 100644
--- a/res/lang/eo.bin
+++ b/res/lang/eo.bin
diff --git a/res/lang/es.bin b/res/lang/es.bin
index 91121500..bc3e23fc 100644
--- a/res/lang/es.bin
+++ b/res/lang/es.bin
diff --git a/res/lang/es_MX.bin b/res/lang/es_MX.bin
index df129a8a..d158cc92 100644
--- a/res/lang/es_MX.bin
+++ b/res/lang/es_MX.bin
diff --git a/res/lang/fi.bin b/res/lang/fi.bin
index fad0413b..4c21d7f9 100644
--- a/res/lang/fi.bin
+++ b/res/lang/fi.bin
diff --git a/res/lang/fr.bin b/res/lang/fr.bin
index 20fd19ef..42b96be1 100644
--- a/res/lang/fr.bin
+++ b/res/lang/fr.bin
diff --git a/res/lang/gl.bin b/res/lang/gl.bin
index 1cac09b9..8c0010b6 100644
--- a/res/lang/gl.bin
+++ b/res/lang/gl.bin
diff --git a/res/lang/ia.bin b/res/lang/ia.bin
index 64ebfe03..2ee2884f 100644
--- a/res/lang/ia.bin
+++ b/res/lang/ia.bin
diff --git a/res/lang/ie.bin b/res/lang/ie.bin
index 87064cef..3524454f 100644
--- a/res/lang/ie.bin
+++ b/res/lang/ie.bin
diff --git a/res/lang/isv.bin b/res/lang/isv.bin
index 726441ce..cbe694c0 100644
--- a/res/lang/isv.bin
+++ b/res/lang/isv.bin
diff --git a/res/lang/pl.bin b/res/lang/pl.bin
index a857c547..207f588d 100644
--- a/res/lang/pl.bin
+++ b/res/lang/pl.bin
diff --git a/res/lang/ru.bin b/res/lang/ru.bin
index c1884651..5f8a3aa5 100644
--- a/res/lang/ru.bin
+++ b/res/lang/ru.bin
diff --git a/res/lang/sk.bin b/res/lang/sk.bin
index 981ab7e1..766a7d1c 100644
--- a/res/lang/sk.bin
+++ b/res/lang/sk.bin
diff --git a/res/lang/sr.bin b/res/lang/sr.bin
index 384665cc..d9b85067 100644
--- a/res/lang/sr.bin
+++ b/res/lang/sr.bin
diff --git a/res/lang/tok.bin b/res/lang/tok.bin
index 51080283..9b80ccba 100644
--- a/res/lang/tok.bin
+++ b/res/lang/tok.bin
diff --git a/res/lang/zh_Hans.bin b/res/lang/zh_Hans.bin
index 0cf56935..07f65240 100644
--- a/res/lang/zh_Hans.bin
+++ b/res/lang/zh_Hans.bin
diff --git a/res/lang/zh_Hant.bin b/res/lang/zh_Hant.bin
index 28e7cedf..d0846df8 100644
--- a/res/lang/zh_Hant.bin
+++ b/res/lang/zh_Hant.bin
diff --git a/src/app.c b/src/app.c
index 70b611c2..c7e803d4 100644
--- a/src/app.c
+++ b/src/app.c
@@ -2566,12 +2566,23 @@ iBool handleCommand_App(const char *cmd) {
         const iBool fromSidebar = argLabel_Command(cmd, "fromsidebar") != 0;
         iUrl parts;
         init_Url(&parts, url);
+        if (equal_Rangecc(parts.scheme, "about") && equal_Rangecc(parts.path, "command") &&
+            !isEmpty_Range(&parts.query)) {
+            /* NOTE: Careful here! `about:command` allows issuing UI events via links on the page.
+               There is a special set of pages where these are allowed (e.g., "about:fonts").
+               On every other page, `about:command` links will not be clickable. */
+            iString *query = collectNewRange_String((iRangecc){
+                parts.query.start + 1, parts.query.end
+            });
+            replace_String(query, "%20", " ");
+            postCommandString_Root(NULL, query);
+            return iTrue;
+        }
         if (equalCase_Rangecc(parts.scheme, "titan")) {
             iUploadWidget *upload = new_UploadWidget();
             setUrl_UploadWidget(upload, url);
             setResponseViewer_UploadWidget(upload, document_App());
             addChild_Widget(get_Root()->widget, iClob(upload));
-//            finalizeSheet_Mobile(as_Widget(upload));
             setupSheetTransition_Mobile(as_Widget(upload), iTrue);
             postRefresh_App();
             return iTrue;
@@ -3043,8 +3054,8 @@ iBool handleCommand_App(const char *cmd) {
         }
         return iFalse;
     }
-    else if (equal_Command(cmd, "media.fontpack.enable")) {
-        const iString *packId = collect_String(suffix_Command(cmd, "packid"));
+    else if (equal_Command(cmd, "fontpack.enable")) {
+        const iString *packId = collect_String(suffix_Command(cmd, "id"));
         if (arg_Command(cmd)) {
             remove_StringSet(d->prefs.disabledFontPacks, packId);
         }
@@ -3052,10 +3063,35 @@ iBool handleCommand_App(const char *cmd) {
             insert_StringSet(d->prefs.disabledFontPacks, packId);
         }
         resetFonts_App();
-        const iMedia *media = pointerLabel_Command(cmd, "media");
-        if (media) {
-            postCommandf_App("media.fontpack.updated id:%u media:%p",
-                             argU32Label_Command(cmd, "mediaid"), media);
+        postCommand_App("navigate.reload");
+        return iTrue;
+    }
+    else if (equal_Command(cmd, "fontpack.delete")) {
+        const iString *packId = collect_String(suffix_Command(cmd, "id"));
+        if (isEmpty_String(packId)) {
+            return iTrue;
+        }
+        const iFontPack *pack = pack_Fonts(cstr_String(packId));
+        if (pack && loadPath_FontPack(pack)) {
+            if (argLabel_Command(cmd, "confirmed")) {
+                remove_StringSet(d->prefs.disabledFontPacks, packId);
+                remove(cstr_String(loadPath_FontPack(pack)));
+                reload_Fonts();
+                postCommand_App("navigate.reload");
+            }
+            else {
+                makeQuestion_Widget(
+                    uiTextCaution_ColorEscape "${heading.fontpack.delete}",
+                    format_Lang("${dlg.fontpack.delete.confirm}",
+                                cstr_String(packId)),
+                    (iMenuItem[]){ { "${cancel}" },
+                                   { uiTextCaution_ColorEscape " ${dlg.fontpack.delete}",
+                                     0,
+                                     0,
+                                     format_CStr("!fontpack.delete confirmed:1 id:%s",
+                                                 cstr_String(packId)) } },
+                    2);
+            }
         }
         return iTrue;
     }
diff --git a/src/defs.h b/src/defs.h
index 40e134c9..9a466674 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -126,8 +126,8 @@ iLocalDef int acceptKeyMod_ReturnKeyBehavior(int behavior) {
 #define delete_Icon         "\u232b"
 #define copy_Icon           "\u2398" //"\u2bba"
 #define check_Icon          "\u2714"
-#define ballotChecked_Icon  "\U0001f5f9"
-#define ballotUnchecked_Icon "\U0001f5f9"
+#define ballotChecked_Icon  "\u2611"
+#define ballotUnchecked_Icon "\u2610"
 #define inbox_Icon          "\U0001f4e5"
 #define book_Icon           "\U0001f56e"
 #define bookmark_Icon       "\U0001f516"
@@ -162,6 +162,7 @@ iLocalDef int acceptKeyMod_ReturnKeyBehavior(int behavior) {
 #define select_Icon         "\u2b1a"
 #define downAngle_Icon      "\ufe40"
 #define photo_Icon          "\U0001f5bc"
+#define fontpack_Icon       "\U0001f520"
 
 #if defined (iPlatformApple)
 #   define shift_Icon       "\u21e7"
diff --git a/src/fontpack.c b/src/fontpack.c
index 9603bded..9b165051 100644
--- a/src/fontpack.c
+++ b/src/fontpack.c
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include <the_Foundation/path.h>
 #include <the_Foundation/ptrarray.h>
 #include <the_Foundation/string.h>
+#include <the_Foundation/stringlist.h>
 #include <the_Foundation/toml.h>
 
 const char *mimeType_FontPack = "application/lagrange-fontpack+zip";
@@ -236,6 +237,10 @@ iFontPackId id_FontPack(const iFontPack *d) {
     return (iFontPackId){ &d->id, d->version };
 }
 
+const iString *loadPath_FontPack(const iFontPack *d) {
+    return d->loadPath;
+}
+
 const iPtrArray *listSpecs_FontPack(const iFontPack *d) {
     if (!d) return NULL;
     iPtrArray *list = collectNew_PtrArray();
@@ -441,6 +446,20 @@ void setLoadPath_FontPack(iFontPack *d, const iString *path) {
     setRange_String(&d->id, withoutExtension_Path(&d->id));
 }
 
+const iString *idFromUrl_FontPack(const iString *url) {
+    iString *id = new_String();
+    iUrl parts;
+    init_Url(&parts, url);
+    setRange_String(id, baseName_Path(collectNewRange_String(parts.path)));
+    setRange_String(id, withoutExtension_Path(id));
+    return collect_String(id);
+}
+
+void setUrl_FontPack(iFontPack *d, const iString *url) {
+    /* TODO: Should we remember the URL as well? */
+    set_String(&d->id, idFromUrl_FontPack(url));
+}
+
 void setStandalone_FontPack(iFontPack *d, iBool standalone) {
     d->isStandalone = standalone;
 }
@@ -486,7 +505,7 @@ static void sortSpecs_Fonts_(iFonts *d) {
     clear_PtrArray(&d->specOrder);
     iConstForEach(PtrArray, p, &d->packs) {
         const iFontPack *pack = p.ptr;
-        if (!contains_StringSet(prefs_App()->disabledFontPacks, &pack->id)) {
+        if (!isDisabled_FontPack(pack)) {
             iConstForEach(Array, i, &pack->fonts) {
                 pushBack_PtrArray(&d->specOrder, i.value);
             }
@@ -620,24 +639,131 @@ const iPtrArray *listSpecsByPriority_Fonts(void) {
     return &fonts_.specOrder;
 }
 
+iString *infoText_FontPack(const iFontPack *d) {
+    const iFontPack *installed        = pack_Fonts(cstr_String(&d->id));
+    const iBool      isInstalled      = (installed != NULL);
+    const int        installedVersion = installed ? installed->version : 0;
+    const iBool      isDisabled       = isDisabled_FontPack(d);
+    iString         *str              = new_String();
+    size_t           sizeInBytes      = 0;
+    iPtrSet         *uniqueFiles      = new_PtrSet();
+    iStringList     *names            = new_StringList();
+    iConstForEach(PtrArray, i, listSpecs_FontPack(d)) {
+        const iFontSpec *spec = i.ptr;
+        pushBack_StringList(names, &spec->name);
+        iForIndices(j, spec->styles) {
+            insert_PtrSet(uniqueFiles, spec->styles[j]);
+        }
+    }
+    iConstForEach(PtrSet, j, uniqueFiles) {
+        sizeInBytes += size_Block(&((const iFontFile *) *j.value)->sourceData);
+    }
+    appendFormat_String(str, "%.1f ${mb} (%s)\n%s: %s\n",
+                        sizeInBytes / 1.0e6,
+                        formatCStrs_Lang("num.files.n", size_PtrSet(uniqueFiles)),
+                        formatCStrs_Lang("num.fonts.n", size_StringList(names)),
+                        cstrCollect_String(joinCStr_StringList(names, ", ")),
+                        d->version);
+    if (isInstalled && installedVersion != d->version) {
+        appendCStr_String(str, format_Lang("${fontpack.meta.version}\n", d->version));
+    }
+    if (!isEmpty_String(&d->id)) {
+        appendFormat_String(str, "%s %s%s\n",
+                            isInstalled ? ballotChecked_Icon : ballotUnchecked_Icon,
+                            isInstalled ? (installedVersion == d->version ? "${fontpack.meta.installed}"
+                                           : format_CStr("${fontpack.meta.installed} (%s)",
+                                                         format_Lang("${fontpack.meta.version}",
+                                                                     installedVersion)))
+                                           : "${fontpack.meta.notinstalled}",
+                            isDisabled ? "${fontpack.meta.disabled}" : "");
+    }
+    iRelease(names);
+    delete_PtrSet(uniqueFiles);
+    return str;
+}
+
+const iArray *actions_FontPack(const iFontPack *d) {
+    iArray           *items     = new_Array(sizeof(iMenuItem));
+    const iFontPackId fp        = id_FontPack(d);
+    const char       *fpId      = cstr_String(fp.id);
+    const iFontPack  *installed = pack_Fonts(fpId);
+    const iBool       isEnabled = !isDisabled_FontPack(d);
+    if (isInstalled_Fonts(fpId)) {
+        if (d->version > installed->version) {
+            pushBack_Array(items, &(iMenuItem){
+                format_Lang(add_Icon " ${fontpack.upgrade}", fpId, d->version),
+                SDLK_RETURN, 0, "fontpack.install"
+            });
+        }
+        pushBack_Array(items, &(iMenuItem){
+            format_Lang(isEnabled ? close_Icon " ${fontpack.disable}"
+                      : leftArrowhead_Icon " ${fontpack.enable}", fpId), 0, 0,
+            format_CStr("fontpack.enable arg:%d id:%s", !isEnabled, fpId) });
+        if (!d->isReadOnly && installed->loadPath && d->loadPath &&
+            !cmpString_String(installed->loadPath, d->loadPath)) {
+            pushBack_Array(items, &(iMenuItem){
+                format_Lang(delete_Icon " ${fontpack.delete}", fpId), 0, 0,
+                format_CStr("fontpack.delete id:%s", fpId) });
+        }
+    }
+    else if (d->isStandalone) {
+        pushBack_Array(items, &(iMenuItem){
+            format_Lang(add_Icon " ${fontpack.install}", fpId),
+            SDLK_RETURN, 0, "fontpack.install"
+        });
+    }
+    return collect_Array(items);
+}
+
+iBool isDisabled_FontPack(const iFontPack *d) {
+    return contains_StringSet(prefs_App()->disabledFontPacks, &d->id);
+}
+
 const iString *infoPage_Fonts(void) {
     iFonts *d = &fonts_;
-    iString *str = collectNewCStr_String("# Fonts\n");
+    iString *str = collectNewCStr_String("# ${heading.fontpack.meta}\n"
+         "=> gemini://skyjake.fi/fonts  Download more fonts\n"
+         "=> about:command?!open%20newtab:1%20gotoheading:1%20url:about:help  Using fonts in Lagrange\n"
+         "=> about:command?!open%20newtab:1%20gotoheading:1%20url:about:help  How to create a fontpack\n");
     iPtrArray *specsByPack = collectNew_PtrArray();
     setCopy_PtrArray(specsByPack, &d->specOrder);
     sort_Array(specsByPack, cmpSourceAndPriority_FontSpecPtr_);
     iString *currentSourcePath = collectNew_String();
-    iConstForEach(PtrArray, i, specsByPack) {
-        const iFontSpec *spec = i.ptr;
-        if (isEmpty_String(&spec->sourcePath)) {
-            continue; /* built-in font */
-        }
-        if (!equal_String(&spec->sourcePath, currentSourcePath)) {
-            appendFormat_String(str, "=> %s %s%s\n",
-                                cstrCollect_String(makeFileUrl_String(&spec->sourcePath)),
-                                endsWithCase_String(&spec->sourcePath, ".fontpack") ? "\U0001f520 " : "",
-                                cstr_Rangecc(baseName_Path(&spec->sourcePath)));
-            set_String(currentSourcePath, &spec->sourcePath);
+    for (int group = 0; group < 2; group++) {
+        iBool isFirst = iTrue;
+        iConstForEach(PtrArray, i, specsByPack) {
+            const iFontSpec *spec = i.ptr;
+            if (isEmpty_String(&spec->sourcePath)) {
+                continue; /* built-in font */
+            }
+            if (!equal_String(&spec->sourcePath, currentSourcePath)) {
+                set_String(currentSourcePath, &spec->sourcePath);
+                /* Print some information about this page. */
+                const iFontPack *pack = packByPath_Fonts(currentSourcePath);
+                if (pack) {
+                    if (!isDisabled_FontPack(pack) ^ group) {
+                        if (isFirst) {
+                            appendCStr_String(str, "\n## ");
+                            appendCStr_String(str, group == 0 ? "${heading.fontpack.meta.enabled}"
+                                                              : "${heading.fontpack.meta.disabled}");
+                            appendCStr_String(str, "\n\n");
+                            isFirst = iFalse;
+                        }
+                        const iString *packId = id_FontPack(pack).id;
+                        appendFormat_String(str, "### %s\n=> %s ${fontpack.meta.viewfile}\n",
+                                            isEmpty_String(packId) ? "fonts.ini" :
+                                            cstr_String(packId),
+                                            cstrCollect_String(makeFileUrl_String(&spec->sourcePath)));
+                        append_String(str, collect_String(infoText_FontPack(pack)));
+                        iConstForEach(Array, a, actions_FontPack(pack)) {
+                            const iMenuItem *item = a.value;
+                            appendFormat_String(str, "=> about:command?%s %s\n",
+                                                cstr_String(withSpacesEncoded_String(collectNewCStr_String(item->command))),
+                                                item->label);
+                        }
+                    }
+                }
+            }
         }
     }
     return str;
@@ -645,6 +771,9 @@ const iString *infoPage_Fonts(void) {
 
 const iFontPack *pack_Fonts(const char *packId) {
     iFonts *d = &fonts_;
+    if (!*packId) {
+        return NULL;
+    }
     iConstForEach(PtrArray, i, &d->packs) {
         const iFontPack *pack = i.ptr;
         if (!cmp_String(&pack->id, packId)) {
@@ -675,10 +804,15 @@ void reload_Fonts(void) {
     delete_String(userDir);
 }
 
-void install_Fonts(const iString *fontId, const iBlock *data) {
+void install_Fonts(const iString *packId, const iBlock *data) {
+    if (!detect_FontPack(data)) {
+        return;
+    }
+    /* Newly installed packs will never be disabled. */
+    remove_StringSet(prefs_App()->disabledFontPacks, packId);
     iFonts *d = &fonts_;
     iFile *f = new_File(collect_String(concatCStr_Path(
-        userFontsDirectory_Fonts_(d), format_CStr("%s.fontpack", cstr_String(fontId)))));
+        userFontsDirectory_Fonts_(d), format_CStr("%s.fontpack", cstr_String(packId)))));
     if (open_File(f, writeOnly_FileMode)) {
         write_File(f, data);
     }
@@ -687,38 +821,5 @@ void install_Fonts(const iString *fontId, const iBlock *data) {
     reload_Fonts();
 }
 
-iBool preloadLocalFontpackForPreview_Fonts(iGmDocument *doc) {
-    iBool wasLoaded = iFalse;
-    for (size_t linkId = 1; ; linkId++) {
-        const iString *linkUrl = linkUrl_GmDocument(doc, linkId);
-        if (!linkUrl) {
-            break; /* ran out of links */
-        }
-        const int linkFlags = linkFlags_GmDocument(doc, linkId);
-        if (linkFlags & fontpackFileExtension_GmLinkFlag &&
-            scheme_GmLinkFlag(linkFlags) == file_GmLinkScheme) {
-            iMediaId linkMedia = findMediaForLink_Media(media_GmDocument(doc), linkId, fontpack_MediaType);
-            if (linkMedia.type) {
-                continue; /* got this one already */
-            }
-            iString *filePath = localFilePathFromUrl_String(linkUrl);
-            iFile *f = new_File(filePath);
-            if (open_File(f, readOnly_FileMode)) {
-                iBlock *fontPackArchiveData = readAll_File(f);
-                setUrl_Media(media_GmDocument(doc), linkId, fontpack_MediaType, linkUrl);
-                setData_Media(media_GmDocument(doc),
-                              linkId,
-                              collectNewCStr_String(mimeType_FontPack),
-                              fontPackArchiveData,
-                              0);
-                delete_Block(fontPackArchiveData);
-                wasLoaded = iTrue;
-            }
-            iRelease(f);
-        }
-    }
-    return wasLoaded;
-}
-
 iDefineClass(FontFile)
 
diff --git a/src/fontpack.h b/src/fontpack.h
index 2fdfa9ab..fb8d757e 100644
--- a/src/fontpack.h
+++ b/src/fontpack.h
@@ -148,12 +148,21 @@ struct Impl_FontPackId {
 void                setReadOnly_FontPack    (iFontPack *, iBool readOnly);
 void                setStandalone_FontPack  (iFontPack *, iBool standalone);
 void                setLoadPath_FontPack    (iFontPack *, const iString *path);
+void                setUrl_FontPack         (iFontPack *, const iString *url);
 iBool               loadArchive_FontPack    (iFontPack *, const iArchive *zip);
 iBool               detect_FontPack         (const iBlock *data);
 
 iFontPackId         id_FontPack             (const iFontPack *);
-const iPtrArray *   listSpecs_FontPack      (const iFontPack *);
+const iString *     loadPath_FontPack       (const iFontPack *); /* may return NULL */
+iBool               isDisabled_FontPack     (const iFontPack *);
 iBool               isReadOnly_FontPack     (const iFontPack *);
+const iPtrArray *   listSpecs_FontPack      (const iFontPack *);
+iString *           infoText_FontPack       (const iFontPack *);
+const iArray *      actions_FontPack        (const iFontPack *);
+
+const iString *     idFromUrl_FontPack      (const iString *url);
+
+/*----------------------------------------------------------------------------------------------*/
 
 iDeclareType(GmDocument)
 
@@ -170,8 +179,6 @@ const iString *     infoPage_Fonts              (void);
 void                install_Fonts               (const iString *fontId, const iBlock *data);
 void                reload_Fonts                (void);
 
-iBool   preloadLocalFontpackForPreview_Fonts    (iGmDocument *doc);
-
 iLocalDef iBool isInstalled_Fonts(const char *packId) {
     return pack_Fonts(packId) != NULL;
 }
diff --git a/src/gmdocument.c b/src/gmdocument.c
index 0adf5243..1f66e978 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -94,6 +94,7 @@ struct Impl_GmDocument {
     iString   localHost;
     iInt2     size;
     int       outsideMargin;
+    iBool     enableCommandLinks; /* `about:command?` only allowed on selected pages */
     iArray    layout; /* contents of source, laid out in document space */
     iPtrArray links;
     enum iGmDocumentBanner bannerType;
@@ -256,6 +257,14 @@ static iRangecc addLink_GmDocument_(iGmDocument *d, iRangecc line, iGmLinkId *li
         link->urlRange = capturedRange_RegExpMatch(&m, 1);
         setRange_String(&link->url, link->urlRange);
         set_String(&link->url, canonicalUrl_String(absoluteUrl_String(&d->url, &link->url)));
+        if (startsWithCase_String(&link->url, "about:command")) {
+            /* This is a special internal page that allows submitting UI events. */
+            if (!d->enableCommandLinks) {
+                delete_GmLink(link);
+                *linkId = 0;
+                return line;
+            }
+        }
         /* Check the URL. */ {
             iUrl parts;
             init_Url(&parts, &link->url);
@@ -336,7 +345,7 @@ static iRangecc addLink_GmDocument_(iGmDocument *d, iRangecc line, iGmLinkId *li
             /* Check for a custom icon. */
             enum iGmLinkScheme scheme = scheme_GmLinkFlag(link->flags);
             if ((scheme == gemini_GmLinkScheme && ~link->flags & remote_GmLinkFlag) ||
-                scheme == file_GmLinkScheme ||
+                scheme == about_GmLinkScheme || scheme == file_GmLinkScheme ||
                 scheme == mailto_GmLinkScheme) {
                 iChar icon = 0;
                 int len = 0;
@@ -826,6 +835,7 @@ static void doLayout_GmDocument_(iGmDocument *d) {
                                              : scheme == mailto_GmLinkScheme   ? envelope
                                              : link->flags & remote_GmLinkFlag ? globe
                                              : link->flags & imageFileExtension_GmLinkFlag ? image
+                                             : link->flags & fontpackFileExtension_GmLinkFlag ? fontpack_Icon
                                              : scheme == file_GmLinkScheme     ? folder
                                                                                : arrow);
             /* Custom link icon is shown on local Gemini links only. */
@@ -1012,14 +1022,6 @@ static void doLayout_GmDocument_(iGmDocument *d) {
                     pushBack_Array(&d->layout, &run);
                     break;
                 }
-                case fontpack_MediaType: {
-                    run.bounds.pos    = pos;
-                    run.bounds.size.x = d->size.x;
-                    run.bounds.size.y = height_FontpackUI(d->media, media.id, d->size.x);
-                    run.visBounds     = run.bounds;
-                    pushBack_Array(&d->layout, &run);
-                    break;
-                }
                 default:
                     break;
             }
@@ -1069,6 +1071,7 @@ void init_GmDocument(iGmDocument *d) {
     d->bannerType = siteDomain_GmDocumentBanner;
     d->outsideMargin = 0;
     d->size = zero_I2();
+    d->enableCommandLinks = iFalse;
     init_Array(&d->layout, sizeof(iGmRun));
     init_PtrArray(&d->links);
     init_String(&d->bannerText);
@@ -1760,6 +1763,10 @@ void setUrl_GmDocument(iGmDocument *d, const iString *url) {
     init_Url(&parts, url);
     setRange_String(&d->localHost, parts.host);
     updateIconBasedOnUrl_GmDocument_(d);
+    if (!cmp_String(url, "about:fonts")) {
+        /* This is an interactive internal page. */
+        d->enableCommandLinks = iTrue;
+    }
 }
 
 static int replaceRegExp_String(iString *d, const iRegExp *regexp, const char *replacement,
@@ -1973,9 +1980,15 @@ void setSource_GmDocument(iGmDocument *d, const iString *source, int width, int
         d->theme.ansiEscapesEnabled = prefs_App()->gemtextAnsiEscapes;
     }
     else if (d->format == markdown_SourceFormat) {
-        convertMarkdownToGemtext_GmDocument_(d);
-        set_String(&d->unormSource, &d->source); /* use the converted source from now on */
-        d->theme.ansiEscapesEnabled = iTrue; /* escapes are used for styling */
+        /* Attempt a conversion to Gemtext when viewing local Markdown files. */
+        if (equalCase_Rangecc(urlScheme_String(&d->url), "file")) {
+            convertMarkdownToGemtext_GmDocument_(d);
+            set_String(&d->unormSource, &d->source); /* use the converted source from now on */
+            d->theme.ansiEscapesEnabled = iTrue; /* escapes are used for styling */
+        }
+        else {
+            d->format = plainText_SourceFormat; /* just show as plain text */
+        }
     }
     else {
         d->theme.ansiEscapesEnabled = iTrue;
diff --git a/src/gmutil.c b/src/gmutil.c
index 692c1cb9..e44971d0 100644
--- a/src/gmutil.c
+++ b/src/gmutil.c
@@ -539,6 +539,9 @@ const char *mediaTypeFromFileExtension_String(const iString *d) {
     else if (endsWithCase_String(d, ".fontpack")) {
         return mimeType_FontPack;
     }
+    else if (endsWithCase_String(d, ".ttf")) {
+        return "font/ttf";
+    }
     else if (endsWithCase_String(d, ".xml")) {
         return "text/xml";
     }
diff --git a/src/lang.c b/src/lang.c
index a867f911..1dac4201 100644
--- a/src/lang.c
+++ b/src/lang.c
@@ -247,3 +247,12 @@ const char *formatCStr_Lang(const char *formatMsgId, int count) {
 const char *formatCStrs_Lang(const char *formatMsgId, size_t count) {
     return format_CStr(cstrCount_Lang(formatMsgId, (int) count), count);
 }
+
+const char *format_Lang(const char *formatTextWithIds, ...) {
+    iBlock *msg = new_Block(0);
+    va_list args;
+    va_start(args, formatTextWithIds);
+    vprintf_Block(msg, translateCStr_Lang(formatTextWithIds), args);
+    va_end(args);
+    return cstr_Block(collect_Block(msg));
+}
diff --git a/src/lang.h b/src/lang.h
index 23161bb2..e3e6c433 100644
--- a/src/lang.h
+++ b/src/lang.h
@@ -39,3 +39,4 @@ const char *    translateCStr_Lang  (const char *textWithIds);
 const char *    cstrCount_Lang      (const char *msgId, int count);
 const char *    formatCStr_Lang     (const char *formatMsgId, int count);
 const char *    formatCStrs_Lang    (const char *formatMsgId, size_t count);
+const char *    format_Lang         (const char *formatTextWithIds, ...);
diff --git a/src/media.c b/src/media.c
index 412205a7..a3f381ec 100644
--- a/src/media.c
+++ b/src/media.c
@@ -288,76 +288,6 @@ iDefineTypeConstruction(GmDownload)
 
 /*----------------------------------------------------------------------------------------------*/
 
-iDeclareType(GmFontpack)
-
-struct Impl_GmFontpack {
-    iGmMediaProps props;
-    iString packId;
-    iFontpackMediaInfo info;
-    /* TODO: Font preview images? */
-};
-
-void init_GmFontpack(iGmFontpack *d) {
-    init_GmMediaProps_(&d->props);
-    init_String(&d->packId);
-    iZap(d->info);
-    d->info.names = new_StringList();
-}
-
-void deinit_GmFontpack(iGmFontpack *d) {
-    iRelease(d->info.names);
-    deinit_String(&d->packId);
-    deinit_GmMediaProps_(&d->props);
-}
-
-static void loadData_GmFontpack_(iGmFontpack *d, const iBlock *data) {
-    const iString *loadPath = collect_String(localFilePathFromUrl_String(&d->props.url));
-    const iFontPack *pack = packByPath_Fonts(loadPath);
-    d->info.isValid = d->info.isInstalled = pack != NULL;
-    d->info.isReadOnly = iFalse;
-    d->info.isDisabled = iFalse;
-    clear_StringList(d->info.names);
-    clear_String(&d->packId);
-    if (!pack) {
-        /* Let's load it now temporarily and see what's inside. */
-        iArchive *zip = new_Archive();
-        if (openData_Archive(zip, data)) {
-            iFontPack *fp = collect_FontPack(new_FontPack());
-            setLoadPath_FontPack(fp, loadPath);
-            /* TODO: No need to load all the font files here, just the metadata. */
-            setStandalone_FontPack(fp, iTrue);
-            if (loadArchive_FontPack(fp, zip)) {
-                d->info.isValid = iTrue;
-                pack = fp;
-            }
-        }
-        iRelease(zip);
-    }
-    if (pack) {
-        set_String(&d->packId, id_FontPack(pack).id);
-        d->info.packId.id = &d->packId; /* we own this String */
-        d->info.packId.version = id_FontPack(pack).version;
-        d->info.isReadOnly = isReadOnly_FontPack(pack);
-        d->info.isDisabled = contains_StringSet(prefs_App()->disabledFontPacks, &d->packId);
-    }
-    iPtrSet *unique = new_PtrSet();
-    iConstForEach(PtrArray, i, listSpecs_FontPack(pack)) {
-        const iFontSpec *spec = i.ptr;
-        pushBack_StringList(d->info.names, &spec->name);
-        iForIndices(j, spec->styles) {
-            insert_PtrSet(unique, spec->styles[j]);
-        }
-    }
-    iConstForEach(PtrSet, j, unique) {
-        d->info.sizeInBytes += size_Block(&((const iFontFile *) *j.value)->sourceData);
-    }
-    delete_PtrSet(unique);
-}
-
-iDefineTypeConstruction(GmFontpack)
-
-/*----------------------------------------------------------------------------------------------*/
-
 struct Impl_Media {
     iPtrArray items[max_MediaType];
     /* TODO: Add a hash to quickly look up a link's media. */
@@ -388,9 +318,6 @@ void clear_Media(iMedia *d) {
     iForEach(PtrArray, n, &d->items[download_MediaType]) {
         deinit_GmDownload(n.ptr);
     }
-    iForEach(PtrArray, f, &d->items[fontpack_MediaType]) {
-        deinit_GmFontpack(f.ptr);
-    }
     iForIndices(type, d->items) {
         clear_PtrArray(&d->items[type]);
     }
@@ -436,17 +363,6 @@ iBool setUrl_Media(iMedia *d, iGmLinkId linkId, enum iMediaType mediaType, const
         }
         props = &dl->props;
     }
-    else if (mediaType == fontpack_MediaType) {
-        iGmFontpack *fp = NULL;
-        if (isNew) {
-            fp = new_GmFontpack();
-            pushBack_PtrArray(&d->items[fontpack_MediaType], fp);
-        }
-        else {
-            fp = at_PtrArray(&d->items[fontpack_MediaType], index_MediaId(existing));
-        }
-        props = &fp->props;
-    }
     if (props) {
         props->linkId = linkId;
         props->isPermanent = iTrue;
@@ -517,21 +433,6 @@ iBool setData_Media(iMedia *d, iGmLinkId linkId, const iString *mime, const iBlo
             }
         }
     }
-    else if (existing.type == fontpack_MediaType) {
-        iGmFontpack *fp;
-        if (isDeleting) {
-            take_PtrArray(&d->items[fontpack_MediaType], existingIndex, (void **) &fp);
-            delete_GmFontpack(fp);
-        }
-        else {
-            iAssert(!isPartial);
-            fp = at_PtrArray(&d->items[fontpack_MediaType], existingIndex);
-            if (isEmpty_String(&fp->props.mime)) {
-                set_String(&fp->props.mime, mime);
-            }
-            loadData_GmFontpack_(fp, data);
-        }
-    }
     else if (!isDeleting) {
         if (startsWith_String(mime, "image/")) {
             /* Copy the image to a texture. */
@@ -591,23 +492,6 @@ iMediaId findMediaForLink_Media(const iMedia *d, iGmLinkId linkId, enum iMediaTy
     return mid;
 }
 
-#if 0
-iMediaId findUrl_Media(const iMedia *d, const iString *url) {
-    iMediaId mid = iInvalidMediaId;
-    for (int i = 0; i < max_MediaType; i++) {
-        for (int j = 0; j < size_PtrArray(&d->items[i]); j++) {
-            const iGmMediaProps *props = constAt_PtrArray(&d->items[i], j);
-            if (equal_String(&props->url, url)) {
-                mid.type = i;
-                mid.id   = j + 1;
-                break;
-            }
-        }
-    }
-    return mid;
-}
-#endif
-
 size_t numAudio_Media(const iMedia *d) {
     return size_PtrArray(&d->items[audio_MediaType]);
 }
@@ -662,9 +546,6 @@ iBool info_Media(const iMedia *d, iMediaId mediaId, iGmMediaInfo *info_out) {
                 return iTrue;
             }
             break;
-        case fontpack_MediaType:
-            /* TODO */
-            break;
         default:
             break;
     }
@@ -718,16 +599,6 @@ void downloadStats_Media(const iMedia *d, iMediaId downloadId, const iString **p
     }
 }
 
-void fontpackInfo_Media(const iMedia *d, iMediaId fontpackId, iFontpackMediaInfo *info_out) {
-    iAssert(fontpackId.type == fontpack_MediaType);
-    iZap(*info_out);
-    const size_t index = index_MediaId(fontpackId);
-    if (index < size_PtrArray(&d->items[fontpack_MediaType])) {
-        const iGmFontpack *fp = constAt_PtrArray(&d->items[fontpack_MediaType], index);
-        *info_out = fp->info;
-    }
-}
-
 /*----------------------------------------------------------------------------------------------*/
 
 static void updated_MediaRequest_(iAnyObject *obj) {
diff --git a/src/media.h b/src/media.h
index 92a46cd3..3b329716 100644
--- a/src/media.h
+++ b/src/media.h
@@ -53,7 +53,6 @@ enum iMediaType { /* Note: There is a limited number of bits for these; see GmRu
     //animatedImage_MediaType, /* TODO */
     audio_MediaType,
     download_MediaType,
-    fontpack_MediaType,
     max_MediaType
 };
 
@@ -74,7 +73,6 @@ iBool           setData_Media           (iMedia *, uint16_t linkId, const iStrin
 
 size_t          memorySize_Media        (const iMedia *);
 iMediaId        findMediaForLink_Media  (const iMedia *, uint16_t linkId, enum iMediaType mediaType);
-//iMediaId        findUrl_Media           (const iMedia *, const iString *url);
 
 iMediaId        id_Media        (const iMedia *, uint16_t linkId, enum iMediaType type);
 iBool           info_Media      (const iMedia *, iMediaId mediaId, iGmMediaInfo *info_out);
@@ -109,21 +107,6 @@ void            pauseAllPlayers_Media   (const iMedia *, iBool setPaused);
 void            downloadStats_Media     (const iMedia *, iMediaId downloadId, const iString **path_out,
                                          float *bytesPerSecond_out, iBool *isFinished_out);
 
-iDeclareType(FontpackMediaInfo)
-
-struct Impl_FontpackMediaInfo {
-    iFontPackId packId;
-    iBool isValid;
-    iBool isInstalled;
-    iBool isDisabled;
-    iBool isReadOnly;
-    size_t sizeInBytes;
-    iStringList *names;
-};
-
-void            fontpackInfo_Media      (const iMedia *, iMediaId fontpackId,
-                                         iFontpackMediaInfo *info_out);
-
 /*----------------------------------------------------------------------------------------------*/
 
 iDeclareType(GmRequest)
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 1aca895c..a1992967 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1257,7 +1257,7 @@ static const char *zipPageHeading_(const iRangecc mime) {
         return book_Icon " Gempub";
     }
     else if (equalCase_Rangecc(mime, mimeType_FontPack)) {
-        return "\U0001f520 Fontpack";
+        return fontpack_Icon " Fontpack";
     }
     iRangecc type = iNullRange;
     nextSplit_Rangecc(mime, "/", &type); /* skip the part before the slash */
@@ -1435,13 +1435,6 @@ static void postProcessRequestContent_DocumentWidget_(iDocumentWidget *d, iBool
             }
         }
     }
-    /* Local fontpacks are automatically shown. */
-    if (preloadLocalFontpackForPreview_Fonts(d->doc)) {
-        documentRunsInvalidated_DocumentWidget_(d);
-        redoLayout_GmDocument(d->doc);
-        updateVisible_DocumentWidget_(d);
-        invalidate_DocumentWidget_(d);
-    }
 }
 
 static void updateDocument_DocumentWidget_(iDocumentWidget *d,
@@ -1503,6 +1496,25 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d,
                     appendFormat_String(&str,
                                         cstr_Lang("doc.archive"),
                                         cstr_Rangecc(baseName_Path(d->mod.url)));
+                    if (isRequestFinished) {
+                        if (equal_Rangecc(param, mimeType_FontPack)) {
+                            /* Show some information about fontpacks, and set up footer actions. */
+                            iArchive *zip = iClob(new_Archive());
+                            if (openData_Archive(zip, &d->sourceContent)) {
+                                iFontPack *fp = new_FontPack();
+                                setUrl_FontPack(fp, d->mod.url);
+                                setStandalone_FontPack(fp, iTrue);
+                                if (loadArchive_FontPack(fp, zip)) {
+                                    appendFormat_String(&str, "\n\n%s",
+                                                        cstrCollect_String(infoText_FontPack(fp)));
+                                }
+                                const iArray *actions = actions_FontPack(fp);
+                                makeFooterButtons_DocumentWidget_(d, constData_Array(actions),
+                                                                  size_Array(actions));
+                                delete_FontPack(fp);
+                            }
+                        }
+                    }
                     appendCStr_String(&str, "\n\n");
                     iString *localPath = localFilePathFromUrl_String(d->mod.url);
                     if (!localPath) {
@@ -2916,27 +2928,6 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         updateMedia_DocumentWidget_(d);
         return iFalse;
     }
-    else if (equal_Command(cmd, "media.fontpack.updated")) {
-        iMedia *media = pointerLabel_Command(cmd, "media");
-        if (media == media_GmDocument(d->doc)) {
-            /*iGmMediaInfo info;
-            if (info_Media(media,
-                           (iMediaId){ fontpack_MediaType, argU32Label_Command(cmd, "id")},
-                           &info)) {
-                
-            }*/
-            
-//            findCachedContent_App(<#const iString *url#>, <#iString *mime_out#>, <#iBlock *data_out#>)
-//            setData_Media(media,
-        }
-        return iFalse;
-    }
-    else if (equal_Command(cmd, "media.fontpack.install")) {
-        if (pointerLabel_Command(cmd, "media") == media_GmDocument(d->doc)) {
-            /* TODO: This is ours, we may have a MediaRequest with the data in memory. */
-        }
-        return iFalse;
-    }
     else if (equal_Command(cmd, "document.stop") && document_App() == d) {
         if (cancelRequest_DocumentWidget_(d, iTrue /* navigate back */)) {
             return iTrue;
@@ -3253,7 +3244,16 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         return handleSwipe_DocumentWidget_(d, cmd);
     }
     else if (equal_Command(cmd, "document.setmediatype") && document_App() == d) {
-        setUrlAndSource_DocumentWidget(d, d->mod.url, string_Command(cmd, "mime"), &d->sourceContent);
+        if (!isRequestOngoing_DocumentWidget(d)) {
+            setUrlAndSource_DocumentWidget(d, d->mod.url, string_Command(cmd, "mime"),
+                                           &d->sourceContent);
+        }
+        return iTrue;
+    }
+    else if (equalWidget_Command(cmd, w, "fontpack.install")) {
+        const iString *id = idFromUrl_FontPack(d->mod.url);
+        install_Fonts(id, &d->sourceContent);
+        postCommandf_App("open gotoheading:%s url:about:fonts", cstr_String(id));
         return iTrue;
     }
     return iFalse;
@@ -3302,15 +3302,6 @@ static iBool processMediaEvents_DocumentWidget_(iDocumentWidget *d, const SDL_Ev
     const iInt2 mouse = init_I2(ev->button.x, ev->button.y);
     iConstForEach(PtrArray, i, &d->visibleMedia) {
         const iGmRun *run  = i.ptr;
-        if (run->mediaType == fontpack_MediaType) {
-            iFontpackUI ui;
-            init_FontpackUI(&ui, media_GmDocument(d->doc), run->mediaId,
-                            runRect_DocumentWidget_(d, run));
-            if (processEvent_FontpackUI(&ui, ev)) {
-                refresh_Widget(d);
-                return iTrue;
-            }
-        }
         if (run->mediaType != audio_MediaType) {
             continue;
         }
@@ -4685,12 +4676,6 @@ static void drawMedia_DocumentWidget_(const iDocumentWidget *d, iPaint *p) {
                             runRect_DocumentWidget_(d, run));
             draw_DownloadUI(&ui, p);
         }
-        else if (run->mediaType == fontpack_MediaType) {
-            iFontpackUI ui;
-            init_FontpackUI(&ui, constMedia_GmDocument(d->doc), run->mediaId,
-                            runRect_DocumentWidget_(d, run));
-            draw_FontpackUI(&ui, p);
-        }
     }
 }
 
diff --git a/src/ui/mediaui.c b/src/ui/mediaui.c
index ac9475dd..d85d0df9 100644
--- a/src/ui/mediaui.c
+++ b/src/ui/mediaui.c
@@ -279,85 +279,3 @@ void draw_DownloadUI(const iDownloadUI *d, iPaint *p) {
                        translateCStr_Lang("\u2014 ${mb.per.sec}"));
     }
 }
-
-/*----------------------------------------------------------------------------------------------*/
-
-static iMenuItem action_FontpackUI_(const iFontpackUI *d) {
-    if (d->info.isInstalled) {
-        return (iMenuItem){ d->info.isDisabled ? "${media.fontpack.enable}"
-                                            : close_Icon " ${media.fontpack.disable}",
-            0, 0, format_CStr("media.fontpack.enable arg:%d", d->info.isDisabled) };
-    }
-    return (iMenuItem){ d->info.isInstalled ? close_Icon " ${media.fontpack.disable}"
-                                            : "${media.fontpack.install}",
-            0, 0,
-        d->info.isInstalled ? "media.fontpack.enable arg:0" : "media.fontpack.install" };
-}
-
-void init_FontpackUI(iFontpackUI *d, const iMedia *media, uint16_t mediaId, iRect bounds) {
-    d->media   = media;
-    d->mediaId = mediaId;
-    fontpackInfo_Media(d->media, (iMediaId){ fontpack_MediaType, d->mediaId }, &d->info);
-    d->bounds  = bounds;
-    iMenuItem action = action_FontpackUI_(d);
-    d->buttonRect.size = add_I2(measure_Text(uiLabel_FontId, action.label).bounds.size,
-                                muli_I2(gap2_UI, 3));
-    d->buttonRect.pos.x = right_Rect(d->bounds) - gap_UI - d->buttonRect.size.x;
-    d->buttonRect.pos.y = mid_Rect(d->bounds).y - d->buttonRect.size.y / 2;
-}
-
-iBool processEvent_FontpackUI(iFontpackUI *d, const SDL_Event *ev) {
-    switch (ev->type) {
-        case SDL_MOUSEBUTTONDOWN:
-        case SDL_MOUSEBUTTONUP: {
-            const iInt2 pos = init_I2(ev->button.x, ev->button.y);
-            if (contains_Rect(d->buttonRect, pos)) {
-                if (ev->type == SDL_MOUSEBUTTONUP) {
-                    postCommandf_App("%s media:%p mediaid:%u packid:%s",
-                                     action_FontpackUI_(d).command,
-                                     d->media, d->mediaId, cstr_String(d->info.packId.id));
-                }
-                return iTrue;
-            }
-            break;
-        }
-        case SDL_MOUSEMOTION:
-            if (contains_Rect(d->bounds, init_I2(ev->motion.x, ev->motion.y))) {
-                return iTrue;
-            }
-            break;
-    }
-    return iFalse;
-}
-
-int height_FontpackUI(const iMedia *media, uint16_t mediaId, int width) {
-    const iStringList *names;
-    iFontpackMediaInfo info;
-    fontpackInfo_Media(media, (iMediaId){ fontpack_MediaType, mediaId }, &info);
-    return lineHeight_Text(uiContent_FontId) +
-           lineHeight_Text(uiLabel_FontId) * (1 + size_StringList(info.names));
-}
-
-void draw_FontpackUI(const iFontpackUI *d, iPaint *p) {
-    /* Draw a background box. */
-    fillRect_Paint(p, d->bounds, uiBackground_ColorId);
-    drawRect_Paint(p, d->bounds, uiSeparator_ColorId);
-    iInt2 pos = topLeft_Rect(d->bounds);
-    const char *checks[] = { "\u2610", "\u2611" };
-    draw_Text(uiContentBold_FontId, pos,
-              d->info.isDisabled ? uiText_ColorId : uiHeading_ColorId, "\"%s\" v%d",
-              cstr_String(d->info.packId.id), d->info.packId.version);
-    pos.y += lineHeight_Text(uiContentBold_FontId);
-    draw_Text(uiLabelBold_FontId, pos, uiText_ColorId, "%.1f MB, %d fonts   %s %s   %s",
-              d->info.sizeInBytes / 1.0e6, size_StringList(d->info.names),
-//              checks[info.isValid], info.isValid ? "No errors" : "Errors detected",
-              checks[d->info.isInstalled], d->info.isInstalled ? "Installed" : "Not installed",
-              d->info.isReadOnly ? "Read-Only" : "");
-    pos.y += lineHeight_Text(uiLabelBold_FontId);
-    iConstForEach(StringList, i, d->info.names) {
-        drawRange_Text(uiLabel_FontId, pos, uiText_ColorId, range_String(i.value));
-        pos.y += lineHeight_Text(uiLabel_FontId);
-    }
-    /* Buttons. */
-    drawInlineButton_(p, d->buttonRect, action_FontpackUI_(d).label, uiLabel_FontId);
-}
diff --git a/src/ui/mediaui.h b/src/ui/mediaui.h
index 03ea0afc..3d51e4c9 100644
--- a/src/ui/mediaui.h
+++ b/src/ui/mediaui.h
@@ -59,20 +59,3 @@ struct Impl_DownloadUI {
 void    init_DownloadUI         (iDownloadUI *, const iMedia *media, uint16_t mediaId, iRect bounds);
 iBool   processEvent_DownloadUI (iDownloadUI *, const SDL_Event *ev);
 void    draw_DownloadUI         (const iDownloadUI *, iPaint *p);
-
-/*----------------------------------------------------------------------------------------------*/
-
-iDeclareType(FontpackUI)
-
-struct Impl_FontpackUI {
-    const iMedia *media;
-    uint16_t mediaId;
-    iFontpackMediaInfo info;
-    iRect bounds;
-    iRect buttonRect;
-};
-
-void    init_FontpackUI         (iFontpackUI *, const iMedia *media, uint16_t mediaId, iRect bounds);
-int     height_FontpackUI       (const iMedia *media, uint16_t mediaId, int width);
-iBool   processEvent_FontpackUI (iFontpackUI *, const SDL_Event *ev);
-void    draw_FontpackUI         (const iFontpackUI *, iPaint *p);