35 files changed, 501 insertions, 173 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 314505c5..69b7c5c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@
 cmake_minimum_required (VERSION 3.9)
 
 project (Lagrange
-    VERSION 1.8.3
+    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,19 @@ 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_SPARKLE          "Use Sparkle for automatic updates (macOS)" 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_WINSPARKLE       "Use WinSparkle for automatic updates (Windows)" 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
@@ -94,14 +93,15 @@ 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})
-
 set (EMB_BIN ${CMAKE_CURRENT_BINARY_DIR}/resources.lgr)
+make_resources (${EMB_BIN} ${RESOURCES})
 set_source_files_properties (${EMB_BIN} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
 
 # Source files.
@@ -144,11 +144,14 @@ 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
     src/stb_image_resize.h
     src/stb_truetype.h
+    src/updater.h
     src/visited.c
     src/visited.h
     # Audio playback:
@@ -219,10 +222,11 @@ 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
+    ${EMB_BIN}
 )
+if (NOT APPLE) # macos.m has Sparkle updater
+    list (APPEND SOURCES src/updater.c)
+endif ()
 if (ENABLE_IPC)
     list (APPEND SOURCES
         src/ipc.c
@@ -363,6 +367,9 @@ if (APPLE)
     else ()
         target_link_libraries (app PUBLIC "-framework AppKit")
     endif ()
+    if (ENABLE_SPARKLE)
+        target_link_libraries (app PUBLIC sparkle)
+    endif ()
     if (CMAKE_OSX_DEPLOYMENT_TARGET AND NOT IOS)
         target_compile_options (app PUBLIC -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET})
         target_link_options (app PUBLIC -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET})
@@ -406,6 +413,9 @@ if (APPLE)
 endif ()
 if (MSYS)
     target_link_libraries (app PUBLIC d2d1 uuid dwmapi) # querying DPI
+    if (ENABLE_WINSPARKLE)
+        target_link_libraries (app PUBLIC winsparkle)        
+    endif ()
 endif ()
 if (UNIX)
     target_link_libraries (app PUBLIC m)
@@ -420,9 +430,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
@@ -433,11 +441,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)
     include (GNUInstallDirs)
     set_target_properties (app PROPERTIES
@@ -464,11 +470,10 @@ MimeType=x-scheme-handler/gemini;x-scheme-handler/gopher;
     install (FILES res/fi.skyjake.Lagrange.appdata.xml
         DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo
     )
-    if (NOT ENABLE_RESOURCE_EMBED)
-        if (NOT ENABLE_RELATIVE_EMBED)
-            target_compile_definitions (app PUBLIC
+    if (NOT ENABLE_RELATIVE_EMBED)
+        target_compile_definitions (app PUBLIC
                 LAGRANGE_EMB_BIN="${CMAKE_INSTALL_FULL_DATADIR}/lagrange/resources.lgr")
         endif ()
-        install (FILES ${EMB_BIN} DESTINATION ${CMAKE_INSTALL_DATADIR}/lagrange)
     endif ()
+    install (FILES ${EMB_BIN} DESTINATION ${CMAKE_INSTALL_DATADIR}/lagrange)
 endif ()
diff --git a/Depends.cmake b/Depends.cmake
index aaa2e8ea..0ea313f3 100644
--- a/Depends.cmake
+++ b/Depends.cmake
@@ -146,6 +146,32 @@ endif ()
 
 add_custom_target (ext-deps DEPENDS ${_dependsToBuild})
 
+if (ENABLE_SPARKLE)
+    # macOS only.
+    add_library (sparkle INTERFACE)
+    set (SPARKLE_FRAMEWORK ${SPARKLE_DIR}/Sparkle.framework)
+    target_link_libraries (sparkle INTERFACE ${SPARKLE_FRAMEWORK})
+    target_compile_definitions (sparkle INTERFACE LAGRANGE_ENABLE_SPARKLE=1)
+    message (STATUS "Using Sparkle: ${SPARKLE_FRAMEWORK}")
+    if (NOT SPARKLE_ARCH)
+        message (FATAL_ERROR "Set SPARKLE_ARCH to a CPU architecture ID (e.g., arm64)")
+    endif ()
+endif ()
+
+if (ENABLE_WINSPARKLE)
+    # Windows only.
+    add_library (winsparkle INTERFACE)
+    target_include_directories (winsparkle INTERFACE ${WINSPARKLE_DIR}/include)
+    set (WINSPARKLE_DLL ${WINSPARKLE_DIR}/x64/Release/WinSparkle.dll)
+    target_link_libraries (winsparkle INTERFACE ${WINSPARKLE_DLL})
+    target_compile_definitions (winsparkle INTERFACE LAGRANGE_ENABLE_WINSPARKLE=1)
+    install (
+        PROGRAMS ${WINSPARKLE_DLL}
+        DESTINATION .
+    )
+    message (STATUS "Using WinSparkle: ${WINSPARKLE_DLL}")
+endif ()
+
 find_package (PkgConfig REQUIRED)
 pkg_check_modules (SDL2 REQUIRED sdl2)
 pkg_check_modules (MPG123 IMPORTED_TARGET libmpg123)
diff --git a/README.md b/README.md
index 5e66ea3c..9e68bf26 100644
--- a/README.md
+++ b/README.md
@@ -35,10 +35,10 @@ On openSUSE Tumbleweed:
 
 You need a POSIX-compatible environment to compile Lagrange.
 
-The required tools are a C11 compiler (e.g., Clang or GCC), CMake and `pkg-config`. Additional tools are required for the optional compilation of HarfBuzz and GNU FriBidi (see next section for details).
+The required tools are a C11 compiler (e.g., Clang or GCC), CMake, `pkg-config`, and `zip`. Additional tools are required for the optional compilation of HarfBuzz and GNU FriBidi (see next section for details).
 
 1. Download and extract a source tarball from [Releases][rel]. Please note that the GitHub/Gitea-generated tarballs do not contain HarfBuzz, GNU FriBidi, or [the_Foundation](https://git.skyjake.fi/skyjake/the_Foundation) submodules; check which tarball you are getting. Alternatively, you may also clone the repository and its submodules: `git clone --recursive --branch release https://git.skyjake.fi/gemini/lagrange`
-2. Check that you have the recommended build tools and dependencies installed: CMake, SDL 2, OpenSSL 1.1.1, libpcre, libunistring, GNU FriBidi, and zlib. For example, on macOS this would do the trick (using Homebrew): ```brew install cmake sdl2 openssl@1.1 pcre libunistring fribidi``` Or on Ubuntu: ```sudo apt install cmake libsdl2-dev libssl-dev libpcre3-dev zlib1g-dev libunistring-dev libfribidi-dev```
+2. Check that you have the recommended build tools and dependencies installed: SDL 2, OpenSSL 1.1.1, libpcre, libunistring, GNU FriBidi, and zlib. For example, on macOS this would do the trick (using Homebrew): ```brew install cmake sdl2 openssl@1.1 pcre libunistring fribidi``` Or on Ubuntu: ```sudo apt install cmake zip libsdl2-dev libssl-dev libpcre3-dev zlib1g-dev libunistring-dev libfribidi-dev```
 3. Optionally, install the mpg123 decoder library for MPEG audio support. For example, the macOS Homebrew package is `mpg123` and on Ubuntu it is `libmpg123-dev`.
 4. Create a build directory.
 5. In your empty build directory, run CMake: ```cmake {path_of_lagrange_sources} -DCMAKE_BUILD_TYPE=Release```
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/MacOSXBundleInfo.plist.in b/res/MacOSXBundleInfo.plist.in
index a17831ad..08907283 100644
--- a/res/MacOSXBundleInfo.plist.in
+++ b/res/MacOSXBundleInfo.plist.in
@@ -104,5 +104,9 @@
                         </array>
                 </dict>
         </array>
+                <key>SUFeedURL</key>
+                <string>https://etc.skyjake.fi/lagrange/appcast-${SPARKLE_ARCH}.xml</string>
+                <key>SUPublicEDKey</key>
+                <string>NK3VR3l8lypjm05VS4+Ry8A95rhmRzX+ftgQpzqYAy4=</string>
 </dict>
 </plist>
diff --git a/res/about/version.gmi b/res/about/version.gmi
index b5750c8c..a5e0d01f 100644
--- a/res/about/version.gmi
+++ b/res/about/version.gmi
@@ -6,6 +6,17 @@
 ```
 # Release notes
 
+# 1.9
+
+New features:
+* macOS: Automatic updates using the Sparkle framework.
+* Windows: Automatic updates using the WinSparkle library.
+
+Changes and enhancements:
+* The resource bundle (resources.lgr) is now a regular ZIP archive. This allows it to do double duty as a fontpack containing the built-in fonts. The archive contains a version number to avoid use of obsolete resources.
+
+Fixes:
+
 ## 1.8.3
 * Fixed clicking on UI elements that are over the page top banner. The banner would always get clicked instead.
 * Titan upload identity is remembered as a site-specific setting. It is no longer affected by selections in the Identities sidebar.
@@ -43,7 +54,6 @@ New features:
 * Added warning message about missing font glyphs.
 * Added warning message about terminal emulation. Lagrange supports a small subset of ANSI escape sequences, so page appearance may be incorrect when these are used in content.
 * Added tab close buttons.
-* Added style option to show links as bold regardless of visited status.
 * Added a feed subscription option to exclude web links (HTTP/HTTPS), since those are not viewable in the app by default. 
 * Added an automatic conversion of Markdown to Gemtext when viewing local files. (Not all Markdown features are supported.)
 * Added UI language for Ukrainian (uk).
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 148bba52..abcf95da 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"
@@ -33,6 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "ipc.h"
 #include "periodic.h"
 #include "sitespec.h"
+#include "updater.h"
 #include "ui/certimportwidget.h"
 #include "ui/color.h"
 #include "ui/command.h"
@@ -711,19 +712,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 +741,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")) {
@@ -3127,6 +3126,10 @@ iBool handleCommand_App(const char *cmd) {
         }
         return iFalse;
     }
+    else if (equal_Command(cmd, "updater.check")) {
+        checkNow_Updater();
+        return iTrue;
+    }
     else if (equal_Command(cmd, "fontpack.enable")) {
         const iString *packId = collect_String(suffix_Command(cmd, "id"));
         enablePack_Fonts(packId, arg_Command(cmd));
diff --git a/src/fontpack.c b/src/fontpack.c
index bbf1833e..79f35526 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"
 
@@ -79,6 +79,15 @@ void init_FontFile(iFontFile *d) {
 
 static void load_FontFile_(iFontFile *d, const iBlock *data) {
     set_Block(&d->sourceData, data);
+#if 0
+    /* Count the number of available fonts. */
+    for (int i = 0; ; i++) {
+        if (stbtt_GetFontOffsetForIndex(constData_Block(&d->sourceData), i) < 0) {
+            printf("%s: contains %d fonts\n", cstr_String(&d->id), i);
+            break;
+        }
+    }
+#endif
     const size_t offset = stbtt_GetFontOffsetForIndex(constData_Block(&d->sourceData),
                                                       d->colIndex);
     stbtt_InitFont(&d->stbInfo, constData_Block(data), offset);
@@ -581,11 +590,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/gmutil.c b/src/gmutil.c
index e0792d69..70a3608e 100644
--- a/src/gmutil.c
+++ b/src/gmutil.c
@@ -301,6 +301,10 @@ void urlEncodePath_String(iString *d) {
         return;
     }
     if (isEmpty_Range(&url.path)) {
+        if (equalCase_Rangecc(url.scheme, "gemini") && url.path.start) {            
+            /* Normalize to "/" as per specification (November 2021 update). */
+            insertData_Block(&d->chars, url.path.start - constBegin_String(d), "/", 1);
+        }        
         return;
     }
     iString *encoded = new_String();
diff --git a/src/lang.c b/src/lang.c
index 7b00f172..0bafb42b 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,44 +83,44 @@ 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. */
     /* TODO: How about an array for these? (id, blob, pluralType) */
     iUnused(id);
-    const iBlock *data = equal_CStr(id, "fi")      ? &blobFi_Embedded
-                       : equal_CStr(id, "fr")      ? &blobFr_Embedded
-                       : equal_CStr(id, "cs")      ? &blobCs_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, "hu")      ? &blobHu_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, "cs")      ? &blobCs_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, "hu")      ? &blobHu_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 == &blobCs_Embedded || data == &blobSk_Embedded) {
+    else if (data == &blobCs_Resources || 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/macos.m b/src/macos.m
index 35594b7b..cfbca488 100644
--- a/src/macos.m
+++ b/src/macos.m
@@ -709,3 +709,25 @@ iColor systemAccent_Color(void) {
 #endif
     return (iColor){ 255, 255, 255, 255 };
 }
+
+#if defined (LAGRANGE_ENABLE_SPARKLE)
+#import <Sparkle/Sparkle.h>
+
+void init_Updater(void) {
+    SUUpdater *updater = [SUUpdater sharedUpdater];
+    /* Add it to the menu. */
+    NSMenu *appMenu = [[[NSApp mainMenu] itemAtIndex:0] submenu];
+    NSMenuItem *item = [appMenu insertItemWithTitle:@"Check for Updates…"
+                                             action:@selector(checkForUpdates:)
+                                      keyEquivalent:@""
+                                            atIndex:3];
+    item.target = updater;
+}
+
+#else
+/* dummy as a fallback */
+void init_Updater(void) {}
+#endif
+
+void deinit_Updater(void) {}
+void checkNow_Updater(void) {}
diff --git a/src/main.c b/src/main.c
index f7ac6522..6e5e99e9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -21,6 +21,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #include "app.h"
+#include "updater.h"
 
 #if defined (iPlatformAppleDesktop)
 #  include "macos.h"
@@ -82,11 +83,13 @@ int main(int argc, char **argv) {
     if (SDL_Init(SDL_INIT_AUDIO)) {
         fprintf(stderr, "[SDL] audio init failed: %s\n", SDL_GetError());
     }
+    init_Updater();
     run_App(argc, argv);
     SDL_Quit();
 #if defined (LAGRANGE_ENABLE_MPG123)
     mpg123_exit();
 #endif
+    deinit_Updater();
     deinit_Foundation();
     return 0;
 }
diff --git a/src/resources.c b/src/resources.c
new file mode 100644
index 00000000..24fbe214
--- /dev/null
+++ b/src/resources.c
@@ -0,0 +1,127 @@
+/* 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 blobCs_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 blobHu_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;
+iBlock imageLagrange64_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" },
+    { &blobCs_Resources, "lang/cs.bin" },
+    { &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" },
+    { &blobHu_Resources, "lang/hu.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" },
+    { &imageLagrange64_Resources, "lagrange-64.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/src/resources.h b/src/resources.h
new file mode 100644
index 00000000..df5cac36
--- /dev/null
+++ b/src/resources.h
@@ -0,0 +1,63 @@
+/* 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/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 blobCs_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 blobHu_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;
+extern iBlock imageLagrange64_Resources;
diff --git a/src/ui/root.c b/src/ui/root.c
index 95126654..4849d0c7 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"
@@ -78,6 +78,9 @@ static const iMenuItem navMenuItems_[] = {
     { gear_Icon " ${menu.preferences}", SDLK_COMMA, KMOD_PRIMARY, "preferences" },
     { "${menu.help}", SDLK_F1, 0, "!open url:about:help" },
     { "${menu.releasenotes}", 0, 0, "!open url:about:version" },
+ #if defined (LAGRANGE_ENABLE_WINSPARKLE)
+    { "${menu.update}", 0, 0, "updater.check" },
+ #endif
     { "---" },
     { "${menu.quit}", 'q', KMOD_PRIMARY, "quit" }
 };
diff --git a/src/ui/text.c b/src/ui/text.c
index abe8640c..91633f27 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 fa364cff..2f6fe430 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);
diff --git a/src/updater.c b/src/updater.c
new file mode 100644
index 00000000..706de31d
--- /dev/null
+++ b/src/updater.c
@@ -0,0 +1,86 @@
+/* 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 "updater.h"
+
+#if defined (LAGRANGE_ENABLE_WINSPARKLE)
+#include <time.h>
+#include <winsparkle.h>
+
+static const char *signaturePublicKeyPem_ = 
+    "-----BEGIN PUBLIC KEY-----\n"
+    "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\n"
+    "4YdR7KTyioKNHjvC5EG2bvHtYfw6ng6zSOY=\n"
+    "-----END PUBLIC KEY-----";
+
+void init_Updater(void) {
+    win_sparkle_set_appcast_url("https://etc.skyjake.fi/lagrange/appcast-windows.xml");
+    win_sparkle_set_dsa_pub_pem(signaturePublicKeyPem_);
+    win_sparkle_init();
+}
+
+void deinit_Updater(void) {
+    win_sparkle_cleanup();
+}
+
+void checkNow_Updater(void) {
+    win_sparkle_check_update_with_ui();
+}
+
+#else
+/* dummy as a fallback */
+void init_Updater(void) {}
+void deinit_Updater(void) {}
+void checkNow_Updater(void) {}
+#endif
diff --git a/res/bincat.c b/src/updater.h
index 8fc9d831..00cb8b7f 100644
--- a/res/bincat.c
+++ b/src/updater.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,9 @@ 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 */
+#pragma once
 
-#include <stdio.h>
-#include <stdlib.h>
+void    init_Updater        (void);
+void    deinit_Updater      (void);
 
-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;
-}
+void    checkNow_Updater    (void);