bot: Scrape my changes better from gitea RSS.

update: speedscope 1.21.0.
cleanup: Consolidate countof macros.
2024-11-18 22:58:51 -05:00 · 2024-11-17 19:07:27 -05:00 · 2024-11-13 20:22:42 -05:00 · 2024-11-13 19:23:04 -05:00 · 2024-11-13 19:15:59 -05:00 · 2024-11-13 19:03:01 -05:00
116 changed files with 13214 additions and 6386 deletions
--- a/.clang-format
+++ b/.clang-format
@ -14,7 +14,7 @@ IndentWidth: 4
 MaxEmptyLinesToKeep: 1
 ObjCBlockIndentWidth: 4
 ObjCBreakBeforeNestedBlockParam: false
-SortIncludes: false
+SortIncludes: true
 TabWidth: 4
 UseTab: Always
 ...
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@ -24,7 +24,7 @@ jobs:
        uses: android-actions/setup-android@v3
        with:
          packages: 'tools platform-tools build-tools;34.0.0 platforms;android-34 ndk;26.3.11579264'
-      - run: sudo apt update && sudo apt install -y doxygen graphviz mingw-w64
+      - run: sudo apt update && sudo apt install -y doxygen graphviz mingw-w64 libgpgme11
      - run: ANDROID_SDK=$HOME/.android/sdk make -j`nproc` all docs
      - run: docker build .
      - uses: actions/upload-artifact@v3
--- a/.gitignore
+++ b/.gitignore
@ -4,6 +4,7 @@ db.*
 deps/ios_toolchain/
 deps/openssl/
 dist/
+.flatpak-builder
 .keys
 logs/
 **/node_modules
--- a/220
+++ b/220
@ -3,14 +3,14 @@
 MAKEFLAGS += --warn-undefined-variables
 MAKEFLAGS += --no-builtin-rules

-VERSION_CODE := 27
-VERSION_NUMBER := 0.0.23
-VERSION_NAME := Me upon my pony on my boat.
+VERSION_CODE := 30
+VERSION_NUMBER := 0.0.25-wip
+VERSION_NAME := This program kills fascists.

-SQLITE_URL := https://www.sqlite.org/2024/sqlite-amalgamation-3460100.zip
+SQLITE_URL := https://www.sqlite.org/2024/sqlite-amalgamation-3470000.zip
 BUNDLETOOL_URL := https://github.com/google/bundletool/releases/download/1.17.0/bundletool-all-1.17.0.jar
-LINUXDEPLOY_URL := https://github.com/linuxdeploy/linuxdeploy/releases/download/1-alpha-20240109-1/linuxdeploy-x86_64.AppImage
-LINUXDEPLOY_MD5 := 659d69326199524552bfbbe46cb0adae  out/linuxdeploy
+APPIMAGETOOL_URL := https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
+APPIMAGETOOL_MD5 := e989fadfc4d685fd3d6aeeb9b525d74d  out/appimagetool

 PROJECT = tildefriends
 BUILD_DIR ?= out
@ -66,6 +66,7 @@ CFLAGS += \
 	-g
 LDFLAGS += \
 	-Wno-attributes \
+	-Wno-aggressive-loop-optimizations \
 	-flto=auto

 ANDROID_MIN_SDK_VERSION := 24
@ -103,9 +104,6 @@ BUILD_TYPES += \
 	androidrelease-x86_64
 all: out/TildeFriends-arm-debug.apk out/TildeFriends-arm-release.apk out/TildeFriends-x86-debug.apk out/TildeFriends-x86-release.apk out/TildeFriends-release.fdroid.apk
 endif
-ifeq ($(UNAME_S),Linux)
-all: appimage
-endif

 WINDOWS_TARGETS := \
 	out/windebug/tildefriends.exe \
@ -165,7 +163,9 @@ NONANDROID_RELEASE_TARGETS := $(filter-out $(ANDROID_ARM64_TARGETS),$(RELEASE_TA
 NONANDROID_TARGETS := $(filter-out $(ANDROID_TARGETS),$(ALL_TARGETS))
 NONMACOS_TARGETS := $(filter-out $(MACOS_TARGETS) $(IOS_TARGETS) $(IOSSIM_TARGETS),$(ALL_TARGETS))
 DEADSTRIP_TARGETS := $(filter-out $(ANDROID_TARGETS),$(NONMACOS_TARGETS))
+ifneq ($(UNAME_S),OpenBSD)
 $(NONMACOS_TARGETS): LDFLAGS += -static-libgcc
+endif

 $(NONANDROID_TARGETS): CFLAGS += -fno-omit-frame-pointer
 $(filter-out $(WINDOWS_TARGETS),$(ALL_TARGETS)): LDFLAGS += -rdynamic
@ -225,12 +225,15 @@ $(ANDROID_X86_64_TARGETS): CFLAGS += -Ideps/openssl/android/x86_64/usr/local/inc
 $(ANDROID_X86_64_TARGETS): LDFLAGS += -Ldeps/openssl/android/x86_64/usr/local/lib
 $(NONMACOS_TARGETS): CFLAGS += -Wno-cast-function-type
 $(DEADSTRIP_TARGETS): LDFLAGS += -Wl,--gc-sections
-$(IOS_TARGETS): CFLAGS += -mios-version-min=9.0 -Ideps/openssl/ios/ios64-xcrun/usr/local/include
-$(IOS_TARGETS): LDFLAGS += -Ldeps/openssl/ios/ios64-xcrun/usr/local/lib
+$(IOS_TARGETS): CFLAGS += -miphoneos-version-min=9.0 -Ideps/openssl/ios/ios64-xcrun/usr/local/include
+$(IOS_TARGETS): LDFLAGS += -miphoneos-version-min=9.0 -Ldeps/openssl/ios/ios64-xcrun/usr/local/lib
 $(IOSSIM_TARGETS): CFLAGS += -Ideps/openssl/ios/iossimulator-xcrun/usr/local/include
 $(IOSSIM_TARGETS): LDFLAGS += -Ldeps/openssl/ios/iossimulator-xcrun/usr/local/lib

 ifeq ($(UNAME_M),x86_64)
+ifeq ($(UNAME_S),Linux)
+all: appimage
+endif
 ifneq ($(UNAME_S),Haiku)
 out/debug/tildefriends: CFLAGS += -fsanitize=address -fsanitize=undefined -fno-common
 out/debug/tildefriends: LDFLAGS += -fsanitize=address -fsanitize=undefined
@ -278,98 +281,101 @@ $(filter-out $(BUILD_DIR)/android% $(BUILD_DIR)/macos% $(BUILD_DIR)/ios%,$(APP_O
 endif

 ARES_SOURCES := \
-	deps/c-ares/src/lib/ares_platform.c \
-	deps/c-ares/src/lib/record/ares_dns_mapping.c \
-	deps/c-ares/src/lib/record/ares_dns_parse.c \
-	deps/c-ares/src/lib/record/ares_dns_write.c \
-	deps/c-ares/src/lib/record/ares_dns_name.c \
-	deps/c-ares/src/lib/record/ares_dns_record.c \
-	deps/c-ares/src/lib/record/ares_dns_multistring.c \
-	deps/c-ares/src/lib/ares_destroy.c \
-	deps/c-ares/src/lib/ares_data.c \
-	deps/c-ares/src/lib/ares_sysconfig.c \
+	deps/c-ares/src/lib/ares_addrinfo2hostent.c \
+	deps/c-ares/src/lib/ares_addrinfo_localhost.c \
+	deps/c-ares/src/lib/ares_android.c \
 	deps/c-ares/src/lib/ares_cancel.c \
-	deps/c-ares/src/lib/ares_metrics.c \
-	deps/c-ares/src/lib/ares_getnameinfo.c \
-	deps/c-ares/src/lib/legacy/ares_parse_txt_reply.c \
-	deps/c-ares/src/lib/legacy/ares_parse_naptr_reply.c \
-	deps/c-ares/src/lib/legacy/ares_create_query.c \
-	deps/c-ares/src/lib/legacy/ares_parse_mx_reply.c \
-	deps/c-ares/src/lib/legacy/ares_parse_srv_reply.c \
-	deps/c-ares/src/lib/legacy/ares_parse_ptr_reply.c \
-	deps/c-ares/src/lib/legacy/ares_parse_caa_reply.c \
-	deps/c-ares/src/lib/legacy/ares_parse_aaaa_reply.c \
-	deps/c-ares/src/lib/legacy/ares_expand_name.c \
-	deps/c-ares/src/lib/legacy/ares_parse_uri_reply.c \
-	deps/c-ares/src/lib/legacy/ares_parse_a_reply.c \
-	deps/c-ares/src/lib/legacy/ares_expand_string.c \
-	deps/c-ares/src/lib/legacy/ares_fds.c \
-	deps/c-ares/src/lib/legacy/ares_parse_ns_reply.c \
-	deps/c-ares/src/lib/legacy/ares_parse_soa_reply.c \
-	deps/c-ares/src/lib/legacy/ares_getsock.c \
-	deps/c-ares/src/lib/windows_port.c \
-	deps/c-ares/src/lib/ares_qcache.c \
-	deps/c-ares/src/lib/ares_update_servers.c \
-	deps/c-ares/src/lib/ares_process.c \
+	deps/c-ares/src/lib/ares_close_sockets.c \
+	deps/c-ares/src/lib/ares_conn.c \
+	deps/c-ares/src/lib/ares_cookie.c \
+	deps/c-ares/src/lib/ares_data.c \
+	deps/c-ares/src/lib/ares_destroy.c \
+	deps/c-ares/src/lib/ares_free_hostent.c \
+	deps/c-ares/src/lib/ares_free_string.c \
+	deps/c-ares/src/lib/ares_freeaddrinfo.c \
+	deps/c-ares/src/lib/ares_getaddrinfo.c \
 	deps/c-ares/src/lib/ares_getenv.c \
+	deps/c-ares/src/lib/ares_gethostbyaddr.c \
 	deps/c-ares/src/lib/ares_gethostbyname.c \
+	deps/c-ares/src/lib/ares_getnameinfo.c \
+	deps/c-ares/src/lib/ares_hosts_file.c \
+	deps/c-ares/src/lib/ares_init.c \
+	deps/c-ares/src/lib/ares_library_init.c \
+	deps/c-ares/src/lib/ares_metrics.c \
+	deps/c-ares/src/lib/ares_options.c \
+	deps/c-ares/src/lib/ares_parse_into_addrinfo.c \
+	deps/c-ares/src/lib/ares_process.c \
+	deps/c-ares/src/lib/ares_qcache.c \
+	deps/c-ares/src/lib/ares_query.c \
+	deps/c-ares/src/lib/ares_search.c \
 	deps/c-ares/src/lib/ares_send.c \
-	deps/c-ares/src/lib/dsa/ares__slist.c \
-	deps/c-ares/src/lib/dsa/ares__htable.c \
-	deps/c-ares/src/lib/dsa/ares__llist.c \
-	deps/c-ares/src/lib/dsa/ares__htable_szvp.c \
-	deps/c-ares/src/lib/dsa/ares__htable_asvp.c \
-	deps/c-ares/src/lib/dsa/ares__htable_vpvp.c \
-	deps/c-ares/src/lib/dsa/ares__htable_strvp.c \
-	deps/c-ares/src/lib/dsa/ares__array.c \
-	deps/c-ares/src/lib/ares__socket.c \
-	deps/c-ares/src/lib/event/ares_event_poll.c \
-	deps/c-ares/src/lib/event/ares_event_thread.c \
-	deps/c-ares/src/lib/event/ares_event_select.c \
-	deps/c-ares/src/lib/event/ares_event_kqueue.c \
+	deps/c-ares/src/lib/ares_set_socket_functions.c \
+	deps/c-ares/src/lib/ares_socket.c \
+	deps/c-ares/src/lib/ares_sortaddrinfo.c \
+	deps/c-ares/src/lib/ares_strerror.c \
+	deps/c-ares/src/lib/ares_sysconfig.c \
+	deps/c-ares/src/lib/ares_sysconfig_files.c \
+	deps/c-ares/src/lib/ares_sysconfig_mac.c \
+	deps/c-ares/src/lib/ares_sysconfig_win.c \
+	deps/c-ares/src/lib/ares_update_servers.c \
+	deps/c-ares/src/lib/ares_version.c \
+	deps/c-ares/src/lib/dsa/ares_array.c \
+	deps/c-ares/src/lib/dsa/ares_htable.c \
+	deps/c-ares/src/lib/dsa/ares_htable_asvp.c \
+	deps/c-ares/src/lib/dsa/ares_htable_dict.c \
+	deps/c-ares/src/lib/dsa/ares_htable_strvp.c \
+	deps/c-ares/src/lib/dsa/ares_htable_szvp.c \
+	deps/c-ares/src/lib/dsa/ares_htable_vpvp.c \
+	deps/c-ares/src/lib/dsa/ares_llist.c \
+	deps/c-ares/src/lib/dsa/ares_slist.c \
 	deps/c-ares/src/lib/event/ares_event_configchg.c \
 	deps/c-ares/src/lib/event/ares_event_epoll.c \
+	deps/c-ares/src/lib/event/ares_event_kqueue.c \
+	deps/c-ares/src/lib/event/ares_event_poll.c \
+	deps/c-ares/src/lib/event/ares_event_select.c \
+	deps/c-ares/src/lib/event/ares_event_thread.c \
 	deps/c-ares/src/lib/event/ares_event_wake_pipe.c \
 	deps/c-ares/src/lib/event/ares_event_win32.c \
-	deps/c-ares/src/lib/ares_search.c \
-	deps/c-ares/src/lib/ares__parse_into_addrinfo.c \
-	deps/c-ares/src/lib/ares__hosts_file.c \
-	deps/c-ares/src/lib/ares_getaddrinfo.c \
-	deps/c-ares/src/lib/ares__addrinfo2hostent.c \
-	deps/c-ares/src/lib/ares_freeaddrinfo.c \
-	deps/c-ares/src/lib/ares_strerror.c \
-	deps/c-ares/src/lib/ares_version.c \
-	deps/c-ares/src/lib/ares_gethostbyaddr.c \
-	deps/c-ares/src/lib/ares__addrinfo_localhost.c \
-	deps/c-ares/src/lib/ares_free_hostent.c \
-	deps/c-ares/src/lib/ares__close_sockets.c \
-	deps/c-ares/src/lib/ares_free_string.c \
-	deps/c-ares/src/lib/ares_init.c \
-	deps/c-ares/src/lib/ares_options.c \
-	deps/c-ares/src/lib/str/ares_strcasecmp.c \
-	deps/c-ares/src/lib/str/ares__buf.c \
-	deps/c-ares/src/lib/str/ares_strsplit.c \
-	deps/c-ares/src/lib/str/ares_str.c \
-	deps/c-ares/src/lib/ares_sysconfig_mac.c \
-	deps/c-ares/src/lib/ares__sortaddrinfo.c \
-	deps/c-ares/src/lib/ares_sysconfig_files.c \
-	deps/c-ares/src/lib/util/ares__iface_ips.c \
-	deps/c-ares/src/lib/util/ares__timeval.c \
-	deps/c-ares/src/lib/util/ares_math.c \
-	deps/c-ares/src/lib/util/ares_rand.c \
-	deps/c-ares/src/lib/util/ares__threads.c \
-	deps/c-ares/src/lib/ares_query.c \
-	deps/c-ares/src/lib/ares_cookie.c \
 	deps/c-ares/src/lib/inet_net_pton.c \
 	deps/c-ares/src/lib/inet_ntop.c \
-	deps/c-ares/src/lib/ares_library_init.c \
-	deps/c-ares/src/lib/ares_android.c \
-	deps/c-ares/src/lib/ares_sysconfig_win.c \
+	deps/c-ares/src/lib/legacy/ares_create_query.c \
+	deps/c-ares/src/lib/legacy/ares_expand_name.c \
+	deps/c-ares/src/lib/legacy/ares_expand_string.c \
+	deps/c-ares/src/lib/legacy/ares_fds.c \
+	deps/c-ares/src/lib/legacy/ares_getsock.c \
+	deps/c-ares/src/lib/legacy/ares_parse_a_reply.c \
+	deps/c-ares/src/lib/legacy/ares_parse_aaaa_reply.c \
+	deps/c-ares/src/lib/legacy/ares_parse_caa_reply.c \
+	deps/c-ares/src/lib/legacy/ares_parse_mx_reply.c \
+	deps/c-ares/src/lib/legacy/ares_parse_naptr_reply.c \
+	deps/c-ares/src/lib/legacy/ares_parse_ns_reply.c \
+	deps/c-ares/src/lib/legacy/ares_parse_ptr_reply.c \
+	deps/c-ares/src/lib/legacy/ares_parse_soa_reply.c \
+	deps/c-ares/src/lib/legacy/ares_parse_srv_reply.c \
+	deps/c-ares/src/lib/legacy/ares_parse_txt_reply.c \
+	deps/c-ares/src/lib/legacy/ares_parse_uri_reply.c \
+	deps/c-ares/src/lib/record/ares_dns_mapping.c \
+	deps/c-ares/src/lib/record/ares_dns_multistring.c \
+	deps/c-ares/src/lib/record/ares_dns_name.c \
+	deps/c-ares/src/lib/record/ares_dns_parse.c \
+	deps/c-ares/src/lib/record/ares_dns_record.c \
+	deps/c-ares/src/lib/record/ares_dns_write.c \
+	deps/c-ares/src/lib/str/ares_buf.c \
+	deps/c-ares/src/lib/str/ares_str.c \
+	deps/c-ares/src/lib/str/ares_strsplit.c \
+	deps/c-ares/src/lib/util/ares_iface_ips.c \
+	deps/c-ares/src/lib/util/ares_math.c \
+	deps/c-ares/src/lib/util/ares_rand.c \
+	deps/c-ares/src/lib/util/ares_threads.c \
+	deps/c-ares/src/lib/util/ares_timeval.c \
+	deps/c-ares/src/lib/util/ares_uri.c \
+	deps/c-ares/src/lib/windows_port.c \
 	deps/c-ares/src/lib/ares_timeout.c
 ARES_OBJS := $(call get_objs,ARES_SOURCES)
 $(ARES_OBJS): CFLAGS += \
 	-Ideps/c-ares/include \
 	-Ideps/c-ares/src/lib \
+	-Ideps/c-ares/src/lib/include \
 	-Ideps/c-ares_config/ \
 	-D_GNU_SOURCE \
 	-Wno-unused-function \
@ -503,10 +509,12 @@ $(UV_OBJS): CFLAGS += \
 	-Wno-incompatible-pointer-types \
 	-Wno-maybe-uninitialized \
 	-Wno-sign-compare \
+	-Wno-unknown-attributes \
 	-Wno-unused-but-set-parameter \
 	-Wno-unused-but-set-variable \
 	-Wno-unused-result \
-	-Wno-unused-variable
+	-Wno-unused-variable \
+	-Wno-nonnull
 $(UV_OBJS): CFLAGS += -fno-lto
 $(filter out/win%,$(UV_OBJS)): \
 	CFLAGS += \
@ -587,7 +595,6 @@ ifneq ($(UNAME_S),OpenBSD)
 $(filter-out $(BUILD_DIR)/win%,$(SODIUM_OBJS)): CFLAGS += \
 	-DHAVE_ALLOCA_H
 endif
-$(SODIUM_OBJS): CFLAGS := $(filter-out -flto,$(CFLAGS))

 SQLITE_SOURCES := deps/sqlite/sqlite3.c
 SQLITE_OBJS := $(call get_objs,SQLITE_SOURCES)
@ -1001,6 +1008,7 @@ out/data.zip: $(RAW_FILES)
 out/tildefriends-%.app/tildefriends: out/%/tildefriends out/tildefriends-%.app/Info.plist out/tildefriends-%.app/tildefriends.png out/data.zip
 	@mkdir -p $(dir $@)
 	@cp -v $< $@
+	@cp -v out/data.zip $(@D)/
 ifeq ($(HAVE_LINUX_IOS),1)
 	@zsign -q -k .keys/apple.p12 -f -m src/ios/embedded.mobileprovision $(realpath $(dir $@))
 endif
@ -1077,21 +1085,31 @@ endif

 out/tildefriends-x86_64.AppImage: out/release/tildefriends out/data.zip
 	@echo "[appimage] $$@"
-	@mkdir -p out/AppDir/usr/bin
-	@mkdir -p out/AppDir/usr/share/applications
-	@mkdir -p out/AppDir/usr/share/icons/hicolor/scalable/apps
-	@echo $(LINUXDEPLOY_MD5) > out/linuxdeploy.md5
-	@test -x out/linuxdeploy || curl -q -L -o out/linuxdeploy $(LINUXDEPLOY_URL) && md5sum -c out/linuxdeploy.md5 && chmod +x out/linuxdeploy
-	@echo "[Desktop Entry]\nName=tildefriends\nExec=tildefriends\nIcon=tildefriends\nType=Application\nCategories=Network" > out/AppDir/usr/share/applications/tildefriends.desktop
-	@cp src/ios/tildefriends.svg out/AppDir/usr/share/icons/hicolor/scalable/apps/
-	@cat out/release/tildefriends out/data.zip > out/AppDir/usr/bin/tildefriends
-	@chmod +x out/AppDir/usr/bin/tildefriends
-	@cd out; ./linuxdeploy --appimage-extract; cd ..
-	@unset SOURCE_DATE_EPOCH; cd out; squashfs-root/usr/bin/linuxdeploy --appdir AppDir --output appimage; cd ..
+	@rm -rf out/tildefriends.AppDir
+	@mkdir -p out/tildefriends.AppDir/usr/bin
+	@mkdir -p out/tildefriends.AppDir/usr/share/applications
+	@mkdir -p out/tildefriends.AppDir/usr/share/icons/hicolor/scalable/apps
+	@mkdir -p out/tildefriends.AppDir/usr/share/tildefriends
+	@echo $(APPIMAGETOOL_MD5) > out/appimagetool.md5
+	@test -x out/appimagetool || curl -q -L -o out/appimagetool $(APPIMAGETOOL_URL) && md5sum -c out/appimagetool.md5 && chmod +x out/appimagetool
+	@echo "[Desktop Entry]\nName=tildefriends\nExec=/usr/bin/tildefriends\nIcon=/usr/share/icons/hicolor/scalable/apps/tildefriends\nType=Application\nCategories=Network" > out/tildefriends.AppDir/tildefriends.desktop
+	@cp src/ios/tildefriends.svg out/tildefriends.AppDir/usr/share/icons/hicolor/scalable/apps/
+	@cp src/ios/tildefriends.svg out/tildefriends.AppDir/
+	@cp out/release/tildefriends out/tildefriends.AppDir/usr/bin/
+	@cp out/data.zip out/tildefriends.AppDir/usr/share/tildefriends/data.zip
+	@echo "#!/bin/sh\n\$${APPDIR}/usr/bin/tildefriends run -z \$$APPDIR/usr/share/tildefriends/data.zip" > out/tildefriends.AppDir/AppRun
+	@chmod +x out/tildefriends.AppDir/AppRun
+	@cd out; ./appimagetool --appimage-extract; cd ..
+	@cd out; unset SOURCE_DATE_EPOCH; PATH=$$PATH:squashfs-root/usr/bin ARCH=x86_64 squashfs-root/usr/bin/appimagetool -u 'zsync|https://dev.tildefriends.net/releases/tildefriends-x86_64.AppImage.zsync' tildefriends.AppDir tildefriends-x86_64.AppImage; cd ..

 appimage: out/tildefriends-x86_64.AppImage
 .PHONY: appimage

+flatpak: out/
+	flatpak-builder --force-clean --user --install-deps-from=flathub --install --repo=out/flatpak-repo out/flatpak src/com.unprompted.tildefriends.yml
+	flatpak build-bundle out/flatpak-repo out/tildefriends.flatpak com.unprompted.tildefriends
+.PHONY: flatpak
+
 clean:
 	rm -rf $(BUILD_DIR)
 .PHONY: clean
--- a/README.md
+++ b/README.md
@ -19,8 +19,24 @@ Scuttlebutt, as well as a platform for writing and running web applications.
 Builds on Linux (x86_64 and aarch64), MacOS, OpenBSD, and Haiku. Builds for
 all of those host platforms plus mingw64, iOS, and android.

-1. Requires openssl (`libssl-dev`, in debian-speak). All other dependencies
-   are kept up to date in the tree.
+Tilde Friends uses git submodules, so either:
+
+```
+git clone --recurse-submodules https://dev.tildefriends.net/cory/tildefriends.git
+```
+
+or:
+
+```
+git clone https://dev.tildefriends.net/cory/tildefriends.git
+cd tildefriends
+git submodule update --init --recursive
+```
+
+The `.tar.xz` source releases are all-inclusive.
+
+1. On Linux only, system OpenSSL libraries (`libssl-dev`, in debian-speak) are
+   assumed to be available.
 2. To build, run `make debug` or `make release`. An executable will be
   generated in a subdirectory of `out/`.
 3. It's possible to build for Android, iOS, and Windows on Linux, if you have
--- a/apps/api.json
+++ b/apps/api.json
@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
 	"emoji": "📜",
-	"previous": "&miGORZ8BwjHg2YO0t4bms6SI28XWPYqnqOZ8u9zsbZc=.sha256"
+	"previous": "&BEf0nraBdHk/+PWqx6tOSu5rheWVaxaL7orAOz3285M=.sha256"
 }
--- a/apps/api/app.js
+++ b/apps/api/app.js
@ -21,7 +21,7 @@ function* treeify(prefix, o) {

 function markdown(md) {
 	let parsed = new commonmark.Parser().parse(md ?? '*undocumented*');
-	return new commonmark.HtmlRenderer().render(parsed);
+	return new commonmark.HtmlRenderer({safe: true}).render(parsed);
 }

 function document(api) {
--- a/apps/blog.json
+++ b/apps/blog.json
@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
 	"emoji": "🪵",
-	"previous": "&TIrBnpN3iz3O9L9MCCteAcVJZjA83EKdcfu4SCM76VE=.sha256"
+	"previous": "&3jabNEk6W2uolzTvfXX6fcWF50N3501vtgZ6ZxFVJ1s=.sha256"
 }
--- a/apps/blog/blog.js
+++ b/apps/blog/blog.js
@ -52,8 +52,8 @@ export async function get_blog_message(id) {
 }

 export function markdown(md) {
-	let reader = new commonmark.Parser({safe: true});
-	let writer = new commonmark.HtmlRenderer();
+	let reader = new commonmark.Parser();
+	let writer = new commonmark.HtmlRenderer({safe: true});
 	let parsed = reader.parse(md || '');
 	let walker = parsed.walker();
 	let event, node;
--- a/apps/blog/commonmark.min.js
+++ b/apps/blog/commonmark.min.js
--- a/apps/blog/lit-all.min.js
+++ b/apps/blog/lit-all.min.js
--- a/apps/blog/lit-all.min.js.map
+++ b/apps/blog/lit-all.min.js.map
--- a/apps/db.json
+++ b/apps/db.json
@ -1,4 +1,5 @@
 {
 	"type": "tildefriends-app",
-	"emoji": "💽"
+	"emoji": "💽",
+	"previous": "&uQzkIe/Aj8yNhLKe3hEq+5fEJsGwIUx8NVBjJKwoV2U=.sha256"
 }
--- a/apps/db/app.js
+++ b/apps/db/app.js
@ -51,6 +51,19 @@ async function key_list(db) {
 	app.setDocument(doc);
 }

+function load() {
+	if (core.user?.credentials?.session) {
+		database_list();
+	} else {
+		app.setDocument(`<!DOCTYPE html>
+<html>
+<body style="background: #888">
+	<h1>Must be signed in to examine databases.</h1>
+</body>
+</html>`);
+	}
+}
+
 core.register('message', async function (message) {
 	if (message.event == 'hashChange') {
 		let hash = message.hash.substring(1);
@ -62,9 +75,9 @@ core.register('message', async function (message) {
 		} else if (hash.length) {
 			key_list(await database(hash.split(':').slice(1).join(':')));
 		} else {
-			database_list();
+			load();
 		}
 	}
 });

-database_list();
+load();
--- a/apps/identity.json
+++ b/apps/identity.json
@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
 	"emoji": "🪪",
-	"previous": "&zxsmzdLKsiG/WZt/Gw7JOxepgypoktNNbIyWiyFiJVc=.sha256"
+	"previous": "&5kw/2PgcySwOYCmAkjHTR2xTkIx3i7UjQmtQ8MfgWw8=.sha256"
 }
--- a/apps/identity/app.js
+++ b/apps/identity/app.js
@ -1,5 +1,7 @@
 import * as tfrpc from '/tfrpc.js';

+const is_admin = core.user?.credentials?.permissions?.administration;
+
 tfrpc.register(async function get_private_key(id) {
 	return bip39Words(await ssb.getPrivateKey(id));
 });
@ -15,6 +17,9 @@ tfrpc.register(async function delete_id(id) {
 tfrpc.register(async function reload() {
 	await main();
 });
+tfrpc.register(async function make_server(id) {
+	return await ssb.swapWithServerIdentity(id);
+});

 async function main() {
 	let ids = await ssb.getIdentities();
@ -99,6 +104,16 @@ async function main() {
 					alert('Error deleting ID: ' + e);
 				}
 			}
+			handler.make_server = async function make_server(event) {
+				let id = event.srcElement.dataset.id;
+				try {
+					if (confirm('Are you sure you want to make "' + id + '" the server identity?\\n\\nFor it to take effect, you will need to both sign in again and restart Tilde Friends.')) {
+						await tfrpc.rpc.make_server(id);
+					}
+				} catch (e) {
+					alert('Error making server ID: ' + e);
+				}
+			}
 		</script>
 		<header class="w3-theme w3-padding"><h1>SSB Identity Management</h1></header>
 		<div class="w3-card-4 w3-margin">
@ -117,13 +132,14 @@ async function main() {
 		<div class="w3-card-4 w3-margin">
 			<header class="w3-container w3-theme-l2"><h2>Identities</h2></header>
 			<ul class="w3-ul">` +
-			ids
+			(ids ?? [])
 				.map(
 					(
 						id
 					) => `<li style="overflow: hidden; text-wrap: nowrap; text-overflow: ellipsis">
 				<button onclick="handler.export_id(event)" data-id="${id}" class="w3-button w3-theme">Export Identity</button>
 				<button onclick="handler.delete_id(event)" data-id="${id}" class="w3-button w3-theme">Delete Identity</button>
+				${is_admin && id != server_id ? `<button onclick="handler.make_server(event)" data-id="${id}" class="w3-button w3-theme">Make Server Identity</button>` : ''}
 				${id}${id == server_id ? ' <div class="w3-tag w3-theme-l4 w3-round">🖥 local server</div>' : ''}
 			</li>`
 				)
--- a/apps/issues.json
+++ b/apps/issues.json
@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
 	"emoji": "🦟",
-	"previous": "&cUqvSDUls3jn0haD85LPFAGdkc8wFuy347TtATNcJgg=.sha256"
+	"previous": "&O0huuEgL/UQC9bkUfhPOyZFo9eRiz+koOkba6QwCGNA=.sha256"
 }
--- a/apps/issues/commonmark.min.js
+++ b/apps/issues/commonmark.min.js
--- a/apps/issues/lit-all.min.js
+++ b/apps/issues/lit-all.min.js
--- a/apps/issues/lit-all.min.js.map
+++ b/apps/issues/lit-all.min.js.map
--- a/apps/issues/tf-utils.js
+++ b/apps/issues/tf-utils.js
@ -1,5 +1,11 @@
 import * as linkify from './commonmark-linkify.js';

+var reUnsafeProtocol = /^javascript:|vbscript:|file:|data:/i;
+var reSafeDataProtocol = /^data:image\/(?:png|gif|jpeg|webp)/i;
+var potentiallyUnsafe = function (url) {
+	return reUnsafeProtocol.test(url) && !reSafeDataProtocol.test(url);
+};
+
 function image(node, entering) {
 	if (
 		node.firstChild?.type === 'text' &&
@ -61,8 +67,8 @@ function image(node, entering) {
 }

 export function markdown(md) {
-	var reader = new commonmark.Parser({safe: true});
-	var writer = new commonmark.HtmlRenderer();
+	var reader = new commonmark.Parser();
+	var writer = new commonmark.HtmlRenderer({safe: true});
 	writer.image = image;
 	var parsed = reader.parse(md || '');
 	parsed = linkify.transform(parsed);
--- a/apps/journal.json
+++ b/apps/journal.json
@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
 	"emoji": "📝",
-	"previous": "&b//KqE4Vx6kOSBRODK1p/8wjOLKZJ+CBB5IkaBt5YsM=.sha256"
+	"previous": "&5LpOTEnor/rYFk3axyfmmehAoq9aEwNQRH4jwNhRQ7o=.sha256"
 }
--- a/apps/journal/commonmark.min.js
+++ b/apps/journal/commonmark.min.js
--- a/apps/journal/lit-all.min.js
+++ b/apps/journal/lit-all.min.js
--- a/apps/journal/lit-all.min.js.map
+++ b/apps/journal/lit-all.min.js.map
--- a/apps/journal/tf-journal-entry.js
+++ b/apps/journal/tf-journal-entry.js
@ -18,8 +18,8 @@ class TfJournalEntryElement extends LitElement {
 	}

 	markdown(md) {
-		var reader = new commonmark.Parser({safe: true});
-		var writer = new commonmark.HtmlRenderer();
+		var reader = new commonmark.Parser();
+		var writer = new commonmark.HtmlRenderer({safe: true});
 		var parsed = reader.parse(md || '');
 		return writer.render(parsed);
 	}
--- a/apps/sneaker/lit-all.min.js
+++ b/apps/sneaker/lit-all.min.js
--- a/apps/sneaker/lit-all.min.js.map
+++ b/apps/sneaker/lit-all.min.js.map
--- a/apps/ssb.json
+++ b/apps/ssb.json
@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
 	"emoji": "🐌",
-	"previous": "&7L314QLuVl8kNbFIWuXXeLqIVefUe5S66WvEmOMQb2U=.sha256"
+	"previous": "&tL1A9Kt6d8wGwBFPAq5V5GtMqOatVCzuLIG6wwJhdyI=.sha256"
 }
--- a/apps/ssb/app.js
+++ b/apps/ssb/app.js
@ -103,6 +103,9 @@ tfrpc.register(async function encrypt(id, recipients, content) {
 tfrpc.register(async function getActiveIdentity() {
 	return await ssb.getActiveIdentity();
 });
+tfrpc.register(async function sync() {
+	return await ssb.sync();
+});
 core.register('onBroadcastsChanged', async function () {
 	await tfrpc.rpc.set('broadcasts', await ssb.getBroadcasts());
 });
--- a/apps/ssb/commonmark.min.js
+++ b/apps/ssb/commonmark.min.js
--- a/apps/ssb/lit-all.min.js
+++ b/apps/ssb/lit-all.min.js
--- a/apps/ssb/lit-all.min.js.map
+++ b/apps/ssb/lit-all.min.js.map
--- a/apps/ssb/tf-app.js
+++ b/apps/ssb/tf-app.js
@ -67,7 +67,7 @@ class TfElement extends LitElement {
 	}

 	set_hash(hash) {
-		this.hash = hash || '#';
+		this.hash = decodeURIComponent(hash || '#');
 		if (this.hash.startsWith('#q=')) {
 			this.tab = 'search';
 		} else if (this.hash === '#connections') {
--- a/apps/ssb/tf-compose.js
+++ b/apps/ssb/tf-compose.js
@ -180,6 +180,13 @@ class TfComposeElement extends LitElement {
 				break;
 			}
 		}
+
+		event.preventDefault();
+		document.execCommand(
+			'insertText',
+			false,
+			event.clipboardData.getData('text/plain')
+		);
 	}

 	async submit() {
--- a/apps/ssb/tf-message.js
+++ b/apps/ssb/tf-message.js
@ -73,16 +73,17 @@ class TfMessageElement extends LitElement {
 			}
 		}
 		if (this.message?.votes?.length) {
-			return html`
-			<div class="w3-container">
-				<div class="w3-button w3-bar w3-padding-small" @click=${this.show_reactions}>
+			return html` <div class="w3-container">
+				<div
+					class="w3-button w3-bar w3-padding-small"
+					@click=${this.show_reactions}
+				>
 					${(this.message.votes || []).map(
 						(vote) => html`
 							<span
 								class="w3-bar-item w3-padding-small"
-								title="${this.users[vote.author]?.name ?? vote.author} ${new Date(
-									vote.timestamp
-								)}"
+								title="${this.users[vote.author]?.name ??
+								vote.author} ${new Date(vote.timestamp)}"
 							>
 								${normalize_expression(vote.content.vote.expression)}
 							</span>
--- a/apps/ssb/tf-profile.js
+++ b/apps/ssb/tf-profile.js
@ -289,16 +289,10 @@ class TfProfileElement extends LitElement {
 			typeof profile.image == 'string' ? profile.image : profile.image?.link;
 		image = this.editing?.image ?? image;
 		let description = this.editing?.description ?? profile.description;
-		return html`<div style="border: 2px solid black; background-color: rgba(255, 255, 255, 0.2); padding: 16px">
-			<tf-user id=${this.id} .users=${this.users}></tf-user> (${tfutils.human_readable_size(this.size)})
-			<div class="w3-row">
-				<div class="w3-col s1 w3-container w3-right">
-					<button class="w3-button w3-theme-d1 w3-ripple" @click=${this.copy_id}>Copy</button>
-				</div>
-				<div class="w3-rest w3-container">
-					<input type="text" class="w3-theme-d1" style="width: 100%; vertical-align: middle" readonly value=${this.id}></input>
-				</div>
-			</div>
+		return html`<div class="w3-container" style="box-sizing: border-box; border: 2px solid black; background-color: rgba(255, 255, 255, 0.2)">
+			<p><tf-user id=${this.id} .users=${this.users}></tf-user> (${tfutils.human_readable_size(this.size)})
+			<input type="text" class="w3-input w3-border w3-theme-d1" readonly value=${this.id}></input>
+			<button class="w3-button w3-theme-d1 w3-ripple" @click=${this.copy_id}>Copy</button>
 			<div style="display: flex; flex-direction: row; gap: 1em">
 				${edit_profile}
 				<div style="flex: 1 0 50%">
@ -312,11 +306,11 @@ class TfProfileElement extends LitElement {
 				Blocking ${profile.blocking} identities.
 				Blocked by ${profile.blocked} identities.
 			</div>
-			<div>
+			<p>
 				${edit}
 				${follow}
 				${block}
-			</div>
+			</p>
 		</div>`;
 	}
 }
--- a/apps/ssb/tf-reactions-modal.js
+++ b/apps/ssb/tf-reactions-modal.js
@ -27,8 +27,12 @@ class TfReactionsModalElement extends LitElement {
 			? html` <div
 					class="w3-modal w3-animate-opacity"
 					style="display: block; box-sizing: border-box"
+					@click=${this.clear}
 				>
-					<div class="w3-modal-content w3-card-4 w3-theme-d1">
+					<div
+						class="w3-modal-content w3-card-4 w3-theme-d1"
+						onclick="event.stopPropagation()"
+					>
 						<div class="w3-container w3-padding">
 							<header class="w3-container">
 								<h2>Reactions</h2>
--- a/apps/ssb/tf-tab-connections.js
+++ b/apps/ssb/tf-tab-connections.js
@ -12,6 +12,9 @@ class TfTabConnectionsElement extends LitElement {
 			stored_connections: {type: Array},
 			users: {type: Object},
 			server_identity: {type: String},
+			connect_attempt: {type: Object},
+			connect_message: {type: String},
+			connect_success: {type: Boolean},
 		};
 	}

@ -88,20 +91,36 @@ class TfTabConnectionsElement extends LitElement {
 		`;
 	}

+	render_message(connection) {
+		return html`<div
+			?hidden=${this.connect_message === undefined ||
+			this.connect_attempt != connection}
+			style="cursor: pointer"
+			class=${'w3-panel ' + (this.connect_success ? 'w3-green' : 'w3-red')}
+			@click=${() => (this.connect_attempt = undefined)}
+		>
+			<p>${this.connect_message}</p>
+		</div>`;
+	}
+
 	render_broadcast(connection) {
+		let self = this;
 		return html`
-			<li class="w3-bar" style="overflow: hidden; overflow-wrap: nowrap">
-				<button
-					class="w3-bar-item w3-button w3-theme-d1"
-					@click=${() => tfrpc.rpc.connect(connection)}
-				>
-					Connect
-				</button>
-				<div class="w3-bar-item">
-					${TfTabConnectionsElement.k_broadcast_emojis[connection.origin]}
-					<tf-user id=${connection.pubkey} .users=${this.users}></tf-user>
-					${this.render_connection_summary(connection)}
+			<li>
+				<div class="w3-bar" style="overflow: hidden; overflow-wrap: nowrap">
+					<button
+						class="w3-bar-item w3-button w3-theme-d1"
+						@click=${() => self.connect(connection)}
+					>
+						Connect
+					</button>
+					<div class="w3-bar-item">
+						${TfTabConnectionsElement.k_broadcast_emojis[connection.origin]}
+						<tf-user id=${connection.pubkey} .users=${this.users}></tf-user>
+						${this.render_connection_summary(connection)}
+					</div>
 				</div>
+				${this.render_message(connection)}
 			</li>
 		`;
 	}
@ -129,6 +148,7 @@ class TfTabConnectionsElement extends LitElement {
 			>
 				Close
 			</button>
+			${connection.flags.one_shot ? '🔃' : undefined}
 			<tf-user id=${connection.id} .users=${this.users}></tf-user>
 			${connection.tunnel !== undefined
 				? '🚇'
@ -136,7 +156,9 @@ class TfTabConnectionsElement extends LitElement {
 			<div>
 				${requests.map(
 					(x) => html`
-						<span class="w3-tag w3-small"
+						<span
+							class=${'w3-tag w3-small ' +
+							(x.active ? 'w3-theme-l3' : 'w3-theme-d3')}
 							>${x.request_number > 0 ? '🟩' : '🟥'} ${x.name}
 							<span
 								class="w3-badge w3-white"
@ -156,16 +178,48 @@ class TfTabConnectionsElement extends LitElement {
 		`;
 	}

+	refresh() {
+		tfrpc.rpc.sync();
+	}
+
+	connect(address) {
+		let self = this;
+		self.connect_attempt = address;
+		self.connect_message = undefined;
+		self.connect_success = false;
+		tfrpc.rpc
+			.connect(address)
+			.then(function () {
+				if (self.connect_attempt == address) {
+					self.connect_message = 'Connected.';
+					self.connect_success = true;
+				}
+			})
+			.catch(function (error) {
+				if (self.connect_attempt == address) {
+					self.connect_message = 'Error: ' + error;
+					self.connect_success = false;
+				}
+			});
+	}
+
 	render() {
 		let self = this;
 		return html`
 			<div class="w3-container" style="box-sizing: border-box">
+				<button
+					class="w3-button w3-theme-l3 w3-circle w3-ripple w3-large"
+					@click=${this.refresh}
+				>
+					🔃
+				</button>
 				<h2>New Connection</h2>
 				<textarea class="w3-input w3-theme-d1" id="code"></textarea>
+				${this.render_message(this.renderRoot.getElementById('code')?.value)}
 				<button
 					class="w3-button w3-theme-d1"
 					@click=${() =>
-						tfrpc.rpc.connect(self.renderRoot.getElementById('code').value)}
+						self.connect(self.renderRoot.getElementById('code')?.value)}
 				>
 					Connect
 				</button>
@ -173,6 +227,7 @@ class TfTabConnectionsElement extends LitElement {
 				<ul class="w3-ul w3-border">
 					${this.broadcasts
 						.filter((x) => x.address)
+						.filter((x) => self.connections.map(c => c.id).indexOf(x.pubkey) == -1)
 						.map((x) => self.render_broadcast(x))}
 				</ul>
 				<h2>Connections</h2>
@ -189,23 +244,26 @@ class TfTabConnectionsElement extends LitElement {
 				<ul class="w3-ul w3-border">
 					${this.stored_connections.map(
 						(x) => html`
-							<li class="w3-bar">
-								<button
-									class="w3-bar-item w3-button w3-theme-d1"
-									@click=${() => self.forget_stored_connection(x)}
-								>
-									Forget
-								</button>
-								<button
-									class="w3-bar-item w3-button w3-theme-d1"
-									@click=${() => tfrpc.rpc.connect(x)}
-								>
-									Connect
-								</button>
-								<div class="w3-bar-item">
-									<tf-user id=${x.pubkey} .users=${self.users}></tf-user>
-									<div><small>${x.address}:${x.port}</small></div>
+							<li>
+								<div class="w3-bar">
+									<button
+										class="w3-bar-item w3-button w3-theme-d1"
+										@click=${() => self.forget_stored_connection(x)}
+									>
+										Forget
+									</button>
+									<button
+										class="w3-bar-item w3-button w3-theme-d1"
+										@click=${() => this.connect(x)}
+									>
+										Connect
+									</button>
+									<div class="w3-bar-item">
+										<tf-user id=${x.pubkey} .users=${self.users}></tf-user>
+										<div><small>${x.address}:${x.port}</small></div>
+									</div>
 								</div>
+								${this.render_message(x)}
 							</li>
 						`
 					)}
--- a/apps/ssb/tf-user.js
+++ b/apps/ssb/tf-user.js
@ -37,7 +37,7 @@ class TfUserElement extends LitElement {
 			if (image_link !== undefined) {
 				image = html`<img
 					class="w3-circle"
-					style="width: 2em; height: 2em; vertical-align: middle"
+					style="width: 2em; height: 2em; vertical-align: middle; object-fit: cover"
 					src="/${image_link}/view"
 				/>`;
 			}
--- a/apps/ssb/tf-utils.js
+++ b/apps/ssb/tf-utils.js
@ -2,6 +2,12 @@ import * as hashtagify from './commonmark-hashtag.js';

 const k_code_classes = 'w3-theme-l4 w3-theme-border w3-round';

+var reUnsafeProtocol = /^javascript:|vbscript:|file:|data:/i;
+var reSafeDataProtocol = /^data:image\/(?:png|gif|jpeg|webp)/i;
+var potentiallyUnsafe = function (url) {
+	return reUnsafeProtocol.test(url) && !reSafeDataProtocol.test(url);
+};
+
 function image(node, entering) {
 	if (
 		node.firstChild?.type === 'text' &&
@ -81,8 +87,8 @@ function attrs(node) {
 }

 export function markdown(md) {
-	let reader = new commonmark.Parser({safe: true});
-	let writer = new commonmark.HtmlRenderer();
+	let reader = new commonmark.Parser();
+	let writer = new commonmark.HtmlRenderer({safe: true});
 	writer.image = image;
 	writer.code = code;
 	writer.attrs = attrs;
--- a/apps/test.json
+++ b/apps/test.json
@ -0,0 +1,4 @@
+{
+	"type": "tildefriends-app",
+	"emoji": "📦"
+}
--- a/apps/test/app.js
+++ b/apps/test/app.js
@ -0,0 +1,3 @@
+app.setDocument(
+	'<p style="color: #fff">Maybe one day this app will run tests, but for now there is nothing to see here.</p>'
+);
--- a/apps/test/hello.txt
+++ b/apps/test/hello.txt
@ -0,0 +1 @@
+Hello, world!
--- a/apps/welcome.json
+++ b/apps/welcome.json
@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
 	"emoji": "👋",
-	"previous": "&7Pqk5nBAcbjzp0etv6WgiyTD3UF++ID0mW6qIbhwt3s=.sha256"
+	"previous": "&7gFmLW5zSMhmxWWY1+jeRcHdullgujSqGJg94lVgr1k=.sha256"
 }
--- a/apps/welcome/appimage.svg
+++ b/apps/welcome/appimage.svg
@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="48px" height="48px" id="svg3832" version="1.1" inkscape:version="0.47 r22583" sodipodi:docname="appimage-assistant_alt3.svg">
+  <defs id="defs3834">
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3308-4-6-931-761-0" id="linearGradient2975" gradientUnits="userSpaceOnUse" x1="24.3125" y1="22.96875" x2="24.3125" y2="41.03125"/>
+    <linearGradient id="linearGradient3308-4-6-931-761-0">
+      <stop id="stop2919-2" style="stop-color:#ffffff;stop-opacity:1" offset="0"/>
+      <stop id="stop2921-76" style="stop-color:#ffffff;stop-opacity:0" offset="1"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4222" id="linearGradient2979" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0,0.3704967,-0.3617496,0,33.508315,6.1670925)" x1="7.6485429" y1="26.437023" x2="41.861729" y2="26.437023"/>
+    <linearGradient id="linearGradient4222">
+      <stop id="stop4224" style="stop-color:#ffffff;stop-opacity:1" offset="0"/>
+      <stop id="stop4226" style="stop-color:#ffffff;stop-opacity:0" offset="1"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3308-4-6-931-761" id="linearGradient2982" gradientUnits="userSpaceOnUse" gradientTransform="translate(0,0.9999987)" x1="23.99999" y1="4.999989" x2="23.99999" y2="43"/>
+    <linearGradient id="linearGradient3308-4-6-931-761">
+      <stop id="stop2919" style="stop-color:#ffffff;stop-opacity:1" offset="0"/>
+      <stop id="stop2921" style="stop-color:#ffffff;stop-opacity:0" offset="1"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3575" id="radialGradient2985" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0,1.0262008,-1.6561124,9.4072203e-4,-56.097482,-45.332325)" cx="48.42384" cy="-48.027504" fx="48.42384" fy="-48.027504" r="38.212933"/>
+    <linearGradient id="linearGradient3575">
+      <stop id="stop3577" style="stop-color:#fafafa;stop-opacity:1" offset="0"/>
+      <stop id="stop3579" style="stop-color:#e6e6e6;stop-opacity:1" offset="1"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3993" id="radialGradient2990" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0,2.0478765,-2.7410544,-8.6412258e-8,47.161382,-8.837436)" cx="9.3330879" cy="8.4497671" fx="9.3330879" fy="8.4497671" r="19.99999"/>
+    <linearGradient id="linearGradient3993">
+      <stop offset="0" style="stop-color:#a3c0d0;stop-opacity:1" id="stop3995"/>
+      <stop offset="1" style="stop-color:#427da1;stop-opacity:1" id="stop4001"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient2508" id="linearGradient2992" gradientUnits="userSpaceOnUse" gradientTransform="translate(0,0.9674382)" x1="14.048676" y1="44.137306" x2="14.048676" y2="4.0000005"/>
+    <linearGradient id="linearGradient2508">
+      <stop offset="0" style="stop-color:#2e4a5a;stop-opacity:1" id="stop2510"/>
+      <stop offset="1" style="stop-color:#6e8796;stop-opacity:1" id="stop2512"/>
+    </linearGradient>
+    <radialGradient cx="4.9929786" cy="43.5" r="2.5" fx="4.9929786" fy="43.5" id="radialGradient2873-966-168" xlink:href="#linearGradient3688-166-749" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"/>
+    <linearGradient id="linearGradient3688-166-749">
+      <stop id="stop2883" style="stop-color:#181818;stop-opacity:1" offset="0"/>
+      <stop id="stop2885" style="stop-color:#181818;stop-opacity:0" offset="1"/>
+    </linearGradient>
+    <radialGradient cx="4.9929786" cy="43.5" r="2.5" fx="4.9929786" fy="43.5" id="radialGradient2875-742-326" xlink:href="#linearGradient3688-464-309" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"/>
+    <linearGradient id="linearGradient3688-464-309">
+      <stop id="stop2889" style="stop-color:#181818;stop-opacity:1" offset="0"/>
+      <stop id="stop2891" style="stop-color:#181818;stop-opacity:0" offset="1"/>
+    </linearGradient>
+    <linearGradient x1="25.058096" y1="47.027729" x2="25.058096" y2="39.999443" id="linearGradient2877-634-617" xlink:href="#linearGradient3702-501-757" gradientUnits="userSpaceOnUse"/>
+    <linearGradient id="linearGradient3702-501-757">
+      <stop id="stop2895" style="stop-color:#181818;stop-opacity:0" offset="0"/>
+      <stop id="stop2897" style="stop-color:#181818;stop-opacity:1" offset="0.5"/>
+      <stop id="stop2899" style="stop-color:#181818;stop-opacity:0" offset="1"/>
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="7" inkscape:cx="24" inkscape:cy="24" inkscape:current-layer="layer1" showgrid="true" inkscape:grid-bbox="true" inkscape:document-units="px" inkscape:window-width="603" inkscape:window-height="484" inkscape:window-x="417" inkscape:window-y="162" inkscape:window-maximized="0"/>
+  <metadata id="metadata3837">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
+    <g style="display:inline" id="g2036" transform="matrix(1.1,0,0,0.4444449,-2.4000022,25.11107)">
+      <g style="opacity:0.4" id="g3712" transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)">
+        <rect style="fill:url(#radialGradient2873-966-168);fill-opacity:1;stroke:none" id="rect2801" y="40" x="38" height="7" width="5"/>
+        <rect style="fill:url(#radialGradient2875-742-326);fill-opacity:1;stroke:none" id="rect3696" transform="scale(-1,-1)" y="-47" x="-10" height="7" width="5"/>
+        <rect style="fill:url(#linearGradient2877-634-617);fill-opacity:1;stroke:none" id="rect3700" y="40" x="10" height="7.0000005" width="28"/>
+      </g>
+    </g>
+    <rect style="fill:url(#radialGradient2990);fill-opacity:1;stroke:url(#linearGradient2992);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" id="rect5505" y="5.4674392" x="4.5" ry="2.2322156" rx="2.2322156" height="39" width="39"/>
+    <path style="opacity:0.05;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00178742;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="path4294-1" d="m 21,6.9687498 a 2.0165107,2.0165107 0 0 0 -2.03125,2.03125 l 0,3.9687502 -1.15625,0 a 2.0165107,2.0165107 0 0 0 -1.5,3.375 l 5.0625,5.75 c -0.06312,0.110777 -0.178724,0.246032 -0.21875,0.34375 -0.195898,0.478256 -0.25,0.83653 -0.25,1.21875 l 0,0.125 L 20.8125,23.6875 C 20.534322,23.409323 20.213169,23.162739 19.71875,22.96875 19.47154,22.87176 19.185456,22.791748 18.75,22.8125 c -0.435456,0.02075 -1.054055,0.210302 -1.46875,0.625 L 15.75,24.96875 c -0.414689,0.414689 -0.604245,1.033294 -0.625,1.46875 -0.02075,0.435456 0.05925,0.721537 0.15625,0.96875 C 15.475241,27.900677 15.721817,28.221821 16,28.5 l 0.09375,0.09375 -0.125,0 c -0.382218,0 -0.740493,0.0541 -1.21875,0.25 -0.239128,0.09795 -0.538285,0.214988 -0.84375,0.53125 -0.305465,0.316262 -0.625,0.914788 -0.625,1.53125 l 0,2.1875 c 0,0.616465 0.319536,1.214989 0.625,1.53125 0.305464,0.316261 0.604622,0.433301 0.84375,0.53125 0.478256,0.195898 0.83653,0.25 1.21875,0.25 l 0.125,0 L 16,35.5 c -0.278175,0.278176 -0.52476,0.599329 -0.71875,1.09375 -0.09699,0.24721 -0.177003,0.533292 -0.15625,0.96875 0.02075,0.435458 0.210304,1.054058 0.625,1.46875 l 1.53125,1.53125 c 0.414691,0.414697 1.033292,0.604245 1.46875,0.625 0.435458,0.02076 0.721537,-0.05926 0.96875,-0.15625 0.494425,-0.19399 0.81557,-0.440568 1.09375,-0.71875 l 0.09375,-0.09375 0,0.125 c 0,0.38222 0.0541,0.740495 0.25,1.21875 0.09795,0.239127 0.214989,0.538285 0.53125,0.84375 0.316261,0.305465 0.914783,0.625 1.53125,0.625 l 2.1875,0 c 0.616466,0 1.214989,-0.319534 1.53125,-0.625 0.316261,-0.305466 0.433302,-0.604622 0.53125,-0.84375 0.195896,-0.478255 0.25,-0.836532 0.25,-1.21875 l 0,-0.125 0.09375,0.09375 c 0.278176,0.278175 0.599329,0.52476 1.09375,0.71875 0.24721,0.09699 0.533292,0.177003 0.96875,0.15625 0.435458,-0.02075 1.054058,-0.210304 1.46875,-0.625 L 32.875,39.03125 C 33.289697,38.616559 33.479245,37.997958 33.5,37.5625 33.52076,37.127042 33.44074,36.840963 33.34375,36.59375 33.14976,36.099325 32.903182,35.77818 32.625,35.5 l -0.09375,-0.09375 0.125,0 c 0.38222,0 0.740494,-0.0541 1.21875,-0.25 0.239128,-0.09795 0.538286,-0.214988 0.84375,-0.53125 0.305464,-0.316262 0.625,-0.914787 0.625,-1.53125 l 0,-2.1875 c 0,-0.61646 -0.319535,-1.214987 -0.625,-1.53125 -0.305465,-0.316263 -0.604621,-0.433301 -0.84375,-0.53125 -0.478257,-0.195898 -0.836532,-0.25 -1.21875,-0.25 l -0.125,0 L 32.625,28.5 c 0.278177,-0.278177 0.52476,-0.599329 0.71875,-1.09375 C 33.44074,27.15904 33.520753,26.872957 33.5,26.4375 33.47925,26.002043 33.289697,25.383443 32.875,24.96875 L 31.34375,23.4375 c -0.414688,-0.414694 -1.03329,-0.604245 -1.46875,-0.625 -0.43546,-0.02076 -0.721537,0.05925 -0.96875,0.15625 -0.494426,0.193991 -0.815572,0.44057 -1.09375,0.71875 l -0.09375,0.09375 0,-0.125 c 0,-0.382218 -0.0541,-0.740493 -0.25,-1.21875 -0.09112,-0.22245 -0.228127,-0.500183 -0.5,-0.78125 l 4.71875,-5.3125 a 2.0165107,2.0165107 0 0 0 -1.5,-3.375 l -1.15625,0 0,-3.9687502 A 2.0165107,2.0165107 0 0 0 27,6.9687498 l -6,0 z M 24.3125,31.25 c 0.427097,0 0.75,0.322904 0.75,0.75 0,0.427096 -0.322903,0.75 -0.75,0.75 -0.427094,0 -0.75,-0.322906 -0.75,-0.75 0,-0.427094 0.322906,-0.75 0.75,-0.75 z"/>
+    <path style="opacity:0.05;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00178742;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="path4294" d="m 20.90625,8.0312498 a 0.96385067,0.96385067 0 0 0 -0.875,0.96875 l 0,5.0312502 -2.21875,0 A 0.96385067,0.96385067 0 0 0 17.09375,15.625 l 5.78125,6.53125 c -0.158814,0.0616 -0.341836,0.0951 -0.4375,0.1875 -0.169161,0.163386 -0.252971,0.323419 -0.3125,0.46875 -0.119058,0.290663 -0.15625,0.566746 -0.15625,0.84375 l 0,1.65625 C 21.718163,25.40233 21.485871,25.509772 21.25,25.625 l -1.1875,-1.1875 c -0.199651,-0.19965 -0.421433,-0.352095 -0.71875,-0.46875 -0.148659,-0.05833 -0.329673,-0.104846 -0.5625,-0.09375 -0.232827,0.0111 -0.53583,0.09833 -0.75,0.3125 L 16.5,25.71875 c -0.214168,0.214168 -0.301403,0.517173 -0.3125,0.75 -0.0111,0.232827 0.03542,0.41384 0.09375,0.5625 0.116655,0.297321 0.269096,0.519099 0.46875,0.71875 l 1.1875,1.1875 c -0.115228,0.235871 -0.222668,0.468163 -0.3125,0.71875 l -1.65625,0 c -0.277003,0 -0.553087,0.03719 -0.84375,0.15625 -0.145332,0.05953 -0.305363,0.143338 -0.46875,0.3125 -0.163387,0.169162 -0.3125,0.46403 -0.3125,0.78125 l 0,2.1875 c 0,0.317221 0.149114,0.612089 0.3125,0.78125 0.163386,0.169161 0.323419,0.252971 0.46875,0.3125 0.290663,0.119058 0.566746,0.15625 0.84375,0.15625 l 1.65625,0 c 0.08983,0.250587 0.197272,0.482879 0.3125,0.71875 L 16.75,36.25 c -0.199649,0.19965 -0.352095,0.421432 -0.46875,0.71875 -0.05833,0.148659 -0.104846,0.329672 -0.09375,0.5625 0.0111,0.232828 0.09833,0.535831 0.3125,0.75 l 1.53125,1.53125 c 0.214168,0.214172 0.517172,0.301403 0.75,0.3125 0.232828,0.0111 0.41384,-0.03542 0.5625,-0.09375 0.29732,-0.116655 0.519098,-0.269096 0.71875,-0.46875 L 21.25,38.375 c 0.235871,0.115228 0.468164,0.222668 0.71875,0.3125 l 0,1.65625 c 0,0.277003 0.03719,0.553087 0.15625,0.84375 0.05953,0.145331 0.143339,0.305364 0.3125,0.46875 0.169161,0.163386 0.464028,0.3125 0.78125,0.3125 l 2.1875,0 c 0.317221,0 0.612089,-0.149113 0.78125,-0.3125 0.169161,-0.163387 0.252971,-0.323419 0.3125,-0.46875 0.119057,-0.290663 0.15625,-0.566748 0.15625,-0.84375 l 0,-1.65625 c 0.250586,-0.08983 0.482879,-0.197272 0.71875,-0.3125 l 1.1875,1.1875 c 0.19965,0.199649 0.421432,0.352095 0.71875,0.46875 0.148659,0.05833 0.329672,0.104846 0.5625,0.09375 0.232828,-0.0111 0.535831,-0.09833 0.75,-0.3125 L 32.125,38.28125 c 0.214172,-0.214168 0.301403,-0.517172 0.3125,-0.75 0.0111,-0.232828 -0.03542,-0.41384 -0.09375,-0.5625 C 32.227095,36.67143 32.074654,36.449652 31.875,36.25 L 30.6875,35.0625 C 30.802728,34.82663 30.910168,34.594337 31,34.34375 l 1.65625,0 c 0.277004,0 0.553087,-0.03719 0.84375,-0.15625 0.145332,-0.05953 0.305364,-0.143339 0.46875,-0.3125 0.163386,-0.169161 0.3125,-0.46403 0.3125,-0.78125 l 0,-2.1875 c 0,-0.317219 -0.149114,-0.612088 -0.3125,-0.78125 C 33.805364,29.955838 33.645332,29.872029 33.5,29.8125 33.209336,29.693442 32.933253,29.65625 32.65625,29.65625 l -1.65625,0 C 30.91017,29.405663 30.802728,29.17337 30.6875,28.9375 L 31.875,27.75 c 0.19965,-0.19965 0.352095,-0.421432 0.46875,-0.71875 0.05833,-0.148659 0.104846,-0.329672 0.09375,-0.5625 -0.0111,-0.232828 -0.09833,-0.535831 -0.3125,-0.75 L 30.59375,24.1875 c -0.214167,-0.21417 -0.517171,-0.301403 -0.75,-0.3125 -0.232829,-0.0111 -0.41384,0.03542 -0.5625,0.09375 -0.29732,0.116656 -0.519099,0.269097 -0.71875,0.46875 L 27.375,25.625 c -0.235871,-0.115228 -0.468163,-0.222668 -0.71875,-0.3125 l 0,-1.65625 c 0,-0.277003 -0.03719,-0.553087 -0.15625,-0.84375 -0.05953,-0.145332 -0.143338,-0.305363 -0.3125,-0.46875 -0.169162,-0.163387 -0.46403,-0.3125 -0.78125,-0.3125 l -0.15625,0 5.65625,-6.40625 A 0.96385067,0.96385067 0 0 0 30.1875,14.03125 l -2.21875,0 0,-5.0312502 A 0.96385067,0.96385067 0 0 0 27,8.0312498 l -6,0 a 0.96385067,0.96385067 0 0 0 -0.09375,0 z M 24.3125,30.1875 c 1.002113,0 1.8125,0.810388 1.8125,1.8125 0,1.002112 -0.810387,1.8125 -1.8125,1.8125 C 23.31039,33.8125 22.5,33.002111 22.5,32 c 0,-1.002111 0.81039,-1.8125 1.8125,-1.8125 z"/>
+    <path style="fill:url(#radialGradient2985);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00178742;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="path2317" d="M 21,8.9999996 21,15 17.8125,15 24,22 30.1875,15 27,15 l 0,-6.0000004 -6,0 z M 23.21875,23 c -0.172892,0 -0.28125,0.294922 -0.28125,0.65625 l 0,2.28125 C 22.24145,26.095996 21.585954,26.379869 21,26.75 l -1.625,-1.625 c -0.255498,-0.255497 -0.533998,-0.372253 -0.65625,-0.25 l -1.53125,1.53125 c -0.122254,0.122254 -0.0055,0.400753 0.25,0.65625 l 1.625,1.625 c -0.37013,0.585953 -0.654003,1.24145 -0.8125,1.9375 l -2.28125,0 c -0.361328,0 -0.65625,0.108357 -0.65625,0.28125 l 0,2.1875 c 0,0.172892 0.294922,0.28125 0.65625,0.28125 l 2.28125,0 c 0.158497,0.69605 0.44237,1.351546 0.8125,1.9375 l -1.625,1.625 c -0.255497,0.255498 -0.372254,0.533997 -0.25,0.65625 l 1.53125,1.53125 c 0.122252,0.122254 0.400752,0.0055 0.65625,-0.25 L 21,37.25 c 0.585954,0.37013 1.24145,0.654002 1.9375,0.8125 l 0,2.28125 C 22.9375,40.705077 23.045858,41 23.21875,41 l 2.1875,0 c 0.172893,0 0.28125,-0.294924 0.28125,-0.65625 l 0,-2.28125 c 0.69605,-0.158498 1.351546,-0.44237 1.9375,-0.8125 l 1.625,1.625 c 0.255498,0.255497 0.533997,0.372254 0.65625,0.25 l 1.53125,-1.53125 c 0.122254,-0.122252 0.0055,-0.400752 -0.25,-0.65625 l -1.625,-1.625 c 0.370129,-0.585954 0.654003,-1.24145 0.8125,-1.9375 l 2.28125,0 c 0.361329,0 0.65625,-0.108358 0.65625,-0.28125 l 0,-2.1875 c 0,-0.172893 -0.294921,-0.28125 -0.65625,-0.28125 l -2.28125,0 c -0.158497,-0.69605 -0.442371,-1.351547 -0.8125,-1.9375 l 1.625,-1.625 c 0.255497,-0.255497 0.372254,-0.533997 0.25,-0.65625 L 29.90625,24.875 C 29.783997,24.752745 29.505498,24.8695 29.25,25.125 l -1.625,1.625 c -0.585954,-0.370131 -1.24145,-0.654004 -1.9375,-0.8125 l 0,-2.28125 C 25.6875,23.294922 25.579143,23 25.40625,23 l -2.1875,0 z m 1.09375,6.21875 c 1.528616,0 2.78125,1.252635 2.78125,2.78125 0,1.528615 -1.252634,2.78125 -2.78125,2.78125 -1.528614,0 -2.78125,-1.252635 -2.78125,-2.78125 0,-1.528615 1.252636,-2.78125 2.78125,-2.78125 z"/>
+    <rect style="opacity:0.4;fill:none;stroke:url(#linearGradient2982);stroke-width:0.99999976;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" id="rect6741" y="6.4999886" x="5.4999981" ry="1.365193" rx="1.365193" height="37.000011" width="36.999985"/>
+    <path style="fill:none;stroke:url(#linearGradient2979);stroke-width:0.99829447;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" id="path2777" d="M 28.926376,15.466668 24,21.177578 18.963089,15.5 21.5,15.5 l 0,-6.0000004 5,0 0,6.0000004 2.426376,-0.03333 z"/>
+    <path style="fill:none;stroke:url(#linearGradient2975);stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="path4243" d="m 23.4375,23.46875 c -0.01166,0.05381 -0.03125,0.100205 -0.03125,0.1875 l 0,2.28125 a 0.48185467,0.48185467 0 0 1 -0.375,0.46875 c -0.638467,0.145384 -1.238423,0.407111 -1.78125,0.75 a 0.48185467,0.48185467 0 0 1 -0.59375,-0.0625 l -1.625,-1.625 C 18.9779,25.4154 18.9477,25.40242 18.90625,25.375 l -1.21875,1.21875 c 0.02742,0.04145 0.0404,0.07165 0.09375,0.125 l 1.625,1.625 a 0.48185467,0.48185467 0 0 1 0.0625,0.59375 c -0.342888,0.542826 -0.604615,1.142782 -0.75,1.78125 a 0.48185467,0.48185467 0 0 1 -0.46875,0.375 l -2.28125,0 c -0.08729,0 -0.133695,0.01959 -0.1875,0.03125 l 0,1.75 c 0.05381,0.01166 0.100205,0.03125 0.1875,0.03125 l 2.28125,0 a 0.48185467,0.48185467 0 0 1 0.46875,0.375 c 0.145385,0.638468 0.407112,1.238423 0.75,1.78125 a 0.48185467,0.48185467 0 0 1 -0.0625,0.59375 l -1.625,1.625 c -0.05335,0.05335 -0.06633,0.08355 -0.09375,0.125 l 1.21875,1.21875 c 0.04145,-0.02742 0.07165,-0.0404 0.125,-0.09375 l 1.625,-1.625 A 0.48185467,0.48185467 0 0 1 21.25,36.84375 c 0.542827,0.342888 1.142781,0.604614 1.78125,0.75 a 0.48185467,0.48185467 0 0 1 0.375,0.46875 l 0,2.28125 c 0,0.08729 0.01959,0.133695 0.03125,0.1875 l 1.75,0 c 0.01166,-0.0538 0.03125,-0.100206 0.03125,-0.1875 l 0,-2.28125 a 0.48185467,0.48185467 0 0 1 0.375,-0.46875 c 0.638469,-0.145386 1.238423,-0.407112 1.78125,-0.75 a 0.48185467,0.48185467 0 0 1 0.59375,0.0625 l 1.625,1.625 c 0.05335,0.05335 0.08355,0.06633 0.125,0.09375 l 1.21875,-1.21875 c -0.02742,-0.04145 -0.0404,-0.07165 -0.09375,-0.125 l -1.625,-1.625 a 0.48185467,0.48185467 0 0 1 -0.0625,-0.59375 c 0.342888,-0.542828 0.604615,-1.142783 0.75,-1.78125 a 0.48185467,0.48185467 0 0 1 0.46875,-0.375 l 2.28125,0 c 0.08729,0 0.133695,-0.01959 0.1875,-0.03125 l 0,-1.75 c -0.0538,-0.01166 -0.100204,-0.03125 -0.1875,-0.03125 l -2.28125,0 a 0.48185467,0.48185467 0 0 1 -0.46875,-0.375 c -0.145385,-0.638467 -0.407113,-1.238424 -0.75,-1.78125 a 0.48185467,0.48185467 0 0 1 0.0625,-0.59375 l 1.625,-1.625 c 0.05335,-0.05335 0.06633,-0.08355 0.09375,-0.125 L 29.71875,25.375 c -0.04145,0.02742 -0.07165,0.0404 -0.125,0.09375 l -1.625,1.625 a 0.48185467,0.48185467 0 0 1 -0.59375,0.0625 c -0.542827,-0.342889 -1.142783,-0.604616 -1.78125,-0.75 a 0.48185467,0.48185467 0 0 1 -0.375,-0.46875 l 0,-2.28125 c 0,-0.0873 -0.01959,-0.133695 -0.03125,-0.1875 l -1.75,0 z m 0.875,5.28125 c 1.791829,0 3.25,1.458172 3.25,3.25 0,1.791828 -1.458171,3.25 -3.25,3.25 -1.791827,0 -3.25,-1.458172 -3.25,-3.25 0,-1.791828 1.458173,-3.25 3.25,-3.25 z"/>
+  </g>
+</svg>
--- a/apps/welcome/f-droid.svg
+++ b/apps/welcome/f-droid.svg
@ -1,124 +1,75 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Original Author: Unknown (if you are the original creator of the F-Droid button, please contact laura@ind.ie so I can credit you!)  -->
-<!-- Author: Created by Laura Kalbag and Released with ❤ by ind.ie (laura@ind.ie) -->
-<!-- License: This work is licensed under the Creative Commons Attribution-ShareAlike 4.0 International License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/4.0/. (As attribution is included in this file, you needn't include additional attribution on your site.) -->
-<!-- How to use: The original blog post about this SVG button and how I use SVG on the Ind.ie website is at https://ind.ie/blog/f-droid-button/ -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="button_1_" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="1490 188 300 104" enable-background="new 1490 188 300 104" xml:space="preserve">
-<g id="get_it_on_f-droid_2_">
-	<path id="button" d="M1780,292h-280c-5.5,0-10-4.5-10-10v-84c0-5.5,4.5-10,10-10h280c5.5,0,10,4.5,10,10v84
-		C1790,287.5,1785.5,292,1780,292z"/>
-	<g id="f-droid_2_">
-		<path fill="#FFFFFF" d="M1621.2,236.8v3.6v1.2v5h-0.3h-0.6h-2.2c-0.7,0-1-0.3-1.2-1c-0.1-0.4-0.2-1.6-0.3-3.4h-13.5v11.1h13.2v5.5
-			h-13.2v10.1c0.9,0.2,1.7,0.3,2.6,0.4c0.9,0.2,1.3,0.7,1.3,1.6v3h-3.9h-7.1h-3.9v-3c0-0.9,0.4-1.5,1.3-1.6c0.9-0.2,1.7-0.3,2.6-0.4
-			V242c-0.9-0.2-1.7-0.3-2.6-0.4c-0.9-0.2-1.3-0.7-1.3-1.6v-3h3.9h22.7h1.2L1621.2,236.8L1621.2,236.8z"/>
-		<path fill="#FFFFFF" d="M1637.2,256v5.4h-13.5V256H1637.2z"/>
-		<path fill="#FFFFFF" d="M1676.7,255.6c0,5-1.7,10-5.3,13.5c-3.7,3.6-8.8,5.3-13.9,5.3h-13.9h-3.9v-3c0-0.9,0.4-1.5,1.3-1.6
-			c0.9-0.2,1.7-0.3,2.6-0.4V242c-0.9-0.2-1.7-0.3-2.6-0.4c-0.9-0.2-1.3-0.7-1.3-1.6v-3h3.9h13.9c5.1,0,10.2,1.6,13.9,5.3
-			C1675.1,245.6,1676.7,250.7,1676.7,255.6C1676.7,258.4,1676.7,252.9,1676.7,255.6z M1669.6,255.6c0-3.4-0.8-6.9-3.1-9.5
-			s-5.6-3.7-8.9-3.7h-6.8v26.4h6.8c3.4,0,6.7-1.1,8.9-3.7C1668.8,262.5,1669.6,259,1669.6,255.6z"/>
-		<path fill="#FFFFFF" d="M1699.7,248.1l-0.9,4.8c-0.2,1.1-1.3,0.9-2.1,0.7c-1-0.3-2.2-0.3-3.1,0c-2.2,0.5-3.7,2.3-4.5,4.2v11.4
-			c2.3,0.4,2.3,0.4,2.6,0.4c0.9,0.2,1.3,0.7,1.3,1.6v3h-3.9l0,0h-6.5h-3.9v-3c0-0.9,0.4-1.5,1.3-1.6c0.4-0.1,0.4-0.1,2.6-0.4v-16.3
-			c-2.3-0.4-2.3-0.4-2.6-0.4c-0.9-0.2-1.3-0.7-1.3-1.6v-3h3.9l0,0h3.8c1.1,0,1.7,0.4,1.9,1.6l0.3,3.2c1.1-1.9,2.6-3.7,4.7-4.7
-			C1695.2,247,1697.8,246.9,1699.7,248.1z"/>
-		<path fill="#FFFFFF" d="M1719.4,248.3c5.7,2.3,8,8,7.8,13.7c-0.3,5.6-3.4,10.7-9.1,12.3c-5.4,1.5-11.9,0-15.1-4.9
-			c-3.1-4.6-3.2-11.6-0.3-16.4C1706,247.6,1713.6,246,1719.4,248.3C1721,248.9,1717.8,247.6,1719.4,248.3z M1718.9,267.6
-			c2-2.8,2-7.1,1.2-10.2c-0.3-1.5-1-2.9-2.2-3.9c-1.3-1-3-1.4-4.6-1.2c-3.5,0.2-5.3,2.7-5.8,5.9c-0.5,3.1-0.5,7.5,1.8,10
-			C1711.8,270.7,1716.8,270.5,1718.9,267.6C1720,266.2,1717.9,269.1,1718.9,267.6z"/>
-		<path fill="#FFFFFF" d="M1743.3,271.4v3h-3.9h-6.5h-4v-3c0-0.9,0.4-1.5,1.3-1.6c0.9-0.2,1.7-0.3,2.6-0.4v-16.4
-			c-0.9-0.2-1.7-0.3-2.6-0.4c-0.9-0.2-1.3-0.7-1.3-1.6v-3h3.9h6.5v21.5c0.9,0.2,1.7,0.3,2.6,0.4
-			C1742.9,269.9,1743.3,270.5,1743.3,271.4z M1740,241.6c-1,2-3.4,3-5.4,2.2c-2-0.9-3.1-3.3-2.2-5.3c0.9-2.1,3.3-3,5.4-2.2
-			C1739.9,237.1,1741,239.5,1740,241.6C1739.8,242,1740.3,241,1740,241.6z"/>
-		<path fill="#FFFFFF" d="M1773.4,274.3h-3.7h-3.9c-0.8,0-1.5-0.3-1.7-1.2l-0.5-2.4c-2.4,2.8-5.9,4.5-9.8,4.1
-			c-3.8-0.4-6.5-3.2-7.8-6.6c-2.4-6.6-1.3-16.3,5.6-19.8c3.8-1.9,8.5-1.5,11.6,1.5V241c-0.9-0.2-1.7-0.3-2.6-0.4
-			c-0.9-0.2-1.3-0.7-1.3-1.6v-3h3.9h6.5v33.5c0.8,0.2,1.6,0.3,2.4,0.4c0.9,0.2,1.3,0.7,1.3,1.6V274.3z M1763.3,254.6
-			c-1.7-2-4.2-2.9-6.7-2.3c-2.5,0.6-3.9,2.8-4.4,5.1c-0.5,2.3-0.5,5-0.1,7.4c0.4,2.3,1.7,4.4,4.1,4.9c2.9,0.5,5.4-1,7.2-3.1V254.6z"
-			/>
-	</g>
-	<g id="get_it_on_2_">
-		<path fill="#FFFFFF" d="M1597.5,218.2v-2.9h7.6v6.9c-3.7,3.6-11.2,3.9-14.5-0.3c-3.3-4.2-2.4-11.5,2.6-14c2.2-1.1,5.1-1.1,7.3-0.4
-			s3.8,2.4,4.3,4.7l-3.5,0.7c-0.7-2.5-3.5-3.3-5.8-2.5c-2.2,0.7-3.1,2.8-3.2,4.9c-0.1,2.2,0.3,4.6,2.1,5.9c2.1,1.6,5.1,0.9,7-0.6
-			v-2.3H1597.5z"/>
-		<path fill="#FFFFFF" d="M1608.3,224.7v-17.3h13v2.9h-9.4v3.8h8.8v2.9h-8.8v4.8h9.8v2.9L1608.3,224.7L1608.3,224.7z"/>
-		<path fill="#FFFFFF" d="M1628.6,224.7v-14.4h-5.1v-2.9h13.9v2.9h-5.1v14.5L1628.6,224.7L1628.6,224.7z"/>
-		<path fill="#FFFFFF" d="M1646.3,224.7v-17.3h3.5v17.3H1646.3z"/>
-		<path fill="#FFFFFF" d="M1657.1,224.7v-14.4h-5.1v-2.9h13.9v2.9h-5.1v14.5L1657.1,224.7L1657.1,224.7z"/>
-		<path fill="#FFFFFF" d="M1674.1,216.1c0-1.7,0.3-3.3,0.8-4.4c0.8-1.7,2.2-3.2,3.9-4c2.8-1.1,6.5-1,9,0.9c2.5,1.8,3.4,4.9,3.3,7.8
-			c-0.1,2.9-1.1,5.8-3.8,7.5c-2.5,1.6-6.1,1.6-8.7,0.3C1675.4,222.7,1674.1,219.4,1674.1,216.1z M1677.8,216c0,2.3,0.7,4.8,3.1,5.6
-			c2.2,0.9,4.8,0,5.8-2c1-1.9,1-4.9,0.3-6.8c-0.9-2.1-3.1-3.1-5.3-2.7C1678.7,210.6,1677.8,213.4,1677.8,216z"/>
-		<path fill="#FFFFFF" d="M1693.9,224.7v-17.3h3.4l7.2,11.6v-11.6h3.3v17.3h-3.6l-7.1-11.4v11.4H1693.9z"/>
-	</g>
-	<g id="droid_2_">
-		<g>
-
-				<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="413.9844" y1="440.5436" x2="413.9844" y2="452.6552" gradientTransform="matrix(3.7209 0 0 -3.7209 0 1914.4187)">
-				<stop  offset="0" style="stop-color:#2B6099"/>
-				<stop  offset="0.1299" style="stop-color:#2F69A1"/>
-				<stop  offset="0.3451" style="stop-color:#3B83B6"/>
-				<stop  offset="0.5" style="stop-color:#4699C8"/>
-				<stop  offset="0.9944" style="stop-color:#479ECB"/>
-			</linearGradient>
-			<path fill="url(#SVGID_1_)" d="M1570.1,275.2h-59.3c-2.9,0-5.2-2.3-5.2-5.2v-34.7c0-2.9,2.4-5.2,5.2-5.2h59.3
-				c2.9,0,5.2,2.3,5.2,5.2V270C1575.3,272.8,1572.9,275.2,1570.1,275.2z"/>
-
-				<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="413.9844" y1="440.5436" x2="413.9844" y2="452.6552" gradientTransform="matrix(3.7209 0 0 -3.7209 0 1914.4187)">
-				<stop  offset="0" style="stop-color:#2B6099"/>
-				<stop  offset="0.5" style="stop-color:#58A4CD"/>
-				<stop  offset="0.7865" style="stop-color:#7FB8D9"/>
-				<stop  offset="1" style="stop-color:#9EC9E2"/>
-			</linearGradient>
-			<path fill="url(#SVGID_2_)" d="M1570.1,231.9c1.9,0,3.5,1.6,3.5,3.5V270c0,1.9-1.6,3.5-3.5,3.5h-59.3c-1.9,0-3.5-1.6-3.5-3.5
-				v-34.7c0-1.9,1.6-3.5,3.5-3.5H1570.1 M1570.1,230.1h-59.3c-2.9,0-5.2,2.3-5.2,5.2V270c0,2.9,2.4,5.2,5.2,5.2h59.3
-				c2.9,0,5.2-2.3,5.2-5.2v-34.7C1575.3,232.5,1572.9,230.1,1570.1,230.1L1570.1,230.1z"/>
-		</g>
-		<g>
-			<path fill="#295384" d="M1540.4,236.6c8.9,0,16.1,7.2,16.1,16c0,8.8-7.2,16-16.1,16s-16.1-7.2-16.1-16S1531.5,236.6,1540.4,236.6
-				 M1540.4,235.3c-9.6,0-17.4,7.8-17.4,17.3s7.8,17.3,17.4,17.3s17.4-7.8,17.4-17.3S1550.1,235.3,1540.4,235.3L1540.4,235.3z"/>
-		</g>
-		<path fill="#295384" d="M1535.4,251.1c1.9-5.7,10.7-3.9,10.2,2.2c-0.5,5.6-8.5,6.2-10.2,1.2c0,0,0,0.1,0,0l0,0
-			c-2.4,0.2-4.7,0.4-7.1,0.6c1.7,10.1,15.3,13.1,21.6,5.3c6.5-8,0.3-20.2-10-19.8c-5.6,0.3-10.5,4.3-11.5,9.8"/>
-		<path fill="#7B952D" d="M1580.3,198.7l-2-1.6c-0.3-0.3-1-0.3-1.2,0.1l-6.8,7.9c-0.3,0.3-0.3,1,0.1,1.2l2,1.6
-			c0.3,0.3,1,0.3,1.2-0.1l6.8-7.9C1580.7,199.6,1580.6,199,1580.3,198.7z"/>
-		<path fill="#7B952D" d="M1500.6,198.1l2-1.6c0.3-0.3,1-0.3,1.2,0.1l6.8,7.9c0.3,0.3,0.3,1-0.1,1.2l-2,1.6c-0.3,0.3-1,0.3-1.2-0.1
-			l-6.8-7.9C1500.2,199,1500.3,198.5,1500.6,198.1z"/>
-
-			<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="413.9844" y1="453.354" x2="413.9844" y2="459.4099" gradientTransform="matrix(3.7209 0 0 -3.7209 0 1914.4187)">
-			<stop  offset="0" style="stop-color:#BCDB52"/>
-			<stop  offset="0.3206" style="stop-color:#C5E358"/>
-			<stop  offset="0.5" style="stop-color:#CDEA5C"/>
-			<stop  offset="0.9944" style="stop-color:#DCF285"/>
-		</linearGradient>
-		<path fill="url(#SVGID_3_)" stroke="#7B952D" stroke-miterlimit="10" d="M1572.7,227.5h-64.5c-1,0-1.7-0.8-1.7-1.7v-19.1
-			c0-1,0.8-1.7,1.7-1.7h64.5c1,0,1.7,0.8,1.7,1.7v19.1C1574.4,226.7,1573.6,227.5,1572.7,227.5z"/>
-		<g>
-			<ellipse fill="#FFFFFF" cx="1523" cy="215.4" rx="6.1" ry="6.1"/>
-
-				<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="409.8439" y1="458.401" x2="408.7539" y2="454.8358" gradientTransform="matrix(3.7209 0 0 -3.7209 0 1914.4187)">
-				<stop  offset="0" style="stop-color:#8BA53D"/>
-				<stop  offset="8.484717e-02" style="stop-color:#94AE45"/>
-				<stop  offset="0.2259" style="stop-color:#AEC65C"/>
-				<stop  offset="0.4048" style="stop-color:#D7ED81"/>
-				<stop  offset="0.4246" style="stop-color:#DCF285"/>
-			</linearGradient>
-			<path fill="url(#SVGID_4_)" d="M1523,222.3c-3.8,0-7-3.1-7-6.9c0-3.8,3.1-6.9,7-6.9c3.8,0,7,3.1,7,6.9
-				C1529.9,219.2,1526.9,222.3,1523,222.3z M1523,210.2c-2.9,0-5.2,2.3-5.2,5.2s2.4,5.2,5.2,5.2s5.2-2.3,5.2-5.2
-				S1525.9,210.2,1523,210.2z"/>
-		</g>
-		<g>
-			<ellipse fill="#FFFFFF" cx="1557.8" cy="215.4" rx="6.1" ry="6.1"/>
-
-				<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="419.2189" y1="458.401" x2="418.129" y2="454.8359" gradientTransform="matrix(3.7209 0 0 -3.7209 0 1914.4187)">
-				<stop  offset="0" style="stop-color:#8BA53D"/>
-				<stop  offset="8.484717e-02" style="stop-color:#94AE45"/>
-				<stop  offset="0.2259" style="stop-color:#AEC65C"/>
-				<stop  offset="0.4048" style="stop-color:#D7ED81"/>
-				<stop  offset="0.4246" style="stop-color:#DCF285"/>
-			</linearGradient>
-			<path fill="url(#SVGID_5_)" d="M1557.8,222.3c-3.8,0-7-3.1-7-6.9c0-3.8,3.1-6.9,7-6.9c3.8,0,7,3.1,7,6.9
-				C1564.8,219.2,1561.8,222.3,1557.8,222.3z M1557.8,210.2c-2.9,0-5.2,2.3-5.2,5.2s2.4,5.2,5.2,5.2c2.9,0,5.2-2.3,5.2-5.2
-				S1560.8,210.2,1557.8,210.2z"/>
-		</g>
-	</g>
-</g>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="48" height="48" viewBox="0 0 48.000001 48.000001" id="svg4230" version="1.1" inkscape:version="0.91 r13725" sodipodi:docname="fdroid-logo.svg">
+  <defs id="defs4232">
+    <linearGradient inkscape:collect="always" id="linearGradient5212">
+      <stop style="stop-color:#ffffff;stop-opacity:0.09803922" offset="0" id="stop5214"/>
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop5216"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient5212" id="radialGradient5220" cx="-98.23381" cy="3.4695871" fx="-98.23381" fy="3.4695871" r="22.671185" gradientTransform="matrix(0,1.9747624,-2.117225,3.9784049e-8,8.677247,1199.588)" gradientUnits="userSpaceOnUse"/>
+    <filter inkscape:collect="always" style="color-interpolation-filters:sRGB" id="filter4175" x="-0.023846937" width="1.0476939" y="-0.02415504" height="1.0483101">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.45053152" id="feGaussianBlur4177"/>
+    </filter>
+  </defs>
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="11.313708" inkscape:cx="6.4184057" inkscape:cy="25.737489" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" units="px" inkscape:window-width="1920" inkscape:window-height="1009" inkscape:window-x="0" inkscape:window-y="34" inkscape:window-maximized="1" gridtolerance="10000"/>
+  <metadata id="metadata4235">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+        <cc:license rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/"/>
+      </cc:Work>
+      <cc:License rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction"/>
+        <cc:permits rdf:resource="http://creativecommons.org/ns#Distribution"/>
+        <cc:requires rdf:resource="http://creativecommons.org/ns#Notice"/>
+        <cc:requires rdf:resource="http://creativecommons.org/ns#Attribution"/>
+        <cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks"/>
+        <cc:requires rdf:resource="http://creativecommons.org/ns#ShareAlike"/>
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(0,-1004.3622)">
+    <path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#263238;fill-opacity:0.4;fill-rule:evenodd;stroke:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4175);color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m 2.613462,1006.3488 a 1.250125,1.250125 0 0 0 -1.01172,2.0293 l 3.60351,4.6641 c -0.12699,0.3331 -0.20312,0.6915 -0.20312,1.0703 l 0,4 0,2.8652 0,0.1348 c 0,1.662 1.338,3 3,3 l 32,0 c 1.662,0 3,-1.338 3,-3 l 0,-4 0,-2.8652 0,-0.1348 c 0,-0.3803 -0.0771,-0.74 -0.20508,-1.0742 l 3.60156,-4.6602 a 1.250125,1.250125 0 0 0 -1.04882,-2.0273 1.250125,1.250125 0 0 0 -0.92969,0.498 l -3.43164,4.4414 c -0.31022,-0.1079 -0.63841,-0.1777 -0.98633,-0.1777 l -32,0 c -0.34857,0 -0.67757,0.069 -0.98828,0.1777 l -3.4336,-4.4414 a 1.250125,1.250125 0 0 0 -0.96679,-0.5 z m 5.38867,18.7637 c -0.20775,0 -0.40983,0.021 -0.60547,0.061 -1.36951,0.2761 -2.39453,1.4698 -2.39453,2.9101 l 0,0.029 0,19.7793 0,0.029 0,0.1914 c 0,1.662 1.338,3 3,3 l 32,0 c 1.662,0 3,-1.338 3,-3 l 0,-20 0,-0.029 c 0,-1.4403 -1.02502,-2.634 -2.39453,-2.9101 -0.19565,-0.039 -0.39772,-0.061 -0.60547,-0.061 l -32,0 z" id="path4192" inkscape:connector-curvature="0"/>
+    <g id="g5012">
+      <g id="g4179" transform="matrix(-1,0,0,1,47.999779,0)">
+        <path style="fill:#8ab000;fill-opacity:1;fill-rule:evenodd;stroke:#769616;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 2.5889342,1006.8622 4.25,5.5" id="path4181" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+        <path sodipodi:nodetypes="cccccc" inkscape:connector-curvature="0" id="path4183" d="m 2.6113281,1005.6094 c -0.4534623,0.012 -0.7616975,0.189 -0.9807462,0.4486 2.0269314,2.4089 2.368401,2.7916 5.1354735,6.2214 1.0195329,1.319 2.0816026,0.6373 1.0620696,-0.6817 l -4.25,-5.5 c -0.2289894,-0.3056 -0.5850813,-0.478 -0.9667969,-0.4883 z" style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:0.29803923;fill-rule:evenodd;stroke:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path4185" d="m 1.6220992,1006.0705 c -0.1238933,0.1479 -0.561176,0.8046 -0.02249,1.5562 l 4.25,5.5 c 1.0195329,1.319 1.1498748,-0.6123 1.1498748,-0.6123 0,0 -3.7344514,-4.51 -5.3773848,-6.4439 z" style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#263238;fill-opacity:0.2;fill-rule:evenodd;stroke:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"/>
+        <path sodipodi:nodetypes="cscccc" inkscape:connector-curvature="0" id="path4187" d="m 2.3378905,1005.8443 c -0.438175,0 -0.959862,0.1416 -0.8242183,0.7986 0.103561,0.5016 4.6608262,6.0744 4.6608262,6.0744 1.0195329,1.319 2.4934721,0.6763 1.4739391,-0.6425 l -4.234375,-5.4727 c -0.2602394,-0.29 -0.6085188,-0.7436 -1.076172,-0.7578 z" style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#8ab000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"/>
+      </g>
+      <g id="g4955">
+        <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path4945" d="m 2.5889342,1006.8622 4.25,5.5" style="fill:#8ab000;fill-opacity:1;fill-rule:evenodd;stroke:#769616;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/>
+        <path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:0.29803923;fill-rule:evenodd;stroke:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m 2.6113281,1005.6094 c -0.4534623,0.012 -0.7616975,0.189 -0.9807462,0.4486 2.0269314,2.4089 2.368401,2.7916 5.1354735,6.2214 1.0195329,1.319 2.0816026,0.6373 1.0620696,-0.6817 l -4.25,-5.5 c -0.2289894,-0.3056 -0.5850813,-0.478 -0.9667969,-0.4883 z" id="path4947" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccc"/>
+        <path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#263238;fill-opacity:0.2;fill-rule:evenodd;stroke:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m 1.6220992,1006.0705 c -0.1238933,0.1479 -0.561176,0.8046 -0.02249,1.5562 l 4.25,5.5 c 1.0195329,1.319 1.1498748,-0.6123 1.1498748,-0.6123 0,0 -3.7344514,-4.51 -5.3773848,-6.4439 z" id="path4951" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#8ab000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m 2.3378905,1005.8443 c -0.438175,0 -0.959862,0.1416 -0.8242183,0.7986 0.103561,0.5016 4.6608262,6.0744 4.6608262,6.0744 1.0195329,1.319 2.4934721,0.6763 1.4739391,-0.6425 l -4.234375,-5.4727 c -0.2602394,-0.29 -0.6085188,-0.7436 -1.076172,-0.7578 z" id="path4925" inkscape:connector-curvature="0" sodipodi:nodetypes="cscccc"/>
+      </g>
+      <g transform="translate(42,0)" id="g4967">
+        <rect style="opacity:1;fill:#aeea00;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4144" width="38" height="13" x="-37" y="1010.3622" rx="3" ry="3"/>
+        <rect ry="3" rx="3" y="1013.3622" x="-37" height="10" width="38" id="rect4961" style="opacity:1;fill:#263238;fill-opacity:0.2;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"/>
+        <rect ry="3" rx="3" y="1010.3622" x="-37" height="10" width="38" id="rect4963" style="opacity:1;fill:#ffffff;fill-opacity:0.29803923;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"/>
+        <rect ry="2.5384617" rx="3" y="1011.3622" x="-37" height="11" width="38" id="rect4965" style="opacity:1;fill:#aeea00;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"/>
+      </g>
+      <g id="g4979">
+        <rect style="opacity:1;fill:#1976d2;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4146" width="38" height="26" x="5" y="1024.3622" rx="3" ry="3"/>
+        <rect ry="3" rx="3" y="1037.3622" x="5" height="13" width="38" id="rect4973" style="opacity:1;fill:#263238;fill-opacity:0.2;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"/>
+        <rect ry="3" rx="3" y="1024.3622" x="5" height="13" width="38" id="rect4975" style="opacity:1;fill:#ffffff;fill-opacity:0.2;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"/>
+        <rect ry="2.7692308" rx="3" y="1025.3622" x="5" height="24" width="38" id="rect4977" style="opacity:1;fill:#1976d2;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"/>
+      </g>
+      <g transform="translate(0,1013.3622)" id="g4211">
+        <path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#0d47a1;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m 24,17.75 c -2.880662,0 -5.319789,1.984685 -6.033203,4.650391 l 3.212891,0 C 21.734004,21.415044 22.774798,20.75 24,20.75 c 1.812692,0 3.25,1.437308 3.25,3.25 0,1.812693 -1.437308,3.25 -3.25,3.25 -1.307381,0 -2.411251,-0.75269 -2.929688,-1.849609 l -3.154296,0 C 18.558263,28.166146 21.04791,30.25 24,30.25 c 3.434013,0 6.25,-2.815987 6.25,-6.25 0,-3.434012 -2.815987,-6.25 -6.25,-6.25 z" id="path4161" inkscape:connector-curvature="0"/>
+        <circle style="opacity:1;fill:none;fill-opacity:0.40392157;stroke:#0d47a1;stroke-width:1.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="path4209" cx="24" cy="24" r="9.5500002"/>
+      </g>
+      <g id="g4989" transform="translate(0,0.50001738)">
+        <ellipse cy="1016.4872" cx="14.375" id="circle4985" style="opacity:1;fill:#263238;fill-opacity:0.2;stroke:none;stroke-width:1.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.69721117" rx="3.375" ry="3.875"/>
+        <circle style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.69721117" id="path4859" cx="14.375" cy="1016.9872" r="3.375"/>
+      </g>
+      <g transform="translate(19.5,0.50001738)" id="g4171">
+        <ellipse ry="3.875" rx="3.375" style="opacity:1;fill:#263238;fill-opacity:0.2;stroke:none;stroke-width:1.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.69721117" id="ellipse4175" cx="14.375" cy="1016.4872"/>
+        <circle r="3.375" cy="1016.9872" cx="14.375" id="circle4177" style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.69721117"/>
+      </g>
+    </g>
+    <path inkscape:connector-curvature="0" id="path5128" d="m 2.613462,1005.5987 a 1.250125,1.250125 0 0 0 -1.01172,2.0293 l 3.60351,4.6641 c -0.12699,0.3331 -0.20312,0.6915 -0.20312,1.0703 l 0,4 0,2.8652 0,0.1348 c 0,1.662 1.338,3 3,3 l 32,0 c 1.662,0 3,-1.338 3,-3 l 0,-4 0,-2.8652 0,-0.1348 c 0,-0.3803 -0.0771,-0.74 -0.20508,-1.0742 l 3.60156,-4.6602 a 1.250125,1.250125 0 0 0 -1.04882,-2.0273 1.250125,1.250125 0 0 0 -0.92969,0.498 l -3.43164,4.4414 c -0.31022,-0.1079 -0.63841,-0.1777 -0.98633,-0.1777 l -32,0 c -0.34857,0 -0.67757,0.069 -0.98828,0.1777 l -3.4336,-4.4414 a 1.250125,1.250125 0 0 0 -0.96679,-0.5 z m 5.38867,18.7637 c -0.20775,0 -0.40983,0.021 -0.60547,0.061 -1.36951,0.2761 -2.39453,1.4698 -2.39453,2.9101 l 0,0.029 0,19.7793 0,0.029 0,0.1914 c 0,1.662 1.338,3 3,3 l 32,0 c 1.662,0 3,-1.338 3,-3 l 0,-20 0,-0.029 c 0,-1.4403 -1.02502,-2.634 -2.39453,-2.9101 -0.19565,-0.039 -0.39772,-0.061 -0.60547,-0.061 l -32,0 z" style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#radialGradient5220);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"/>
+  </g>
 </svg>
--- a/apps/welcome/googleplay.svg
+++ b/apps/welcome/googleplay.svg
@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg height="800px" width="800px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" 
+	 viewBox="0 0 511.999 511.999" xml:space="preserve">
+<g>
+	<path style="fill:#32BBFF;" d="M382.369,175.623C322.891,142.356,227.427,88.937,79.355,6.028
+		C69.372-0.565,57.886-1.429,47.962,1.93l254.05,254.05L382.369,175.623z"/>
+	<path style="fill:#32BBFF;" d="M47.962,1.93c-1.86,0.63-3.67,1.39-5.401,2.308C31.602,10.166,23.549,21.573,23.549,36v439.96
+		c0,14.427,8.052,25.834,19.012,31.761c1.728,0.917,3.537,1.68,5.395,2.314L302.012,255.98L47.962,1.93z"/>
+	<path style="fill:#32BBFF;" d="M302.012,255.98L47.956,510.035c9.927,3.384,21.413,2.586,31.399-4.103
+		c143.598-80.41,237.986-133.196,298.152-166.746c1.675-0.941,3.316-1.861,4.938-2.772L302.012,255.98z"/>
+</g>
+<path style="fill:#2C9FD9;" d="M23.549,255.98v219.98c0,14.427,8.052,25.834,19.012,31.761c1.728,0.917,3.537,1.68,5.395,2.314
+	L302.012,255.98H23.549z"/>
+<path style="fill:#29CC5E;" d="M79.355,6.028C67.5-1.8,53.52-1.577,42.561,4.239l255.595,255.596l84.212-84.212
+	C322.891,142.356,227.427,88.937,79.355,6.028z"/>
+<path style="fill:#D93F21;" d="M298.158,252.126L42.561,507.721c10.96,5.815,24.939,6.151,36.794-1.789
+	c143.598-80.41,237.986-133.196,298.152-166.746c1.675-0.941,3.316-1.861,4.938-2.772L298.158,252.126z"/>
+<path style="fill:#FFD500;" d="M488.45,255.98c0-12.19-6.151-24.492-18.342-31.314c0,0-22.799-12.721-92.682-51.809l-83.123,83.123
+	l83.204,83.205c69.116-38.807,92.6-51.892,92.6-51.892C482.299,280.472,488.45,268.17,488.45,255.98z"/>
+<path style="fill:#FFAA00;" d="M470.108,287.294c12.191-6.822,18.342-19.124,18.342-31.314H294.303l83.204,83.205
+	C446.624,300.379,470.108,287.294,470.108,287.294z"/>
+</svg>
--- a/apps/welcome/index.html
+++ b/apps/welcome/index.html
@ -66,10 +66,29 @@
 					<a
 						class="w3-button w3-black w3-padding-large"
 						href="https://dev.tildefriends.net/"
-						><i class="fa fa-mug-hot"></i> Code</a
+						><i class="fa fa-mug-hot"></i> Development</a
 					>
 					<p>
-						<a href="https://f-droid.org/en/packages/com.unprompted.tildefriends.fdroid/"><img src="f-droid.svg" style="height: 3em"></a>
+						<a
+							class="w3-button w3-round-large w3-padding w3-blue-gray w3-margin-top"
+							href="https://f-droid.org/en/packages/com.unprompted.tildefriends.fdroid/"
+							><img src="f-droid.svg" style="height: 2em; margin: 0" /> Get it
+							on F-Droid</a
+						>
+						<a
+							class="w3-button w3-round-large w3-padding w3-blue-gray w3-margin-top"
+							href="https://dev.tildefriends.net/releases/tildefriends-x86_64.AppImage"
+						>
+							<img src="appimage.svg" style="height: 2em; margin: 0" />
+							Get Linux 64-bit AppImage
+						</a>
+						<a
+							class="w3-button w3-round-large w3-padding w3-blue-gray w3-margin-top"
+							href="https://play.google.com/store/apps/details?id=com.unprompted.tildefriends"
+						>
+							<img src="googleplay.svg" style="height: 2em; margin: 0" />
+							Get it on Google Play (Open Testing)
+						</a>
 					</p>
 				</div>
 				<div class="w3-col l4 m6">
@ -91,36 +110,31 @@
 							<a href="https://dev.tildefriends.net/cory/tildefriends/releases"
 								>Download</a
 							>
-							Tilde Friends and run your own instance, or use
+							Tilde Friends or use
 							<a href="https://www.tildefriends.net/"
 								>https://www.tildefriends.net/</a
 							>.
 						</li>
-						<li>
-							Create an account to identify yourself with that instance by
-							username and password.
-						</li>
-						<li>
-							Create an SSB identity in the <b>ssb</b> app. This will generate a
-							keypair used to identify yourself to other users and sign your
-							messages so that they can be verified as from you.
-						</li>
+						<li>Create an account to identify yourself with that instance.</li>
 						<li>
 							Describe yourself in your profile in the <b>ssb</b> app. Give
 							yourself a name and an avatar if you like.
 						</li>
 						<li>
-							Connect to others. You will automatically discover peers on the
-							same instance and same network if there are any. Or use
-							<a href="https://github.com/staltz/ssb-room/blob/master/FAQ.md"
-								>rooms</a
-							>
-							and pubs to reach more distant users.
-							<a href="https://www.tildefriends.net/~cory/room/"
-								>tildefriends.net itself</a
-							>
-							operates as a room, so you can connect and see who else is online
-							and establish a connection.
+							Connect to others.
+							<ul>
+								<li>Automatically discover peers on the same network.</li>
+								<li>
+									Manually connect to rooms and pubs, including
+									<a href="https://www.tildefriends.net/~cory/room/"
+										>tildefriends.net itself</a
+									>.
+								</li>
+								<li>
+									Enable <b>Peer Exchange</b> in the <b>admin</b> to discover
+									internet peers.
+								</li>
+							</ul>
 						</li>
 						<li>Follow people to grow your network.</li>
 						<li>
@ -209,8 +223,13 @@

 		<!-- Technlology Section -->
 		<div class="w3-container w3-padding-64 w3-light-grey w3-center">
-			<h1 class="w3-jumbo"><b>Trusted Technology</b></h1>
-			<p>Tilde Friends is built using boring, trusted tech.</p>
+			<h1 class="w3-jumbo"><b>Boring Technology</b></h1>
+			<p>
+				Tilde Friends is built using boring, trusted tech. Unless a better
+				reason presents itself, it strives to use only simple and widely adopted
+				dependencies in order to keep it easy to build for all sorts of
+				platforms and maintainable for a very long time.
+			</p>
 			<p>
 				Though of course for building Tilde Friends apps, you are free to use
 				whatever fits.
@ -247,7 +266,7 @@
 					<i class="fa fa-lock w3-text-purple w3-jumbo"></i>
 					<p>libsodium</p>
 				</a>
-				<a href="https://www.openssl.org/" class="w3-col s3">
+				<a href="https://github.com/openssl/openssl/releases" class="w3-col s3">
 					<i class="fa fa-shield-halved w3-text-green w3-jumbo"></i>
 					<p>OpenSSL</p>
 				</a>
--- a/apps/wiki.json
+++ b/apps/wiki.json
@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
 	"emoji": "📝",
-	"previous": "&DaYqKHRBKhjFGaOzbKZ1+/pLspJeEkDJYTF2B50tH6k=.sha256"
+	"previous": "&4F4D8+QlJVaxXywChQrNTdSV4Y3TvJ0xxqdq/i9HUWA=.sha256"
 }
--- a/apps/wiki/commonmark.min.js
+++ b/apps/wiki/commonmark.min.js
--- a/apps/wiki/handler.js
+++ b/apps/wiki/handler.js
@ -2,8 +2,8 @@ import * as utils from './utils.js';
 import * as commonmark from './commonmark.min.js';

 function markdown(md) {
-	let reader = new commonmark.Parser({safe: true});
-	let writer = new commonmark.HtmlRenderer();
+	let reader = new commonmark.Parser();
+	let writer = new commonmark.HtmlRenderer({safe: true});
 	let parsed = reader.parse(md || '');
 	let walker = parsed.walker();
 	let event;
--- a/apps/wiki/lit-all.min.js
+++ b/apps/wiki/lit-all.min.js
--- a/apps/wiki/lit-all.min.js.map
+++ b/apps/wiki/lit-all.min.js.map
--- a/apps/wiki/tf-wiki-doc.js
+++ b/apps/wiki/tf-wiki-doc.js
@ -20,8 +20,8 @@ class TfWikiDocElement extends LitElement {
 	}

 	markdown(md) {
-		let reader = new commonmark.Parser({safe: true});
-		let writer = new commonmark.HtmlRenderer();
+		let reader = new commonmark.Parser();
+		let writer = new commonmark.HtmlRenderer({safe: true});
 		let parsed = reader.parse(md || '');
 		let walker = parsed.walker();
 		let event;
--- a/core/app.js
+++ b/core/app.js
@ -10,7 +10,7 @@ let gSessionIndex = 0;
 * @returns
 */
 function makeSessionId() {
-	return (gSessionIndex++).toString();
+	return 'session_' + (gSessionIndex++).toString();
 }

 /**
@ -172,11 +172,7 @@ async function socket(request, response, client) {
 							0x1
 						);
 					} else {
-						process = await core.getSessionProcessBlob(
-							blobId,
-							sessionId,
-							options
-						);
+						process = await core.getProcessBlob(blobId, sessionId, options);
 					}
 				}
 				if (process) {
--- a/core/client.js
+++ b/core/client.js
@ -162,6 +162,10 @@ class TfNavigationElement extends LitElement {
 							class="w3-dropdown-content w3-bar-block w3-card-4"
 							style="max-width: 100%; right: 0"
 						>
+							<div
+								style="position: fixed; left: 0; right: 0; top: 0; bottom: 0; background-color: rgba(0, 0, 0, 0.25); z-index: -100"
+								@click=${self.toggle_id_dropdown}
+							></div>
 							<button
 								class="w3-bar-item w3-button w3-border"
 								@click=${() => (window.location.href = '/~core/identity')}
@ -382,8 +386,8 @@ class TfNavigationElement extends LitElement {
 					<link type="text/css" rel="stylesheet" href="/static/w3.css" />
 					<div class="w3-model w3-animate-top" style="position: absolute; left: 50%; transform: translate(-50%); z-index: 1">
 						<dijv class="w3-modal-content w3-card-4" style="display: block; padding: 1em">
-							<span @click=${self.clear_error} class="w3-button w3-display-topright">&times;</span>
-							<div style="color: ${this.status.color ?? kErrorColor}"><b>ERROR:</b><p style="white-space: pre">${this.status.message}</p></div>
+							<span id="close_error" @click=${self.clear_error} class="w3-button w3-display-topright">&times;</span>
+							<div style="color: ${this.status.color ?? kErrorColor}"><b>ERROR:</b><p id="error" style="white-space: pre">${this.status.message}</p></div>
 						</div>
 					</div>
 					`
@ -1174,7 +1178,7 @@ function api_requestPermission(permission, id) {

 	let div = document.createElement('div');
 	div.appendChild(
-		document.createTextNode('This app is requesting the following permission:')
+		document.createTextNode('This app is requesting the following permission: ')
 	);
 	let span = document.createElement('span');
 	span.style = 'font-weight: bold';
@ -1190,6 +1194,7 @@ function api_requestPermission(permission, id) {
 	check.classList.add('w3-check');
 	check.classList.add('w3-blue');
 	div.appendChild(check);
+	div.appendChild(document.createTextNode(' '));
 	let label = document.createElement('label');
 	label.htmlFor = check.id;
 	label.appendChild(document.createTextNode('Remember this decision.'));
@ -1782,10 +1787,11 @@ async function sourcePretty() {
 	let prettier = (await import('/prettier/standalone.mjs')).default;
 	let babel = (await import('/prettier/babel.mjs')).default;
 	let estree = (await import('/prettier/estree.mjs')).default;
+	let prettier_html = (await import('/prettier/html.mjs')).default;
 	let source = gEditor.state.doc.toString();
 	let formatted = await prettier.format(source, {
-		parser: 'babel',
-		plugins: [babel, estree],
+		parser: gCurrentFile?.toLowerCase()?.endsWith('.html') ? 'html' : 'babel',
+		plugins: [babel, estree, prettier_html],
 		trailingComma: 'es5',
 		useTabs: true,
 		semi: true,
@ -1820,8 +1826,8 @@ function toggleVisibleWhitespace() {
 			.cm-highlightTab {
 				background-image: unset !important;
 			}
-			.cm-highlightSpace:before {
-				content: unset !important;
+			.cm-highlightSpace {
+				background-image: unset !important;
 			}
 		`;
 		window.localStorage.setItem('visible_whitespace', '1');
--- a/core/core.js
+++ b/core/core.js
@ -4,93 +4,6 @@ import * as http from './http.js';

 let gProcesses = {};
 let gStatsTimer = false;
-
-const k_content_security_policy =
-	'sandbox allow-downloads allow-top-navigation-by-user-activation';
-
-const k_global_settings = {
-	index: {
-		type: 'string',
-		default_value: '/~core/apps/',
-		description: 'Default path.',
-	},
-	index_map: {
-		type: 'textarea',
-		default_value: undefined,
-		description:
-			'Mappings from hostname to redirect path, one per line, as in: "www.tildefriends.net=/~core/index/"',
-	},
-	room: {
-		type: 'boolean',
-		default_value: true,
-		description: 'Enable peers to tunnel through this instance as a room.',
-	},
-	room_name: {
-		type: 'string',
-		default_value: 'tilde friends tunnel',
-		description: 'Name of the room.',
-	},
-	replicator: {
-		type: 'boolean',
-		default_value: true,
-		description: 'Enable message and blob replication.',
-	},
-	code_of_conduct: {
-		type: 'textarea',
-		default_value: undefined,
-		description: 'Code of conduct presented at sign-in.',
-	},
-	http_redirect: {
-		type: 'string',
-		default_value: undefined,
-		description:
-			'If connecting by HTTP and HTTPS is configured, Location header prefix (ie, "https://example.com")',
-	},
-	fetch_hosts: {
-		type: 'string',
-		default_value: undefined,
-		description:
-			'Comma-separated list of host names to which HTTP fetch requests are allowed.  None if empty.',
-	},
-	blob_fetch_age_seconds: {
-		type: 'integer',
-		default_value:
-			platform() == 'android' || platform() == 'iphone'
-				? 0.5 * 365 * 24 * 60 * 60
-				: undefined,
-		description:
-			'Only blobs mentioned more recently than this age will be automatically fetched.',
-	},
-	blob_expire_age_seconds: {
-		type: 'integer',
-		default_value:
-			platform() == 'android' || platform() == 'iphone'
-				? 1.0 * 365 * 24 * 60 * 60
-				: undefined,
-		description: 'Blobs older than this will be automatically deleted.',
-	},
-	seeds_host: {
-		type: 'string',
-		default_value: 'seeds.tildefriends.net',
-		description: 'Hostname for seed connections.',
-	},
-	peer_exchange: {
-		type: 'boolean',
-		default_value: false,
-		description:
-			'Enable discovery of, sharing of, and connecting to internet peer strangers, including announcing this instance.',
-	},
-	account_registration: {
-		type: 'boolean',
-		default_value: true,
-		description: 'Allow registration of new accounts.',
-	},
-};
-
-let gGlobalSettings = {
-	index: '/~core/apps/',
-};
-
 let kPingInterval = 60 * 1000;

 /**
@ -262,23 +175,6 @@ function postMessageInternal(from, to, message) {
 	}
 }

-/**
- * TODOC
- * @param {*} blobId
- * @param {*} session
- * @param {*} options
- * @returns
- */
-async function getSessionProcessBlob(blobId, session, options) {
-	let actualOptions = {timeout: kPingInterval};
-	if (options) {
-		for (let i in options) {
-			actualOptions[i] = options[i];
-		}
-	}
-	return getProcessBlob(blobId, 'session_' + session, actualOptions);
-}
-
 /**
 * TODOC
 * @param {*} blobId
@ -306,7 +202,7 @@ async function getProcessBlob(blobId, key, options) {
 			}
 			process.lastActive = Date.now();
 			process.lastPing = null;
-			process.timeout = options.timeout;
+			process.timeout = kPingInterval;
 			process.ready = new Promise(function (resolve, reject) {
 				resolveReady = resolve;
 				rejectReady = reject;
@ -345,59 +241,59 @@ async function getProcessBlob(blobId, key, options) {
 							return [];
 						}
 					},
-					permissionsGranted: function () {
+					permissionsGranted: async function () {
 						let user = process?.credentials?.session?.name;
+						let settings = await loadSettings();
 						if (
 							user &&
 							options?.packageOwner &&
 							options?.packageName &&
-							gGlobalSettings.userPermissions &&
-							gGlobalSettings.userPermissions[user] &&
-							gGlobalSettings.userPermissions[user][options.packageOwner]
+							settings.userPermissions &&
+							settings.userPermissions[user] &&
+							settings.userPermissions[user][options.packageOwner]
 						) {
-							return gGlobalSettings.userPermissions[user][
-								options.packageOwner
-							][options.packageName];
+							return settings.userPermissions[user][options.packageOwner][
+								options.packageName
+							];
 						}
 					},
-					allPermissionsGranted: function () {
+					allPermissionsGranted: async function () {
 						let user = process?.credentials?.session?.name;
+						let settings = await loadSettings();
 						if (
 							user &&
 							options?.packageOwner &&
 							options?.packageName &&
-							gGlobalSettings.userPermissions &&
-							gGlobalSettings.userPermissions[user]
+							settings.userPermissions &&
+							settings.userPermissions[user]
 						) {
-							return gGlobalSettings.userPermissions[user];
+							return settings.userPermissions[user];
 						}
 					},
-					permissionsForUser: function (user) {
-						return (
-							(gGlobalSettings?.permissions
-								? gGlobalSettings.permissions[user]
-								: []) ?? []
-						);
+					permissionsForUser: async function (user) {
+						let settings = await loadSettings();
+						return settings?.permissions?.[user] ?? [];
 					},
 					apps: (user) => getApps(user, process),
 					getSockets: getSockets,
-					permissionTest: function (permission) {
+					permissionTest: async function (permission) {
 						let user = process?.credentials?.session?.name;
+						let settings = await loadSettings();
 						if (!user || !options?.packageOwner || !options?.packageName) {
 							return;
 						} else if (
-							gGlobalSettings.userPermissions &&
-							gGlobalSettings.userPermissions[user] &&
-							gGlobalSettings.userPermissions[user][options.packageOwner] &&
-							gGlobalSettings.userPermissions[user][options.packageOwner][
+							settings.userPermissions &&
+							settings.userPermissions[user] &&
+							settings.userPermissions[user][options.packageOwner] &&
+							settings.userPermissions[user][options.packageOwner][
 								options.packageName
 							] &&
-							gGlobalSettings.userPermissions[user][options.packageOwner][
+							settings.userPermissions[user][options.packageOwner][
 								options.packageName
 							][permission] !== undefined
 						) {
 							if (
-								gGlobalSettings.userPermissions[user][options.packageOwner][
+								settings.userPermissions[user][options.packageOwner][
 									options.packageName
 								][permission]
 							) {
@ -408,9 +304,9 @@ async function getProcessBlob(blobId, key, options) {
 						} else if (process.app) {
 							return process.app
 								.makeFunction(['requestPermission'])(permission)
-								.then(function (value) {
+								.then(async function (value) {
 									if (value == 'allow') {
-										storePermission(
+										await ssb.setUserPermission(
 											user,
 											options.packageOwner,
 											options.packageName,
@ -422,7 +318,7 @@ async function getProcessBlob(blobId, key, options) {
 									} else if (value == 'allow once') {
 										return true;
 									} else if (value == 'deny') {
-										storePermission(
+										await ssb.setUserPermission(
 											user,
 											options.packageOwner,
 											options.packageName,
@ -509,23 +405,24 @@ async function getProcessBlob(blobId, key, options) {
 				}
 			};
 			if (process.credentials?.permissions?.administration) {
-				imports.core.globalSettingsDescriptions = function () {
-					let settings = Object.assign({}, k_global_settings);
-					for (let [key, value] of Object.entries(gGlobalSettings)) {
+				imports.core.globalSettingsDescriptions = async function () {
+					let settings = Object.assign({}, defaultGlobalSettings());
+					for (let [key, value] of Object.entries(await loadSettings())) {
 						if (settings[key]) {
 							settings[key].value = value;
 						}
 					}
 					return settings;
 				};
-				imports.core.globalSettingsGet = function (key) {
-					return gGlobalSettings[key];
+				imports.core.globalSettingsGet = async function (key) {
+					let settings = await loadSettings();
+					return settings?.[key];
 				};
 				imports.core.globalSettingsSet = async function (key, value) {
 					print('Setting', key, value);
-					await loadSettings();
-					gGlobalSettings[key] = value;
-					setGlobalSettings(gGlobalSettings);
+					let settings = await loadSettings();
+					settings[key] = value;
+					await new Database('core').set('settings', JSON.stringify(settings));
 					print('Done.');
 				};
 				imports.core.deleteUser = async function (user) {
@ -692,11 +589,24 @@ async function getProcessBlob(blobId, key, options) {
 					);
 				}
 			};
+			imports.ssb.swapWithServerIdentity = function (id) {
+				if (
+					process.credentials &&
+					process.credentials.session &&
+					process.credentials.session.name
+				) {
+					return ssb.swapWithServerIdentity(
+						process.credentials.session.name,
+						id
+					);
+				}
+			};
 			imports.ssb.addEventListener = undefined;
 			imports.ssb.removeEventListener = undefined;
 			imports.ssb.getIdentityInfo = undefined;
-			imports.fetch = function (url, options) {
-				return http.fetch(url, options, gGlobalSettings.fetch_hosts);
+			imports.fetch = async function (url, options) {
+				let settings = await loadSettings();
+				return http.fetch(url, options, settings?.fetch_hosts);
 			};

 			if (
@ -723,12 +633,12 @@ async function getProcessBlob(blobId, key, options) {
 						Object.keys(db).map((x) => [x, db[x].bind(db)])
 					);
 				};
-				imports.databases = function () {
+				imports.databases = async function () {
 					return [].concat(
-						databases.list(
+						await databases.list(
 							':shared:' + process.credentials.session.name + ':%'
 						),
-						databases.list(process.credentials.session.name + ':%')
+						await databases.list(process.credentials.session.name + ':%')
 					);
 				};
 			}
@ -747,22 +657,22 @@ async function getProcessBlob(blobId, key, options) {
 					);
 				};
 			}
-			process.sendPermissions = function sendPermissions() {
+			process.sendPermissions = async function sendPermissions() {
 				process.app.send({
 					action: 'permissions',
-					permissions: imports.core.permissionsGranted(),
+					permissions: await imports.core.permissionsGranted(),
 				});
 			};
-			process.resetPermission = function resetPermission(permission) {
+			process.resetPermission = async function resetPermission(permission) {
 				let user = process?.credentials?.session?.name;
-				storePermission(
+				await ssb.setUserPermission(
 					user,
 					options?.packageOwner,
 					options?.packageName,
 					permission,
 					undefined
 				);
-				process.sendPermissions();
+				return process.sendPermissions();
 			};
 			process.task.setImports(imports);
 			process.task.activate();
@ -795,7 +705,7 @@ async function getProcessBlob(blobId, key, options) {
 			broadcastEvent('onSessionBegin', [getUser(process, process)]);
 			if (process.app) {
 				process.app.send({action: 'ready', version: version()});
-				process.sendPermissions();
+				await process.sendPermissions();
 			}
 			await process.task.execute({name: appSourceName, source: appSource});
 			resolveReady(process);
@ -819,374 +729,6 @@ async function getProcessBlob(blobId, key, options) {
 	return process;
 }

-/**
- * TODOC
- * @param {*} settings
- * @returns
- */
-async function setGlobalSettings(settings) {
-	gGlobalSettings = settings;
-	try {
-		return await new Database('core').set('settings', JSON.stringify(settings));
-	} catch (error) {
-		print('Error storing settings:', error);
-	}
-}
-
-/**
- * TODOC
- * @param {*} response
- * @param {*} data
- * @param {*} type
- * @param {*} headers
- * @param {*} status_code
- */
-function sendData(response, data, type, headers, status_code) {
-	if (data) {
-		response.writeHead(
-			status_code ?? 200,
-			Object.assign(
-				{
-					'Content-Type':
-						type ||
-						httpd.mime_type_from_magic_bytes(data) ||
-						'application/binary',
-					'Content-Length': data.byteLength,
-				},
-				headers || {}
-			)
-		);
-		response.end(data);
-	} else {
-		response.writeHead(
-			status_code ?? 404,
-			Object.assign(
-				{
-					'Content-Type': 'text/plain; charset=utf-8',
-					'Content-Length': 'File not found'.length,
-				},
-				headers || {}
-			)
-		);
-		response.end('File not found');
-	}
-}
-
-let g_handler_index = 0;
-
-/**
- * TODOC
- * @param {*} response
- * @param {*} handler_blob_id
- * @param {*} path
- * @param {*} query
- * @param {*} headers
- * @param {*} packageOwner
- * @param {*} packageName
- * @returns
- */
-async function useAppHandler(
-	response,
-	handler_blob_id,
-	path,
-	query,
-	headers,
-	packageOwner,
-	packageName
-) {
-	print('useAppHandler', packageOwner, packageName);
-	let do_resolve;
-	let promise = new Promise(async function (resolve, reject) {
-		do_resolve = resolve;
-	});
-	let process;
-	let result;
-	try {
-		process = await getProcessBlob(
-			handler_blob_id,
-			'handler_' + g_handler_index++,
-			{
-				script: 'handler.js',
-				imports: {
-					request: {
-						path: path,
-						query: query,
-					},
-					respond: do_resolve,
-				},
-				credentials: await httpd.auth_query(headers),
-				packageOwner: packageOwner,
-				packageName: packageName,
-			}
-		);
-		await process.ready;
-
-		result = await promise;
-	} finally {
-		if (process?.task) {
-			await process.task.kill();
-		}
-	}
-	return result;
-}
-
-/**
- * TODOC
- * @param {*} request
- * @param {*} response
- * @param {*} blobId
- * @param {*} uri
- * @returns
- */
-async function blobHandler(request, response, blobId, uri) {
-	if (!uri) {
-		response.writeHead(303, {
-			Location:
-				(request.client.tls ? 'https://' : 'http://') +
-				(request.headers['x-forwarded-host'] ?? request.headers.host) +
-				blobId +
-				'/',
-			'Content-Length': '0',
-		});
-		response.end();
-		return;
-	}
-
-	let process;
-	if (uri == '/view') {
-		let data;
-		let match;
-		let query = form.decodeForm(request.query);
-		let headers = {
-			'Content-Security-Policy': k_content_security_policy,
-		};
-		if (query.filename && query.filename.match(/^[A-Za-z0-9\.-]*$/)) {
-			headers['Content-Disposition'] = `attachment; filename=${query.filename}`;
-		}
-		if ((match = /^\/\~(\w+)\/(\w+)$/.exec(blobId))) {
-			let id = await new Database(match[1]).get('path:' + match[2]);
-			if (id) {
-				if (request.headers['if-none-match'] === '"' + id + '"') {
-					headers['Content-Length'] = '0';
-					response.writeHead(304, headers);
-					response.end();
-				} else {
-					data = await ssb.blobGet(id);
-					if (match[3]) {
-						let appObject = JSON.parse(data);
-						data = appObject.files[match[3]];
-					}
-					sendData(
-						response,
-						data,
-						undefined,
-						Object.assign({etag: '"' + id + '"'}, headers)
-					);
-				}
-			} else {
-				if (request.headers['if-none-match'] === '"' + blobId + '"') {
-					headers['Content-Length'] = '0';
-					response.writeHead(304, headers);
-					response.end();
-				} else {
-					sendData(
-						response,
-						data,
-						undefined,
-						Object.assign({etag: '"' + blobId + '"'}, headers)
-					);
-				}
-			}
-		} else {
-			if (request.headers['if-none-match'] === '"' + blobId + '"') {
-				headers['Content-Length'] = '0';
-				response.writeHead(304, headers);
-				response.end();
-			} else {
-				data = await ssb.blobGet(blobId);
-				sendData(
-					response,
-					data,
-					undefined,
-					Object.assign({etag: '"' + blobId + '"'}, headers)
-				);
-			}
-		}
-	} else if (uri == '/save') {
-		let match;
-		if ((match = /^\/\~(\w+)\/(\w+)$/.exec(blobId))) {
-			let user = match[1];
-			let appName = match[2];
-			let credentials = await httpd.auth_query(request.headers);
-			if (
-				credentials &&
-				credentials.session &&
-				(credentials.session.name == user ||
-					(credentials.permissions.administration && user == 'core'))
-			) {
-				let database = new Database(user);
-
-				let app_object = JSON.parse(utf8Decode(request.body));
-				let previous_id = await database.get('path:' + appName);
-				if (previous_id) {
-					try {
-						let previous_object = JSON.parse(
-							utf8Decode(await ssb.blobGet(previous_id))
-						);
-						delete previous_object.previous;
-						delete app_object.previous;
-						if (JSON.stringify(previous_object) == JSON.stringify(app_object)) {
-							response.writeHead(200, {
-								'Content-Type': 'text/plain; charset=utf-8',
-							});
-							response.end('/' + previous_id);
-							return;
-						}
-					} catch {}
-				}
-				app_object.previous = previous_id;
-				let newBlobId = await ssb.blobStore(JSON.stringify(app_object));
-
-				let apps = new Set();
-				let apps_original = await database.get('apps');
-				try {
-					apps = new Set(JSON.parse(apps_original));
-				} catch {}
-				if (!apps.has(appName)) {
-					apps.add(appName);
-				}
-				apps = JSON.stringify([...apps].sort());
-				if (apps != apps_original) {
-					await database.set('apps', apps);
-				}
-				await database.set('path:' + appName, newBlobId);
-				response.writeHead(200, {'Content-Type': 'text/plain; charset=utf-8'});
-				response.end('/' + newBlobId);
-			} else {
-				response.writeHead(401, {'Content-Type': 'text/plain; charset=utf-8'});
-				response.end('401 Unauthorized');
-				return;
-			}
-		} else if (blobId === '') {
-			let newBlobId = await ssb.blobStore(request.body);
-			response.writeHead(200, {'Content-Type': 'text/plain; charset=utf-8'});
-			response.end('/' + newBlobId);
-		} else {
-			response.writeHead(400, {'Content-Type': 'text/plain; charset=utf-8'});
-			response.end('Invalid name.');
-		}
-	} else if (uri == '/delete') {
-		let match;
-		if ((match = /^\/\~(\w+)\/(\w+)$/.exec(blobId))) {
-			let user = match[1];
-			let appName = match[2];
-			let credentials = await httpd.auth_query(request.headers);
-			if (
-				credentials &&
-				credentials.session &&
-				(credentials.session.name == user ||
-					(credentials.permissions.administration && user == 'core'))
-			) {
-				let database = new Database(user);
-				let apps = new Set();
-				try {
-					apps = new Set(JSON.parse(await database.get('apps')));
-				} catch {}
-				if (apps.delete(appName)) {
-					await database.set('apps', JSON.stringify([...apps].sort()));
-				}
-				database.remove('path:' + appName);
-			} else {
-				response.writeHead(401, {'Content-Type': 'text/plain; charset=utf-8'});
-				response.end('401 Unauthorized');
-				return;
-			}
-		}
-
-		response.writeHead(200, {'Content-Type': 'text/plain; charset=utf-8'});
-		response.end('OK');
-	} else {
-		let data;
-		let match;
-		let id;
-		let app_id = blobId;
-		let packageOwner;
-		let packageName;
-		if ((match = /^\/\~(\w+)\/(\w+)$/.exec(blobId))) {
-			packageOwner = match[1];
-			packageName = match[2];
-			let db = new Database(match[1]);
-			app_id = await db.get('path:' + match[2]);
-		}
-
-		let app_object = JSON.parse(utf8Decode(await ssb.blobGet(app_id)));
-		id = app_object?.files[uri.substring(1)];
-		if (!id && app_object?.files['handler.js']) {
-			let answer;
-			try {
-				answer = await useAppHandler(
-					response,
-					app_id,
-					uri.substring(1),
-					request.query ? form.decodeForm(request.query) : undefined,
-					request.headers,
-					packageOwner,
-					packageName
-				);
-			} catch (error) {
-				data = utf8Encode(
-					`Internal Server Error\n\n${error?.message}\n${error?.stack}`
-				);
-				response.writeHead(500, {
-					'Content-Type': 'text/plain; charset=utf-8',
-					'Content-Length': data.length,
-				});
-				response.end(data);
-				return;
-			}
-			if (answer && typeof answer.data == 'string') {
-				answer.data = utf8Encode(answer.data);
-			}
-			sendData(
-				response,
-				answer?.data,
-				answer?.content_type,
-				Object.assign(answer?.headers ?? {}, {
-					'Access-Control-Allow-Origin': '*',
-					'Content-Security-Policy': k_content_security_policy,
-				}),
-				answer.status_code
-			);
-		} else if (id) {
-			if (
-				request.headers['if-none-match'] &&
-				request.headers['if-none-match'] == '"' + id + '"'
-			) {
-				let headers = {
-					'Access-Control-Allow-Origin': '*',
-					'Content-Security-Policy': k_content_security_policy,
-					'Content-Length': '0',
-				};
-				response.writeHead(304, headers);
-				response.end();
-			} else {
-				let headers = {
-					ETag: '"' + id + '"',
-					'Access-Control-Allow-Origin': '*',
-					'Content-Security-Policy': k_content_security_policy,
-				};
-				data = await ssb.blobGet(id);
-				let type =
-					httpd.mime_type_from_extension(uri) ||
-					httpd.mime_type_from_magic_bytes(data);
-				sendData(response, data, type, headers);
-			}
-		} else {
-			sendData(response, data, undefined, {});
-		}
-	}
-}
-
 ssb.addEventListener('message', function () {
 	broadcastEvent('onMessage', [...arguments]);
 });
@ -1212,12 +754,12 @@ async function loadSettings() {
 	} catch (error) {
 		print('Settings not found in database:', error);
 	}
-	for (let [key, value] of Object.entries(k_global_settings)) {
+	for (let [key, value] of Object.entries(defaultGlobalSettings())) {
 		if (data[key] === undefined) {
 			data[key] = value.default_value;
 		}
 	}
-	gGlobalSettings = data;
+	return data;
 }

 /**
@ -1238,34 +780,82 @@ function sendStats() {
 	}
 }

+let g_handler_index = 0;
+
+exports.callAppHandler = async function callAppHandler(
+	response,
+	app_blob_id,
+	path,
+	query,
+	headers,
+	package_owner,
+	package_name
+) {
+	let answer;
+	try {
+		let do_resolve;
+		let promise = new Promise(async function (resolve, reject) {
+			do_resolve = resolve;
+		});
+		let process;
+		try {
+			process = await getProcessBlob(
+				app_blob_id,
+				'handler_' + g_handler_index++,
+				{
+					script: 'handler.js',
+					imports: {
+						request: {
+							path: path,
+							query: query,
+						},
+						respond: do_resolve,
+					},
+					credentials: await httpd.auth_query(headers),
+					packageOwner: package_owner,
+					packageName: package_name,
+				}
+			);
+			await process.ready;
+			answer = await promise;
+		} finally {
+			if (process?.task) {
+				await process.task.kill();
+			}
+		}
+	} catch (error) {
+		let data = utf8Encode(
+			`Internal Server Error\n\n${error?.message}\n${error?.stack}`
+		);
+		response.writeHead(500, {
+			'Content-Type': 'text/plain; charset=utf-8',
+			'Content-Length': data.length,
+		});
+		response.end(data);
+		return;
+	}
+	if (typeof answer?.data == 'string') {
+		answer.data = utf8Encode(answer.data);
+	}
+	response.writeHead(answer?.status_code, {
+		'Content-Type': answer?.content_type,
+		'Content-Length': answer?.data?.length,
+		'Access-Control-Allow-Origin': '*',
+		'Content-Security-Policy':
+			'sandbox allow-downloads allow-top-navigation-by-user-activation',
+	});
+	response.end(answer?.data);
+};
+
 /**
 * TODOC
 */
 loadSettings()
-	.then(function () {
-		if (tildefriends.https_port && gGlobalSettings.http_redirect) {
-			httpd.set_http_redirect(gGlobalSettings.http_redirect);
+	.then(function (settings) {
+		if (tildefriends.https_port && settings.http_redirect) {
+			httpd.set_http_redirect(settings.http_redirect);
 		}
 		httpd.all('/app/socket', app.socket);
-		httpd.all('', function default_http_handler(request, response) {
-			let match;
-			if ((match = /^(\/~[^\/]+\/[^\/]+)(\/?.*)$/.exec(request.uri))) {
-				return blobHandler(request, response, match[1], match[2]);
-			} else if (
-				(match = /^\/([&\%][^\.]{44}(?:\.\w+)?)(\/?.*)/.exec(request.uri))
-			) {
-				return blobHandler(request, response, match[1], match[2]);
-			} else if ((match = /^(.*)(\/(?:save|delete)?)$/.exec(request.uri))) {
-				return blobHandler(request, response, match[1], match[2]);
-			} else {
-				let data = 'File not found.';
-				response.writeHead(404, {
-					'Content-Type': 'text/plain; charset=utf-8',
-					'Content-Length': data.length.toString(),
-				});
-				return response.end(data);
-			}
-		});
 		let port = httpd.start(tildefriends.http_port);
 		if (tildefriends.args.out_http_port_file) {
 			print('Writing the port file.');
@ -1312,43 +902,4 @@ loadSettings()
 		exit(1);
 	});

-/**
- * TODOC
- * @param {*} user
- * @param {*} packageOwner
- * @param {*} packageName
- * @param {*} permission
- * @param {*} allow
- */
-function storePermission(user, packageOwner, packageName, permission, allow) {
-	if (!gGlobalSettings.userPermissions) {
-		gGlobalSettings.userPermissions = {};
-	}
-	if (!gGlobalSettings.userPermissions[user]) {
-		gGlobalSettings.userPermissions[user] = {};
-	}
-	if (!gGlobalSettings.userPermissions[user][packageOwner]) {
-		gGlobalSettings.userPermissions[user][packageOwner] = {};
-	}
-	if (!gGlobalSettings.userPermissions[user][packageOwner][packageName]) {
-		gGlobalSettings.userPermissions[user][packageOwner][packageName] = {};
-	}
-	if (
-		gGlobalSettings.userPermissions[user][packageOwner][packageName][
-			permission
-		] !== allow
-	) {
-		if (allow === undefined) {
-			delete gGlobalSettings.userPermissions[user][packageOwner][packageName][
-				permission
-			];
-		} else {
-			gGlobalSettings.userPermissions[user][packageOwner][packageName][
-				permission
-			] = allow;
-		}
-		setGlobalSettings(gGlobalSettings);
-	}
-}
-
-export {gGlobalSettings as globalSettings, invoke, getSessionProcessBlob};
+export {invoke, getProcessBlob};
--- a/default.nix
+++ b/default.nix
@ -21,14 +21,14 @@
 }:
 pkgs.stdenv.mkDerivation rec {
  pname = "tildefriends";
-  version = "0.0.22";
+  version = "0.0.24";

  src = pkgs.fetchFromGitea {
    domain = "dev.tildefriends.net";
    owner = "cory";
    repo = "tildefriends";
    rev = "v${version}";
-    hash = "sha256-Su+y++zVXmYNbwfhCP6w5e36oxW5fkURPFzFLjbyFEI=";
+    hash = "sha256-XlmRr08UmScY//qxUEXHzagXHCFqARRYr3q8RK/jKFY=";
    fetchSubmodules = true;
  };

--- a/deps/c-ares
+++ b/deps/c-ares
@ -1 +1 @@
-Subproject commit 27b98d96eff6122fb981e338bddef3d6a57d8d44
+Subproject commit c29e75d54c3743783d51a609980495cf553b4bca
--- a/deps/codemirror/cm6.js
+++ b/deps/codemirror/cm6.js
--- a/deps/codemirror_src/package-lock.json
+++ b/deps/codemirror_src/package-lock.json
@ -19,9 +19,9 @@
      }
    },
    "node_modules/@codemirror/autocomplete": {
-      "version": "6.18.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.18.1.tgz",
-      "integrity": "sha512-iWHdj/B1ethnHRTwZj+C1obmmuCzquH29EbcKr0qIjA9NfDeBDJ7vs+WOHsFeLeflE4o+dHfYndJloMKHUkWUA==",
+      "version": "6.18.3",
+      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.18.3.tgz",
+      "integrity": "sha512-1dNIOmiM0z4BIBwxmxEfA1yoxh1MF/6KPBbh20a5vphGV0ictKlgQsbJs6D6SkR6iJpGbpwRsa6PFMNlg9T9pQ==",
      "license": "MIT",
      "dependencies": {
        "@codemirror/language": "^6.0.0",
@ -37,9 +37,9 @@
      }
    },
    "node_modules/@codemirror/commands": {
-      "version": "6.6.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.6.2.tgz",
-      "integrity": "sha512-Fq7eWOl1Rcbrfn6jD8FPCj9Auaxdm5nIK5RYOeW7ughnd/rY5AmPg6b+CfsG39ZHdwiwe8lde3q8uR7CF5S0yQ==",
+      "version": "6.7.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.7.1.tgz",
+      "integrity": "sha512-llTrboQYw5H4THfhN4U3qCnSZ1SOJ60ohhz+SzU0ADGtwlc533DtklQP0vSFaQuCPDn3BPpOd1GbbnUtwNjsrw==",
      "license": "MIT",
      "dependencies": {
        "@codemirror/language": "^6.0.0",
@ -104,9 +104,9 @@
      }
    },
    "node_modules/@codemirror/language": {
-      "version": "6.10.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.2.tgz",
-      "integrity": "sha512-kgbTYTo0Au6dCSc/TFy7fK3fpJmgHDv1sG1KNQKJXVi+xBTEeBPY/M30YXiU6mMXeH+YIDLsbrT4ZwNRdtF+SA==",
+      "version": "6.10.3",
+      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.10.3.tgz",
+      "integrity": "sha512-kDqEU5sCP55Oabl6E7m5N+vZRoc0iWqgDVhEKifcHzPzjqCegcO4amfrYVL9PmPZpl4G0yjkpTpUO/Ui8CzO8A==",
      "license": "MIT",
      "dependencies": {
        "@codemirror/state": "^6.0.0",
@ -118,9 +118,9 @@
      }
    },
    "node_modules/@codemirror/lint": {
-      "version": "6.8.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.8.1.tgz",
-      "integrity": "sha512-IZ0Y7S4/bpaunwggW2jYqwLuHj0QtESf5xcROewY6+lDNwZ/NzvR4t+vpYgg9m7V8UXLPYqG+lu3DF470E5Oxg==",
+      "version": "6.8.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.8.2.tgz",
+      "integrity": "sha512-PDFG5DjHxSEjOXk9TQYYVjZDqlZTFaDBfhQixHnQOEVDDNHUbEh/hstAjcQJaA6FQdZTD1hquXTK0rVBLADR1g==",
      "license": "MIT",
      "dependencies": {
        "@codemirror/state": "^6.0.0",
@ -129,9 +129,9 @@
      }
    },
    "node_modules/@codemirror/search": {
-      "version": "6.5.6",
-      "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.6.tgz",
-      "integrity": "sha512-rpMgcsh7o0GuCDUXKPvww+muLA1pDJaFrpq/CCHtpQJYz8xopu4D1hPcKRoDD0YlF8gZaqTNIRa4VRBWyhyy7Q==",
+      "version": "6.5.7",
+      "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.7.tgz",
+      "integrity": "sha512-6+iLsXvITWKHYlkgHPCs/qiX4dNzn8N78YfhOFvPtPYCkuXqZq10rAfsUMhOq7O/1VjJqdXRflyExlfVcu/9VQ==",
      "license": "MIT",
      "dependencies": {
        "@codemirror/state": "^6.0.0",
@ -158,9 +158,9 @@
      }
    },
    "node_modules/@codemirror/view": {
-      "version": "6.33.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.33.0.tgz",
-      "integrity": "sha512-AroaR3BvnjRW8fiZBalAaK+ZzB5usGgI014YKElYZvQdNH5ZIidHlO+cyf/2rWzyBFRkvG6VhiXeAEbC53P2YQ==",
+      "version": "6.34.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.34.2.tgz",
+      "integrity": "sha512-d6n0WFvL970A9Z+l9N2dO+Hk9ev4hDYQzIx+B9tCyBP0W5wPEszi1rhuyFesNSkLZzXbQE5FPH7F/z/TMJfoPA==",
      "license": "MIT",
      "dependencies": {
        "@codemirror/state": "^6.4.0",
@ -233,9 +233,9 @@
      }
    },
    "node_modules/@lezer/common": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.2.1.tgz",
-      "integrity": "sha512-yemX0ZD2xS/73llMZIK6KplkjIjf2EvAHcinDi/TfJ9hS25G0388+ClHt6/3but0oOxinTcQHJLDXh6w1crzFQ==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.2.3.tgz",
+      "integrity": "sha512-w7ojc8ejBqr2REPsWxJjrMFsA/ysDCFICn8zEOR9mrqzOu2amhITYuLD8ag6XZf0CFXDrhKqw7+tW8cX66NaDA==",
      "license": "MIT"
    },
    "node_modules/@lezer/css": {
@ -270,9 +270,9 @@
      }
    },
    "node_modules/@lezer/javascript": {
-      "version": "1.4.18",
-      "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.18.tgz",
-      "integrity": "sha512-Y8BeHOt4LtcxJgXwadtfSeWPrh0XzklcCHnCVT+vOsxqH4gWmunP2ykX+VVOlM/dusyVyiNfG3lv0f10UK+mgA==",
+      "version": "1.4.19",
+      "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.19.tgz",
+      "integrity": "sha512-j44kbR1QL26l6dMunZ1uhKBFteVGLVCBGNUD2sUaMnic+rbTviVuoK0CD1l9FTW31EueWvFFswCKMH7Z+M3JRA==",
      "license": "MIT",
      "dependencies": {
        "@lezer/common": "^1.2.0",
@ -301,15 +301,14 @@
      }
    },
    "node_modules/@rollup/plugin-node-resolve": {
-      "version": "15.2.3",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.2.3.tgz",
-      "integrity": "sha512-j/lym8nf5E21LwBT4Df1VD6hRO2L2iwUeUmP7litikRsVp1H6NWx20NEp0Y7su+7XGc476GnXXc4kFeZNGmaSQ==",
+      "version": "15.3.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.3.0.tgz",
+      "integrity": "sha512-9eO5McEICxMzJpDW9OnMYSv4Sta3hmt7VtBFz5zR9273suNOydOyq/FrGeGy+KsTRFm8w0SLVhzig2ILFT63Ag==",
      "license": "MIT",
      "dependencies": {
        "@rollup/pluginutils": "^5.0.1",
        "@types/resolve": "1.20.2",
        "deepmerge": "^4.2.2",
-        "is-builtin-module": "^3.2.1",
        "is-module": "^1.0.0",
        "resolve": "^1.22.1"
      },
@ -349,14 +348,14 @@
      }
    },
    "node_modules/@rollup/pluginutils": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.0.tgz",
-      "integrity": "sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.3.tgz",
+      "integrity": "sha512-Pnsb6f32CD2W3uCaLZIzDmeFyQ2b8UWMFI7xtwUezpcGBDVDW6y9XgAWIlARiGAo6eNF5FK5aQTr0LFyNyqq5A==",
      "license": "MIT",
      "dependencies": {
        "@types/estree": "^1.0.0",
        "estree-walker": "^2.0.2",
-        "picomatch": "^2.3.1"
+        "picomatch": "^4.0.2"
      },
      "engines": {
        "node": ">=14.0.0"
@ -371,9 +370,9 @@
      }
    },
    "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.3.tgz",
-      "integrity": "sha512-MmKSfaB9GX+zXl6E8z4koOr/xU63AMVleLEa64v7R0QF/ZloMs5vcD1sHgM64GXXS1csaJutG+ddtzcueI/BLg==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.26.0.tgz",
+      "integrity": "sha512-gJNwtPDGEaOEgejbaseY6xMFu+CPltsc8/T+diUTTbOQLqD+bnrJq9ulH6WD69TqwqWmrfRAtUv30cCFZlbGTQ==",
      "cpu": [
        "arm"
      ],
@ -384,9 +383,9 @@
      ]
    },
    "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.3.tgz",
-      "integrity": "sha512-zrt8ecH07PE3sB4jPOggweBjJMzI1JG5xI2DIsUbkA+7K+Gkjys6eV7i9pOenNSDJH3eOr/jLb/PzqtmdwDq5g==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.26.0.tgz",
+      "integrity": "sha512-YJa5Gy8mEZgz5JquFruhJODMq3lTHWLm1fOy+HIANquLzfIOzE9RA5ie3JjCdVb9r46qfAQY/l947V0zfGJ0OQ==",
      "cpu": [
        "arm64"
      ],
@ -397,9 +396,9 @@
      ]
    },
    "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.3.tgz",
-      "integrity": "sha512-P0UxIOrKNBFTQaXTxOH4RxuEBVCgEA5UTNV6Yz7z9QHnUJ7eLX9reOd/NYMO3+XZO2cco19mXTxDMXxit4R/eQ==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.26.0.tgz",
+      "integrity": "sha512-ErTASs8YKbqTBoPLp/kA1B1Um5YSom8QAc4rKhg7b9tyyVqDBlQxy7Bf2wW7yIlPGPg2UODDQcbkTlruPzDosw==",
      "cpu": [
        "arm64"
      ],
@ -410,9 +409,9 @@
      ]
    },
    "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.3.tgz",
-      "integrity": "sha512-L1M0vKGO5ASKntqtsFEjTq/fD91vAqnzeaF6sfNAy55aD+Hi2pBI5DKwCO+UNDQHWsDViJLqshxOahXyLSh3EA==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.26.0.tgz",
+      "integrity": "sha512-wbgkYDHcdWW+NqP2mnf2NOuEbOLzDblalrOWcPyY6+BRbVhliavon15UploG7PpBRQ2bZJnbmh8o3yLoBvDIHA==",
      "cpu": [
        "x64"
      ],
@ -422,10 +421,36 @@
        "darwin"
      ]
    },
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.26.0.tgz",
+      "integrity": "sha512-Y9vpjfp9CDkAG4q/uwuhZk96LP11fBz/bYdyg9oaHYhtGZp7NrbkQrj/66DYMMP2Yo/QPAsVHkV891KyO52fhg==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.26.0.tgz",
+      "integrity": "sha512-A/jvfCZ55EYPsqeaAt/yDAG4q5tt1ZboWMHEvKAH9Zl92DWvMIbnZe/f/eOXze65aJaaKbL+YeM0Hz4kLQvdwg==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.3.tgz",
-      "integrity": "sha512-btVgIsCjuYFKUjopPoWiDqmoUXQDiW2A4C3Mtmp5vACm7/GnyuprqIDPNczeyR5W8rTXEbkmrJux7cJmD99D2g==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.26.0.tgz",
+      "integrity": "sha512-paHF1bMXKDuizaMODm2bBTjRiHxESWiIyIdMugKeLnjuS1TCS54MF5+Y5Dx8Ui/1RBPVRE09i5OUlaLnv8OGnA==",
      "cpu": [
        "arm"
      ],
@ -436,9 +461,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.3.tgz",
-      "integrity": "sha512-zmjbSphplZlau6ZTkxd3+NMtE4UKVy7U4aVFMmHcgO5CUbw17ZP6QCgyxhzGaU/wFFdTfiojjbLG3/0p9HhAqA==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.26.0.tgz",
+      "integrity": "sha512-cwxiHZU1GAs+TMxvgPfUDtVZjdBdTsQwVnNlzRXC5QzIJ6nhfB4I1ahKoe9yPmoaA/Vhf7m9dB1chGPpDRdGXg==",
      "cpu": [
        "arm"
      ],
@ -449,9 +474,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.3.tgz",
-      "integrity": "sha512-nSZfcZtAnQPRZmUkUQwZq2OjQciR6tEoJaZVFvLHsj0MF6QhNMg0fQ6mUOsiCUpTqxTx0/O6gX0V/nYc7LrgPw==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.26.0.tgz",
+      "integrity": "sha512-4daeEUQutGRCW/9zEo8JtdAgtJ1q2g5oHaoQaZbMSKaIWKDQwQ3Yx0/3jJNmpzrsScIPtx/V+1AfibLisb3AMQ==",
      "cpu": [
        "arm64"
      ],
@ -462,9 +487,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.3.tgz",
-      "integrity": "sha512-MnvSPGO8KJXIMGlQDYfvYS3IosFN2rKsvxRpPO2l2cum+Z3exiExLwVU+GExL96pn8IP+GdH8Tz70EpBhO0sIQ==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.26.0.tgz",
+      "integrity": "sha512-eGkX7zzkNxvvS05ROzJ/cO/AKqNvR/7t1jA3VZDi2vRniLKwAWxUr85fH3NsvtxU5vnUUKFHKh8flIBdlo2b3Q==",
      "cpu": [
        "arm64"
      ],
@ -475,9 +500,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.3.tgz",
-      "integrity": "sha512-+W+p/9QNDr2vE2AXU0qIy0qQE75E8RTwTwgqS2G5CRQ11vzq0tbnfBd6brWhS9bCRjAjepJe2fvvkvS3dno+iw==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.26.0.tgz",
+      "integrity": "sha512-Odp/lgHbW/mAqw/pU21goo5ruWsytP7/HCC/liOt0zcGG0llYWKrd10k9Fj0pdj3prQ63N5yQLCLiE7HTX+MYw==",
      "cpu": [
        "ppc64"
      ],
@ -488,9 +513,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.3.tgz",
-      "integrity": "sha512-yXH6K6KfqGXaxHrtr+Uoy+JpNlUlI46BKVyonGiaD74ravdnF9BUNC+vV+SIuB96hUMGShhKV693rF9QDfO6nQ==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.26.0.tgz",
+      "integrity": "sha512-MBR2ZhCTzUgVD0OJdTzNeF4+zsVogIR1U/FsyuFerwcqjZGvg2nYe24SAHp8O5sN8ZkRVbHwlYeHqcSQ8tcYew==",
      "cpu": [
        "riscv64"
      ],
@ -501,9 +526,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.3.tgz",
-      "integrity": "sha512-R8cwY9wcnApN/KDYWTH4gV/ypvy9yZUHlbJvfaiXSB48JO3KpwSpjOGqO4jnGkLDSk1hgjYkTbTt6Q7uvPf8eg==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.26.0.tgz",
+      "integrity": "sha512-YYcg8MkbN17fMbRMZuxwmxWqsmQufh3ZJFxFGoHjrE7bv0X+T6l3glcdzd7IKLiwhT+PZOJCblpnNlz1/C3kGQ==",
      "cpu": [
        "s390x"
      ],
@ -514,9 +539,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.3.tgz",
-      "integrity": "sha512-kZPbX/NOPh0vhS5sI+dR8L1bU2cSO9FgxwM8r7wHzGydzfSjLRCFAT87GR5U9scj2rhzN3JPYVC7NoBbl4FZ0g==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.26.0.tgz",
+      "integrity": "sha512-ZuwpfjCwjPkAOxpjAEjabg6LRSfL7cAJb6gSQGZYjGhadlzKKywDkCUnJ+KEfrNY1jH5EEoSIKLCb572jSiglA==",
      "cpu": [
        "x64"
      ],
@ -527,9 +552,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.3.tgz",
-      "integrity": "sha512-S0Yq+xA1VEH66uiMNhijsWAafffydd2X5b77eLHfRmfLsRSpbiAWiRHV6DEpz6aOToPsgid7TI9rGd6zB1rhbg==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.26.0.tgz",
+      "integrity": "sha512-+HJD2lFS86qkeF8kNu0kALtifMpPCZU80HvwztIKnYwym3KnA1os6nsX4BGSTLtS2QVAGG1P3guRgsYyMA0Yhg==",
      "cpu": [
        "x64"
      ],
@ -540,9 +565,9 @@
      ]
    },
    "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.3.tgz",
-      "integrity": "sha512-9isNzeL34yquCPyerog+IMCNxKR8XYmGd0tHSV+OVx0TmE0aJOo9uw4fZfUuk2qxobP5sug6vNdZR6u7Mw7Q+Q==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.26.0.tgz",
+      "integrity": "sha512-WUQzVFWPSw2uJzX4j6YEbMAiLbs0BUysgysh8s817doAYhR5ybqTI1wtKARQKo6cGop3pHnrUJPFCsXdoFaimQ==",
      "cpu": [
        "arm64"
      ],
@ -553,9 +578,9 @@
      ]
    },
    "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.3.tgz",
-      "integrity": "sha512-nMIdKnfZfzn1Vsk+RuOvl43ONTZXoAPUUxgcU0tXooqg4YrAqzfKzVenqqk2g5efWh46/D28cKFrOzDSW28gTA==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.26.0.tgz",
+      "integrity": "sha512-D4CxkazFKBfN1akAIY6ieyOqzoOoBV1OICxgUblWxff/pSjCA2khXlASUx7mK6W1oP4McqhgcCsu6QaLj3WMWg==",
      "cpu": [
        "ia32"
      ],
@ -566,9 +591,9 @@
      ]
    },
    "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.3.tgz",
-      "integrity": "sha512-fOvu7PCQjAj4eWDEuD8Xz5gpzFqXzGlxHZozHP4b9Jxv9APtdxL6STqztDzMLuRXEc4UpXGGhx029Xgm91QBeA==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.26.0.tgz",
+      "integrity": "sha512-2x8MO1rm4PGEP0xWbubJW5RtbNLk3puzAMaLQd3B3JHVw4KcHlmXcO+Wewx9zCoo7EUFiMlu/aZbCJ7VjMzAag==",
      "cpu": [
        "x64"
      ],
@ -591,9 +616,9 @@
      "license": "MIT"
    },
    "node_modules/acorn": {
-      "version": "8.12.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
-      "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
+      "version": "8.14.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
+      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
      "dev": true,
      "license": "MIT",
      "bin": {
@ -610,18 +635,6 @@
      "dev": true,
      "license": "MIT"
    },
-    "node_modules/builtin-modules": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
-      "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
    "node_modules/codemirror": {
      "version": "6.0.1",
      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz",
@ -700,21 +713,6 @@
        "node": ">= 0.4"
      }
    },
-    "node_modules/is-builtin-module": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz",
-      "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==",
-      "license": "MIT",
-      "dependencies": {
-        "builtin-modules": "^3.3.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
    "node_modules/is-core-module": {
      "version": "2.15.1",
      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
@ -743,12 +741,12 @@
      "license": "MIT"
    },
    "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
      "license": "MIT",
      "engines": {
-        "node": ">=8.6"
+        "node": ">=12"
      },
      "funding": {
        "url": "https://github.com/sponsors/jonschlinkert"
@ -782,12 +780,12 @@
      }
    },
    "node_modules/rollup": {
-      "version": "4.21.3",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.21.3.tgz",
-      "integrity": "sha512-7sqRtBNnEbcBtMeRVc6VRsJMmpI+JU1z9VTvW8D4gXIYQFz0aLcsE6rRkyghZkLfEgUZgVvOG7A5CVz/VW5GIA==",
+      "version": "4.26.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.26.0.tgz",
+      "integrity": "sha512-ilcl12hnWonG8f+NxU6BlgysVA0gvY2l8N0R84S1HcINbW20bvwuCngJkkInV6LXhwRpucsW5k1ovDwEdBVrNg==",
      "license": "MIT",
      "dependencies": {
-        "@types/estree": "1.0.5"
+        "@types/estree": "1.0.6"
      },
      "bin": {
        "rollup": "dist/bin/rollup"
@ -797,31 +795,27 @@
        "npm": ">=8.0.0"
      },
      "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.21.3",
-        "@rollup/rollup-android-arm64": "4.21.3",
-        "@rollup/rollup-darwin-arm64": "4.21.3",
-        "@rollup/rollup-darwin-x64": "4.21.3",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.21.3",
-        "@rollup/rollup-linux-arm-musleabihf": "4.21.3",
-        "@rollup/rollup-linux-arm64-gnu": "4.21.3",
-        "@rollup/rollup-linux-arm64-musl": "4.21.3",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.21.3",
-        "@rollup/rollup-linux-riscv64-gnu": "4.21.3",
-        "@rollup/rollup-linux-s390x-gnu": "4.21.3",
-        "@rollup/rollup-linux-x64-gnu": "4.21.3",
-        "@rollup/rollup-linux-x64-musl": "4.21.3",
-        "@rollup/rollup-win32-arm64-msvc": "4.21.3",
-        "@rollup/rollup-win32-ia32-msvc": "4.21.3",
-        "@rollup/rollup-win32-x64-msvc": "4.21.3",
+        "@rollup/rollup-android-arm-eabi": "4.26.0",
+        "@rollup/rollup-android-arm64": "4.26.0",
+        "@rollup/rollup-darwin-arm64": "4.26.0",
+        "@rollup/rollup-darwin-x64": "4.26.0",
+        "@rollup/rollup-freebsd-arm64": "4.26.0",
+        "@rollup/rollup-freebsd-x64": "4.26.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.26.0",
+        "@rollup/rollup-linux-arm-musleabihf": "4.26.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.26.0",
+        "@rollup/rollup-linux-arm64-musl": "4.26.0",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.26.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.26.0",
+        "@rollup/rollup-linux-s390x-gnu": "4.26.0",
+        "@rollup/rollup-linux-x64-gnu": "4.26.0",
+        "@rollup/rollup-linux-x64-musl": "4.26.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.26.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.26.0",
+        "@rollup/rollup-win32-x64-msvc": "4.26.0",
        "fsevents": "~2.3.2"
      }
    },
-    "node_modules/rollup/node_modules/@types/estree": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
-      "license": "MIT"
-    },
    "node_modules/safe-buffer": {
      "version": "5.2.1",
      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@ -900,9 +894,9 @@
      }
    },
    "node_modules/terser": {
-      "version": "5.33.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.33.0.tgz",
-      "integrity": "sha512-JuPVaB7s1gdFKPKTelwUyRq5Sid2A3Gko2S0PncwdBq7kN9Ti9HPWDQ06MPsEDGsZeVESjKEnyGy68quBk1w6g==",
+      "version": "5.36.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.36.0.tgz",
+      "integrity": "sha512-IYV9eNMuFAV4THUspIRXkLakHnV6XO7FEdtKjf/mDyrnqUg9LnlOn6/RwRvM9SZjR4GUq8Nk8zj67FzVARr74w==",
      "dev": true,
      "license": "BSD-2-Clause",
      "dependencies": {
--- a/deps/libbacktrace
+++ b/deps/libbacktrace
@ -1 +1 @@
-Subproject commit 86885d14049fab06ef8a33aac51664230ca09200
+Subproject commit d48f84034ce3e53e501d10593710d025cb1121db
--- a/deps/libuv
+++ b/deps/libuv
@ -1 +1 @@
-Subproject commit d2e56a5e8d3e39947b78405ca6e4727c70f5568a
+Subproject commit e1095c7a4373ce00cd8874d8e820de5afb25776e
--- a/deps/lit/lit-all.min.js
+++ b/deps/lit/lit-all.min.js
--- a/deps/lit/lit-all.min.js.map
+++ b/deps/lit/lit-all.min.js.map
--- a/deps/openssl_src
+++ b/deps/openssl_src
@ -1 +1 @@
-Subproject commit fb7fab9fa6f4869eaa8fbb97e0d593159f03ffe4
+Subproject commit 98acb6b02839c609ef5b837794e08d906d965335
--- a/deps/speedscope/SourceCodePro-Regular.ttf.f546cbe0.woff2
+++ b/deps/speedscope/SourceCodePro-Regular.ttf.f546cbe0.woff2
--- a/deps/speedscope/import.bcbb2033.js
+++ b/deps/speedscope/import.bcbb2033.js
--- a/deps/speedscope/index.html
+++ b/deps/speedscope/index.html
@ -1,2 +1,2 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta http-equiv="X-UA-Compatible" content="ie=edge"><title>speedscope</title><link href="https://fonts.googleapis.com/css?family=Source+Code+Pro" rel="stylesheet"><script></script><link rel="stylesheet" href="reset.8c46b7a1.css"><link rel="icon" type="image/png" sizes="32x32" href="favicon-32x32.bc503437.png"><link rel="icon" type="image/png" sizes="16x16" href="favicon-16x16.f74b3187.png"></head><body> <script src="speedscope.80eb88d2.js"></script>
+<!DOCTYPE html><html lang="en"><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta http-equiv="X-UA-Compatible" content="ie=edge"><title>speedscope</title><link href="source-code-pro.52b1676f.css" rel="stylesheet"><script></script><link rel="stylesheet" href="reset.8c46b7a1.css"><link rel="icon" type="image/png" sizes="32x32" href="favicon-32x32.bc503437.png"><link rel="icon" type="image/png" sizes="16x16" href="favicon-16x16.f74b3187.png"></head><body> <script src="speedscope.6f107512.js"></script>
 </body></html>
--- a/deps/speedscope/release.txt
+++ b/deps/speedscope/release.txt
@ -1,3 +1,3 @@
-speedscope@1.20.0
-Fri Jan 12 09:57:49 PST 2024
-68fd88ceaf93d89aa27f3f0a20a27c9cfdc015c5
+speedscope@1.21.0
+Sat Nov 16 22:13:27 PST 2024
+d36c3a54424063a8df7bc67a7b824a223d73861b
--- a/deps/speedscope/source-code-pro.52b1676f.css
+++ b/deps/speedscope/source-code-pro.52b1676f.css
@ -0,0 +1,2 @@
+@font-face{font-family:Source Code Pro;font-weight:400;font-style:normal;font-stretch:normal;src:url(SourceCodePro-Regular.ttf.f546cbe0.woff2) format("woff2")}
+/*# sourceMappingURL=source-code-pro.52b1676f.css.map */
--- a/deps/speedscope/source-code-pro.LICENSE.md
+++ b/deps/speedscope/source-code-pro.LICENSE.md
@ -0,0 +1,93 @@
+Copyright 2010-2019 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe in the United States and/or other countries.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+
+This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
--- a/deps/speedscope/speedscope.6f107512.js
+++ b/deps/speedscope/speedscope.6f107512.js
--- a/deps/sqlite/shell.c
+++ b/deps/sqlite/shell.c
--- a/deps/sqlite/sqlite3.c
+++ b/deps/sqlite/sqlite3.c
--- a/deps/sqlite/sqlite3.h
+++ b/deps/sqlite/sqlite3.h
@ -146,9 +146,9 @@ extern "C" {
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
 ** [sqlite_version()] and [sqlite_source_id()].
 */
-#define SQLITE_VERSION        "3.46.1"
-#define SQLITE_VERSION_NUMBER 3046001
-#define SQLITE_SOURCE_ID      "2024-08-13 09:16:08 c9c2ab54ba1f5f46360f1b4f35d849cd3f080e6fc2b6c60e91b16c63f69a1e33"
+#define SQLITE_VERSION        "3.47.0"
+#define SQLITE_VERSION_NUMBER 3047000
+#define SQLITE_SOURCE_ID      "2024-10-21 16:30:22 03a9703e27c44437c39363d0baf82db4ebc94538a0f28411c85dda156f82636e"

 /*
 ** CAPI3REF: Run-Time Library Version Numbers
@ -772,8 +772,8 @@ struct sqlite3_file {
 ** to xUnlock() is a no-op.
 ** The xCheckReservedLock() method checks whether any database connection,
 ** either in this process or in some other process, is holding a RESERVED,
-** PENDING, or EXCLUSIVE lock on the file.  It returns true
-** if such a lock exists and false otherwise.
+** PENDING, or EXCLUSIVE lock on the file.  It returns, via its output
+** pointer parameter, true if such a lock exists and false otherwise.
 **
 ** The xFileControl() method is a generic interface that allows custom
 ** VFS implementations to directly control an open file using the
@ -3570,8 +3570,8 @@ SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
 **
 ** [[OPEN_EXRESCODE]] ^(<dt>[SQLITE_OPEN_EXRESCODE]</dt>
 ** <dd>The database connection comes up in "extended result code mode".
-** In other words, the database behaves has if
-** [sqlite3_extended_result_codes(db,1)] where called on the database
+** In other words, the database behaves as if
+** [sqlite3_extended_result_codes(db,1)] were called on the database
 ** connection as soon as the connection is created. In addition to setting
 ** the extended result code mode, this flag also causes [sqlite3_open_v2()]
 ** to return an extended result code.</dd>
@ -4222,13 +4222,17 @@ SQLITE_API int sqlite3_limit(sqlite3*, int id, int newVal);
 ** and sqlite3_prepare16_v3() use UTF-16.
 **
 ** ^If the nByte argument is negative, then zSql is read up to the
-** first zero terminator. ^If nByte is positive, then it is the
-** number of bytes read from zSql.  ^If nByte is zero, then no prepared
+** first zero terminator. ^If nByte is positive, then it is the maximum
+** number of bytes read from zSql.  When nByte is positive, zSql is read
+** up to the first zero terminator or until the nByte bytes have been read,
+** whichever comes first.  ^If nByte is zero, then no prepared
 ** statement is generated.
 ** If the caller knows that the supplied string is nul-terminated, then
 ** there is a small performance advantage to passing an nByte parameter that
 ** is the number of bytes in the input string <i>including</i>
 ** the nul-terminator.
+** Note that nByte measure the length of the input in bytes, not
+** characters, even for the UTF-16 interfaces.
 **
 ** ^If pzTail is not NULL then *pzTail is made to point to the first byte
 ** past the end of the first SQL statement in zSql.  These routines only
@ -5599,7 +5603,7 @@ SQLITE_API int sqlite3_create_window_function(
 ** This flag instructs SQLite to omit some corner-case optimizations that
 ** might disrupt the operation of the [sqlite3_value_subtype()] function,
 ** causing it to return zero rather than the correct subtype().
-** SQL functions that invokes [sqlite3_value_subtype()] should have this
+** All SQL functions that invoke [sqlite3_value_subtype()] should have this
 ** property.  If the SQLITE_SUBTYPE property is omitted, then the return
 ** value from [sqlite3_value_subtype()] might sometimes be zero even though
 ** a non-zero subtype was specified by the function argument expression.
@ -5615,6 +5619,15 @@ SQLITE_API int sqlite3_create_window_function(
 ** [sqlite3_result_subtype()] should avoid setting this property, as the
 ** purpose of this property is to disable certain optimizations that are
 ** incompatible with subtypes.
+**
+** [[SQLITE_SELFORDER1]] <dt>SQLITE_SELFORDER1</dt><dd>
+** The SQLITE_SELFORDER1 flag indicates that the function is an aggregate
+** that internally orders the values provided to the first argument.  The
+** ordered-set aggregate SQL notation with a single ORDER BY term can be
+** used to invoke this function.  If the ordered-set aggregate notation is
+** used on a function that lacks this flag, then an error is raised. Note
+** that the ordered-set aggregate syntax is only available if SQLite is
+** built using the -DSQLITE_ENABLE_ORDERED_SET_AGGREGATES compile-time option.
 ** </dd>
 ** </dl>
 */
@ -5623,6 +5636,7 @@ SQLITE_API int sqlite3_create_window_function(
 #define SQLITE_SUBTYPE          0x000100000
 #define SQLITE_INNOCUOUS        0x000200000
 #define SQLITE_RESULT_SUBTYPE   0x001000000
+#define SQLITE_SELFORDER1       0x002000000

 /*
 ** CAPI3REF: Deprecated Functions
@ -5820,7 +5834,7 @@ SQLITE_API int sqlite3_value_encoding(sqlite3_value*);
 ** one SQL function to another.  Use the [sqlite3_result_subtype()]
 ** routine to set the subtype for the return value of an SQL function.
 **
-** Every [application-defined SQL function] that invoke this interface
+** Every [application-defined SQL function] that invokes this interface
 ** should include the [SQLITE_SUBTYPE] property in the text
 ** encoding argument when the function is [sqlite3_create_function|registered].
 ** If the [SQLITE_SUBTYPE] property is omitted, then sqlite3_value_subtype()
@ -7427,9 +7441,11 @@ struct sqlite3_module {
 ** will be returned by the strategy.
 **
 ** The xBestIndex method may optionally populate the idxFlags field with a
-** mask of SQLITE_INDEX_SCAN_* flags. Currently there is only one such flag -
-** SQLITE_INDEX_SCAN_UNIQUE. If the xBestIndex method sets this flag, SQLite
-** assumes that the strategy may visit at most one row.
+** mask of SQLITE_INDEX_SCAN_* flags. One such flag is
+** [SQLITE_INDEX_SCAN_HEX], which if set causes the [EXPLAIN QUERY PLAN]
+** output to show the idxNum has hex instead of as decimal.  Another flag is
+** SQLITE_INDEX_SCAN_UNIQUE, which if set indicates that the query plan will
+** return at most one row.
 **
 ** Additionally, if xBestIndex sets the SQLITE_INDEX_SCAN_UNIQUE flag, then
 ** SQLite also assumes that if a call to the xUpdate() method is made as
@ -7493,7 +7509,9 @@ struct sqlite3_index_info {
 ** [sqlite3_index_info].idxFlags field to some combination of
 ** these bits.
 */
-#define SQLITE_INDEX_SCAN_UNIQUE      1     /* Scan visits at most 1 row */
+#define SQLITE_INDEX_SCAN_UNIQUE 0x00000001 /* Scan visits at most 1 row */
+#define SQLITE_INDEX_SCAN_HEX    0x00000002 /* Display idxNum as hex */
+                                            /* in EXPLAIN QUERY PLAN */

 /*
 ** CAPI3REF: Virtual Table Constraint Operator Codes
@ -8330,6 +8348,7 @@ SQLITE_API int sqlite3_test_control(int op, ...);
 #define SQLITE_TESTCTRL_JSON_SELFCHECK          14
 #define SQLITE_TESTCTRL_OPTIMIZATIONS           15
 #define SQLITE_TESTCTRL_ISKEYWORD               16  /* NOT USED */
+#define SQLITE_TESTCTRL_GETOPT                  16
 #define SQLITE_TESTCTRL_SCRATCHMALLOC           17  /* NOT USED */
 #define SQLITE_TESTCTRL_INTERNAL_FUNCTIONS      17
 #define SQLITE_TESTCTRL_LOCALTIME_FAULT         18
@ -8349,7 +8368,7 @@ SQLITE_API int sqlite3_test_control(int op, ...);
 #define SQLITE_TESTCTRL_TRACEFLAGS              31
 #define SQLITE_TESTCTRL_TUNE                    32
 #define SQLITE_TESTCTRL_LOGEST                  33
-#define SQLITE_TESTCTRL_USELONGDOUBLE           34
+#define SQLITE_TESTCTRL_USELONGDOUBLE           34  /* NOT USED */
 #define SQLITE_TESTCTRL_LAST                    34  /* Largest TESTCTRL */

 /*
@ -9325,6 +9344,16 @@ typedef struct sqlite3_backup sqlite3_backup;
 ** APIs are not strictly speaking threadsafe. If they are invoked at the
 ** same time as another thread is invoking sqlite3_backup_step() it is
 ** possible that they return invalid values.
+**
+** <b>Alternatives To Using The Backup API</b>
+**
+** Other techniques for safely creating a consistent backup of an SQLite
+** database include:
+**
+** <ul>
+** <li> The [VACUUM INTO] command.
+** <li> The [sqlite3_rsync] utility program.
+** </ul>
 */
 SQLITE_API sqlite3_backup *sqlite3_backup_init(
  sqlite3 *pDest,                        /* Destination database handle */
@ -10524,6 +10553,14 @@ typedef struct sqlite3_snapshot {
 ** If there is not already a read-transaction open on schema S when
 ** this function is called, one is opened automatically.
 **
+** If a read-transaction is opened by this function, then it is guaranteed
+** that the returned snapshot object may not be invalidated by a database
+** writer or checkpointer until after the read-transaction is closed. This
+** is not guaranteed if a read-transaction is already open when this
+** function is called. In that case, any subsequent write or checkpoint
+** operation on the database may invalidate the returned snapshot handle,
+** even while the read-transaction remains open.
+**
 ** The following must be true for this function to succeed. If any of
 ** the following statements are false when sqlite3_snapshot_get() is
 ** called, SQLITE_ERROR is returned. The final value of *P is undefined
@ -10832,8 +10869,6 @@ SQLITE_API int sqlite3_deserialize(
 #if defined(__wasi__)
 # undef SQLITE_WASI
 # define SQLITE_WASI 1
-# undef SQLITE_OMIT_WAL
-# define SQLITE_OMIT_WAL 1/* because it requires shared memory APIs */
 # ifndef SQLITE_OMIT_LOAD_EXTENSION
 #  define SQLITE_OMIT_LOAD_EXTENSION
 # endif
@ -13036,6 +13071,10 @@ struct Fts5PhraseIter {
 **   (i.e. if it is a contentless table), then this API always iterates
 **   through an empty set (all calls to xPhraseFirst() set iCol to -1).
 **
+**   In all cases, matches are visited in (column ASC, offset ASC) order.
+**   i.e. all those in column 0, sorted by offset, followed by those in
+**   column 1, etc.
+**
 ** xPhraseNext()
 **   See xPhraseFirst above.
 **
@ -13102,9 +13141,32 @@ struct Fts5PhraseIter {
 **
 **   This API can be quite slow if used with an FTS5 table created with the
 **   "detail=none" or "detail=column" option.
+**
+** xColumnLocale(pFts5, iIdx, pzLocale, pnLocale)
+**   If parameter iCol is less than zero, or greater than or equal to the
+**   number of columns in the table, SQLITE_RANGE is returned.
+**
+**   Otherwise, this function attempts to retrieve the locale associated
+**   with column iCol of the current row. Usually, there is no associated
+**   locale, and output parameters (*pzLocale) and (*pnLocale) are set
+**   to NULL and 0, respectively. However, if the fts5_locale() function
+**   was used to associate a locale with the value when it was inserted
+**   into the fts5 table, then (*pzLocale) is set to point to a nul-terminated
+**   buffer containing the name of the locale in utf-8 encoding. (*pnLocale)
+**   is set to the size in bytes of the buffer, not including the
+**   nul-terminator.
+**
+**   If successful, SQLITE_OK is returned. Or, if an error occurs, an
+**   SQLite error code is returned. The final value of the output parameters
+**   is undefined in this case.
+**
+** xTokenize_v2:
+**   Tokenize text using the tokenizer belonging to the FTS5 table. This
+**   API is the same as the xTokenize() API, except that it allows a tokenizer
+**   locale to be specified.
 */
 struct Fts5ExtensionApi {
-  int iVersion;                   /* Currently always set to 3 */
+  int iVersion;                   /* Currently always set to 4 */

  void *(*xUserData)(Fts5Context*);

@ -13146,6 +13208,15 @@ struct Fts5ExtensionApi {
      const char **ppToken, int *pnToken
  );
  int (*xInstToken)(Fts5Context*, int iIdx, int iToken, const char**, int*);
+
+  /* Below this point are iVersion>=4 only */
+  int (*xColumnLocale)(Fts5Context*, int iCol, const char **pz, int *pn);
+  int (*xTokenize_v2)(Fts5Context*,
+    const char *pText, int nText,      /* Text to tokenize */
+    const char *pLocale, int nLocale,  /* Locale to pass to tokenizer */
+    void *pCtx,                        /* Context passed to xToken() */
+    int (*xToken)(void*, int, const char*, int, int, int)       /* Callback */
+  );
 };

 /*
@ -13166,7 +13237,7 @@ struct Fts5ExtensionApi {
 **   A tokenizer instance is required to actually tokenize text.
 **
 **   The first argument passed to this function is a copy of the (void*)
-**   pointer provided by the application when the fts5_tokenizer object
+**   pointer provided by the application when the fts5_tokenizer_v2 object
 **   was registered with FTS5 (the third argument to xCreateTokenizer()).
 **   The second and third arguments are an array of nul-terminated strings
 **   containing the tokenizer arguments, if any, specified following the
@ -13190,7 +13261,7 @@ struct Fts5ExtensionApi {
 **   argument passed to this function is a pointer to an Fts5Tokenizer object
 **   returned by an earlier call to xCreate().
 **
-**   The second argument indicates the reason that FTS5 is requesting
+**   The third argument indicates the reason that FTS5 is requesting
 **   tokenization of the supplied text. This is always one of the following
 **   four values:
 **
@ -13214,6 +13285,13 @@ struct Fts5ExtensionApi {
 **            on a columnsize=0 database.
 **   </ul>
 **
+**   The sixth and seventh arguments passed to xTokenize() - pLocale and
+**   nLocale - are a pointer to a buffer containing the locale to use for
+**   tokenization (e.g. "en_US") and its size in bytes, respectively. The
+**   pLocale buffer is not nul-terminated. pLocale may be passed NULL (in
+**   which case nLocale is always 0) to indicate that the tokenizer should
+**   use its default locale.
+**
 **   For each token in the input string, the supplied callback xToken() must
 **   be invoked. The first argument to it should be a copy of the pointer
 **   passed as the second argument to xTokenize(). The third and fourth
@ -13237,6 +13315,30 @@ struct Fts5ExtensionApi {
 **   may abandon the tokenization and return any error code other than
 **   SQLITE_OK or SQLITE_DONE.
 **
+**   If the tokenizer is registered using an fts5_tokenizer_v2 object,
+**   then the xTokenize() method has two additional arguments - pLocale
+**   and nLocale. These specify the locale that the tokenizer should use
+**   for the current request. If pLocale and nLocale are both 0, then the
+**   tokenizer should use its default locale. Otherwise, pLocale points to
+**   an nLocale byte buffer containing the name of the locale to use as utf-8
+**   text. pLocale is not nul-terminated.
+**
+** FTS5_TOKENIZER
+**
+** There is also an fts5_tokenizer object. This is an older, deprecated,
+** version of fts5_tokenizer_v2. It is similar except that:
+**
+**  <ul>
+**    <li> There is no "iVersion" field, and
+**    <li> The xTokenize() method does not take a locale argument.
+**  </ul>
+**
+** Legacy fts5_tokenizer tokenizers must be registered using the
+** legacy xCreateTokenizer() function, instead of xCreateTokenizer_v2().
+**
+** Tokenizer implementations registered using either API may be retrieved
+** using both xFindTokenizer() and xFindTokenizer_v2().
+**
 ** SYNONYM SUPPORT
 **
 **   Custom tokenizers may also support synonyms. Consider a case in which a
@ -13345,6 +13447,33 @@ struct Fts5ExtensionApi {
 **   inefficient.
 */
 typedef struct Fts5Tokenizer Fts5Tokenizer;
+typedef struct fts5_tokenizer_v2 fts5_tokenizer_v2;
+struct fts5_tokenizer_v2 {
+  int iVersion;             /* Currently always 2 */
+
+  int (*xCreate)(void*, const char **azArg, int nArg, Fts5Tokenizer **ppOut);
+  void (*xDelete)(Fts5Tokenizer*);
+  int (*xTokenize)(Fts5Tokenizer*,
+      void *pCtx,
+      int flags,            /* Mask of FTS5_TOKENIZE_* flags */
+      const char *pText, int nText,
+      const char *pLocale, int nLocale,
+      int (*xToken)(
+        void *pCtx,         /* Copy of 2nd argument to xTokenize() */
+        int tflags,         /* Mask of FTS5_TOKEN_* flags */
+        const char *pToken, /* Pointer to buffer containing token */
+        int nToken,         /* Size of token in bytes */
+        int iStart,         /* Byte offset of token within input text */
+        int iEnd            /* Byte offset of end of token within input text */
+      )
+  );
+};
+
+/*
+** New code should use the fts5_tokenizer_v2 type to define tokenizer
+** implementations. The following type is included for legacy applications
+** that still use it.
+*/
 typedef struct fts5_tokenizer fts5_tokenizer;
 struct fts5_tokenizer {
  int (*xCreate)(void*, const char **azArg, int nArg, Fts5Tokenizer **ppOut);
@ -13364,6 +13493,7 @@ struct fts5_tokenizer {
  );
 };

+
 /* Flags that may be passed as the third argument to xTokenize() */
 #define FTS5_TOKENIZE_QUERY     0x0001
 #define FTS5_TOKENIZE_PREFIX    0x0002
@ -13383,7 +13513,7 @@ struct fts5_tokenizer {
 */
 typedef struct fts5_api fts5_api;
 struct fts5_api {
-  int iVersion;                   /* Currently always set to 2 */
+  int iVersion;                   /* Currently always set to 3 */

  /* Create a new tokenizer */
  int (*xCreateTokenizer)(
@ -13410,6 +13540,25 @@ struct fts5_api {
    fts5_extension_function xFunction,
    void (*xDestroy)(void*)
  );
+
+  /* APIs below this point are only available if iVersion>=3 */
+
+  /* Create a new tokenizer */
+  int (*xCreateTokenizer_v2)(
+    fts5_api *pApi,
+    const char *zName,
+    void *pUserData,
+    fts5_tokenizer_v2 *pTokenizer,
+    void (*xDestroy)(void*)
+  );
+
+  /* Find an existing tokenizer */
+  int (*xFindTokenizer_v2)(
+    fts5_api *pApi,
+    const char *zName,
+    void **ppUserData,
+    fts5_tokenizer_v2 **ppTokenizer
+  );
 };

 /*
--- a/docs/release.md
+++ b/docs/release.md
@ -0,0 +1,19 @@
+# Release Checklist
+
+- make sure ci is passing
+- run the tests
+- format + prettier
+- update metadata/en-US/changelogs
+- git tag
+- push
+- make dist
+- make a release on gitea
+- upload the artifacts
+- nix
+  - comment out the hash in default.nix
+  - update the version
+  - run `nix-build`
+  - update the hash
+- bump the versions in GNUmakefile for the next release
+- make
+- commit
--- a/metadata/en-US/changelogs/29.txt
+++ b/metadata/en-US/changelogs/29.txt
@ -0,0 +1,19 @@
+* Command-line publishing.
+* SSB replication improvements.
+* Disallow rich text paste more.
+* identity app lets you change the server account.
+* SSB profile icons stretching.
+* Fixed iPhone app missing data.
+* Added an initiate sync button.
+* Fixed the AppImage.
+* Flatpak WIP.
+* Android compatibility fixes.
+* Updates:
+  * CodeMirror
+  * CommonMark 0.31.2
+  * Lit 3.2.1
+  * OpenSSL 3.4.0
+  * c-ares 1.34.2
+  * libbacktrace
+  * libuv 1.49.2
+  * sqlite 3.47.0
--- a/package-lock.json
+++ b/package-lock.json
@ -11,7 +11,9 @@
 			}
 		},
 		"node_modules/prettier": {
-			"version": "3.2.5",
+			"version": "3.3.3",
+			"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
+			"integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
 			"license": "MIT",
 			"bin": {
 				"prettier": "bin/prettier.cjs"
--- a/src/android/AndroidManifest.xml
+++ b/src/android/AndroidManifest.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.unprompted.tildefriends"
-	android:versionCode="27"
-	android:versionName="0.0.23">
+	android:versionCode="30"
+	android:versionName="0.0.25-wip">
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<application
--- a/src/android/com/unprompted/tildefriends/TildeFriendsActivity.java
+++ b/src/android/com/unprompted/tildefriends/TildeFriendsActivity.java
@ -11,6 +11,7 @@ import android.net.ConnectivityManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
+import android.os.FileObserver;
 import android.os.IBinder;
 import android.os.Parcel;
 import android.os.ParcelFileDescriptor;
@ -42,12 +43,6 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.OutputStream;
-import java.nio.file.FileSystems;
-import java.nio.file.Paths;
-import java.nio.file.StandardWatchEventKinds;
-import java.nio.file.WatchEvent;
-import java.nio.file.WatchKey;
-import java.nio.file.WatchService;
 import java.util.concurrent.TimeUnit;

 public class TildeFriendsActivity extends Activity {
@ -55,9 +50,9 @@ public class TildeFriendsActivity extends Activity {
 	TildeFriendsWebView web_view;
 	String base_url;
 	String port_file_path;
-	Thread thread;
 	Thread server_thread;
 	ServiceConnection service_connection;
+	FileObserver observer;

 	private ValueCallback<Uri[]> upload_message;
 	private final static int FILECHOOSER_RESULT = 1;
@ -95,56 +90,9 @@ public class TildeFriendsActivity extends Activity {

 		TildeFriendsActivity activity = this;

-		thread = new Thread(new Runnable() {
-			@Override
-			public void run() {
-				Log.w("tildefriends", "Watching for changes in: " + getFilesDir().toString());
-				try (WatchService watcher = FileSystems.getDefault().newWatchService()) {
-					Paths.get(getFilesDir().toString()).register(
-						watcher,
-						StandardWatchEventKinds.ENTRY_CREATE,
-						StandardWatchEventKinds.ENTRY_MODIFY);
-					while (true) {
-						WatchKey key = watcher.poll(100, TimeUnit.MILLISECONDS);
-						boolean attempt_it = true;
-						if (key != null)
-						{
-							attempt_it = false;
-							for (WatchEvent event : key.pollEvents()) {
-								if (event.context().toString().equals("port.txt")) {
-									Log.w("tildefriends", "Observed file write: " + event.context().toString());
-									attempt_it = true;
-								}
-							}
-						}
-						if (attempt_it) {
-							int port = read_port(port_file_path);
-							if (port >= 0) {
-								base_url = "http://127.0.0.1:" + String.valueOf(port) + "/";
-								activity.runOnUiThread(() -> {
-									activity.hide_status();
-									web_view.loadUrl(base_url);
-								});
-								break;
-							} else {
-								activity.runOnUiThread(() -> {
-									activity.set_status("Waiting to connect...");
-								});
-							}
-						}
-						if (key != null && !key.reset()) {
-							Log.w("tildefriends", "watcher is no longer valid");
-							break;
-						}
-					}
-				} catch (java.io.IOException e) {
-					Log.w("tildefriends", "IOException: " + e.toString());
-				} catch (InterruptedException e) {
-					Log.w("tildefriends", "InterruptedException: " + e.toString());
-				}
-			}
-		});
-		thread.start();
+		Log.w("tildefriends", "Watching for changes in: " + getFilesDir().toString());
+		observer = make_file_observer(getFilesDir().toString(), port_file_path);
+		observer.startWatching();

 		set_status("Starting server...");
 		server_thread = new Thread(new Runnable() {
@ -392,11 +340,14 @@ public class TildeFriendsActivity extends Activity {

 	private int read_port(String path) {
 		try (BufferedReader reader = new BufferedReader(new FileReader(path))) {
-			return Integer.parseInt(reader.readLine());
+			String line = reader.readLine();
+			if (line != null) {
+				return Integer.parseInt(line);
+			}
 		} catch (NumberFormatException e) {
 			e.printStackTrace();
 		} catch (java.io.FileNotFoundException e) {
-			e.printStackTrace();
+			Log.w("tildefriends", "Port file does not yet exist.");
 		} catch (java.io.IOException e) {
 			e.printStackTrace();
 		}
@ -461,6 +412,36 @@ public class TildeFriendsActivity extends Activity {
 		}
 	}

+	private void check_port_file(String path) {
+		int port = read_port(port_file_path);
+		if (port >= 0) {
+			base_url = "http://127.0.0.1:" + String.valueOf(port) + "/";
+			runOnUiThread(() -> {
+				hide_status();
+				web_view.loadUrl(base_url);
+			});
+			observer = null;
+		} else {
+			runOnUiThread(() -> {
+				set_status("Waiting to connect...");
+			});
+		}
+	}
+
+	@SuppressWarnings("deprecation")
+	private FileObserver make_file_observer(String dir, String path) {
+		FileObserver file_observer = new FileObserver(dir, FileObserver.ALL_EVENTS) {
+			@Override
+			public void onEvent(int event, String file) {
+				if (observer != null) {
+					check_port_file(path);
+				}
+			}
+		};
+		check_port_file(path);
+		return file_observer;
+	}
+
 	@SuppressWarnings("deprecation")
 	private void set_database_path()
 	{
--- a/src/android/com/unprompted/tildefriends/TildeFriendsSandboxService.java
+++ b/src/android/com/unprompted/tildefriends/TildeFriendsSandboxService.java
@ -41,7 +41,7 @@ public class TildeFriendsSandboxService extends Service {
 			@Override
 			protected boolean onTransact(int code, Parcel data, Parcel reply, int flags) {
 				if (code == START_CALL) {
-					ParcelFileDescriptor pfd = data.readParcelable(ParcelFileDescriptor.class.getClassLoader(), ParcelFileDescriptor.class);
+					ParcelFileDescriptor pfd = read_pfd(data);
 					if (pfd != null) {
 						Log.w("tildefriends", "fd is " + pfd.getFd());
 						start_thread(pfd.detachFd());
@ -56,4 +56,9 @@ public class TildeFriendsSandboxService extends Service {
 			}
 		};
 	}
+
+	@SuppressWarnings("deprecation")
+	static private ParcelFileDescriptor read_pfd(Parcel data) {
+		return data.readParcelable(ParcelFileDescriptor.class.getClassLoader());
+	}
 }
--- a/src/com.unprompted.tildefriends.yml
+++ b/src/com.unprompted.tildefriends.yml
@ -0,0 +1,26 @@
+id: com.unprompted.tildefriends
+runtime: org.freedesktop.Platform
+runtime-version: '23.08'
+sdk: org.freedesktop.Sdk
+command: tildefriends-run.sh
+finish-args:
+  - --share=network
+  - --filesystem=xdg-data/applications/tildefriends
+modules:
+  - name: tildefriends
+    buildsystem: simple
+    build-commands:
+      - make release out/data.zip
+      - install -Dm755 out/release/tildefriends /app/bin/tildefriends
+      - install -D out/data.zip /app/share/data.zip
+      - install -Dm755 tildefriends-run.sh /app/bin/tildefriends-run.sh
+    sources:
+      - type: git
+        url: https://dev.tildefriends.net/cory/tildefriends.git
+        dest: .
+        commit: main
+      - type: script
+        dest-filename: tildefriends-run.sh
+        commands:
+          - mkdir -p ~/.local/share/applications/tildefriends/
+          - exec tildefriends run -z /app/share/data.zip -d ~/.local/share/applications/tildefriends/db.sqlite
--- a/src/database.js.c
+++ b/src/database.js.c
@ -390,8 +390,6 @@ static JSValue _database_remove(JSContext* context, JSValueConst this_val, int a
 typedef struct _database_get_all_t
 {
 	const char* id;
-	const char* key;
-	size_t key_length;
 	char** out_values;
 	size_t* out_lengths;
 	int out_values_length;
@ -455,17 +453,11 @@ static JSValue _database_get_all(JSContext* context, JSValueConst this_val, int
 	{
 		tf_ssb_t* ssb = tf_task_get_ssb(database->task);

-		size_t length;
-		const char* key = JS_ToCStringLen(context, &length, argv[0]);
-		database_get_all_t* work = tf_malloc(sizeof(database_get_all_t) + strlen(database->id) + 1 + length + 1);
+		database_get_all_t* work = tf_malloc(sizeof(database_get_all_t) + strlen(database->id) + 1);
 		*work = (database_get_all_t) {
 			.id = (const char*)(work + 1),
-			.key = (const char*)(work + 1) + strlen(database->id) + 1,
-			.key_length = length,
 		};
 		memcpy((char*)work->id, database->id, strlen(database->id) + 1);
-		memcpy((char*)work->key, key, length + 1);
-		JS_FreeCString(context, key);

 		tf_ssb_run_work(ssb, _database_get_all_work, _database_get_all_after_work, work);
 		result = JS_NewPromiseCapability(context, work->promise);
--- a/src/http.c
+++ b/src/http.c
@ -67,7 +67,6 @@ typedef struct _tf_http_connection_t
 typedef struct _tf_http_handler_t
 {
 	const char* pattern;
-	bool is_wildcard;
 	tf_http_callback_t* callback;
 	tf_http_cleanup_t* cleanup;
 	void* user_data;
@ -107,6 +106,7 @@ static const char* _http_connection_get_header(const tf_http_connection_t* conne
 static void _http_connection_destroy(tf_http_connection_t* connection, const char* reason);
 static void _http_timer_reset(tf_http_connection_t* connection);
 static void _http_tls_update(tf_http_connection_t* connection);
+static void _http_builtin_404_handler(tf_http_request_t* request);

 tf_http_t* tf_http_create(uv_loop_t* loop)
 {
@ -128,9 +128,15 @@ static void _http_allocate_buffer(uv_handle_t* handle, size_t suggested_size, uv
 	*buf = uv_buf_init(connection->incoming, sizeof(connection->incoming));
 }

-static bool _http_pattern_matches(const char* pattern, const char* path, bool is_wildcard)
+bool tf_http_pattern_matches(const char* pattern, const char* path)
 {
-	if (!pattern || !*pattern || (!is_wildcard && strcmp(path, pattern) == 0))
+	if (!*pattern && !*path)
+	{
+		return true;
+	}
+	const char* k_word = "{word}";
+	bool is_wildcard = strchr(pattern, '*') || strstr(pattern, k_word);
+	if (!is_wildcard && strcmp(path, pattern) == 0)
 	{
 		return true;
 	}
@ -139,17 +145,36 @@ static bool _http_pattern_matches(const char* pattern, const char* path, bool is
 	{
 		int i = 0;
 		int j = 0;
-		while (pattern[i] && path[j] && pattern[i] != '*' && pattern[i] == path[j])
+		while (pattern[i] && path[j] && pattern[i] == path[j])
 		{
 			i++;
 			j++;
 		}

-		if (pattern[i] == '*')
+		size_t k_word_len = strlen(k_word);
+		if (strncmp(pattern + i, k_word, k_word_len) == 0 && ((path[j] >= 'a' && path[j] <= 'z') || (path[j] >= 'A' && path[j] <= 'Z')))
 		{
 			while (true)
 			{
-				if (_http_pattern_matches(pattern + i + 1, path + j, strchr(pattern + i + 1, '*') != NULL))
+				if ((path[j] >= 'a' && path[j] <= 'z') || (path[j] >= 'A' && path[j] <= 'Z') || (path[j] >= '0' && path[j] <= '9'))
+				{
+					if (tf_http_pattern_matches(pattern + i + k_word_len, path + j + 1))
+					{
+						return true;
+					}
+				}
+				else
+				{
+					break;
+				}
+				j++;
+			}
+		}
+		else if (pattern[i] == '*')
+		{
+			while (true)
+			{
+				if (tf_http_pattern_matches(pattern + i + 1, path + j))
 				{
 					return true;
 				}
@ -169,7 +194,7 @@ static bool _http_find_handler(tf_http_t* http, const char* path, tf_http_callba
 {
 	for (int i = 0; i < http->handlers_count; i++)
 	{
-		if (_http_pattern_matches(http->handlers[i].pattern, path, http->handlers[i].is_wildcard))
+		if (tf_http_pattern_matches(http->handlers[i].pattern, path))
 		{
 			*out_callback = http->handlers[i].callback;
 			*out_trace_name = http->handlers[i].pattern;
@ -196,6 +221,10 @@ static void _http_connection_on_close(uv_handle_t* handle)
 static void _http_request_destroy(tf_http_request_t* request)
 {
 	tf_http_close_callback* on_close = request->on_close;
+	if (request->connection && !request->connection->is_response_sent)
+	{
+		_http_builtin_404_handler(request);
+	}
 	if (on_close)
 	{
 		tf_trace_t* trace = request->http->trace;
@ -402,6 +431,11 @@ static void _http_add_body_bytes(tf_http_connection_t* connection, const void* d

 		if (connection->body_length == connection->content_length)
 		{
+			/* Null-terminate for convenience. */
+			if (connection->body)
+			{
+				((char*)connection->body)[connection->body_length] = '\0';
+			}
 			tf_http_request_t* request = tf_malloc(sizeof(tf_http_request_t));
 			*request = (tf_http_request_t) {
 				.http = connection->http,
@ -495,7 +529,7 @@ static size_t _http_on_read_plain_internal(tf_http_connection_t* connection, con

 			if (connection->content_length)
 			{
-				connection->body = tf_realloc(connection->body, connection->content_length);
+				connection->body = tf_realloc(connection->body, connection->content_length + 1);
 			}

 			if (!_http_find_handler(connection->http, connection->path, &connection->callback, &connection->trace_name, &connection->user_data) || !connection->callback)
@ -731,7 +765,6 @@ void tf_http_add_handler(tf_http_t* http, const char* pattern, tf_http_callback_
 	http->handlers = tf_resize_vec(http->handlers, sizeof(tf_http_handler_t) * (http->handlers_count + 1));
 	http->handlers[http->handlers_count++] = (tf_http_handler_t) {
 		.pattern = tf_strdup(pattern),
-		.is_wildcard = pattern && strchr(pattern, '*') != NULL,
 		.callback = callback,
 		.cleanup = cleanup,
 		.user_data = user_data,
--- a/src/http.h
+++ b/src/http.h
@ -228,4 +228,12 @@ void tf_http_request_websocket_upgrade(tf_http_request_t* request);
 */
 const char* tf_http_status_text(int status);

+/**
+** Match URL patterns.  "*" matches anything, and "{word}" matches [a-zA-Z][a-zA-Z0-9]*".
+** @param pattern The pattern to match.
+** @param path The path to test.
+** @return true if the path matches the pattern.
+*/
+bool tf_http_pattern_matches(const char* pattern, const char* path);
+
 /** @} */
--- a/src/httpd.js.c
+++ b/src/httpd.js.c
@ -4,12 +4,13 @@
 #include "http.h"
 #include "log.h"
 #include "mem.h"
-#include "ssb.h"
 #include "ssb.db.h"
+#include "ssb.h"
 #include "task.h"
 #include "tlscontext.js.h"
 #include "trace.h"
 #include "util.js.h"
+#include "version.h"

 #include "ow-crypt.h"

@ -29,18 +30,20 @@
 #include <alloca.h>
 #endif

-#define tf_countof(a) ((int)(sizeof((a)) / sizeof(*(a))))
-
 #define CYAN "\e[1;36m"
 #define MAGENTA "\e[1;35m"
+#define YELLOW "\e[1;33m"
 #define RESET "\e[0m"

 const int64_t k_refresh_interval = 1ULL * 7 * 24 * 60 * 60 * 1000;

 static JSValue _authenticate_jwt(tf_ssb_t* ssb, JSContext* context, const char* jwt);
 static JSValue _httpd_websocket_upgrade(JSContext* context, JSValueConst this_val, int argc, JSValueConst* argv);
+static bool _is_name_valid(const char* name);
 static const char* _make_session_jwt(JSContext* context, tf_ssb_t* ssb, const char* name);
 static const char* _make_set_session_cookie_header(tf_http_request_t* request, const char* session_cookie);
+const char** _form_data_decode(const char* data, int length);
+const char* _form_data_get(const char** form_data, const char* key);

 static JSClassID _httpd_class_id;
 static JSClassID _httpd_request_class_id;
@ -219,6 +222,17 @@ static void _httpd_message_callback(tf_http_request_t* request, int op_code, con
 	JS_FreeValue(context, on_message);
 }

+static JSValue _httpd_make_response_object(JSContext* context, tf_http_request_t* request)
+{
+	JSValue response_object = JS_NewObjectClass(context, _httpd_request_class_id);
+	JS_SetOpaque(response_object, request);
+	JS_SetPropertyStr(context, response_object, "writeHead", JS_NewCFunction(context, _httpd_response_write_head, "writeHead", 2));
+	JS_SetPropertyStr(context, response_object, "end", JS_NewCFunction(context, _httpd_response_end, "end", 1));
+	JS_SetPropertyStr(context, response_object, "send", JS_NewCFunction(context, _httpd_response_send, "send", 2));
+	JS_SetPropertyStr(context, response_object, "upgrade", JS_NewCFunction(context, _httpd_websocket_upgrade, "upgrade", 2));
+	return response_object;
+}
+
 static void _httpd_callback_internal(tf_http_request_t* request, bool is_websocket)
 {
 	http_handler_data_t* data = request->user_data;
@ -245,14 +259,9 @@ static void _httpd_callback_internal(tf_http_request_t* request, bool is_websock
 	JS_SetPropertyStr(context, client, "tls", request->is_tls ? JS_TRUE : JS_FALSE);
 	JS_SetPropertyStr(context, request_object, "client", client);

-	JSValue response_object = JS_NewObjectClass(context, _httpd_request_class_id);
+	JSValue response_object = _httpd_make_response_object(context, request);
 	/* The ref is owned by the JS object and will be released by the finalizer. */
 	tf_http_request_ref(request);
-	JS_SetOpaque(response_object, request);
-	JS_SetPropertyStr(context, response_object, "writeHead", JS_NewCFunction(context, _httpd_response_write_head, "writeHead", 2));
-	JS_SetPropertyStr(context, response_object, "end", JS_NewCFunction(context, _httpd_response_end, "end", 1));
-	JS_SetPropertyStr(context, response_object, "send", JS_NewCFunction(context, _httpd_response_send, "send", 2));
-	JS_SetPropertyStr(context, response_object, "upgrade", JS_NewCFunction(context, _httpd_websocket_upgrade, "upgrade", 2));
 	JSValue args[] = {
 		request_object,
 		response_object,
@ -420,7 +429,7 @@ static JSValue _httpd_endpoint_start(JSContext* context, JSValueConst this_val,
 	*listener = (httpd_listener_t) { .context = context, .tls = JS_DupValue(context, argv[1]) };
 	tf_tls_context_t* tls = tf_tls_context_get(listener->tls);
 	int assigned_port = tf_http_listen(http, port, tls, _httpd_listener_cleanup, listener);
-	tf_printf(CYAN "~😎 Tilde Friends" RESET " is now up at " MAGENTA "http%s://127.0.0.1:%d/" RESET ".\n", tls ? "s" : "", assigned_port);
+	tf_printf(CYAN "~😎 Tilde Friends" RESET " " YELLOW VERSION_NUMBER RESET " is now up at " MAGENTA "http%s://127.0.0.1:%d/" RESET ".\n", tls ? "s" : "", assigned_port);
 	return JS_NewInt32(context, assigned_port);
 }

@ -555,14 +564,11 @@ static bool _magic_bytes_match(const magic_bytes_t* magic, const uint8_t* actual
 	return true;
 }

-static JSValue _httpd_mime_type_from_magic_bytes(JSContext* context, JSValueConst this_val, int argc, JSValueConst* argv)
+static const char* _httpd_mime_type_from_magic_bytes(const uint8_t* bytes, size_t size)
 {
-	JSValue result = JS_UNDEFINED;
-	size_t size = 0;
-	uint8_t* bytes = tf_util_try_get_array_buffer(context, &size, argv[0]);
+	const char* type = "application/binary";
 	if (bytes)
 	{
-
 		const magic_bytes_t k_magic_bytes[] = {
 			{
 				.type = "image/jpeg",
@ -627,12 +633,12 @@ static JSValue _httpd_mime_type_from_magic_bytes(JSContext* context, JSValueCons
 		{
 			if (_magic_bytes_match(&k_magic_bytes[i], bytes, size))
 			{
-				result = JS_NewString(context, k_magic_bytes[i].type);
+				type = k_magic_bytes[i].type;
 				break;
 			}
 		}
 	}
-	return result;
+	return type;
 }

 static const char* _ext_to_content_type(const char* ext, bool use_fallback)
@ -667,14 +673,6 @@ static const char* _ext_to_content_type(const char* ext, bool use_fallback)
 	return use_fallback ? "application/binary" : NULL;
 }

-static JSValue _httpd_mime_type_from_extension(JSContext* context, JSValueConst this_val, int argc, JSValueConst* argv)
-{
-	const char* name = JS_ToCString(context, argv[0]);
-	const char* type = _ext_to_content_type(strrchr(name, '.'), false);
-	JS_FreeCString(context, name);
-	return type ? JS_NewString(context, type) : JS_UNDEFINED;
-}
-
 static void _httpd_finalizer(JSRuntime* runtime, JSValue value)
 {
 	tf_http_t* http = JS_GetOpaque(value, _httpd_class_id);
@ -959,6 +957,623 @@ static void _httpd_endpoint_static(tf_http_request_t* request)
 	tf_file_stat(task, path, _httpd_endpoint_static_stat, request);
 }

+static void _httpd_endpoint_add_slash(tf_http_request_t* request)
+{
+	const char* host = tf_http_request_get_header(request, "x-forwarded-host");
+	if (!host)
+	{
+		host = tf_http_request_get_header(request, "host");
+	}
+	char url[1024];
+	snprintf(url, sizeof(url), "%s%s%s/", request->is_tls ? "https://" : "http://", host, request->path);
+	const char* headers[] = {
+		"Location",
+		url,
+	};
+	tf_http_respond(request, 303, headers, tf_countof(headers) / 2, "", 0);
+}
+
+typedef struct _user_app_t
+{
+	const char* user;
+	const char* app;
+} user_app_t;
+
+static user_app_t* _parse_user_app_from_path(const char* path, const char* expected_suffix)
+{
+	if (!path || path[0] != '/' || path[1] != '~')
+	{
+		return NULL;
+	}
+
+	size_t length = strlen(path);
+	size_t suffix_length = expected_suffix ? strlen(expected_suffix) : 0;
+	if (length < suffix_length || strcmp(path + length - suffix_length, expected_suffix) != 0)
+	{
+		return NULL;
+	}
+
+	const char* slash = strchr(path + 2, '/');
+	if (!slash)
+	{
+		return NULL;
+	}
+
+	const char* user = path + 2;
+	size_t user_length = (size_t)(slash - user);
+	const char* app = slash + 1;
+	size_t app_length = (size_t)(length - suffix_length - user_length - 3);
+	user_app_t* result = tf_malloc(sizeof(user_app_t) + user_length + 1 + app_length + 1);
+
+	*result = (user_app_t) {
+		.user = (char*)(result + 1),
+		.app = (char*)(result + 1) + user_length + 1,
+	};
+	memcpy((char*)result->user, user, user_length);
+	((char*)result->user)[user_length] = '\0';
+	memcpy((char*)result->app, app, app_length);
+	((char*)result->app)[app_length] = '\0';
+
+	if (!_is_name_valid(result->user) || !_is_name_valid(result->app))
+	{
+		tf_free(result);
+		result = NULL;
+	}
+
+	return result;
+}
+
+typedef struct _app_blob_t
+{
+	tf_http_request_t* request;
+	bool found;
+	bool not_modified;
+	bool use_handler;
+	void* data;
+	size_t size;
+	char app_blob_id[k_blob_id_len];
+	const char* file;
+	user_app_t* user_app;
+	char etag[256];
+} app_blob_t;
+
+static void _httpd_endpoint_app_blob_work(tf_ssb_t* ssb, void* user_data)
+{
+	app_blob_t* data = user_data;
+	tf_http_request_t* request = data->request;
+	if (request->path[0] == '/' && request->path[1] == '~')
+	{
+		const char* last_slash = strchr(request->path + 1, '/');
+		if (last_slash)
+		{
+			last_slash = strchr(last_slash + 1, '/');
+		}
+		data->user_app = last_slash ? _parse_user_app_from_path(request->path, last_slash) : NULL;
+		if (data->user_app)
+		{
+			size_t path_length = strlen("path:") + strlen(data->user_app->app) + 1;
+			char* app_path = tf_malloc(path_length);
+			snprintf(app_path, path_length, "path:%s", data->user_app->app);
+			const char* value = tf_ssb_db_get_property(ssb, data->user_app->user, app_path);
+			snprintf(data->app_blob_id, sizeof(data->app_blob_id), "%s", value);
+			tf_free(app_path);
+			tf_free((void*)value);
+			data->file = last_slash + 1;
+		}
+	}
+	else if (request->path[0] == '/' && request->path[1] == '&')
+	{
+		const char* end = strstr(request->path, ".sha256/");
+		if (end)
+		{
+			snprintf(data->app_blob_id, sizeof(data->app_blob_id), "%.*s", (int)(end + strlen(".sha256") - request->path - 1), request->path + 1);
+			data->file = end + strlen(".sha256/");
+		}
+	}
+
+	char* app_blob = NULL;
+	size_t app_blob_size = 0;
+	if (*data->app_blob_id && tf_ssb_db_blob_get(ssb, data->app_blob_id, (uint8_t**)&app_blob, &app_blob_size))
+	{
+		JSMallocFunctions funcs = { 0 };
+		tf_get_js_malloc_functions(&funcs);
+		JSRuntime* runtime = JS_NewRuntime2(&funcs, NULL);
+		JSContext* context = JS_NewContext(runtime);
+
+		JSValue app_object = JS_ParseJSON(context, app_blob, app_blob_size, NULL);
+		JSValue files = JS_GetPropertyStr(context, app_object, "files");
+		JSValue blob_id = JS_GetPropertyStr(context, files, data->file);
+		if (JS_IsUndefined(blob_id))
+		{
+			blob_id = JS_GetPropertyStr(context, files, "handler.js");
+			if (!JS_IsUndefined(blob_id))
+			{
+				data->use_handler = true;
+			}
+		}
+		else
+		{
+			const char* blob_id_str = JS_ToCString(context, blob_id);
+			if (blob_id_str)
+			{
+				snprintf(data->etag, sizeof(data->etag), "\"%s\"", blob_id_str);
+				const char* match = tf_http_request_get_header(data->request, "if-none-match");
+				if (match && strcmp(match, data->etag) == 0)
+				{
+					data->not_modified = true;
+				}
+				else
+				{
+					data->found = tf_ssb_db_blob_get(ssb, blob_id_str, (uint8_t**)&data->data, &data->size);
+				}
+			}
+			JS_FreeCString(context, blob_id_str);
+		}
+		JS_FreeValue(context, blob_id);
+		JS_FreeValue(context, files);
+		JS_FreeValue(context, app_object);
+
+		JS_FreeContext(context);
+		JS_FreeRuntime(runtime);
+		tf_free(app_blob);
+	}
+}
+
+static void _httpd_call_app_handler(tf_ssb_t* ssb, tf_http_request_t* request, const char* app_blob_id, const char* path, const char* package_owner, const char* app)
+{
+	JSContext* context = tf_ssb_get_context(ssb);
+	JSValue global = JS_GetGlobalObject(context);
+	JSValue exports = JS_GetPropertyStr(context, global, "exports");
+	JSValue call_app_handler = JS_GetPropertyStr(context, exports, "callAppHandler");
+
+	JSValue response = _httpd_make_response_object(context, request);
+	tf_http_request_ref(request);
+	JSValue handler_blob_id = JS_NewString(context, app_blob_id);
+	JSValue path_value = JS_NewString(context, path);
+	JSValue package_owner_value = JS_NewString(context, package_owner);
+	JSValue app_value = JS_NewString(context, app);
+	JSValue query_value = request->query ? JS_NewString(context, request->query) : JS_UNDEFINED;
+
+	JSValue headers = JS_NewObject(context);
+	for (int i = 0; i < request->headers_count; i++)
+	{
+		char name[256] = "";
+		snprintf(name, sizeof(name), "%.*s", (int)request->headers[i].name_len, request->headers[i].name);
+		JS_SetPropertyStr(context, headers, name, JS_NewStringLen(context, request->headers[i].value, request->headers[i].value_len));
+	}
+
+	JSValue args[] = {
+		response,
+		handler_blob_id,
+		path_value,
+		query_value,
+		headers,
+		package_owner_value,
+		app_value,
+	};
+
+	JSValue result = JS_Call(context, call_app_handler, JS_NULL, tf_countof(args), args);
+	tf_util_report_error(context, result);
+	JS_FreeValue(context, result);
+
+	JS_FreeValue(context, headers);
+	JS_FreeValue(context, query_value);
+	JS_FreeValue(context, app_value);
+	JS_FreeValue(context, package_owner_value);
+	JS_FreeValue(context, handler_blob_id);
+	JS_FreeValue(context, path_value);
+	JS_FreeValue(context, response);
+	JS_FreeValue(context, call_app_handler);
+	JS_FreeValue(context, exports);
+	JS_FreeValue(context, global);
+}
+
+static void _httpd_endpoint_app_blob_after_work(tf_ssb_t* ssb, int status, void* user_data)
+{
+	app_blob_t* data = user_data;
+	if (data->not_modified)
+	{
+		tf_http_respond(data->request, 304, NULL, 0, NULL, 0);
+	}
+	else if (data->use_handler)
+	{
+		_httpd_call_app_handler(ssb, data->request, data->app_blob_id, data->file, data->user_app->user, data->user_app->app);
+	}
+	else if (data->found)
+	{
+		const char* mime_type = _ext_to_content_type(strrchr(data->request->path, '.'), false);
+		if (!mime_type)
+		{
+			mime_type = _httpd_mime_type_from_magic_bytes(data->data, data->size);
+		}
+		const char* headers[] = {
+			"Access-Control-Allow-Origin",
+			"*",
+			"Content-Security-Policy",
+			"sandbox allow-downloads allow-top-navigation-by-user-activation",
+			"Content-Type",
+			mime_type ? mime_type : "application/binary",
+			"etag",
+			data->etag,
+		};
+		tf_http_respond(data->request, 200, headers, tf_countof(headers) / 2, data->data, data->size);
+	}
+	tf_free(data->user_app);
+	tf_free(data->data);
+	tf_http_request_unref(data->request);
+	tf_free(data);
+}
+
+static void _httpd_endpoint_app_blob(tf_http_request_t* request)
+{
+	tf_http_request_ref(request);
+	tf_task_t* task = request->user_data;
+	tf_ssb_t* ssb = tf_task_get_ssb(task);
+	app_blob_t* data = tf_malloc(sizeof(app_blob_t));
+	*data = (app_blob_t) { .request = request };
+	tf_ssb_run_work(ssb, _httpd_endpoint_app_blob_work, _httpd_endpoint_app_blob_after_work, data);
+}
+
+typedef struct _view_t
+{
+	tf_http_request_t* request;
+	const char** form_data;
+	void* data;
+	size_t size;
+	char etag[256];
+	bool not_modified;
+} view_t;
+
+static bool _is_filename_safe(const char* filename)
+{
+	if (!filename)
+	{
+		return NULL;
+	}
+	for (const char* p = filename; *p; p++)
+	{
+		if ((*p <= 'a' && *p >= 'z') && (*p <= 'A' && *p >= 'Z') && (*p <= '0' && *p >= '9') && *p != '.' && *p != '-' && *p != '_')
+		{
+			return false;
+		}
+	}
+	return strlen(filename) < 256;
+}
+
+static void _httpd_endpoint_view_work(tf_ssb_t* ssb, void* user_data)
+{
+	view_t* view = user_data;
+	tf_http_request_t* request = view->request;
+	char blob_id[k_blob_id_len] = "";
+
+	user_app_t* user_app = _parse_user_app_from_path(request->path, "/view");
+	if (user_app)
+	{
+		size_t app_path_length = strlen("path:") + strlen(user_app->app) + 1;
+		char* app_path = tf_malloc(app_path_length);
+		snprintf(app_path, app_path_length, "path:%s", user_app->app);
+		const char* value = tf_ssb_db_get_property(ssb, user_app->user, app_path);
+		snprintf(blob_id, sizeof(blob_id), "%s", value);
+		tf_free(app_path);
+		tf_free((void*)value);
+	}
+	else if (request->path[0] == '/' && request->path[1] == '&')
+	{
+		snprintf(blob_id, sizeof(blob_id), "%.*s", (int)(strlen(request->path) - strlen("/view") - 1), request->path + 1);
+	}
+	tf_free(user_app);
+
+	if (*blob_id)
+	{
+		snprintf(view->etag, sizeof(view->etag), "\"%s\"", blob_id);
+		const char* if_none_match = tf_http_request_get_header(request, "if-none-match");
+		char match[258];
+		snprintf(match, sizeof(match), "\"%s\"", blob_id);
+		if (if_none_match && strcmp(if_none_match, match) == 0)
+		{
+			view->not_modified = true;
+		}
+		else
+		{
+			tf_ssb_db_blob_get(ssb, blob_id, (uint8_t**)&view->data, &view->size);
+		}
+	}
+}
+
+static void _httpd_endpoint_view_after_work(tf_ssb_t* ssb, int status, void* user_data)
+{
+	view_t* view = user_data;
+	const char* filename = _form_data_get(view->form_data, "filename");
+	if (!_is_filename_safe(filename))
+	{
+		filename = NULL;
+	}
+	char content_disposition[512] = "";
+	if (filename)
+	{
+		snprintf(content_disposition, sizeof(content_disposition), "attachment; filename=%s", filename);
+	}
+	const char* headers[] = {
+		"Content-Security-Policy",
+		"sandbox allow-downloads allow-top-navigation-by-user-activation",
+		"Content-Type",
+		view->data ? _httpd_mime_type_from_magic_bytes(view->data, view->size) : "text/plain",
+		"etag",
+		view->etag,
+		filename ? "Content-Disposition" : NULL,
+		filename ? content_disposition : NULL,
+	};
+	int count = filename ? tf_countof(headers) / 2 : (tf_countof(headers) / 2 - 1);
+	if (view->not_modified)
+	{
+		tf_http_respond(view->request, 304, headers, count, NULL, 0);
+	}
+	else if (view->data)
+	{
+		tf_http_respond(view->request, 200, headers, count, view->data, view->size);
+		tf_free(view->data);
+	}
+	else
+	{
+		const char* k_payload = tf_http_status_text(404);
+		tf_http_respond(view->request, 404, NULL, 0, k_payload, strlen(k_payload));
+	}
+	tf_free(view->form_data);
+	tf_http_request_unref(view->request);
+	tf_free(view);
+}
+
+static void _httpd_endpoint_view(tf_http_request_t* request)
+{
+	tf_http_request_ref(request);
+	tf_task_t* task = request->user_data;
+	tf_ssb_t* ssb = tf_task_get_ssb(task);
+	view_t* view = tf_malloc(sizeof(view_t));
+	*view = (view_t) { .request = request, .form_data = _form_data_decode(request->query, request->query ? strlen(request->query) : 0) };
+	tf_ssb_run_work(ssb, _httpd_endpoint_view_work, _httpd_endpoint_view_after_work, view);
+}
+
+typedef struct _save_t
+{
+	tf_http_request_t* request;
+	int response;
+	char blob_id[k_blob_id_len];
+} save_t;
+
+static void _httpd_endpoint_save_work(tf_ssb_t* ssb, void* user_data)
+{
+	save_t* save = user_data;
+	tf_http_request_t* request = save->request;
+	const char* session = tf_http_get_cookie(tf_http_request_get_header(request, "cookie"), "session");
+
+	JSMallocFunctions funcs = { 0 };
+	tf_get_js_malloc_functions(&funcs);
+	JSRuntime* runtime = JS_NewRuntime2(&funcs, NULL);
+	JSContext* context = JS_NewContext(runtime);
+
+	JSValue jwt = _authenticate_jwt(ssb, context, session);
+	JSValue user = JS_GetPropertyStr(context, jwt, "name");
+	const char* user_string = JS_ToCString(context, user);
+
+	if (user_string && _is_name_valid(user_string))
+	{
+		user_app_t* user_app = _parse_user_app_from_path(request->path, "/save");
+		if (user_app)
+		{
+			if (strcmp(user_string, user_app->user) == 0 || (strcmp(user_app->user, "core") == 0 && tf_ssb_db_user_has_permission(ssb, user_string, "administration")))
+			{
+				size_t path_length = strlen("path:") + strlen(user_app->app) + 1;
+				char* app_path = tf_malloc(path_length);
+				snprintf(app_path, path_length, "path:%s", user_app->app);
+
+				const char* old_blob_id = tf_ssb_db_get_property(ssb, user_app->user, app_path);
+
+				JSValue new_app = JS_ParseJSON(context, request->body, request->content_length, NULL);
+				tf_util_report_error(context, new_app);
+				if (JS_IsObject(new_app))
+				{
+					uint8_t* old_blob = NULL;
+					size_t old_blob_size = 0;
+					if (tf_ssb_db_blob_get(ssb, old_blob_id, &old_blob, &old_blob_size))
+					{
+						JSValue old_app = JS_ParseJSON(context, (const char*)old_blob, old_blob_size, NULL);
+						if (JS_IsObject(old_app))
+						{
+							JSAtom previous = JS_NewAtom(context, "previous");
+							JS_DeleteProperty(context, old_app, previous, 0);
+							JS_DeleteProperty(context, new_app, previous, 0);
+
+							JSValue old_app_json = JS_JSONStringify(context, old_app, JS_NULL, JS_NULL);
+							JSValue new_app_json = JS_JSONStringify(context, new_app, JS_NULL, JS_NULL);
+							const char* old_app_str = JS_ToCString(context, old_app_json);
+							const char* new_app_str = JS_ToCString(context, new_app_json);
+
+							if (old_app_str && new_app_str && strcmp(old_app_str, new_app_str) == 0)
+							{
+								snprintf(save->blob_id, sizeof(save->blob_id), "/%s", old_blob_id);
+								save->response = 200;
+							}
+
+							JS_FreeCString(context, old_app_str);
+							JS_FreeCString(context, new_app_str);
+							JS_FreeValue(context, old_app_json);
+							JS_FreeValue(context, new_app_json);
+							JS_FreeAtom(context, previous);
+						}
+						JS_FreeValue(context, old_app);
+						tf_free(old_blob);
+					}
+
+					if (!save->response)
+					{
+						if (old_blob_id)
+						{
+							JS_SetPropertyStr(context, new_app, "previous", JS_NewString(context, old_blob_id));
+						}
+						JSValue new_app_json = JS_JSONStringify(context, new_app, JS_NULL, JS_NULL);
+						size_t new_app_length = 0;
+						const char* new_app_str = JS_ToCStringLen(context, &new_app_length, new_app_json);
+
+						char blob_id[k_blob_id_len] = { 0 };
+						if (tf_ssb_db_blob_store(ssb, (const uint8_t*)new_app_str, new_app_length, blob_id, sizeof(blob_id), NULL) &&
+							tf_ssb_db_set_property(ssb, user_app->user, app_path, blob_id))
+						{
+							tf_ssb_db_add_value_to_array_property(ssb, user_app->user, "apps", user_app->app);
+							snprintf(save->blob_id, sizeof(save->blob_id), "%s", blob_id);
+							save->response = 200;
+						}
+
+						JS_FreeCString(context, new_app_str);
+						JS_FreeValue(context, new_app_json);
+					}
+				}
+				else
+				{
+					save->response = 400;
+				}
+				JS_FreeValue(context, new_app);
+
+				tf_free(app_path);
+				tf_free((void*)old_blob_id);
+			}
+			else
+			{
+				save->response = 401;
+			}
+			tf_free(user_app);
+		}
+		else if (strcmp(request->path, "/save") == 0)
+		{
+			char blob_id[k_blob_id_len] = { 0 };
+			if (tf_ssb_db_blob_store(ssb, request->body, request->content_length, blob_id, sizeof(blob_id), NULL))
+			{
+				snprintf(save->blob_id, sizeof(save->blob_id), "%s", blob_id);
+				save->response = 200;
+			}
+		}
+		else
+		{
+			save->response = 400;
+		}
+	}
+
+	tf_free((void*)session);
+	JS_FreeCString(context, user_string);
+	JS_FreeValue(context, user);
+	JS_FreeValue(context, jwt);
+	JS_FreeContext(context);
+	JS_FreeRuntime(runtime);
+}
+
+static void _httpd_endpoint_save_after_work(tf_ssb_t* ssb, int status, void* user_data)
+{
+	save_t* save = user_data;
+	tf_http_request_t* request = save->request;
+	if (*save->blob_id)
+	{
+		char body[256] = "";
+		int length = snprintf(body, sizeof(body), "/%s", save->blob_id);
+		tf_http_respond(request, 200, NULL, 0, body, length);
+	}
+	tf_http_request_unref(request);
+	tf_free(save);
+}
+
+static void _httpd_endpoint_save(tf_http_request_t* request)
+{
+	tf_http_request_ref(request);
+	tf_task_t* task = request->user_data;
+	tf_ssb_t* ssb = tf_task_get_ssb(task);
+	save_t* save = tf_malloc(sizeof(save_t));
+	*save = (save_t) {
+		.request = request,
+	};
+	tf_ssb_run_work(ssb, _httpd_endpoint_save_work, _httpd_endpoint_save_after_work, save);
+}
+
+typedef struct _delete_t
+{
+	tf_http_request_t* request;
+	const char* session;
+	int response;
+} delete_t;
+
+static void _httpd_endpoint_delete_work(tf_ssb_t* ssb, void* user_data)
+{
+	delete_t* delete = user_data;
+	tf_http_request_t* request = delete->request;
+
+	JSMallocFunctions funcs = { 0 };
+	tf_get_js_malloc_functions(&funcs);
+	JSRuntime* runtime = JS_NewRuntime2(&funcs, NULL);
+	JSContext* context = JS_NewContext(runtime);
+
+	JSValue jwt = _authenticate_jwt(ssb, context, delete->session);
+	JSValue user = JS_GetPropertyStr(context, jwt, "name");
+	const char* user_string = JS_ToCString(context, user);
+	if (user_string && _is_name_valid(user_string))
+	{
+		user_app_t* user_app = _parse_user_app_from_path(request->path, "/delete");
+		if (user_app)
+		{
+			if (strcmp(user_string, user_app->user) == 0 || (strcmp(user_app->user, "core") == 0 && tf_ssb_db_user_has_permission(ssb, user_string, "administration")))
+			{
+				size_t path_length = strlen("path:") + strlen(user_app->app) + 1;
+				char* app_path = tf_malloc(path_length);
+				snprintf(app_path, path_length, "path:%s", user_app->app);
+
+				bool changed = false;
+				changed = tf_ssb_db_remove_value_from_array_property(ssb, user_string, "apps", user_app->app) || changed;
+				changed = tf_ssb_db_remove_property(ssb, user_string, app_path) || changed;
+				delete->response = changed ? 200 : 404;
+				tf_free(app_path);
+			}
+			else
+			{
+				delete->response = 401;
+			}
+		}
+		else
+		{
+			delete->response = 404;
+		}
+		tf_free(user_app);
+	}
+	else
+	{
+		delete->response = 401;
+	}
+
+	JS_FreeCString(context, user_string);
+	JS_FreeValue(context, user);
+	JS_FreeValue(context, jwt);
+	JS_FreeContext(context);
+	JS_FreeRuntime(runtime);
+}
+
+static void _httpd_endpoint_delete_after_work(tf_ssb_t* ssb, int status, void* user_data)
+{
+	delete_t* delete = user_data;
+	const char* k_payload = tf_http_status_text(delete->response ? delete->response : 404);
+	tf_http_respond(delete->request, delete->response ? delete->response : 404, NULL, 0, k_payload, strlen(k_payload));
+	tf_http_request_unref(delete->request);
+	tf_free((void*)delete->session);
+	tf_free(delete);
+}
+
+static void _httpd_endpoint_delete(tf_http_request_t* request)
+{
+	tf_http_request_ref(request);
+	tf_task_t* task = request->user_data;
+	tf_ssb_t* ssb = tf_task_get_ssb(task);
+	delete_t* delete = tf_malloc(sizeof(delete_t));
+	*delete = (delete_t) {
+		.request = request,
+		.session = tf_http_get_cookie(tf_http_request_get_header(request, "cookie"), "session"),
+	};
+	tf_ssb_run_work(ssb, _httpd_endpoint_delete_work, _httpd_endpoint_delete_after_work, delete);
+}
+
 static void _httpd_endpoint_root_callback(const char* path, void* user_data)
 {
 	tf_http_request_t* request = user_data;
@ -1280,7 +1895,7 @@ static JSValue _authenticate_jwt(tf_ssb_t* ssb, JSContext* context, const char*
 static bool _session_is_authenticated_as_user(JSContext* context, JSValue session)
 {
 	bool result = false;
-	JSValue user = JS_GetPropertyStr(context, session, "user");
+	JSValue user = JS_GetPropertyStr(context, session, "name");
 	const char* user_string = JS_ToCString(context, user);
 	result = user_string && strcmp(user_string, "guest") != 0;
 	JS_FreeCString(context, user_string);
@ -1688,8 +2303,17 @@ void tf_httpd_register(JSContext* context)
 	tf_http_add_handler(http, "/speedscope/*", _httpd_endpoint_static, NULL, task);
 	tf_http_add_handler(http, "/static/*", _httpd_endpoint_static, NULL, task);
 	tf_http_add_handler(http, "/.well-known/*", _httpd_endpoint_static, NULL, task);
-	tf_http_add_handler(http, "/~*/*/", _httpd_endpoint_static, NULL, task);
+	tf_http_add_handler(http, "/&*.sha256", _httpd_endpoint_add_slash, NULL, task);
 	tf_http_add_handler(http, "/&*.sha256/", _httpd_endpoint_static, NULL, task);
+	tf_http_add_handler(http, "/&*.sha256/view", _httpd_endpoint_view, NULL, task);
+	tf_http_add_handler(http, "/&*.sha256/*", _httpd_endpoint_app_blob, NULL, task);
+	tf_http_add_handler(http, "/~{word}/{word}", _httpd_endpoint_add_slash, NULL, task);
+	tf_http_add_handler(http, "/~{word}/{word}/", _httpd_endpoint_static, NULL, task);
+	tf_http_add_handler(http, "/~{word}/{word}/save", _httpd_endpoint_save, NULL, task);
+	tf_http_add_handler(http, "/~{word}/{word}/delete", _httpd_endpoint_delete, NULL, task);
+	tf_http_add_handler(http, "/~{word}/{word}/view", _httpd_endpoint_view, NULL, task);
+	tf_http_add_handler(http, "/~{word}/{word}/*", _httpd_endpoint_app_blob, NULL, task);
+	tf_http_add_handler(http, "/save", _httpd_endpoint_save, NULL, task);

 	tf_http_add_handler(http, "/robots.txt", _httpd_endpoint_robots_txt, NULL, NULL);
 	tf_http_add_handler(http, "/debug", _httpd_endpoint_debug, NULL, task);
@ -1701,13 +2325,10 @@ void tf_httpd_register(JSContext* context)
 	tf_http_add_handler(http, "/login/logout", _httpd_endpoint_logout, NULL, task);
 	tf_http_add_handler(http, "/login", _httpd_endpoint_login, NULL, task);

-	JS_SetPropertyStr(context, httpd, "handlers", JS_NewObject(context));
 	JS_SetPropertyStr(context, httpd, "all", JS_NewCFunction(context, _httpd_endpoint_all, "all", 2));
 	JS_SetPropertyStr(context, httpd, "start", JS_NewCFunction(context, _httpd_endpoint_start, "start", 2));
 	JS_SetPropertyStr(context, httpd, "set_http_redirect", JS_NewCFunction(context, _httpd_set_http_redirect, "set_http_redirect", 1));
 	JS_SetPropertyStr(context, httpd, "auth_query", JS_NewCFunction(context, _httpd_auth_query, "auth_query", 1));
-	JS_SetPropertyStr(context, httpd, "mime_type_from_magic_bytes", JS_NewCFunction(context, _httpd_mime_type_from_magic_bytes, "mime_type_from_magic_bytes", 1));
-	JS_SetPropertyStr(context, httpd, "mime_type_from_extension", JS_NewCFunction(context, _httpd_mime_type_from_extension, "mime_type_from_extension", 1));
 	JS_SetPropertyStr(context, global, "httpd", httpd);
 	JS_FreeValue(context, global);
 }
--- a/src/ios/embedded.mobileprovision
+++ b/src/ios/embedded.mobileprovision
--- a/src/main.c
+++ b/src/main.c
@ -39,20 +39,17 @@
 #include "jni.h"
 #endif

-#if !defined(_countof)
-#define _countof(a) ((int)(sizeof((a)) / sizeof(*(a))))
-#endif
-
 struct backtrace_state* g_backtrace_state;

 const char* k_db_path_default = "db.sqlite";

 #if !TARGET_OS_IPHONE && !defined(__ANDROID__)
-static int _tf_command_test(const char* file, int argc, char* argv[]);
-static int _tf_command_import(const char* file, int argc, char* argv[]);
 static int _tf_command_export(const char* file, int argc, char* argv[]);
+static int _tf_command_import(const char* file, int argc, char* argv[]);
+static int _tf_command_publish(const char* file, int argc, char* argv[]);
 static int _tf_command_run(const char* file, int argc, char* argv[]);
 static int _tf_command_sandbox(const char* file, int argc, char* argv[]);
+static int _tf_command_test(const char* file, int argc, char* argv[]);
 static int _tf_command_verify(const char* file, int argc, char* argv[]);
 static int _tf_command_usage(const char* file);

@ -68,6 +65,7 @@ const command_t k_commands[] = {
 	{ "sandbox", _tf_command_sandbox, "Run a sandboxed tildefriends sandbox process (used internally)." },
 	{ "import", _tf_command_import, "Import apps to SSB." },
 	{ "export", _tf_command_export, "Export apps from SSB." },
+	{ "publish", _tf_command_publish, "Append a message to a feed." },
 	{ "verify", _tf_command_verify, "Verify a feed." },
 	{ "test", _tf_command_test, "Test SSB." },
 };
@ -262,7 +260,7 @@ static int _tf_command_export(const char* file, int argc, char* argv[])
 			"ssb",
 			"todo",
 		};
-		for (int i = 0; i < (int)_countof(k_export); i++)
+		for (int i = 0; i < tf_countof(k_export); i++)
 		{
 			char buffer[256];
 			snprintf(buffer, sizeof(buffer), "/~%s/%s", user, k_export[i]);
@ -274,6 +272,121 @@ static int _tf_command_export(const char* file, int argc, char* argv[])
 	return EXIT_SUCCESS;
 }

+static void _tf_published_callback(const char* id, bool verified, bool stored, void* user_data)
+{
+	if (verified)
+	{
+		if (stored)
+		{
+			tf_printf("Message %s stored.\n", id);
+		}
+		else
+		{
+			tf_printf("Unable to store the message.\n");
+		}
+	}
+	else
+	{
+		tf_printf("Failed to verify the message.\n");
+	}
+	*(int*)user_data = stored ? EXIT_SUCCESS : EXIT_FAILURE;
+}
+
+static int _tf_command_publish(const char* file, int argc, char* argv[])
+{
+	const char* user = NULL;
+	const char* identity = NULL;
+	const char* db_path = k_db_path_default;
+	const char* content = NULL;
+	bool show_usage = false;
+
+	while (!show_usage)
+	{
+		static const struct option k_options[] = {
+			{ "user", required_argument, NULL, 'u' },
+			{ "id", required_argument, NULL, 'i' },
+			{ "db-path", required_argument, NULL, 'd' },
+			{ "content", required_argument, NULL, 'c' },
+			{ "help", no_argument, NULL, 'h' },
+			{ 0 },
+		};
+		int c = getopt_long(argc, argv, "u:i:d:c:h", k_options, NULL);
+		if (c == -1)
+		{
+			break;
+		}
+
+		switch (c)
+		{
+		case '?':
+		case 'h':
+		default:
+			show_usage = true;
+			break;
+		case 'u':
+			user = optarg;
+			break;
+		case 'i':
+			identity = optarg;
+			break;
+		case 'd':
+			db_path = optarg;
+			break;
+		case 'c':
+			content = optarg;
+			break;
+		}
+	}
+
+	if (show_usage || !user || !identity || !content)
+	{
+		tf_printf("\n%s publish [options]\n\n", file);
+		tf_printf("options:\n");
+		tf_printf("  -u, --user user          User owning identity with which to publish.\n");
+		tf_printf("  -i, --id identity        Identity with which to publish message.\n");
+		tf_printf("  -d, --db-path db_path    SQLite database path (default: %s).\n", k_db_path_default);
+		tf_printf("  -c, --content json       JSON content of message to publish.\n");
+		tf_printf("  -h, --help               Show this usage information.\n");
+		return EXIT_FAILURE;
+	}
+
+	int result = EXIT_FAILURE;
+	tf_printf("Posting %s as account %s belonging to %s...\n", content, identity, user);
+	tf_ssb_t* ssb = tf_ssb_create(NULL, NULL, db_path, NULL);
+	uint8_t private_key[512] = { 0 };
+	if (tf_ssb_db_identity_get_private_key(ssb, user, identity, private_key, sizeof(private_key)))
+	{
+		JSContext* context = tf_ssb_get_context(ssb);
+		int64_t sequence = 0;
+		char previous[k_id_base64_len] = { 0 };
+		tf_ssb_db_get_latest_message_by_author(ssb, identity, &sequence, previous, sizeof(previous));
+		JSValue content_value = JS_ParseJSON(context, content, strlen(content), NULL);
+		if (!JS_IsException(content_value))
+		{
+			JSValue message = tf_ssb_sign_message(ssb, identity, private_key, content_value, previous, sequence);
+			JSValue message_value = JS_JSONStringify(context, message, JS_NULL, JS_NULL);
+			const char* message_str = JS_ToCString(context, message_value);
+			tf_printf("Posting: %s.\n", message_str);
+			tf_ssb_verify_strip_and_store_message(ssb, message, _tf_published_callback, &result);
+			JS_FreeCString(context, message_str);
+			JS_FreeValue(context, message_value);
+			JS_FreeValue(context, message);
+		}
+		else
+		{
+			tf_printf("Unable to parse content as JSON: ");
+			tf_util_report_error(context, content_value);
+		}
+		JS_FreeValue(context, content_value);
+	}
+	else
+	{
+		tf_printf("Did not find private key for identity %s belonging to %s.\n", identity, user);
+	}
+	tf_ssb_destroy(ssb);
+	return result;
+}
+
 static int _tf_command_verify(const char* file, int argc, char* argv[])
 {
 	const char* identity = NULL;
@ -283,7 +396,7 @@ static int _tf_command_verify(const char* file, int argc, char* argv[])
 	while (!show_usage)
 	{
 		static const struct option k_options[] = {
-			{ "id", required_argument, NULL, 'u' },
+			{ "id", required_argument, NULL, 'i' },
 			{ "db-path", required_argument, NULL, 'd' },
 			{ "help", no_argument, NULL, 'h' },
 			{ 0 },
@ -661,7 +774,7 @@ static int _tf_command_usage(const char* file)
 {
 	tf_printf("Usage: %s command [command-options]\n", file);
 	tf_printf("commands:\n");
-	for (int i = 0; i < (int)_countof(k_commands); i++)
+	for (int i = 0; i < tf_countof(k_commands); i++)
 	{
 		tf_printf("  %s - %s\n", k_commands[i].name, k_commands[i].description);
 	}
@ -791,7 +904,7 @@ static jint _tf_server_main(JNIEnv* env, jobject this_object, jstring files_dir,
 	};

 	tf_task_set_android_service_callbacks(_tf_service_start, _tf_service_stop);
-	result = _tf_command_run(apk, _countof(args), (char**)args);
+	result = _tf_command_run(apk, tf_countof(args), (char**)args);
 	tf_task_set_android_service_callbacks(NULL, NULL);

 	(*env)->ReleaseStringUTFChars(env, files_dir, files);
@ -822,7 +935,7 @@ static jint _tf_sandbox_main(JNIEnv* env, jobject this_object, int pipe_fd)
 		fd,
 	};

-	int result = _tf_command_sandbox(NULL, _countof(args), (char**)args);
+	int result = _tf_command_sandbox(NULL, tf_countof(args), (char**)args);

 	tf_mem_shutdown();
 	tf_printf("tf_sandbox_main finished with %d.", result);
@ -854,7 +967,7 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved)
 		{ "tf_server_main", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Landroid/net/ConnectivityManager;)I", _tf_server_main },
 		{ "tf_sandbox_main", "(I)I", _tf_sandbox_main },
 	};
-	int result = (*env)->RegisterNatives(env, c, methods, (int)_countof(methods));
+	int result = (*env)->RegisterNatives(env, c, methods, tf_countof(methods));
 	if (result != JNI_OK)
 	{
 		return result;
@ -901,7 +1014,7 @@ int main(int argc, char* argv[])
 	int result = 0;
 	if (argc >= 2)
 	{
-		for (int i = 0; i < (int)_countof(k_commands); i++)
+		for (int i = 0; i < tf_countof(k_commands); i++)
 		{
 			const command_t* command = &k_commands[i];
 			if (strcmp(argv[1], command->name) == 0)
--- a/src/mem.c
+++ b/src/mem.c
@ -2,15 +2,14 @@

 #include "util.js.h"

-#include "uv.h"
 #include "quickjs.h"
 #include "sqlite3.h"
 #include "uv.h"

 #include <openssl/crypto.h>

-#include <string.h>
 #include <stdbool.h>
+#include <string.h>

 typedef struct _tf_mem_node_t tf_mem_node_t;

--- a/src/serialize.c
+++ b/src/serialize.c
@ -6,9 +6,9 @@
 #include "trace.h"
 #include "util.js.h"

+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>

 #include <assert.h>

--- a/src/ssb.c
+++ b/src/ssb.c
@ -31,10 +31,6 @@
 #include <string.h>
 #include <time.h>

-#if !defined(_countof)
-#define _countof(a) ((int)(sizeof((a)) / sizeof(*(a))))
-#endif
-
 #define GREEN "\e[1;32m"
 #define MAGENTA "\e[1;35m"
 #define CYAN "\e[1;36m"
@ -81,6 +77,7 @@ enum
 	k_seed_check_interval_seconds = 5 * 60,
 	k_udp_discovery_expires_seconds = 10,
 	k_handshake_timeout_ms = 15000,
+	k_rpc_active_ms = 3000,
 };

 typedef struct _tf_ssb_broadcast_t tf_ssb_broadcast_t;
@ -112,6 +109,7 @@ typedef struct _tf_ssb_request_t
 	tf_ssb_callback_cleanup_t* cleanup;
 	void* user_data;
 	tf_ssb_connection_t* dependent_connection;
+	uint64_t last_active;
 	int32_t request_number;
 } tf_ssb_request_t;

@ -131,8 +129,7 @@ typedef struct _tf_ssb_broadcast_t
 typedef struct _tf_ssb_rpc_callback_node_t tf_ssb_rpc_callback_node_t;
 typedef struct _tf_ssb_rpc_callback_node_t
 {
-	const char** name;
-	const char* flattened_name;
+	const char* name;
 	tf_ssb_rpc_callback_t* callback;
 	tf_ssb_callback_cleanup_t* cleanup;
 	void* user_data;
@ -212,6 +209,7 @@ typedef struct _tf_ssb_t
 	uv_timer_t broadcast_cleanup_timer;
 	uv_timer_t broadcast_timer;
 	uv_timer_t trace_timer;
+	uv_timer_t request_activity_timer;
 	uv_tcp_t server;

 	uint8_t network_key[32];
@ -361,6 +359,13 @@ typedef struct _tf_ssb_connection_t

 	int read_back_pressure;
 	int active_write_count;
+
+	uint64_t last_notified_active;
+
+	int flags;
+
+	tf_ssb_connect_callback_t* connect_callback;
+	void* connect_callback_user_data;
 } tf_ssb_connection_t;

 static JSClassID _connection_class_id;
@ -380,6 +385,23 @@ static void _tf_ssb_start_update_settings(tf_ssb_t* ssb);
 static void _tf_ssb_update_settings(tf_ssb_t* ssb);
 static void _tf_ssb_write(tf_ssb_connection_t* connection, void* data, size_t size);

+static const char* _tf_ssb_connection_state_to_string(tf_ssb_state_t state)
+{
+	switch (state)
+	{
+	case k_tf_ssb_state_invalid: return "invalid";
+	case k_tf_ssb_state_connected: return "connected";
+	case k_tf_ssb_state_sent_hello: return "sent hello";
+	case k_tf_ssb_state_sent_identity: return "sent identity";
+	case k_tf_ssb_state_verified: return "verified";
+	case k_tf_ssb_state_server_wait_hello: return "server wait hello";
+	case k_tf_ssb_state_server_wait_client_identity: return "server wait client identity";
+	case k_tf_ssb_state_server_verified: return "server verified";
+	case k_tf_ssb_state_closing: return "closing";
+	default: return "unknown";
+	}
+}
+
 static void _tf_ssb_add_debug_close(tf_ssb_t* ssb, tf_ssb_connection_t* connection, const char* reason)
 {
 	if (!ssb->store_debug_messages)
@ -502,7 +524,9 @@ static void _tf_ssb_write(tf_ssb_connection_t* connection, void* data, size_t si
 		if (result)
 		{
 			tf_ssb_connection_adjust_write_count(connection, -1);
-			_tf_ssb_connection_close(connection, "write failed");
+			char buffer[256];
+			snprintf(buffer, sizeof(buffer), "write failed : %s", uv_strerror(result));
+			_tf_ssb_connection_close(connection, buffer);
 			tf_free(write);
 		}
 	}
@ -658,7 +682,42 @@ static int _request_compare(const void* a, const void* b)
 	return ai < br->request_number ? -1 : br->request_number < ai ? 1 : 0;
 }

-static bool _tf_ssb_connection_get_request_callback(tf_ssb_connection_t* connection, int32_t request_number, tf_ssb_rpc_callback_t** out_callback, void** out_user_data)
+static void _tf_ssb_request_activity_timer(uv_timer_t* timer)
+{
+	tf_ssb_t* ssb = timer->data;
+	uint64_t now_ms = uv_now(ssb->loop);
+	bool any_still_active = false;
+	for (tf_ssb_connection_t* connection = ssb->connections; connection; connection = connection->next)
+	{
+		bool any_changed = false;
+		bool last_notified_active = (now_ms - connection->last_notified_active) < k_rpc_active_ms;
+		for (int i = 0; i < connection->requests_count; i++)
+		{
+			bool last_active = (now_ms - connection->requests[i].last_active) < k_rpc_active_ms;
+			if (last_active != last_notified_active)
+			{
+				any_changed = true;
+			}
+			if (last_active)
+			{
+				any_still_active = true;
+			}
+		}
+		if (any_changed)
+		{
+			_tf_ssb_notify_connections_changed(ssb, k_tf_ssb_change_update, connection);
+			connection->last_notified_active = now_ms;
+		}
+	}
+
+	if (any_still_active && uv_timer_get_due_in(&ssb->request_activity_timer) == 0)
+	{
+		uv_timer_start(&ssb->request_activity_timer, _tf_ssb_request_activity_timer, k_rpc_active_ms, 0);
+	}
+}
+
+static bool _tf_ssb_connection_get_request_callback(
+	tf_ssb_connection_t* connection, int32_t request_number, tf_ssb_rpc_callback_t** out_callback, void** out_user_data, const char** out_name)
 {
 	if (!connection->requests)
 	{
@ -675,6 +734,15 @@ static bool _tf_ssb_connection_get_request_callback(tf_ssb_connection_t* connect
 		{
 			*out_user_data = request->user_data;
 		}
+		if (out_name)
+		{
+			*out_name = request->name;
+		}
+		request->last_active = uv_now(connection->ssb->loop);
+		if (uv_timer_get_due_in(&connection->ssb->request_activity_timer) == 0)
+		{
+			uv_timer_start(&connection->ssb->request_activity_timer, _tf_ssb_request_activity_timer, k_rpc_active_ms, 0);
+		}
 		return true;
 	}
 	return false;
@ -685,12 +753,14 @@ void tf_ssb_connection_add_request(tf_ssb_connection_t* connection, int32_t requ
 {
 	tf_ssb_request_t* existing =
 		connection->requests_count ? bsearch(&request_number, connection->requests, connection->requests_count, sizeof(tf_ssb_request_t), _request_compare) : NULL;
+	uint64_t now_ms = uv_now(connection->ssb->loop);
 	if (existing)
 	{
 		assert(!existing->callback);
 		assert(!existing->cleanup);
 		assert(!existing->user_data);
 		assert(!existing->dependent_connection);
+		existing->last_active = now_ms;
 		existing->callback = callback;
 		existing->cleanup = cleanup;
 		existing->user_data = user_data;
@ -705,6 +775,7 @@ void tf_ssb_connection_add_request(tf_ssb_connection_t* connection, int32_t requ
 			.cleanup = cleanup,
 			.user_data = user_data,
 			.dependent_connection = dependent_connection,
+			.last_active = now_ms,
 		};
 		snprintf(request.name, sizeof(request.name), "%s", name);
 		int index = tf_util_insert_index(&request_number, connection->requests, connection->requests_count, sizeof(tf_ssb_request_t), _request_compare);
@ -715,10 +786,14 @@ void tf_ssb_connection_add_request(tf_ssb_connection_t* connection, int32_t requ
 		}
 		connection->requests[index] = request;
 		connection->requests_count++;
-
 		connection->ssb->request_count++;
 	}
+	if (uv_timer_get_due_in(&connection->ssb->request_activity_timer) == 0)
+	{
+		uv_timer_start(&connection->ssb->request_activity_timer, _tf_ssb_request_activity_timer, k_rpc_active_ms, 0);
+	}
 	_tf_ssb_notify_connections_changed(connection->ssb, k_tf_ssb_change_update, connection);
+	connection->last_notified_active = now_ms;
 }

 static int _message_request_compare(const void* a, const void* b)
@ -783,34 +858,35 @@ void tf_ssb_connection_remove_request(tf_ssb_connection_t* connection, int32_t r
 	}
 }

-void tf_ssb_connection_rpc_send(tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, const char* new_request_name, const uint8_t* message, size_t size,
+bool tf_ssb_connection_rpc_send(tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, const char* new_request_name, const uint8_t* message, size_t size,
 	tf_ssb_rpc_callback_t* callback, tf_ssb_callback_cleanup_t* cleanup, void* user_data)
 {
+	const char* request_name = "<unknown>";
 	if (!connection)
 	{
 		if (cleanup)
 		{
 			cleanup(NULL, user_data);
 		}
-		return;
+		return false;
 	}
 	if (flags & k_ssb_rpc_flag_new_request)
 	{
 		assert(request_number > 0);
-		assert(!_tf_ssb_connection_get_request_callback(connection, request_number, NULL, NULL));
+		assert(!_tf_ssb_connection_get_request_callback(connection, request_number, NULL, NULL, NULL));
 		assert(new_request_name);
 	}
-	else if (!_tf_ssb_connection_get_request_callback(connection, request_number, NULL, NULL))
+	else if (!_tf_ssb_connection_get_request_callback(connection, request_number, NULL, NULL, &request_name))
 	{
 		if (flags & k_ssb_rpc_flag_binary)
 		{
-			tf_printf("Dropping message with no active request (%d): (%zd bytes).\n", request_number, size);
+			tf_printf(MAGENTA "%s RPC DROP" RESET " message with no active request (%d): (%zd bytes).\n", connection->name, request_number, size);
 		}
 		else
 		{
-			tf_printf("Dropping message with no active request (%d): %.*s\n", request_number, (int)size, message);
+			tf_printf(MAGENTA "%s RPC DROP" RESET " message with no active request (%d): %.*s\n", connection->name, request_number, (int)size, message);
 		}
-		return;
+		return false;
 	}

 	uint8_t* combined = tf_malloc(9 + size);
@ -822,9 +898,9 @@ void tf_ssb_connection_rpc_send(tf_ssb_connection_t* connection, uint8_t flags,
 	memcpy(combined + 1 + 2 * sizeof(uint32_t), message, size);
 	if (connection->ssb->verbose)
 	{
-		tf_printf(MAGENTA "%s RPC SEND" RESET " end/error=%s stream=%s type=%s RN=%d: [%zd B] %.*s\n", connection->name, (flags & k_ssb_rpc_flag_end_error) ? "true" : "false",
-			(flags & k_ssb_rpc_flag_stream) ? "true" : "false", k_ssb_type_names[flags & k_ssb_rpc_mask_type], request_number, size,
-			(flags & k_ssb_rpc_mask_type) == k_ssb_rpc_flag_binary ? 0 : (int)size, message);
+		tf_printf(MAGENTA "%s RPC SEND[%s]" RESET " end/error=%s stream=%s type=%s RN=%d: [%zd B] %.*s\n", connection->name, request_name,
+			(flags & k_ssb_rpc_flag_end_error) ? "true" : "false", (flags & k_ssb_rpc_flag_stream) ? "true" : "false", k_ssb_type_names[flags & k_ssb_rpc_mask_type],
+			request_number, size, (flags & k_ssb_rpc_mask_type) == k_ssb_rpc_flag_binary ? 0 : (int)size, message);
 	}
 	_tf_ssb_connection_add_debug_message(connection, true, flags & k_ssb_rpc_mask_send, request_number, message, size);
 	_tf_ssb_connection_box_stream_send(connection, combined, 1 + 2 * sizeof(uint32_t) + size);
@ -838,22 +914,24 @@ void tf_ssb_connection_rpc_send(tf_ssb_connection_t* connection, uint8_t flags,
 	{
 		tf_ssb_connection_add_request(connection, request_number, new_request_name, callback, cleanup, user_data, NULL);
 	}
+	return true;
 }

-void tf_ssb_connection_rpc_send_json(tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, const char* new_request_name, JSValue message,
+bool tf_ssb_connection_rpc_send_json(tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, const char* new_request_name, JSValue message,
 	tf_ssb_rpc_callback_t* callback, tf_ssb_callback_cleanup_t* cleanup, void* user_data)
 {
 	JSContext* context = connection->ssb->context;
 	JSValue json = JS_JSONStringify(context, message, JS_NULL, JS_NULL);
 	size_t size = 0;
 	const char* json_string = JS_ToCStringLen(context, &size, json);
-	tf_ssb_connection_rpc_send(
+	bool result = tf_ssb_connection_rpc_send(
 		connection, k_ssb_rpc_flag_json | (flags & ~k_ssb_rpc_mask_type), request_number, new_request_name, (const uint8_t*)json_string, size, callback, cleanup, user_data);
 	JS_FreeCString(context, json_string);
 	JS_FreeValue(context, json);
+	return result;
 }

-void tf_ssb_connection_rpc_send_error(tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, const char* error)
+bool tf_ssb_connection_rpc_send_error(tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, const char* error)
 {
 	JSContext* context = connection->ssb->context;
 	JSValue message = JS_NewObject(context);
@ -861,17 +939,18 @@ void tf_ssb_connection_rpc_send_error(tf_ssb_connection_t* connection, uint8_t f
 	JS_SetPropertyStr(context, message, "name", JS_NewString(context, "Error"));
 	JS_SetPropertyStr(context, message, "stack", JS_NewString(context, stack ? stack : "stack unavailable"));
 	JS_SetPropertyStr(context, message, "message", JS_NewString(context, error));
-	tf_ssb_connection_rpc_send_json(
+	bool result = tf_ssb_connection_rpc_send_json(
 		connection, ((flags & k_ssb_rpc_flag_stream) ? (k_ssb_rpc_flag_stream) : 0) | k_ssb_rpc_flag_end_error, request_number, NULL, message, NULL, NULL, NULL);
 	JS_FreeValue(context, message);
 	tf_free((void*)stack);
+	return result;
 }

-void tf_ssb_connection_rpc_send_error_method_not_allowed(tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, const char* name)
+bool tf_ssb_connection_rpc_send_error_method_not_allowed(tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, const char* name)
 {
-	char buffer[1024];
+	char buffer[1024] = "";
 	snprintf(buffer, sizeof(buffer), "method '%s' is not in list of allowed methods", name);
-	tf_ssb_connection_rpc_send_error(connection, flags, request_number, buffer);
+	return tf_ssb_connection_rpc_send_error(connection, flags, request_number, buffer);
 }

 static int _utf8_len(uint8_t ch)
@ -1098,11 +1177,11 @@ bool tf_ssb_verify_and_strip_signature(JSContext* context, JSValue val, char* ou
 	return false;
 }

-void tf_ssb_close_all(tf_ssb_t* ssb)
+void tf_ssb_close_all(tf_ssb_t* ssb, const char* reason)
 {
 	for (tf_ssb_connection_t* connection = ssb->connections; connection; connection = connection->next)
 	{
-		_tf_ssb_connection_close(connection, "tf_ssb_close_all");
+		_tf_ssb_connection_close(connection, reason);
 	}
 }

@ -1260,6 +1339,12 @@ static void _tf_ssb_connection_verify_identity(tf_ssb_connection_t* connection,
 	JS_SetPropertyStr(context, connection->object, "is_client", JS_TRUE);

 	connection->state = k_tf_ssb_state_verified;
+	if (connection->connect_callback)
+	{
+		connection->connect_callback(connection, NULL, connection->connect_callback_user_data);
+		connection->connect_callback = NULL;
+		connection->connect_callback_user_data = NULL;
+	}
 	if (connection->handshake_timer.data)
 	{
 		uv_timer_stop(&connection->handshake_timer);
@ -1521,60 +1606,28 @@ static bool _tf_ssb_connection_recv_pop(tf_ssb_connection_t* connection, uint8_t
 	return true;
 }

-static bool _tf_ssb_name_equals(JSContext* context, JSValue object, const char** match)
+static void _tf_ssb_name_to_string(JSContext* context, JSValue object, char* buffer, size_t size)
 {
-	bool result = true;
 	JSValue name = JS_GetPropertyStr(context, object, "name");
-
 	if (JS_IsArray(context, name))
 	{
 		int length = tf_util_get_length(context, name);
+		int offset = 0;
 		for (int i = 0; i < length; i++)
 		{
-			if (!match[i])
-			{
-				result = false;
-				break;
-			}
-
-			JSValue element = JS_GetPropertyUint32(context, name, i);
-			const char* str = JS_ToCString(context, element);
-			if (!str || strcmp(str, match[i]) != 0)
-			{
-				result = false;
-			}
-			JS_FreeCString(context, str);
-			JS_FreeValue(context, element);
-		}
-		if (result && match[length])
-		{
-			result = false;
+			JSValue part = JS_GetPropertyUint32(context, name, i);
+			const char* part_str = JS_ToCString(context, part);
+			offset += snprintf(buffer + offset, size - offset, "%s%s", i == 0 ? "" : ".", part_str);
+			JS_FreeCString(context, part_str);
+			JS_FreeValue(context, part);
 		}
 	}
 	else if (JS_IsString(name))
 	{
-		/* Manifest is traditionally sent as not an array for some reason. */
-		const char* str = JS_ToCString(context, name);
-		result = str && match[0] && strcmp(str, match[0]) == 0 && !match[1];
-		JS_FreeCString(context, str);
+		const char* part_str = JS_ToCString(context, name);
+		snprintf(buffer, size, "%s", part_str);
+		JS_FreeCString(context, part_str);
 	}
-	else
-	{
-		result = false;
-	}
-
-	JS_FreeValue(context, name);
-	return result;
-}
-
-static void _tf_ssb_name_to_string(JSContext* context, JSValue object, char* buffer, size_t size)
-{
-	JSValue name = JS_GetPropertyStr(context, object, "name");
-	JSValue json_val = JS_JSONStringify(context, name, JS_NULL, JS_NewInt32(context, 2));
-	const char* value = JS_ToCString(context, json_val);
-	snprintf(buffer, size, "%s", value);
-	JS_FreeCString(context, value);
-	JS_FreeValue(context, json_val);
 	JS_FreeValue(context, name);
 }

@ -1590,21 +1643,22 @@ static void _tf_ssb_connection_rpc_recv(tf_ssb_connection_t* connection, uint8_t
 	}
 	else if (flags & k_ssb_rpc_flag_json)
 	{
-		char id[k_id_base64_len] = "";
-		tf_ssb_id_bin_to_str(id, sizeof(id), connection->serverpub);
+		tf_ssb_rpc_callback_t* callback = NULL;
+		void* user_data = NULL;
+		const char* request_name = "<unknown>";
+		bool have_request = _tf_ssb_connection_get_request_callback(connection, -request_number, &callback, &user_data, &request_name);
 		if (connection->ssb->verbose)
 		{
-			tf_printf(CYAN "%s RPC RECV" RESET " end/error=%s stream=%s type=%s RN=%d: [%zd B] %.*s\n", connection->name, (flags & k_ssb_rpc_flag_end_error) ? "true" : "false",
-				(flags & k_ssb_rpc_flag_stream) ? "true" : "false", k_ssb_type_names[flags & k_ssb_rpc_mask_type], request_number, size, (int)size, message);
+			tf_printf(CYAN "%s RPC RECV[%s]" RESET " end/error=%s stream=%s type=%s RN=%d: [%zd B] %.*s\n", connection->name, request_name,
+				(flags & k_ssb_rpc_flag_end_error) ? "true" : "false", (flags & k_ssb_rpc_flag_stream) ? "true" : "false", k_ssb_type_names[flags & k_ssb_rpc_mask_type],
+				request_number, size, (int)size, message);
 		}
 		JSContext* context = connection->ssb->context;
 		JSValue val = JS_ParseJSON(context, (const char*)message, size, NULL);

 		if (!JS_IsUndefined(val))
 		{
-			tf_ssb_rpc_callback_t* callback = NULL;
-			void* user_data = NULL;
-			if (_tf_ssb_connection_get_request_callback(connection, -request_number, &callback, &user_data))
+			if (have_request)
 			{
 				if (callback)
 				{
@ -1624,35 +1678,14 @@ static void _tf_ssb_connection_rpc_recv(tf_ssb_connection_t* connection, uint8_t
 			else if (JS_IsObject(val))
 			{
 				bool found = false;
-				char namebuf[256] = "";
-				JSValue name = JS_GetPropertyStr(context, val, "name");
-				if (JS_IsArray(context, name))
-				{
-					int length = tf_util_get_length(context, name);
-					int offset = 0;
-					for (int i = 0; i < length; i++)
-					{
-						JSValue part = JS_GetPropertyUint32(context, name, i);
-						const char* part_str = JS_ToCString(context, part);
-						offset += snprintf(namebuf + offset, sizeof(namebuf) - offset, "%s%s", i == 0 ? "" : ".", part_str);
-						JS_FreeCString(context, part_str);
-						JS_FreeValue(context, part);
-					}
-				}
-				else if (JS_IsString(name))
-				{
-					const char* part_str = JS_ToCString(context, name);
-					snprintf(namebuf, sizeof(namebuf), "%s", part_str);
-					JS_FreeCString(context, part_str);
-				}
-				JS_FreeValue(context, name);
-
+				char name[256] = "";
+				_tf_ssb_name_to_string(context, val, name, sizeof(name));
 				for (tf_ssb_rpc_callback_node_t* it = connection->ssb->rpc; it; it = it->next)
 				{
-					if (_tf_ssb_name_equals(context, val, it->name))
+					if (strcmp(name, it->name) == 0)
 					{
-						tf_ssb_connection_add_request(connection, -request_number, namebuf, NULL, NULL, NULL, NULL);
-						tf_trace_begin(connection->ssb->trace, it->flattened_name);
+						tf_ssb_connection_add_request(connection, -request_number, name, NULL, NULL, NULL, NULL);
+						tf_trace_begin(connection->ssb->trace, it->name);
 						PRE_CALLBACK(connection->ssb, it->callback);
 						it->callback(connection, flags, request_number, val, message, size, it->user_data);
 						POST_CALLBACK(connection->ssb, it->callback);
@ -1661,12 +1694,10 @@ static void _tf_ssb_connection_rpc_recv(tf_ssb_connection_t* connection, uint8_t
 						break;
 					}
 				}
-				if (!found && !_tf_ssb_name_equals(context, val, (const char*[]) { "Error", NULL }))
+				if (!found && strcmp(name, "Error") != 0)
 				{
-					tf_ssb_connection_add_request(connection, -request_number, namebuf, NULL, NULL, NULL, NULL);
-					char buffer[256];
-					_tf_ssb_name_to_string(context, val, buffer, sizeof(buffer));
-					tf_ssb_connection_rpc_send_error_method_not_allowed(connection, flags, -request_number, buffer);
+					tf_ssb_connection_add_request(connection, -request_number, name, NULL, NULL, NULL, NULL);
+					tf_ssb_connection_rpc_send_error_method_not_allowed(connection, flags, -request_number, name);
 				}
 			}
 		}
@ -1680,14 +1711,17 @@ static void _tf_ssb_connection_rpc_recv(tf_ssb_connection_t* connection, uint8_t
 	}
 	else if ((flags & k_ssb_rpc_mask_type) == k_ssb_rpc_flag_binary)
 	{
-		if (connection->ssb->verbose)
-		{
-			tf_printf(CYAN "%s RPC RECV" RESET " end/error=%s stream=%s type=%s RN=%d: [%zd B]\n", connection->name, (flags & k_ssb_rpc_flag_end_error) ? "true" : "false",
-				(flags & k_ssb_rpc_flag_stream) ? "true" : "false", k_ssb_type_names[flags & k_ssb_rpc_mask_type], request_number, size);
-		}
 		tf_ssb_rpc_callback_t* callback = NULL;
 		void* user_data = NULL;
-		if (_tf_ssb_connection_get_request_callback(connection, -request_number, &callback, &user_data))
+		const char* request_name = "<unknown>";
+		bool have_request = _tf_ssb_connection_get_request_callback(connection, -request_number, &callback, &user_data, &request_name);
+		if (connection->ssb->verbose)
+		{
+			tf_printf(CYAN "%s RPC RECV[%s]" RESET " end/error=%s stream=%s type=%s RN=%d: [%zd B]\n", connection->name, request_name,
+				(flags & k_ssb_rpc_flag_end_error) ? "true" : "false", (flags & k_ssb_rpc_flag_stream) ? "true" : "false", k_ssb_type_names[flags & k_ssb_rpc_mask_type],
+				request_number, size);
+		}
+		if (have_request)
 		{
 			if (callback)
 			{
@ -1868,6 +1902,12 @@ static void _tf_ssb_connection_destroy(tf_ssb_connection_t* connection, const ch
 {
 	tf_ssb_t* ssb = connection->ssb;
 	connection->closing = true;
+	if (connection->connect_callback)
+	{
+		connection->connect_callback(NULL, reason, connection->connect_callback_user_data);
+		connection->connect_callback = NULL;
+		connection->connect_callback_user_data = NULL;
+	}
 	if (!connection->destroy_reason)
 	{
 		connection->destroy_reason = reason;
@ -2102,8 +2142,9 @@ static bool _tf_ssb_connection_read_start(tf_ssb_connection_t* connection)
 	int result = uv_read_start((uv_stream_t*)&connection->tcp, _tf_ssb_connection_on_tcp_alloc, _tf_ssb_connection_on_tcp_recv);
 	if (result && result != UV_EALREADY)
 	{
-		tf_printf("uv_read_start => %s\n", uv_strerror(result));
-		_tf_ssb_connection_close(connection, "uv_read_start failed");
+		char reason[1024];
+		snprintf(reason, sizeof(reason), "uv_read_start failed: %s", uv_strerror(result));
+		_tf_ssb_connection_close(connection, reason);
 		return false;
 	}
 	return true;
@ -2114,8 +2155,9 @@ static bool _tf_ssb_connection_read_stop(tf_ssb_connection_t* connection)
 	int result = uv_read_stop((uv_stream_t*)&connection->tcp);
 	if (result && result != UV_EALREADY)
 	{
-		tf_printf("uv_read_stop => %s\n", uv_strerror(result));
-		_tf_ssb_connection_close(connection, "uv_read_stop failed");
+		char reason[1024];
+		snprintf(reason, sizeof(reason), "uv_read_stop failed: %s", uv_strerror(result));
+		_tf_ssb_connection_close(connection, reason);
 		return false;
 	}
 	return true;
@ -2135,7 +2177,9 @@ static void _tf_ssb_connection_on_connect(uv_connect_t* connect, int status)
 	}
 	else
 	{
-		_tf_ssb_connection_close(connection, "uv_tcp_connect failed");
+		char reason[1024];
+		snprintf(reason, sizeof(reason), "uv_tcp_connect failed: %s", uv_strerror(status));
+		_tf_ssb_connection_close(connection, reason);
 	}
 }

@ -2180,7 +2224,7 @@ static void _tf_ssb_trace_timer(uv_timer_t* timer)
 		ssb->broadcasts_changed_count,
 	};

-	tf_trace_counter(ssb->trace, "ssb", _countof(values), names, values);
+	tf_trace_counter(ssb->trace, "ssb", tf_countof(values), names, values);
 }

 void tf_ssb_get_stats(tf_ssb_t* ssb, tf_ssb_stats_t* out_stats)
@ -2272,6 +2316,11 @@ tf_ssb_t* tf_ssb_create(uv_loop_t* loop, JSContext* context, const char* db_path
 	uv_timer_start(&ssb->trace_timer, _tf_ssb_trace_timer, 100, 100);
 	uv_unref((uv_handle_t*)&ssb->trace_timer);

+	ssb->request_activity_timer.data = ssb;
+	uv_timer_init(ssb->loop, &ssb->request_activity_timer);
+	uv_timer_start(&ssb->request_activity_timer, _tf_ssb_request_activity_timer, k_rpc_active_ms, 0);
+	uv_unref((uv_handle_t*)&ssb->request_activity_timer);
+
 	if (!_tf_ssb_load_keys(ssb))
 	{
 		tf_printf("Generating a new keypair.\n");
@ -2435,6 +2484,20 @@ static void _tf_ssb_on_handle_close(uv_handle_t* handle)

 static void _tf_ssb_on_timer_close(uv_handle_t* handle)
 {
+	tf_ssb_timer_t* timer = handle->data;
+	for (int i = 0; i < timer->ssb->timers_count; i++)
+	{
+		if (timer->ssb->timers[i] == timer)
+		{
+			timer->ssb->timers[i] = timer->ssb->timers[--timer->ssb->timers_count];
+			break;
+		}
+	}
+	if (timer->ssb->shutting_down && !timer->ssb->timers_count)
+	{
+		tf_free(timer->ssb->timers);
+		timer->ssb->timers = NULL;
+	}
 	tf_free(handle->data);
 }

@ -2474,6 +2537,11 @@ void tf_ssb_destroy(tf_ssb_t* ssb)
 		uv_close((uv_handle_t*)&ssb->trace_timer, _tf_ssb_on_handle_close);
 	}

+	if (ssb->request_activity_timer.data && !uv_is_closing((uv_handle_t*)&ssb->request_activity_timer))
+	{
+		uv_close((uv_handle_t*)&ssb->request_activity_timer, _tf_ssb_on_handle_close);
+	}
+
 	if (ssb->server.data && !uv_is_closing((uv_handle_t*)&ssb->server))
 	{
 		uv_close((uv_handle_t*)&ssb->server, _tf_ssb_on_handle_close);
@ -2483,14 +2551,11 @@ void tf_ssb_destroy(tf_ssb_t* ssb)
 	{
 		uv_close((uv_handle_t*)&ssb->timers[i]->timer, _tf_ssb_on_timer_close);
 	}
-	ssb->timers_count = 0;
-	tf_free(ssb->timers);
-	ssb->timers = NULL;

 	tf_printf("Waiting for closes.\n");

 	while (ssb->broadcast_listener.data || ssb->broadcast_sender.data || ssb->broadcast_timer.data || ssb->broadcast_cleanup_timer.data || ssb->trace_timer.data ||
-		ssb->server.data || ssb->ref_count)
+		ssb->server.data || ssb->ref_count || ssb->request_activity_timer.data || ssb->timers_count)
 	{
 		uv_run(ssb->loop, UV_RUN_ONCE);
 	}
@ -2667,22 +2732,33 @@ static void _tf_ssb_connection_handshake_timer_callback(uv_timer_t* timer)
 	}
 }

-tf_ssb_connection_t* tf_ssb_connection_create(tf_ssb_t* ssb, const char* host, const struct sockaddr_in* addr, const uint8_t* public_key)
+static tf_ssb_connection_t* _tf_ssb_connection_create(
+	tf_ssb_t* ssb, const char* host, const struct sockaddr_in* addr, const uint8_t* public_key, tf_ssb_connect_callback_t* callback, void* user_data)
 {
 	for (tf_ssb_connection_t* connection = ssb->connections; connection; connection = connection->next)
 	{
 		if (memcmp(connection->serverpub, public_key, k_id_bin_len) == 0 && connection->state != k_tf_ssb_state_invalid)
 		{
-			char id[k_id_base64_len];
-			tf_ssb_id_bin_to_str(id, sizeof(id), public_key);
-			tf_printf("Not connecting to %s:%d, because we are already connected to %s (state = %d).\n", host, ntohs(addr->sin_port), id, connection->state);
+			if (callback)
+			{
+				char id[k_id_base64_len];
+				tf_ssb_id_bin_to_str(id, sizeof(id), public_key);
+				char reason[1024];
+				snprintf(reason, sizeof(reason), "Already connected to %s (%s).", id, _tf_ssb_connection_state_to_string(connection->state));
+				callback(NULL, reason, user_data);
+			}
 			return NULL;
 		}
 		else if (memcmp(ssb->pub, public_key, k_id_bin_len) == 0)
 		{
-			char id[k_id_base64_len];
-			tf_ssb_id_bin_to_str(id, sizeof(id), public_key);
-			tf_printf("Not connecting to %s:%d, because they appear to be ourselves %s.\n", host, ntohs(addr->sin_port), id);
+			if (callback)
+			{
+				char id[k_id_base64_len];
+				tf_ssb_id_bin_to_str(id, sizeof(id), public_key);
+				char reason[1024];
+				snprintf(reason, sizeof(reason), "Not connecting to ourself: %s.", id);
+				callback(NULL, reason, user_data);
+			}
 			return NULL;
 		}
 	}
@ -2700,6 +2776,8 @@ tf_ssb_connection_t* tf_ssb_connection_create(tf_ssb_t* ssb, const char* host, c
 	connection->port = ntohs(addr->sin_port);
 	connection->async.data = connection;
 	uv_async_init(ssb->loop, &connection->async, _tf_ssb_connection_process_message_async);
+	connection->connect_callback = callback;
+	connection->connect_callback_user_data = user_data;

 	connection->handshake_timer.data = connection;
 	uv_timer_init(ssb->loop, &connection->handshake_timer);
@ -2720,9 +2798,10 @@ tf_ssb_connection_t* tf_ssb_connection_create(tf_ssb_t* ssb, const char* host, c
 	int result = uv_tcp_connect(&connection->connect, &connection->tcp, (const struct sockaddr*)addr, _tf_ssb_connection_on_connect);
 	if (result)
 	{
-		tf_printf("uv_tcp_connect(%s): %s\n", host, uv_strerror(result));
+		char reason[1024];
+		snprintf(reason, sizeof(reason), "uv_tcp_connect(%s) => %s", host, uv_strerror(result));
 		connection->connect.data = NULL;
-		_tf_ssb_connection_destroy(connection, "connect failed");
+		_tf_ssb_connection_destroy(connection, reason);
 	}
 	else
 	{
@ -2740,6 +2819,7 @@ static void _tf_ssb_connection_tunnel_callback(
 	tf_ssb_connection_t* tunnel = user_data;
 	if (flags & k_ssb_rpc_flag_end_error)
 	{
+		tf_ssb_connection_remove_request(connection, -request_number);
 		tf_ssb_connection_rpc_send(connection, flags, -request_number, NULL, (const uint8_t*)"false", strlen("false"), NULL, NULL, NULL);
 		tf_ssb_connection_close(tunnel);
 	}
@ -2749,7 +2829,7 @@ static void _tf_ssb_connection_tunnel_callback(
 	}
 }

-tf_ssb_connection_t* tf_ssb_connection_tunnel_create(tf_ssb_t* ssb, const char* portal_id, int32_t request_number, const char* target_id)
+tf_ssb_connection_t* tf_ssb_connection_tunnel_create(tf_ssb_t* ssb, const char* portal_id, int32_t request_number, const char* target_id, int connect_flags)
 {
 	tf_ssb_connection_t* connection = tf_ssb_connection_get(ssb, portal_id);

@ -2759,6 +2839,7 @@ tf_ssb_connection_t* tf_ssb_connection_tunnel_create(tf_ssb_t* ssb, const char*
 	memset(tunnel, 0, sizeof(*tunnel));
 	snprintf(tunnel->name, sizeof(tunnel->name), "tun%d", s_tunnel_index++);
 	tunnel->ssb = ssb;
+	tunnel->flags = connect_flags;
 	tunnel->tunnel_connection = connection;
 	tunnel->tunnel_request_number = -request_number;
 	tunnel->send_request_number = 1;
@ -2801,7 +2882,10 @@ typedef struct _connect_t
 	uv_getaddrinfo_t req;
 	char host[256];
 	int port;
+	int flags;
 	uint8_t key[k_id_bin_len];
+	tf_ssb_connect_callback_t* callback;
+	void* user_data;
 } connect_t;

 static void _tf_on_connect_getaddrinfo(uv_getaddrinfo_t* addrinfo, int result, struct addrinfo* info)
@ -2813,29 +2897,46 @@ static void _tf_on_connect_getaddrinfo(uv_getaddrinfo_t* addrinfo, int result, s
 		{
 			struct sockaddr_in addr = *(struct sockaddr_in*)info->ai_addr;
 			addr.sin_port = htons(connect->port);
-			tf_ssb_connection_create(connect->ssb, connect->host, &addr, connect->key);
+			tf_ssb_connection_t* connection = _tf_ssb_connection_create(connect->ssb, connect->host, &addr, connect->key, connect->callback, connect->user_data);
+			if (connection)
+			{
+				connection->flags = connect->flags;
+			}
 		}
-		else
+		else if (connect->callback)
 		{
-			tf_printf("getaddrinfo(%s) => %s\n", connect->host, uv_strerror(result));
+			char reason[1024];
+			snprintf(reason, sizeof(reason), "uv_getaddrinfo(%s) => %s", connect->host, uv_strerror(result));
+			connect->callback(NULL, reason, connect->user_data);
 		}
 	}
+	else if (connect->callback)
+	{
+		connect->callback(NULL, "Shutting down.", connect->user_data);
+	}
 	uv_freeaddrinfo(info);
 	tf_ssb_unref(connect->ssb);
 	tf_free(connect);
 }

-void tf_ssb_connect(tf_ssb_t* ssb, const char* host, int port, const uint8_t* key)
+void tf_ssb_connect(tf_ssb_t* ssb, const char* host, int port, const uint8_t* key, int connect_flags, tf_ssb_connect_callback_t* callback, void* user_data)
 {
 	if (ssb->shutting_down)
 	{
+		if (callback)
+		{
+			callback(NULL, "Shutting down.", user_data);
+		}
 		return;
 	}
 	connect_t* connect = tf_malloc(sizeof(connect_t));
 	*connect = (connect_t) {
 		.ssb = ssb,
 		.port = port,
+		.flags = connect_flags,
 		.req.data = connect,
+		.callback = callback,
+		.user_data = user_data,
 	};
 	char id[k_id_base64_len] = { 0 };
 	tf_ssb_id_bin_to_str(id, sizeof(id), key);
@ -2846,7 +2947,13 @@ void tf_ssb_connect(tf_ssb_t* ssb, const char* host, int port, const uint8_t* ke
 	int r = uv_getaddrinfo(ssb->loop, &connect->req, _tf_on_connect_getaddrinfo, host, NULL, &(struct addrinfo) { .ai_family = AF_INET });
 	if (r < 0)
 	{
-		tf_printf("uv_getaddrinfo: %s\n", uv_strerror(r));
+		if (callback)
+		{
+			char reason[1024];
+			snprintf(reason, sizeof(reason), "uv_getaddr_info(%s): %s", host, uv_strerror(r));
+			callback(NULL, reason, user_data);
+		}
+		tf_printf("uv_getaddrinfo(%s): %s\n", host, uv_strerror(r));
 		tf_free(connect);
 		tf_ssb_unref(ssb);
 	}
@ -2879,15 +2986,21 @@ static void _tf_ssb_on_connection(uv_stream_t* stream, int status)
 	connection->object = JS_NewObjectClass(ssb->context, _connection_class_id);
 	JS_SetOpaque(connection->object, connection);

-	if (uv_tcp_init(ssb->loop, &connection->tcp) != 0)
+	int result = uv_tcp_init(ssb->loop, &connection->tcp);
+	if (result != 0)
 	{
-		_tf_ssb_connection_destroy(connection, "init failed");
+		char reason[1024];
+		snprintf(reason, sizeof(reason), "uv_tcp_init() => %s", uv_strerror(result));
+		_tf_ssb_connection_destroy(connection, reason);
 		return;
 	}

-	if (uv_accept(stream, (uv_stream_t*)&connection->tcp) != 0)
+	result = uv_accept(stream, (uv_stream_t*)&connection->tcp);
+	if (result != 0)
 	{
-		_tf_ssb_connection_destroy(connection, "accept failed");
+		char reason[1024];
+		snprintf(reason, sizeof(reason), "uv_accept() => %s", uv_strerror(result));
+		_tf_ssb_connection_destroy(connection, reason);
 		return;
 	}

@ -3125,16 +3238,18 @@ static bool _tf_ssb_parse_broadcast(const char* in_broadcast, tf_ssb_broadcast_t
 	return false;
 }

-void tf_ssb_connect_str(tf_ssb_t* ssb, const char* address)
+void tf_ssb_connect_str(tf_ssb_t* ssb, const char* address, int connect_flags, tf_ssb_connect_callback_t* callback, void* user_data)
 {
 	tf_ssb_broadcast_t broadcast = { 0 };
 	if (_tf_ssb_parse_broadcast(address, &broadcast))
 	{
-		tf_ssb_connect(ssb, broadcast.host, ntohs(broadcast.addr.sin_port), broadcast.pub);
+		tf_ssb_connect(ssb, broadcast.host, ntohs(broadcast.addr.sin_port), broadcast.pub, connect_flags, callback, user_data);
 	}
-	else
+	else if (callback)
 	{
-		tf_printf("Unable to parse: %s\n", address);
+		char reason[1024] = "";
+		snprintf(reason, sizeof(reason), "Unable to parse: '%s'.", address);
+		callback(NULL, reason, user_data);
 	}
 }

@ -3352,11 +3467,6 @@ tf_ssb_connection_t* tf_ssb_connection_get(tf_ssb_t* ssb, const char* id)
 	tf_ssb_id_str_to_bin(pub, id);
 	for (tf_ssb_connection_t* connection = ssb->connections; connection; connection = connection->next)
 	{
-		if (connection->tunnel_connection)
-		{
-			continue;
-		}
-
 		if (memcmp(connection->serverpub, pub, k_id_bin_len) == 0)
 		{
 			return connection;
@ -3479,47 +3589,18 @@ void tf_ssb_remove_connections_changed_callback(tf_ssb_t* ssb, tf_ssb_connection
 	}
 }

-void tf_ssb_add_rpc_callback(tf_ssb_t* ssb, const char** name, tf_ssb_rpc_callback_t* callback, tf_ssb_callback_cleanup_t* cleanup, void* user_data)
+void tf_ssb_add_rpc_callback(tf_ssb_t* ssb, const char* name, tf_ssb_rpc_callback_t* callback, tf_ssb_callback_cleanup_t* cleanup, void* user_data)
 {
-	size_t name_len = 0;
-	int name_count = 0;
-	for (int i = 0; name[i]; i++)
-	{
-		name_count++;
-		name_len += strlen(name[i]) + 1;
-	}
-	tf_ssb_rpc_callback_node_t* node = tf_malloc(sizeof(tf_ssb_rpc_callback_node_t) + (name_count + 1) * sizeof(const char*) + name_len + name_len + 3);
+	size_t name_len = strlen(name);
+	tf_ssb_rpc_callback_node_t* node = tf_malloc(sizeof(tf_ssb_rpc_callback_node_t) + name_len + 1);
 	*node = (tf_ssb_rpc_callback_node_t) {
-		.name = (const char**)(node + 1),
-		.flattened_name = (const char*)(node + 1) + (name_count + 1) * sizeof(const char*) + name_len,
+		.name = (const char*)(node + 1),
 		.callback = callback,
 		.cleanup = cleanup,
 		.user_data = user_data,
 		.next = ssb->rpc,
 	};
-	char* p = (char*)(node + 1) + (name_count + 1) * sizeof(const char*);
-	for (int i = 0; i < name_count; i++)
-	{
-		size_t len = strlen(name[i]);
-		memcpy(p, name[i], len + 1);
-		node->name[i] = p;
-		p += len + 1;
-	}
-	char* flattened_name = (char*)node->flattened_name;
-	for (int i = 0; i < name_count; i++)
-	{
-		size_t length = strlen(name[i]);
-		memcpy(flattened_name, name[i], length);
-		flattened_name += length;
-		if (i != name_count - 1)
-		{
-			*flattened_name++ = '.';
-		}
-	}
-	*flattened_name++ = '(';
-	*flattened_name++ = ')';
-	*flattened_name++ = '\0';
-	node->name[name_count] = NULL;
+	memcpy((char*)node->name, name, name_len + 1);
 	ssb->rpc = node;
 	ssb->rpc_count++;
 }
@ -4203,19 +4284,16 @@ static void _tf_ssb_scheduled_timer(uv_timer_t* handle)
 {
 	tf_ssb_timer_t* timer = handle->data;
 	timer->callback(timer->ssb, timer->user_data);
-	for (int i = 0; i < timer->ssb->timers_count; i++)
-	{
-		if (timer->ssb->timers[i] == timer)
-		{
-			timer->ssb->timers[i] = timer->ssb->timers[--timer->ssb->timers_count];
-			break;
-		}
-	}
 	uv_close((uv_handle_t*)handle, _tf_ssb_on_timer_close);
 }

 void tf_ssb_schedule_work(tf_ssb_t* ssb, int delay_ms, void (*callback)(tf_ssb_t* ssb, void* user_data), void* user_data)
 {
+	if (ssb->shutting_down)
+	{
+		return;
+	}
+
 	ssb->timers = tf_resize_vec(ssb->timers, sizeof(uv_timer_t*) * (ssb->timers_count + 1));
 	tf_ssb_timer_t* timer = tf_malloc(sizeof(tf_ssb_timer_t));
 	*timer = (tf_ssb_timer_t)
@ -4265,11 +4343,13 @@ JSValue tf_ssb_connection_requests_to_object(tf_ssb_connection_t* connection)
 {
 	JSContext* context = connection->ssb->context;
 	JSValue object = JS_NewArray(context);
+	uint64_t now_ms = uv_now(connection->ssb->loop);
 	for (int i = 0; i < connection->requests_count; i++)
 	{
 		JSValue request = JS_NewObject(context);
 		JS_SetPropertyStr(context, request, "name", JS_NewString(context, connection->requests[i].name));
 		JS_SetPropertyStr(context, request, "request_number", JS_NewInt32(context, connection->requests[i].request_number));
+		JS_SetPropertyStr(context, request, "active", JS_NewBool(context, (now_ms - connection->requests[i].last_active) < k_rpc_active_ms));
 		JS_SetPropertyUint32(context, object, i, request);
 	}
 	return object;
@ -4303,3 +4383,41 @@ void tf_ssb_connection_adjust_write_count(tf_ssb_connection_t* connection, int d
 	connection->active_write_count += delta;
 	_tf_ssb_connection_dispatch_scheduled(connection);
 }
+
+void tf_ssb_sync_start(tf_ssb_t* ssb)
+{
+	tf_ssb_connections_sync_start(ssb->connections_tracker);
+}
+
+bool tf_ssb_tunnel_create(tf_ssb_t* ssb, const char* portal_id, const char* target_id, int connect_flags)
+{
+	tf_ssb_connection_t* connection = tf_ssb_connection_get(ssb, portal_id);
+	if (connection && !tf_ssb_connection_get(ssb, target_id))
+	{
+		JSContext* context = ssb->context;
+		int32_t request_number = tf_ssb_connection_next_request_number(connection);
+		JSValue message = JS_NewObject(context);
+		JSValue name = JS_NewArray(context);
+		JS_SetPropertyUint32(context, name, 0, JS_NewString(context, "tunnel"));
+		JS_SetPropertyUint32(context, name, 1, JS_NewString(context, "connect"));
+		JS_SetPropertyStr(context, message, "name", name);
+		JSValue arg = JS_NewObject(context);
+		JS_SetPropertyStr(context, arg, "portal", JS_NewString(context, portal_id));
+		JS_SetPropertyStr(context, arg, "target", JS_NewString(context, target_id));
+		JSValue args = JS_NewArray(context);
+		JS_SetPropertyUint32(context, args, 0, arg);
+		JS_SetPropertyStr(context, message, "args", args);
+		JS_SetPropertyStr(context, message, "type", JS_NewString(context, "duplex"));
+		tf_ssb_connection_rpc_send_json(connection, k_ssb_rpc_flag_stream | k_ssb_rpc_flag_new_request, request_number, "tunnel.connect", message, NULL, NULL, NULL);
+		JS_FreeValue(context, message);
+
+		tf_ssb_connection_tunnel_create(ssb, portal_id, request_number, target_id, connect_flags);
+		return true;
+	}
+	return false;
+}
+
+int tf_ssb_connection_get_flags(tf_ssb_connection_t* connection)
+{
+	return connection->flags;
+}
--- a/src/ssb.connections.c
+++ b/src/ssb.connections.c
@ -3,16 +3,13 @@
 #include "log.h"
 #include "mem.h"
 #include "ssb.h"
+#include "util.js.h"

-#include "uv.h"
 #include "sqlite3.h"
+#include "uv.h"

 #include <string.h>

-#if !defined(_countof)
-#define _countof(a) ((int)(sizeof((a)) / sizeof(*(a))))
-#endif
-
 typedef struct _tf_ssb_connections_t
 {
 	tf_ssb_t* ssb;
@ -21,6 +18,11 @@ typedef struct _tf_ssb_connections_t

 static void _tf_ssb_connections_changed_callback(tf_ssb_t* ssb, tf_ssb_change_t change, tf_ssb_connection_t* connection, void* user_data)
 {
+	if (!connection || tf_ssb_is_shutting_down(ssb))
+	{
+		return;
+	}
+
 	tf_ssb_connections_t* connections = user_data;
 	switch (change)
 	{
@ -101,7 +103,7 @@ static void _tf_ssb_connections_get_next_after_work(tf_ssb_t* ssb, int status, v
 		uint8_t key_bin[k_id_bin_len];
 		if (tf_ssb_id_str_to_bin(key_bin, next->key))
 		{
-			tf_ssb_connect(ssb, next->host, next->port, key_bin);
+			tf_ssb_connect(ssb, next->host, next->port, key_bin, 0, NULL, NULL);
 		}
 	}
 	tf_free(next);
@ -111,8 +113,8 @@ static void _tf_ssb_connections_timer(uv_timer_t* timer)
 {
 	tf_ssb_connections_t* connections = timer->data;
 	tf_ssb_connection_t* active[4];
-	int count = tf_ssb_get_connections(connections->ssb, active, _countof(active));
-	if (count < (int)_countof(active))
+	int count = tf_ssb_get_connections(connections->ssb, active, tf_countof(active));
+	if (count < tf_countof(active))
 	{
 		tf_ssb_connections_get_next_t* next = tf_malloc(sizeof(tf_ssb_connections_get_next_t));
 		*next = (tf_ssb_connections_get_next_t) {
@ -262,3 +264,82 @@ void tf_ssb_connections_set_succeeded(tf_ssb_connections_t* connections, const c
 	snprintf(update->key, sizeof(update->key), "%s", key);
 	_tf_ssb_connections_queue_update(connections, update);
 }
+
+static void _tf_ssb_connections_sync_broadcast_visit(
+	const char* host, const struct sockaddr_in* addr, tf_ssb_broadcast_origin_t origin, tf_ssb_connection_t* tunnel, const uint8_t* pub, void* user_data)
+{
+	tf_ssb_t* ssb = user_data;
+	if (tunnel)
+	{
+		char target_id[k_id_base64_len] = { 0 };
+		if (tf_ssb_id_bin_to_str(target_id, sizeof(target_id), pub))
+		{
+			char portal_id[k_id_base64_len] = { 0 };
+			if (tf_ssb_connection_get_id(tunnel, portal_id, sizeof(portal_id)))
+			{
+				tf_ssb_tunnel_create(ssb, portal_id, target_id, k_tf_ssb_connect_flag_one_shot);
+			}
+		}
+	}
+	else
+	{
+		tf_ssb_connect(ssb, host, ntohs(addr->sin_port), pub, k_tf_ssb_connect_flag_one_shot, NULL, NULL);
+	}
+}
+
+typedef struct _tf_ssb_connections_get_all_work_t
+{
+	char** connections;
+	int connections_count;
+} tf_ssb_connections_get_all_work_t;
+
+static void _tf_ssb_connections_get_all_work(tf_ssb_t* ssb, void* user_data)
+{
+	tf_ssb_connections_get_all_work_t* work = user_data;
+	sqlite3_stmt* statement;
+	sqlite3* db = tf_ssb_acquire_db_reader(ssb);
+	if (sqlite3_prepare(db, "SELECT host, port, key FROM connections ORDER BY last_attempt", -1, &statement, NULL) == SQLITE_OK)
+	{
+		while (sqlite3_step(statement) == SQLITE_ROW)
+		{
+			const char* host = (const char*)sqlite3_column_text(statement, 0);
+			int port = sqlite3_column_int(statement, 1);
+			const char* key = (const char*)sqlite3_column_text(statement, 2);
+			char connection[1024] = { 0 };
+			snprintf(connection, sizeof(connection), "net:%s:%d~shs:%s", host, port, *key == '@' ? key + 1 : key);
+			char* dot = strrchr(connection, '.');
+			if (dot && strcmp(dot, ".ed25519") == 0)
+			{
+				*dot = '\0';
+			}
+			work->connections = tf_resize_vec(work->connections, sizeof(char*) * (work->connections_count + 1));
+			work->connections[work->connections_count++] = tf_strdup(connection);
+		}
+		sqlite3_finalize(statement);
+	}
+	else
+	{
+		tf_printf("prepare: %s\n", sqlite3_errmsg(db));
+	}
+	tf_ssb_release_db_reader(ssb, db);
+}
+
+static void _tf_ssb_connections_get_all_after_work(tf_ssb_t* ssb, int status, void* user_data)
+{
+	tf_ssb_connections_get_all_work_t* work = user_data;
+	for (int i = 0; i < work->connections_count; i++)
+	{
+		tf_ssb_connect_str(ssb, work->connections[i], k_tf_ssb_connect_flag_one_shot, NULL, NULL);
+		tf_free(work->connections[i]);
+	}
+	tf_free(work->connections);
+	tf_free(work);
+}
+
+void tf_ssb_connections_sync_start(tf_ssb_connections_t* connections)
+{
+	tf_ssb_connections_get_all_work_t* work = tf_malloc(sizeof(tf_ssb_connections_get_all_work_t));
+	*work = (tf_ssb_connections_get_all_work_t) { 0 };
+	tf_ssb_run_work(connections->ssb, _tf_ssb_connections_get_all_work, _tf_ssb_connections_get_all_after_work, work);
+	tf_ssb_visit_broadcasts(connections->ssb, _tf_ssb_connections_sync_broadcast_visit, connections->ssb);
+}
--- a/src/ssb.connections.h
+++ b/src/ssb.connections.h
@ -53,4 +53,10 @@ void tf_ssb_connections_set_attempted(tf_ssb_connections_t* connections, const c
 */
 void tf_ssb_connections_set_succeeded(tf_ssb_connections_t* connections, const char* host, int port, const char* key);

+/**
+** Initiate an immediate sync.
+** @param connections The connections tracker.
+*/
+void tf_ssb_connections_sync_start(tf_ssb_connections_t* connections);
+
 /** @} */
--- a/src/ssb.db.c
+++ b/src/ssb.db.c
@ -767,14 +767,6 @@ bool tf_ssb_db_blob_store(tf_ssb_t* ssb, const uint8_t* blob, size_t size, char*
 	}
 	tf_ssb_release_db_writer(ssb, db);

-	if (rows)
-	{
-		if (!out_new)
-		{
-			tf_printf("blob stored %s %zd => %d\n", id, size, result);
-		}
-	}
-
 	if (result && out_id)
 	{
 		snprintf(out_id, out_id_size, "%s", id);
@ -1733,7 +1725,6 @@ bool tf_ssb_db_register_account(uv_loop_t* loop, sqlite3* db, JSContext* context
 		{
 			if (sqlite3_bind_text(statement, 1, value, value_length, NULL) == SQLITE_OK)
 			{
-				tf_printf("added user to properties\n");
 				result = sqlite3_step(statement) == SQLITE_DONE;
 			}
 			sqlite3_finalize(statement);
@ -1787,6 +1778,65 @@ bool tf_ssb_db_set_property(tf_ssb_t* ssb, const char* id, const char* key, cons
 	return result;
 }

+bool tf_ssb_db_remove_property(tf_ssb_t* ssb, const char* id, const char* key)
+{
+	bool result = false;
+	sqlite3* db = tf_ssb_acquire_db_writer(ssb);
+	sqlite3_stmt* statement = NULL;
+	if (sqlite3_prepare(db, "DELETE FROM properties WHERE id = ? AND key = ?", -1, &statement, NULL) == SQLITE_OK)
+	{
+		if (sqlite3_bind_text(statement, 1, id, -1, NULL) == SQLITE_OK && sqlite3_bind_text(statement, 2, key, -1, NULL) == SQLITE_OK)
+		{
+			result = sqlite3_step(statement) == SQLITE_DONE && sqlite3_changes(db) != 0;
+		}
+		sqlite3_finalize(statement);
+	}
+	tf_ssb_release_db_writer(ssb, db);
+	return result;
+}
+
+bool tf_ssb_db_remove_value_from_array_property(tf_ssb_t* ssb, const char* id, const char* key, const char* value)
+{
+	bool result = false;
+	sqlite3* db = tf_ssb_acquire_db_writer(ssb);
+	sqlite3_stmt* statement = NULL;
+	if (sqlite3_prepare(db,
+			"UPDATE properties SET value = json_remove(properties.value, entry.fullkey) FROM json_each(properties.value) AS entry WHERE properties.id = ? AND properties.key = ? "
+			"AND entry.value = ?",
+			-1, &statement, NULL) == SQLITE_OK)
+	{
+		if (sqlite3_bind_text(statement, 1, id, -1, NULL) == SQLITE_OK && sqlite3_bind_text(statement, 2, key, -1, NULL) == SQLITE_OK &&
+			sqlite3_bind_text(statement, 3, value, -1, NULL) == SQLITE_OK)
+		{
+			result = sqlite3_step(statement) == SQLITE_DONE && sqlite3_changes(db) != 0;
+		}
+		sqlite3_finalize(statement);
+	}
+	tf_ssb_release_db_writer(ssb, db);
+	return result;
+}
+
+bool tf_ssb_db_add_value_to_array_property(tf_ssb_t* ssb, const char* id, const char* key, const char* value)
+{
+	bool result = false;
+	sqlite3* db = tf_ssb_acquire_db_writer(ssb);
+	sqlite3_stmt* statement = NULL;
+	if (sqlite3_prepare(db,
+			"INSERT INTO properties (id, key, value) VALUES (?1, ?2, json_array(?3)) ON CONFLICT DO UPDATE SET value = json_insert(properties.value, '$[#]', ?3) WHERE "
+			"properties.id = ?1 AND properties.key = ?2 AND NOT EXISTS (SELECT 1 FROM json_each(properties.value) AS entry WHERE entry.value = ?3)",
+			-1, &statement, NULL) == SQLITE_OK)
+	{
+		if (sqlite3_bind_text(statement, 1, id, -1, NULL) == SQLITE_OK && sqlite3_bind_text(statement, 2, key, -1, NULL) == SQLITE_OK &&
+			sqlite3_bind_text(statement, 3, value, -1, NULL) == SQLITE_OK)
+		{
+			result = sqlite3_step(statement) == SQLITE_DONE && sqlite3_changes(db) != 0;
+		}
+		sqlite3_finalize(statement);
+	}
+	tf_ssb_release_db_writer(ssb, db);
+	return result;
+}
+
 bool tf_ssb_db_identity_get_active(sqlite3* db, const char* user, const char* package_owner, const char* package_name, char* out_identity, size_t out_identity_size)
 {
 	sqlite3_stmt* statement = NULL;
--- a/src/ssb.db.h
+++ b/src/ssb.db.h
@ -399,6 +399,35 @@ const char* tf_ssb_db_get_property(tf_ssb_t* ssb, const char* id, const char* ke
 */
 bool tf_ssb_db_set_property(tf_ssb_t* ssb, const char* id, const char* key, const char* value);

+/**
+** Remove an entry in the properties table.
+** @param ssb The SSB instance.
+** @param id The user.
+** @param key The property key.
+** @return true if the property was removed successfully.
+*/
+bool tf_ssb_db_remove_property(tf_ssb_t* ssb, const char* id, const char* key);
+
+/**
+** Remove a value from an entry in the properties table that is a JSON array.
+** @param ssb The SSB instance.
+** @param id The user.
+** @param key The property key.
+** @param value The value to remove from the JSON array.
+** @return true if the property was updated.
+*/
+bool tf_ssb_db_remove_value_from_array_property(tf_ssb_t* ssb, const char* id, const char* key, const char* value);
+
+/**
+** Ensure a value is in an entry in the properties table that is a JSON array.
+** @param ssb The SSB instance.
+** @param id The user.
+** @param key The property key.
+** @param value The value to add to the JSON array.
+** @return true if the property was updated.
+*/
+bool tf_ssb_db_add_value_to_array_property(tf_ssb_t* ssb, const char* id, const char* key, const char* value);
+
 /**
 ** Resolve a hostname to its index path by global settings.
 ** @param ssb The SSB instance.
--- a/src/ssb.export.c
+++ b/src/ssb.export.c
@ -69,7 +69,7 @@ static void _tf_ssb_export_scandir(uv_fs_t* req)
 				int r = uv_fs_unlink(tf_ssb_get_loop(export->ssb), &req, path, NULL);
 				if (r)
 				{
-					tf_printf("Failed to unlink %s: %s.", path, uv_strerror(r));
+					tf_printf("Failed to unlink %s: %s.\n", path, uv_strerror(r));
 				}
 				uv_fs_req_cleanup(&req);
 				tf_free(path);
@ -90,7 +90,7 @@ void tf_ssb_export(tf_ssb_t* ssb, const char* key)
 		return;
 	}

-	char app_blob_id[64] = { 0 };
+	char app_blob_id[k_blob_id_len] = { 0 };
 	sqlite3* db = tf_ssb_acquire_db_reader(ssb);
 	sqlite3_busy_timeout(db, 10000);
 	sqlite3_stmt* statement;
@ -199,7 +199,7 @@ void tf_ssb_export(tf_ssb_t* ssb, const char* key)
 	int r = uv_fs_scandir(tf_ssb_get_loop(ssb), &export.req, file_path, 0, _tf_ssb_export_scandir);
 	if (r)
 	{
-		tf_printf("Failed to scan directory %s: %s.", file_path, uv_strerror(r));
+		tf_printf("Failed to scan directory %s: %s.\n", file_path, uv_strerror(r));
 	}
 	while (!export.done)
 	{
--- a/src/ssb.h
+++ b/src/ssb.h
@ -65,6 +65,14 @@ typedef enum _tf_ssb_message_flags_t
 	k_tf_ssb_message_flag_sequence_before_author = 1,
 } tf_ssb_message_flags_t;

+/**
+** Flags affecting an SSB connection.
+*/
+typedef enum _tf_ssb_connect_flags_t
+{
+	k_tf_ssb_connect_flag_one_shot = 0x1,
+} tf_ssb_connect_flags_t;
+
 /** An SSB instance. */
 typedef struct _tf_ssb_t tf_ssb_t;
 /** An SSB connection. */
@ -340,21 +348,35 @@ const char** tf_ssb_get_connection_ids(tf_ssb_t* ssb);
 */
 int tf_ssb_get_connections(tf_ssb_t* ssb, tf_ssb_connection_t** out_connections, int out_connections_count);

+/**
+** Callback for completing establishing a connection.
+** @param connection The established connection if successful or null.
+** @param reason The reason for failure if the connection failed.
+** @param user_data User data.
+*/
+typedef void(tf_ssb_connect_callback_t)(tf_ssb_connection_t* connection, const char* reason, void* user_data);
+
 /**
 ** Establish an SHS connection with a host.
 ** @param ssb The SSB instance.
 ** @param host The host name or address.
 ** @param port The host's SHS port.
 ** @param key The host's SSB identity.
+** @param connect_flags Flags affecting the connection.
+** @param callback Completion callback.
+** @param user_data User data to be passed to the callback.
 */
-void tf_ssb_connect(tf_ssb_t* ssb, const char* host, int port, const uint8_t* key);
+void tf_ssb_connect(tf_ssb_t* ssb, const char* host, int port, const uint8_t* key, int connect_flags, tf_ssb_connect_callback_t* callback, void* user_data);

 /**
 ** Establish an SHS connection with a host by string address.
 ** @param ssb The SSB instance.
 ** @param address The address.
+** @param connect_flags Flags affecting the connection.
+** @param callback Completion callback.
+** @param user_data User data to be passed to the callback.
 */
-void tf_ssb_connect_str(tf_ssb_t* ssb, const char* address);
+void tf_ssb_connect_str(tf_ssb_t* ssb, const char* address, int connect_flags, tf_ssb_connect_callback_t* callback, void* user_data);

 /**
 ** Begin listening for SHS connections on the given port.
@ -380,8 +402,9 @@ void tf_ssb_server_close(tf_ssb_t* ssb);
 /**
 ** Close all active SHS connections.
 ** @param ssb The SSB instance.
+** @param reason Reason for the close.
 */
-void tf_ssb_close_all(tf_ssb_t* ssb);
+void tf_ssb_close_all(tf_ssb_t* ssb, const char* reason);

 /**
 ** Send a graceful close message to all active SHS connections.
@ -676,12 +699,12 @@ typedef void(tf_ssb_rpc_callback_t)(tf_ssb_connection_t* connection, uint8_t fla
 /**
 ** Register a MUXRPC callback by name.
 ** @param ssb The SSB instance.
-** @param name The NULL-terminated name.
+** @param name The RPC name as a .-separated string.
 ** @param callback The callback.
 ** @param cleanup A function to be called when the callback is removed.
 ** @param user_data User data to pass to the callback.
 */
-void tf_ssb_add_rpc_callback(tf_ssb_t* ssb, const char** name, tf_ssb_rpc_callback_t* callback, tf_ssb_callback_cleanup_t* cleanup, void* user_data);
+void tf_ssb_add_rpc_callback(tf_ssb_t* ssb, const char* name, tf_ssb_rpc_callback_t* callback, tf_ssb_callback_cleanup_t* cleanup, void* user_data);

 /**
 ** Remove a MUXRPC callback.
@ -703,8 +726,9 @@ void tf_ssb_remove_rpc_callback(tf_ssb_t* ssb, const char** name, tf_ssb_rpc_cal
 ** @param callback A callback to call if a response is received.
 ** @param cleanup A callback to call if the callback is removed.
 ** @param user_data User data to pass to the callback.
+** @return true If the message was queued to send, false if the connection or request were invalid.
 */
-void tf_ssb_connection_rpc_send(tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, const char* new_request_name, const uint8_t* message, size_t size,
+bool tf_ssb_connection_rpc_send(tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, const char* new_request_name, const uint8_t* message, size_t size,
 	tf_ssb_rpc_callback_t* callback, tf_ssb_callback_cleanup_t* cleanup, void* user_data);

 /**
@ -717,8 +741,9 @@ void tf_ssb_connection_rpc_send(tf_ssb_connection_t* connection, uint8_t flags,
 ** @param callback A callback to call if a response is received.
 ** @param cleanup A callback to call if the callback is removed.
 ** @param user_data User data to pass to the callback.
+** @return true If the message was queued to send, false if the connection or request were invalid.
 */
-void tf_ssb_connection_rpc_send_json(tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, const char* new_request_name, JSValue message,
+bool tf_ssb_connection_rpc_send_json(tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, const char* new_request_name, JSValue message,
 	tf_ssb_rpc_callback_t* callback, tf_ssb_callback_cleanup_t* cleanup, void* user_data);

 /**
@ -727,8 +752,9 @@ void tf_ssb_connection_rpc_send_json(tf_ssb_connection_t* connection, uint8_t fl
 ** @param flags The message flags.
 ** @param request_number The request number.
 ** @param error The error string.
+** @return true If the message was queued to send, false if the connection or request were invalid.
 */
-void tf_ssb_connection_rpc_send_error(tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, const char* error);
+bool tf_ssb_connection_rpc_send_error(tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, const char* error);

 /**
 ** Send a MUXRPC "method not allowed" error message.
@ -736,8 +762,9 @@ void tf_ssb_connection_rpc_send_error(tf_ssb_connection_t* connection, uint8_t f
 ** @param flags The message flags.
 ** @param request_number The request number.
 ** @param name The name of the not-allowed method.
+** @return true If the message was queued to send, false if the connection or request were invalid.
 */
-void tf_ssb_connection_rpc_send_error_method_not_allowed(tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, const char* name);
+bool tf_ssb_connection_rpc_send_error_method_not_allowed(tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, const char* name);

 /**
 ** Register a callback to be called when a message is received for the given
@ -867,9 +894,10 @@ void tf_ssb_connection_remove_room_attendant(tf_ssb_connection_t* connection, co
 ** @param portal_id The identity of the tunnel intermediary.
 ** @param request_number The tunnel request.
 ** @param target_id The identity being tunneled to.
+** @param connect_flags Flags affecting the connection.
 ** @return The new tunnel connection.
 */
-tf_ssb_connection_t* tf_ssb_connection_tunnel_create(tf_ssb_t* ssb, const char* portal_id, int32_t request_number, const char* target_id);
+tf_ssb_connection_t* tf_ssb_connection_tunnel_create(tf_ssb_t* ssb, const char* portal_id, int32_t request_number, const char* target_id, int connect_flags);

 /**
 ** Get the request number on which to send EBT responses.
@ -1073,4 +1101,26 @@ void tf_ssb_connection_adjust_read_backpressure(tf_ssb_connection_t* connection,
 */
 void tf_ssb_connection_adjust_write_count(tf_ssb_connection_t* connection, int delta);

+/**
+** Initiate a tunnel connection.
+** @param ssb The SSB instance.
+** @param portal_id The public key of the instance through which to tunnel.
+** @param target_id The public key of the instance with which to establish a connection.
+** @param connect_flags Flags affecting the connection.
+** @return true if the tunnel instance was found.
+*/
+bool tf_ssb_tunnel_create(tf_ssb_t* ssb, const char* portal_id, const char* target_id, int connect_flags);
+
+/**
+** Initiate a one time sync operation.
+** @param ssb The SSB instance.
+*/
+void tf_ssb_sync_start(tf_ssb_t* ssb);
+
+/**
+** Get a connection's flags.
+** @param connection The connection.
+*/
+int tf_ssb_connection_get_flags(tf_ssb_connection_t* connection);
+
 /** @} */
--- a/src/ssb.import.c
+++ b/src/ssb.import.c
@ -155,7 +155,7 @@ static void _tf_ssb_import_recursive_add_files(tf_ssb_t* ssb, uv_loop_t* loop, J
 	}
 	else
 	{
-		tf_printf("Failed to scan directory %s: %s.", path, uv_strerror(r));
+		tf_printf("Failed to scan directory %s: %s.\n", path, uv_strerror(r));
 	}
 	uv_fs_req_cleanup(&req);
 }
@ -260,7 +260,7 @@ void tf_ssb_import(tf_ssb_t* ssb, const char* user, const char* path)
 		}
 		else
 		{
-			tf_printf("Failed to scan directory %s: %s.", path, uv_strerror(r));
+			tf_printf("Failed to scan directory %s: %s.\n", path, uv_strerror(r));
 		}
 		uv_fs_req_cleanup(&req);
 	}
--- a/Show More
+++ b/Show More