26 files changed, 277 insertions, 170 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4cafc4fa..77e25b45 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@
 cmake_minimum_required (VERSION 3.9)
 
 project (Lagrange
-    VERSION 1.8.1
+    VERSION 1.9.0
     DESCRIPTION "A Beautiful Gemini Client"
     LANGUAGES C
 )
@@ -29,7 +29,7 @@ if (IOS)
     set (IOS_BUILD_DATE "2021-10-23")
 endif ()
 
-# Default that depend on environment.
+# Defaults that depend on environment.
 set (DEFAULT_RESIZE_DRAW ON)
 if (HAIKU)
     set (DEFAULT_RESIZE_DRAW OFF)
@@ -52,20 +52,17 @@ option (ENABLE_MPG123           "Use mpg123 for decoding MPEG audio" ON)
 option (ENABLE_POPUP_MENUS      "Use popup windows for context menus (if OFF, menus are confined inside main window)" ON)
 option (ENABLE_RELATIVE_EMBED   "Resources should always be found via relative path" OFF)
 option (ENABLE_RESIZE_DRAW      "Force window to redraw during resizing" ${DEFAULT_RESIZE_DRAW})
-option (ENABLE_RESOURCE_EMBED   "Embed resources inside the executable" OFF)
 option (ENABLE_WEBP             "Use libwebp to decode .webp images (via pkg-config)" ON)
 option (ENABLE_WINDOWPOS_FIX    "Set position after showing window (workaround for SDL bug)" OFF)
 option (ENABLE_X11_SWRENDER     "Use software rendering (X11)" OFF)
 
 include (BuildType.cmake)
-include (res/Embed.cmake)
-include (res/Fontpack.cmake)
+include (Resources.cmake)
 include (Depends.cmake)
 
 # Package resources.
 message (STATUS "Preparing resources...")
-make_fontpack (res/default.fontpack)
-set (EMBED_RESOURCES
+set (RESOURCES
     res/about/about.gmi
     res/about/help.gmi
     res/about/lagrange.gmi
@@ -92,12 +89,14 @@ set (EMBED_RESOURCES
     res/lang/zh_Hans.bin
     res/lang/zh_Hant.bin
     res/shadow.png
-    ${CMAKE_BINARY_DIR}/default.fontpack
+    res/fontpack.ini
 )
+file (GLOB FONTS RELATIVE ${CMAKE_SOURCE_DIR} res/fonts/*)
+list (APPEND RESOURCES ${FONTS})
 if ((UNIX AND NOT APPLE) OR MSYS)
-    list (APPEND EMBED_RESOURCES res/lagrange-64.png)
+    list (APPEND RESOURCES res/lagrange-64.png)
 endif ()
-embed_make (${EMBED_RESOURCES})
+make_resources (${CMAKE_CURRENT_BINARY_DIR}/resources.lgr ${RESOURCES})
 
 set (EMB_BIN ${CMAKE_CURRENT_BINARY_DIR}/resources.lgr)
 set_source_files_properties (${EMB_BIN} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
@@ -142,6 +141,8 @@ set (SOURCES
     src/periodic.h
     src/prefs.c
     src/prefs.h
+    src/resources.c
+    src/resources.h
     src/sitespec.c
     src/sitespec.h
     src/stb_image.h
@@ -217,8 +218,6 @@ set (SOURCES
     res/about/lagrange.gmi
     res/about/license.gmi
     res/about/version.gmi
-    ${CMAKE_CURRENT_BINARY_DIR}/embedded.c
-    ${CMAKE_CURRENT_BINARY_DIR}/embedded.h
     ${CMAKE_CURRENT_BINARY_DIR}/resources.lgr
 )
 if (ENABLE_IPC)
@@ -417,9 +416,7 @@ if (MSYS)
     if (TARGET PkgConfig::MPG123)
         install (PROGRAMS ${MPG123_LIBDIR}/../bin/msys-mpg123-0.dll DESTINATION .)
     endif ()
-    if (NOT ENABLE_RESOURCE_EMBED)
-        install (FILES ${EMB_BIN} DESTINATION .)
-    endif ()
+    install (FILES ${EMB_BIN} DESTINATION .)
     install (PROGRAMS
         ${SDL2_LIBDIR}/SDL2.dll
         res/urlopen.bat
@@ -430,11 +427,9 @@ if (MSYS)
     endif ()
 elseif (HAIKU)
     install (TARGETS app DESTINATION .)
-    if (NOT ENABLE_RESOURCE_EMBED)
-        target_compile_definitions (app PUBLIC
-            LAGRANGE_EMB_BIN="${CMAKE_INSTALL_PREFIX}/resources.lgr")
-        install (FILES ${EMB_BIN} DESTINATION .)
-    endif ()
+    target_compile_definitions (app PUBLIC
+        LAGRANGE_EMB_BIN="${CMAKE_INSTALL_PREFIX}/resources.lgr")
+    install (FILES ${EMB_BIN} DESTINATION .)
 elseif (UNIX AND NOT APPLE)
     set_target_properties (app PROPERTIES
         INSTALL_RPATH_USE_LINK_PATH YES
@@ -460,11 +455,9 @@ MimeType=x-scheme-handler/gemini;x-scheme-handler/gopher
     install (FILES res/fi.skyjake.Lagrange.appdata.xml
         DESTINATION share/metainfo
     )
-    if (NOT ENABLE_RESOURCE_EMBED)
-        if (NOT ENABLE_RELATIVE_EMBED)
-            target_compile_definitions (app PUBLIC
-                LAGRANGE_EMB_BIN="${CMAKE_INSTALL_PREFIX}/share/lagrange/resources.lgr")
-        endif ()
-        install (FILES ${EMB_BIN} DESTINATION share/lagrange)
+    if (NOT ENABLE_RELATIVE_EMBED)
+        target_compile_definitions (app PUBLIC
+            LAGRANGE_EMB_BIN="${CMAKE_INSTALL_PREFIX}/share/lagrange/resources.lgr")
     endif ()
+    install (FILES ${EMB_BIN} DESTINATION share/lagrange)
 endif ()
diff --git a/Resources.cmake b/Resources.cmake
new file mode 100644
index 00000000..fc5d20c6
--- /dev/null
+++ b/Resources.cmake
@@ -0,0 +1,27 @@
+find_program (ZIP_EXECUTABLE zip DOC "ZIP archiver")
+if (NOT ZIP_EXECUTABLE)
+    message (FATAL_ERROR "Please install 'zip' for packaging resources.")
+endif ()
+
+function (make_resources dst)
+    list (REMOVE_AT ARGV 0)
+    set (files)
+    foreach (arg ${ARGV})
+        get_filename_component (name ${arg} NAME)
+        if (NOT "${name}" MATCHES "^\\..*")
+            string (SUBSTRING ${arg} 4 -1 rel)
+            list (APPEND files ${rel})
+        endif ()
+    endforeach (arg)
+    file (REMOVE ${dst})
+    get_filename_component (dstName ${dst} NAME)
+    message (STATUS "  ${dstName}")
+    set (versionTempPath ${CMAKE_SOURCE_DIR}/res/VERSION)
+    file (WRITE ${versionTempPath} ${PROJECT_VERSION})
+    execute_process (
+        COMMAND ${ZIP_EXECUTABLE} -1 ${dst} VERSION ${files}
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/res
+        OUTPUT_QUIET
+    )
+    file (REMOVE ${versionTempPath})
+endfunction ()
diff --git a/res/Fontpack.cmake b/res/Fontpack.cmake
deleted file mode 100644
index 26d6df1e..00000000
--- a/res/Fontpack.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-find_program (ZIP_EXECUTABLE zip DOC "ZIP archiver")
-if (NOT ZIP_EXECUTABLE)
-    message (FATAL_ERROR "Please install 'zip' to create fontpacks.")
-endif ()
-
-function (make_fontpack src)
-    get_filename_component (dst ${src} NAME)
-    set (fn ${CMAKE_BINARY_DIR}/${dst})
-    execute_process (COMMAND ${CMAKE_COMMAND} -E remove ${fn})
-    file (GLOB files RELATIVE ${CMAKE_SOURCE_DIR}/${src}
-        ${CMAKE_SOURCE_DIR}/${src}/*
-    )
-    message (STATUS "  ${src}")
-    execute_process (
-        COMMAND ${ZIP_EXECUTABLE} -0 ${fn} ${files}
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/${src}
-        OUTPUT_QUIET
-    )
-endfunction ()
diff --git a/res/bincat.sh b/res/bincat.sh
deleted file mode 100755
index eb46655b..00000000
--- a/res/bincat.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-# Binary Resource Concatenator
-# Copyright: 2021 Jaakko Keränen <jaakko.keranen@iki.fi>
-# License: BSD 2-Clause
-
-OUTPUT=--
-SIZES=""
-for fn in $*; do
-    if [ "$OUTPUT" = "--" ]; then
-        OUTPUT=$fn
-        rm -f ${OUTPUT}
-    else
-        vals=(`/bin/ls -l $fn`)
-        if [ "$SIZES" = "" ]; then
-            SIZES=${vals[4]}
-        else
-            SIZES=$SIZES\;${vals[4]}
-        fi
-        cat ${fn} >> ${OUTPUT}
-    fi
-done
-echo $SIZES
diff --git a/res/default.fontpack/fontpack.ini b/res/fontpack.ini
index 68316ef6..920a4ad2 100644
--- a/res/default.fontpack/fontpack.ini
+++ b/res/fontpack.ini
@@ -19,17 +19,17 @@
 
 [default]
 name        = "Source Sans"
-regular     = "SourceSans3-Regular.ttf"
-italic      = "SourceSans3-It.ttf"
-light       = "SourceSans3-ExtraLight.ttf"
-semibold    = "SourceSans3-Semibold.ttf"
-bold        = "SourceSans3-Bold.ttf"
+regular     = "fonts/SourceSans3-Regular.ttf"
+italic      = "fonts/SourceSans3-It.ttf"
+light       = "fonts/SourceSans3-ExtraLight.ttf"
+semibold    = "fonts/SourceSans3-Semibold.ttf"
+bold        = "fonts/SourceSans3-Bold.ttf"
 
 [iosevka]
 name        = "Iosevka (compact)"
 monospace   = true
 doc.height  = 0.800
-regular     = "IosevkaTerm-Extended.ttf"
+regular     = "fonts/IosevkaTerm-Extended.ttf"
 
 [iosevka-body]
 # Variant of Iosevka with expanded line spacing for better readability.
@@ -38,21 +38,21 @@ name        = "Iosevka"
 monospace   = true
 priority    = -10
 glyphscale  = 0.800
-regular     = "IosevkaTerm-Extended.ttf"
+regular     = "fonts/IosevkaTerm-Extended.ttf"
 
 [smolemoji]
 name        = "Smol Emoji"
 override    = true  # These Emoji/symbols are always preferred.
 auxiliary   = true
 priority    = 100
-regular     = "SmolEmoji-Regular.ttf"
+regular     = "fonts/SmolEmoji-Regular.ttf"
 
 [notoemoji]
 name        = "Noto Emoji"
 auxiliary   = true
 priority    = 30
 glyphscale  = 1.1
-regular     = "NotoEmoji-Regular.ttf"
+regular     = "fonts/NotoEmoji-Regular.ttf"
 
 [notosymbols2]
 name        = "Noto Sans Symbols 2"
@@ -60,7 +60,7 @@ auxiliary   = true
 priority    = 20
 glyphscale  = 1.45
 voffset     = 0.5
-regular     = "NotoSansSymbols2-Regular.ttf"
+regular     = "fonts/NotoSansSymbols2-Regular.ttf"
 
 [notosymbols]
 name        = "Noto Sans Symbols"
@@ -68,4 +68,4 @@ auxiliary   = true
 priority    = 10
 glyphscale  = 2.0
 voffset     = 1.2
-regular     = "NotoSansSymbols-Regular.ttf"
+regular     = "fonts/NotoSansSymbols-Regular.ttf"
diff --git a/res/default.fontpack/IosevkaTerm-Extended.ttf b/res/fonts/IosevkaTerm-Extended.ttf
index 16989a85..16989a85 100644
--- a/res/default.fontpack/IosevkaTerm-Extended.ttf
+++ b/res/fonts/IosevkaTerm-Extended.ttf
diff --git a/res/default.fontpack/LICENSE_OFL.txt b/res/fonts/LICENSE_OFL.txt
index d952d62c..d952d62c 100644
--- a/res/default.fontpack/LICENSE_OFL.txt
+++ b/res/fonts/LICENSE_OFL.txt
diff --git a/res/default.fontpack/LICENSE_SmolEmoji.txt b/res/fonts/LICENSE_SmolEmoji.txt
index 3513b65a..3513b65a 100644
--- a/res/default.fontpack/LICENSE_SmolEmoji.txt
+++ b/res/fonts/LICENSE_SmolEmoji.txt
diff --git a/res/default.fontpack/NotoEmoji-Regular.ttf b/res/fonts/NotoEmoji-Regular.ttf
index 19b7badf..19b7badf 100644
--- a/res/default.fontpack/NotoEmoji-Regular.ttf
+++ b/res/fonts/NotoEmoji-Regular.ttf
diff --git a/res/default.fontpack/NotoSansSymbols-Regular.ttf b/res/fonts/NotoSansSymbols-Regular.ttf
index 68847551..68847551 100644
--- a/res/default.fontpack/NotoSansSymbols-Regular.ttf
+++ b/res/fonts/NotoSansSymbols-Regular.ttf
diff --git a/res/default.fontpack/NotoSansSymbols2-Regular.ttf b/res/fonts/NotoSansSymbols2-Regular.ttf
index 79706435..79706435 100644
--- a/res/default.fontpack/NotoSansSymbols2-Regular.ttf
+++ b/res/fonts/NotoSansSymbols2-Regular.ttf
diff --git a/res/default.fontpack/SmolEmoji-Regular.ttf b/res/fonts/SmolEmoji-Regular.ttf
index 3ab9484b..3ab9484b 100644
--- a/res/default.fontpack/SmolEmoji-Regular.ttf
+++ b/res/fonts/SmolEmoji-Regular.ttf
diff --git a/res/default.fontpack/SourceSans3-Bold.ttf b/res/fonts/SourceSans3-Bold.ttf
index 486ede63..486ede63 100644
--- a/res/default.fontpack/SourceSans3-Bold.ttf
+++ b/res/fonts/SourceSans3-Bold.ttf
diff --git a/res/default.fontpack/SourceSans3-ExtraLight.ttf b/res/fonts/SourceSans3-ExtraLight.ttf
index 53e1541c..53e1541c 100644
--- a/res/default.fontpack/SourceSans3-ExtraLight.ttf
+++ b/res/fonts/SourceSans3-ExtraLight.ttf
diff --git a/res/default.fontpack/SourceSans3-It.ttf b/res/fonts/SourceSans3-It.ttf
index 9823601c..9823601c 100644
--- a/res/default.fontpack/SourceSans3-It.ttf
+++ b/res/fonts/SourceSans3-It.ttf
diff --git a/res/default.fontpack/SourceSans3-Regular.ttf b/res/fonts/SourceSans3-Regular.ttf
index f6d31e8c..f6d31e8c 100644
--- a/res/default.fontpack/SourceSans3-Regular.ttf
+++ b/res/fonts/SourceSans3-Regular.ttf
diff --git a/res/default.fontpack/SourceSans3-Semibold.ttf b/res/fonts/SourceSans3-Semibold.ttf
index d4774aab..d4774aab 100644
--- a/res/default.fontpack/SourceSans3-Semibold.ttf
+++ b/res/fonts/SourceSans3-Semibold.ttf
diff --git a/src/app.c b/src/app.c
index 73771609..a9ec6a26 100644
--- a/src/app.c
+++ b/src/app.c
@@ -23,7 +23,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "app.h"
 #include "bookmarks.h"
 #include "defs.h"
-#include "embedded.h"
+#include "resources.h"
 #include "feeds.h"
 #include "mimehooks.h"
 #include "gmcerts.h"
@@ -711,19 +711,17 @@ static void init_App_(iApp *d, int argc, char **argv) {
         }
         SDL_free(exec);
     }
-#if defined (iHaveLoadEmbed)
     /* Load the resources from a file. Check the executable directory first, then a
        system-wide location, and as a final fallback, the current working directory. */ {
-        if (!load_Embed(concatPath_CStr(cstr_String(execPath_App()), EMB_BIN2))) {
-            if (!load_Embed(concatPath_CStr(cstr_String(execPath_App()), EMB_BIN))) {
-                if (!load_Embed("resources.lgr")) {
+        if (!init_Resources(concatPath_CStr(cstr_String(execPath_App()), EMB_BIN2))) {
+            if (!init_Resources(concatPath_CStr(cstr_String(execPath_App()), EMB_BIN))) {
+                if (!init_Resources("resources.lgr")) {
                     fprintf(stderr, "failed to load resources: %s\n", strerror(errno));
                     exit(-1);
                 }
             }
         }
     }
-#endif
     init_Lang();
     /* Configure the valid command line options. */ {
         defineValues_CommandLine(&d->args, "close-tab", 0);
@@ -742,7 +740,7 @@ static void init_App_(iApp *d, int argc, char **argv) {
     iStringList *openCmds = new_StringList();
     /* Handle command line options. */ {
         if (contains_CommandLine(&d->args, "help")) {
-            puts(cstr_Block(&blobArghelp_Embedded));
+            puts(cstr_Block(&blobArghelp_Resources));
             terminate_App_(0);
         }
         if (contains_CommandLine(&d->args, "version;V")) {
diff --git a/src/fontpack.c b/src/fontpack.c
index 40e4c96c..78181fd4 100644
--- a/src/fontpack.c
+++ b/src/fontpack.c
@@ -21,7 +21,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #include "fontpack.h"
-#include "embedded.h"
+#include "resources.h"
 #include "ui/window.h"
 #include "app.h"
 
@@ -564,11 +564,8 @@ void init_Fonts(const char *userDir) {
     /* Load the required fonts. */ {
         iFontPack *pack = new_FontPack();
         setCStr_String(&pack->id, "default");
-        iArchive *arch = new_Archive();
         setReadOnly_FontPack(pack, iTrue);
-        openData_Archive(arch, &fontpackDefault_Embedded);
-        loadArchive_FontPack(pack, arch); /* should never fail if we've made it this far */
-        iRelease(arch);
+        loadArchive_FontPack(pack, archive_Resources()); /* should never fail if we've made it this far */
         pushBack_PtrArray(&d->packs, pack);
     }
     /* Find and load .fontpack files in known locations. */ {
diff --git a/src/gmrequest.c b/src/gmrequest.c
index 03a6d999..23845475 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "feeds.h"
 #include "bookmarks.h"
 #include "ui/text.h"
-#include "embedded.h"
+#include "resources.h"
 #include "defs.h"
 
 #include <the_Foundation/archive.h>
@@ -344,19 +344,19 @@ static void requestFinished_GmRequest_(iGmRequest *d, iTlsRequest *req) {
 static const iBlock *aboutPageSource_(iRangecc path, iRangecc query) {
     const iBlock *src = NULL;
     if (equalCase_Rangecc(path, "about")) {
-        return &blobAbout_Embedded;
+        return &blobAbout_Resources;
     }
     if (equalCase_Rangecc(path, "lagrange")) {
-        return &blobLagrange_Embedded;
+        return &blobLagrange_Resources;
     }
     if (equalCase_Rangecc(path, "help")) {
-        return &blobHelp_Embedded;
+        return &blobHelp_Resources;
     }
     if (equalCase_Rangecc(path, "license")) {
-        return &blobLicense_Embedded;
+        return &blobLicense_Resources;
     }
     if (equalCase_Rangecc(path, "version")) {
-        return &blobVersion_Embedded;
+        return &blobVersion_Resources;
     }
     if (equalCase_Rangecc(path, "debug")) {
         return utf8_String(debugInfo_App());
@@ -396,7 +396,7 @@ static const iBlock *replaceVariables_(const iBlock *block) {
 #if 0
             else if (startsWith_Rangecc(name, "BT:")) { /* block text */
                 repl = range_String(collect_String(renderBlockChars_Text(
-                    &fontFiraSansRegular_Embedded,
+                    &fontFiraSansRegular_Resources,
                     11, /* should be larger if shaded */
                     quadrants_TextBlockMode,
                     &(iString){ iBlockLiteral(
@@ -404,7 +404,7 @@ static const iBlock *replaceVariables_(const iBlock *block) {
             }
             else if (startsWith_Rangecc(name, "ST:")) { /* shaded text */
                 repl = range_String(collect_String(renderBlockChars_Text(
-                    &fontSmolEmojiRegular_Embedded,
+                    &fontSmolEmojiRegular_Resources,
                     20,
                     shading_TextBlockMode,
                     &(iString){ iBlockLiteral(
diff --git a/src/lang.c b/src/lang.c
index f54ab2d7..017937cf 100644
--- a/src/lang.c
+++ b/src/lang.c
@@ -21,7 +21,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #include "lang.h"
-#include "embedded.h"
+#include "resources.h"
 
 #include <the_Foundation/sortedarray.h>
 #include <the_Foundation/string.h>
@@ -30,7 +30,7 @@ iDeclareType(Lang)
 iDeclareType(MsgStr)
 
 struct Impl_MsgStr {
-    iRangecc id; /* these point to null-terminated strings in embedded data */
+    iRangecc id; /* these point to null-terminated strings in resources */
     iRangecc str;
 };
 
@@ -83,41 +83,41 @@ static void clear_Lang_(iLang *d) {
 }
 
 static void load_Lang_(iLang *d, const char *id) {
-    /* Load compiled language strings from an embedded blob. */
+    /* Load compiled language strings from a resource blob. */
     iUnused(id);
-    const iBlock *data = equal_CStr(id, "fi")      ? &blobFi_Embedded
-                       : equal_CStr(id, "fr")      ? &blobFr_Embedded
-                       : equal_CStr(id, "ru")      ? &blobRu_Embedded
-                       : equal_CStr(id, "eo")      ? &blobEo_Embedded
-                       : equal_CStr(id, "es")      ? &blobEs_Embedded
-                       : equal_CStr(id, "es_MX")   ? &blobEs_MX_Embedded
-                       : equal_CStr(id, "de")      ? &blobDe_Embedded
-                       : equal_CStr(id, "gl")      ? &blobGl_Embedded
-                       : equal_CStr(id, "ia")      ? &blobIa_Embedded
-                       : equal_CStr(id, "ie")      ? &blobIe_Embedded
-                       : equal_CStr(id, "isv")     ? &blobIsv_Embedded
-                       : equal_CStr(id, "pl")      ? &blobPl_Embedded
-                       : equal_CStr(id, "sk")      ? &blobSk_Embedded
-                       : equal_CStr(id, "sr")      ? &blobSr_Embedded
-                       : equal_CStr(id, "tok")     ? &blobTok_Embedded
-                       : equal_CStr(id, "uk")      ? &blobUk_Embedded
-                       : equal_CStr(id, "zh_Hans") ? &blobZh_Hans_Embedded
-                       : equal_CStr(id, "zh_Hant") ? &blobZh_Hant_Embedded
-                                                   : &blobEn_Embedded;
-    if (data == &blobRu_Embedded || data == &blobSr_Embedded || data == &blobUk_Embedded) {
+    const iBlock *data = equal_CStr(id, "fi")      ? &blobFi_Resources
+                       : equal_CStr(id, "fr")      ? &blobFr_Resources
+                       : equal_CStr(id, "ru")      ? &blobRu_Resources
+                       : equal_CStr(id, "eo")      ? &blobEo_Resources
+                       : equal_CStr(id, "es")      ? &blobEs_Resources
+                       : equal_CStr(id, "es_MX")   ? &blobEs_MX_Resources
+                       : equal_CStr(id, "de")      ? &blobDe_Resources
+                       : equal_CStr(id, "gl")      ? &blobGl_Resources
+                       : equal_CStr(id, "ia")      ? &blobIa_Resources
+                       : equal_CStr(id, "ie")      ? &blobIe_Resources
+                       : equal_CStr(id, "isv")     ? &blobIsv_Resources
+                       : equal_CStr(id, "pl")      ? &blobPl_Resources
+                       : equal_CStr(id, "sk")      ? &blobSk_Resources
+                       : equal_CStr(id, "sr")      ? &blobSr_Resources
+                       : equal_CStr(id, "tok")     ? &blobTok_Resources
+                       : equal_CStr(id, "uk")      ? &blobUk_Resources
+                       : equal_CStr(id, "zh_Hans") ? &blobZh_Hans_Resources
+                       : equal_CStr(id, "zh_Hant") ? &blobZh_Hant_Resources
+                                                   : &blobEn_Resources;
+    if (data == &blobRu_Resources || data == &blobSr_Resources || data == &blobUk_Resources) {
         d->pluralType = slavic_PluralType;
     }
-    else if (data == &blobIsv_Embedded) {
+    else if (data == &blobIsv_Resources) {
         d->pluralType = oneTwoMany_PluralType;
     }
-    else if (data == &blobSk_Embedded) {
+    else if (data == &blobSk_Resources) {
         d->pluralType = oneFewMany_PluralType;
     }
-    else if (data == &blobPl_Embedded) {
+    else if (data == &blobPl_Resources) {
         d->pluralType = polish_PluralType;
     }
-    else if (data == &blobZh_Hans_Embedded || data == &blobZh_Hant_Embedded ||
-             data == &blobTok_Embedded) {
+    else if (data == &blobZh_Hans_Resources || data == &blobZh_Hant_Resources ||
+             data == &blobTok_Resources) {
         d->pluralType = none_PluralType;
     }
     else {
diff --git a/src/resources.c b/src/resources.c
new file mode 100644
index 00000000..da78708a
--- /dev/null
+++ b/src/resources.c
@@ -0,0 +1,121 @@
+/* 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 "resources.h"
+
+#include <the_Foundation/archive.h>
+#include <the_Foundation/version.h>
+
+static iArchive *archive_;
+    
+iBlock blobAbout_Resources;
+iBlock blobHelp_Resources;
+iBlock blobLagrange_Resources;
+iBlock blobLicense_Resources;
+iBlock blobVersion_Resources;
+iBlock blobArghelp_Resources;
+iBlock blobDe_Resources;
+iBlock blobEn_Resources;
+iBlock blobEo_Resources;
+iBlock blobEs_Resources;
+iBlock blobEs_MX_Resources;
+iBlock blobFi_Resources;
+iBlock blobFr_Resources;
+iBlock blobGl_Resources;
+iBlock blobIa_Resources;
+iBlock blobIe_Resources;
+iBlock blobIsv_Resources;
+iBlock blobPl_Resources;
+iBlock blobRu_Resources;
+iBlock blobSk_Resources;
+iBlock blobSr_Resources;
+iBlock blobTok_Resources;
+iBlock blobUk_Resources;
+iBlock blobZh_Hans_Resources;
+iBlock blobZh_Hant_Resources;
+iBlock imageShadow_Resources;
+
+static struct {
+    iBlock *data;
+    const char *archivePath;
+} entries_[] = {
+    { &blobAbout_Resources, "about/about.gmi" },
+    { &blobHelp_Resources, "about/help.gmi" },
+    { &blobLagrange_Resources, "about/lagrange.gmi" },
+    { &blobLicense_Resources, "about/license.gmi" },
+    { &blobVersion_Resources, "about/version.gmi" },
+    { &blobArghelp_Resources, "arg-help.txt" },
+    { &blobDe_Resources, "lang/de.bin" },
+    { &blobEn_Resources, "lang/en.bin" },
+    { &blobEo_Resources, "lang/eo.bin" },
+    { &blobEs_Resources, "lang/es.bin" },
+    { &blobEs_MX_Resources, "lang/es_MX.bin" },
+    { &blobFi_Resources, "lang/fi.bin" },
+    { &blobFr_Resources, "lang/fr.bin" },
+    { &blobGl_Resources, "lang/gl.bin" },
+    { &blobIa_Resources, "lang/ia.bin" },
+    { &blobIe_Resources, "lang/ie.bin" },
+    { &blobIsv_Resources, "lang/isv.bin" },
+    { &blobPl_Resources, "lang/pl.bin" },
+    { &blobRu_Resources, "lang/ru.bin" },
+    { &blobSk_Resources, "lang/sk.bin" },
+    { &blobSr_Resources, "lang/sr.bin" },
+    { &blobTok_Resources, "lang/tok.bin" },
+    { &blobUk_Resources, "lang/uk.bin" },
+    { &blobZh_Hans_Resources, "lang/zh_Hans.bin" },
+    { &blobZh_Hant_Resources, "lang/zh_Hant.bin" },
+    { &imageShadow_Resources, "shadow.png" },
+};
+
+iBool init_Resources(const char *path) {
+    archive_ = new_Archive();
+    if (openFile_Archive(archive_, collectNewCStr_String(path))) {
+        iVersion appVer;
+        init_Version(&appVer, range_CStr(LAGRANGE_APP_VERSION));
+        iVersion resVer;
+        init_Version(&resVer, range_Block(dataCStr_Archive(archive_, "VERSION")));
+        if (!cmp_Version(&resVer, &appVer)) {
+            iForIndices(i, entries_) {
+                const iBlock *data = dataCStr_Archive(archive_, entries_[i].archivePath);
+                if (data) {
+                    initCopy_Block(entries_[i].data, data);
+                }
+            }
+            return iTrue;
+        }
+        fprintf(stderr, "[Resources] %s: version mismatch (%s != " LAGRANGE_APP_VERSION ")\n",
+                path, cstr_Block(dataCStr_Archive(archive_, "VERSION")));
+    }
+    iRelease(archive_);
+    return iFalse;
+}
+
+void deinit_Resources(void) {
+    iForIndices(i, entries_) {
+        deinit_Block(entries_[i].data);
+    }
+    iRelease(archive_);
+}
+
+const iArchive *archive_Resources(void) {
+    return archive_;
+}
diff --git a/res/bincat.c b/src/resources.h
index 8fc9d831..a9a5c767 100644
--- a/res/bincat.c
+++ b/src/resources.h
@@ -1,4 +1,4 @@
-/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+/* 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:
@@ -20,29 +20,41 @@ 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. */
 
-/* bincat.c: Tiny tool for concatenating binary files */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-int main(int argc, char *argv[]) {
-    const size_t bufSize = 1024 * 256;
-    char *buf = malloc(bufSize);
-    FILE *out = fopen(argv[1], "wb");
-    int i;
-    for (i = 2; i < argc; ++i) {
-        FILE *f = fopen(argv[i], "rb");
-        size_t fileSize = 0;
-        for (;;) {
-            size_t num = fread(buf, 1, bufSize, f);
-            if (num <= 0) break;
-            fileSize += num;
-            fwrite(buf, 1, num, out); 
-        }
-        fclose(f);
-        printf("%zu;", fileSize);
-    }
-    fclose(out);
-    free(buf);
-    return 0;
-}
+#pragma once
+
+#include <the_Foundation/block.h>
+
+iDeclareType(Archive)
+
+iBool               init_Resources      (const char *path);
+void                deinit_Resources    (void);
+
+const iArchive *    archive_Resources   (void);
+
+extern iBlock blobAbout_Resources;
+extern iBlock blobHelp_Resources;
+extern iBlock blobLagrange_Resources;
+extern iBlock blobLicense_Resources;
+extern iBlock blobVersion_Resources;
+extern iBlock blobArghelp_Resources;
+extern iBlock blobDe_Resources;
+extern iBlock blobEn_Resources;
+extern iBlock blobEo_Resources;
+extern iBlock blobEs_Resources;
+extern iBlock blobEs_MX_Resources;
+extern iBlock blobFi_Resources;
+extern iBlock blobFr_Resources;
+extern iBlock blobGl_Resources;
+extern iBlock blobIa_Resources;
+extern iBlock blobIe_Resources;
+extern iBlock blobIsv_Resources;
+extern iBlock blobPl_Resources;
+extern iBlock blobRu_Resources;
+extern iBlock blobSk_Resources;
+extern iBlock blobSr_Resources;
+extern iBlock blobTok_Resources;
+extern iBlock blobUk_Resources;
+extern iBlock blobZh_Hans_Resources;
+extern iBlock blobZh_Hant_Resources;
+extern iBlock imageShadow_Resources;
+extern iBlock fontpackDefault_Resources;
diff --git a/src/ui/root.c b/src/ui/root.c
index d847480f..f66e0f29 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -27,7 +27,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "command.h"
 #include "defs.h"
 #include "documentwidget.h"
-#include "embedded.h"
+#include "resources.h"
 #include "inputwidget.h"
 #include "keys.h"
 #include "labelwidget.h"
diff --git a/src/ui/text.c b/src/ui/text.c
index 09c01d46..e762b891 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -23,7 +23,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "text.h"
 #include "color.h"
 #include "metrics.h"
-#include "embedded.h"
+#include "resources.h"
 #include "window.h"
 #include "paint.h"
 #include "app.h"
@@ -180,21 +180,21 @@ static void init_Font(iFont *d, const iFontSpec *fontSpec, const iFontFile *font
     d->data = NULL;
     d->family = undefined_TextFont;
     /* Note: We only use `family` currently for applying a kerning fix to Nunito. */
-    if (data == &fontNunitoRegular_Embedded ||
-        data == &fontNunitoBold_Embedded ||
-        data == &fontNunitoExtraBold_Embedded ||
-        //data == &fontNunitoLightItalic_Embedded ||
-        data == &fontNunitoExtraLight_Embedded) {
+    if (data == &fontNunitoRegular_Resources ||
+        data == &fontNunitoBold_Resources ||
+        data == &fontNunitoExtraBold_Resources ||
+        //data == &fontNunitoLightItalic_Resources ||
+        data == &fontNunitoExtraLight_Resources) {
         d->family = nunito_TextFont;
     }
-    else if (//data == &fontScheherazadeNewRegular_Embedded) {
-             data == &fontNotoSansArabicUIRegular_Embedded) {
+    else if (//data == &fontScheherazadeNewRegular_Resources) {
+             data == &fontNotoSansArabicUIRegular_Resources) {
         d->family = arabic_TextFont;
     }
-    else if (data == &fontNotoSansSymbolsRegular_Embedded ||
-             data == &fontNotoSansSymbols2Regular_Embedded ||
-             data == &fontNotoEmojiRegular_Embedded ||
-             data == &fontSmolEmojiRegular_Embedded) {
+    else if (data == &fontNotoSansSymbolsRegular_Resources ||
+             data == &fontNotoSansSymbols2Regular_Resources ||
+             data == &fontNotoEmojiRegular_Resources ||
+             data == &fontSmolEmojiRegular_Resources) {
         d->family = emojiAndSymbols_TextFont;
     }
 #endif
diff --git a/src/ui/window.c b/src/ui/window.c
index c63ad76a..8016e8ef 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -26,7 +26,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "bookmarks.h"
 #include "command.h"
 #include "defs.h"
-#include "embedded.h"
+#include "resources.h"
 #include "keys.h"
 #include "labelwidget.h"
 #include "documentwidget.h"
@@ -583,7 +583,7 @@ void init_MainWindow(iMainWindow *d, iRect rect) {
 #if defined (iPlatformLinux)
     SDL_SetWindowMinimumSize(d->base.win, minSize.x * d->base.pixelRatio, minSize.y * d->base.pixelRatio);
     /* Load the window icon. */ {
-        SDL_Surface *surf = loadImage_(&imageLagrange64_Embedded, 0);
+        SDL_Surface *surf = loadImage_(&imageLagrange64_Resources, 0);
         SDL_SetWindowIcon(d->base.win, surf);
         free(surf->pixels);
         SDL_FreeSurface(surf);
@@ -597,7 +597,7 @@ void init_MainWindow(iMainWindow *d, iRect rect) {
     setupUserInterface_MainWindow(d);
     postCommand_App("~bindings.changed"); /* update from bindings */
     /* Load the border shadow texture. */ {
-        SDL_Surface *surf = loadImage_(&imageShadow_Embedded, 0);
+        SDL_Surface *surf = loadImage_(&imageShadow_Resources, 0);
         d->base.borderShadow = SDL_CreateTextureFromSurface(d->base.render, surf);
         SDL_SetTextureBlendMode(d->base.borderShadow, SDL_BLENDMODE_BLEND);
         free(surf->pixels);
@@ -607,7 +607,7 @@ void init_MainWindow(iMainWindow *d, iRect rect) {
 #if defined (LAGRANGE_ENABLE_CUSTOM_FRAME)
     /* Load the app icon for drawing in the title bar. */
     if (prefs_App()->customFrame) {
-        SDL_Surface *surf = loadImage_(&imageLagrange64_Embedded, appIconSize_Root());
+        SDL_Surface *surf = loadImage_(&imageLagrange64_Resources, appIconSize_Root());
         SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "0");
         d->appIcon = SDL_CreateTextureFromSurface(d->base.render, surf);
         free(surf->pixels);