diff --git a/packages/macos/build-script/11-build-gui-o-mac-tic b/packages/macos/build-script/11-build-gui-o-mac-tic
diff --git a/packages/macos/build-script/20-build-homebrew b/packages/macos/build-script/20-build-homebrew
diff --git a/packages/macos/build-script/21-install-mailpile-deps b/packages/macos/build-script/21-install-mailpile-deps
diff --git a/packages/macos/build-script/30-slim-down b/packages/macos/build-script/30-slim-down
diff --git a/packages/macos/build-script/55-install-mailpile b/packages/macos/build-script/55-install-mailpile
diff --git a/packages/macos/build-script/90-fix-libraries b/packages/macos/build-script/90-fix-libraries
diff --git a/packages/macos/build-script/91-fix-paths b/packages/macos/build-script/91-fix-paths
diff --git a/packages/macos/build-script/92-fix-python-launcher b/packages/macos/build-script/92-fix-python-launcher
diff --git a/packages/macos/build-script/99-make-dmg b/packages/macos/build-script/99-make-dmg
diff --git a/packages/macos/build.sh b/packages/macos/build.sh
diff --git a/packages/macos/configurator.sh b/packages/macos/configurator.sh
diff --git a/packages/macos/dmgbuild-settings.py b/packages/macos/dmgbuild-settings.py
diff --git a/packages/macos/mailpile b/packages/macos/mailpile
diff --git a/packages/macos/package.sh b/packages/macos/package.sh
diff --git a/packages/scripts/build.sh → packages/scripts/build-deb.sh b/packages/scripts/build.sh → packages/scripts/build-deb.sh
diff --git a/packages/scripts/build-desktop.py b/packages/scripts/build-desktop.py
diff --git a/packages/scripts/kite-runner-mac.cfg b/packages/scripts/kite-runner-mac.cfg
diff --git a/packages/scripts/kite-runner-sample.cfg b/packages/scripts/kite-runner-sample.cfg
diff --git a/packages/scripts/kite-runner-win.cfg b/packages/scripts/kite-runner-win.cfg
diff --git a/packages/scripts/kite-runner.py b/packages/scripts/kite-runner.py
diff --git a/packages/scripts/kiterunner.service.plist b/packages/scripts/kiterunner.service.plist
diff --git a/packages/windows-wix/README.QUICK_START.md b/packages/windows-wix/README.QUICK_START.md
diff --git a/packages/windows-wix/README.md b/packages/windows-wix/README.md
diff --git a/packages/windows-wix/TODO.md b/packages/windows-wix/TODO.md
diff --git a/packages/windows-wix/assets/LicenseText.rtf b/packages/windows-wix/assets/LicenseText.rtf
diff --git a/packages/windows-wix/assets/WixUIBanner.bmp b/packages/windows-wix/assets/WixUIBanner.bmp
diff --git a/packages/windows-wix/assets/WixUIDialog.bmp b/packages/windows-wix/assets/WixUIDialog.bmp
diff --git a/packages/windows-wix/assets/mailpile_logo.ico b/packages/windows-wix/assets/mailpile_logo.ico
diff --git a/packages/windows-wix/bin/launch-mailpile.bat b/packages/windows-wix/bin/launch-mailpile.bat
diff --git a/packages/windows-wix/bin/with-mailpile-env.py b/packages/windows-wix/bin/with-mailpile-env.py
diff --git a/packages/windows-wix/dependencies-windows.txt b/packages/windows-wix/dependencies-windows.txt
diff --git a/packages/windows-wix/package.json b/packages/windows-wix/package.json
diff --git a/packages/windows-wix/package.py b/packages/windows-wix/package.py
diff --git a/packages/windows-wix/package_template.json b/packages/windows-wix/package_template.json
diff --git a/packages/windows-wix/provide-example-bootstrap-local.json b/packages/windows-wix/provide-example-bootstrap-local.json
diff --git a/packages/windows-wix/provide-example-bootstrap-remote.json b/packages/windows-wix/provide-example-bootstrap-remote.json
diff --git a/packages/windows-wix/provide-example-fork-local.json b/packages/windows-wix/provide-example-fork-local.json
diff --git a/packages/windows-wix/provide-example-fork-remote.json b/packages/windows-wix/provide-example-fork-remote.json
diff --git a/packages/windows-wix/provide.json b/packages/windows-wix/provide.json
diff --git a/packages/windows-wix/provide/__init__.py b/packages/windows-wix/provide/__init__.py
diff --git a/packages/windows-wix/provide/__main__.py b/packages/windows-wix/provide/__main__.py
diff --git a/packages/windows-wix/provide/build.py b/packages/windows-wix/provide/build.py
diff --git a/packages/windows-wix/provide/cache.py b/packages/windows-wix/provide/cache.py
diff --git a/packages/windows-wix/provide/default.py b/packages/windows-wix/provide/default.py
diff --git a/packages/windows-wix/provide/scripts/__init__.py b/packages/windows-wix/provide/scripts/__init__.py
diff --git a/packages/windows-wix/provide/scripts/bootstrap.py b/packages/windows-wix/provide/scripts/bootstrap.py
diff --git a/packages/windows-wix/provide/scripts/export.py b/packages/windows-wix/provide/scripts/export.py
diff --git a/packages/windows-wix/provide/scripts/external.py b/packages/windows-wix/provide/scripts/external.py
diff --git a/packages/windows-wix/provide/scripts/extract_msi.py b/packages/windows-wix/provide/scripts/extract_msi.py
diff --git a/packages/windows-wix/provide/scripts/git_checkout.py b/packages/windows-wix/provide/scripts/git_checkout.py
diff --git a/packages/windows-wix/provide/scripts/msi_package.py b/packages/windows-wix/provide/scripts/msi_package.py
diff --git a/packages/windows-wix/provide/scripts/python27.py b/packages/windows-wix/provide/scripts/python27.py
diff --git a/packages/windows-wix/provide/scripts/root.py b/packages/windows-wix/provide/scripts/root.py
diff --git a/packages/windows-wix/provide/scripts/sign_tree.py b/packages/windows-wix/provide/scripts/sign_tree.py
diff --git a/packages/windows-wix/provide/scripts/util.py b/packages/windows-wix/provide/scripts/util.py
diff --git a/packages/windows-wix/provide/scripts/version.py b/packages/windows-wix/provide/scripts/version.py
diff --git a/packages/windows-wix/provide/scripts/win4gpg.py b/packages/windows-wix/provide/scripts/win4gpg.py
diff --git a/packages/windows-wix/provide/scripts/zip.py b/packages/windows-wix/provide/scripts/zip.py
diff --git a/packages/windows-wix/resources.json b/packages/windows-wix/resources.json
diff --git a/packages/windows/Makefile b/packages/windows/Makefile
diff --git a/packages/windows/README b/packages/windows/README
diff --git a/packages/windows/bash.mingw32 b/packages/windows/bash.mingw32
diff --git a/packages/windows/launcher.exe.config b/packages/windows/launcher.exe.config
diff --git a/packages/windows/mailpile.ico b/packages/windows/mailpile.ico
diff --git a/packages/windows/mailpile.nsi b/packages/windows/mailpile.nsi
diff --git a/packages/windows/mailpile_logo.bmp b/packages/windows/mailpile_logo.bmp
diff --git a/packages/windows/repackage-linux.sh b/packages/windows/repackage-linux.sh
diff --git a/requirements-dev.txt b/requirements-dev.txt
diff --git a/requirements-with-deps.txt b/requirements-with-deps.txt
diff --git a/requirements.txt b/requirements.txt
diff --git a/scripts/mailpile b/scripts/mailpile
diff --git a/scripts/setup-test.sh b/scripts/setup-test.sh
diff --git a/shared-data/contrib/autoajax/autoajax.js b/shared-data/contrib/autoajax/autoajax.js
diff --git a/shared-data/contrib/demos/manifest.json b/shared-data/contrib/demos/manifest.json
diff --git a/shared-data/contrib/hacks/hacks.py b/shared-data/contrib/hacks/hacks.py
diff --git a/shared-data/contrib/hints/hints.py b/shared-data/contrib/hints/hints.py
diff --git a/shared-data/contrib/hints/hints/dragging-tags.html b/shared-data/contrib/hints/hints/dragging-tags.html
diff --git a/shared-data/contrib/hints/manifest.json b/shared-data/contrib/hints/manifest.json
diff --git a/shared-data/contrib/unthread/i18n-stubs.html b/shared-data/contrib/unthread/i18n-stubs.html
diff --git a/shared-data/contrib/unthread/manifest.json b/shared-data/contrib/unthread/manifest.json
diff --git a/shared-data/contrib/unthread/modal.html b/shared-data/contrib/unthread/modal.html
diff --git a/shared-data/contrib/unthread/unthread.js b/shared-data/contrib/unthread/unthread.js
diff --git a/shared-data/default-theme/css/default.css b/shared-data/default-theme/css/default.css
diff --git a/shared-data/default-theme/html/jsapi/compose/attachments.js b/shared-data/default-theme/html/jsapi/compose/attachments.js
diff --git a/shared-data/default-theme/html/jsapi/compose/crypto.js b/shared-data/default-theme/html/jsapi/compose/crypto.js
diff --git a/shared-data/default-theme/html/jsapi/compose/events.js b/shared-data/default-theme/html/jsapi/compose/events.js
diff --git a/shared-data/default-theme/html/jsapi/compose/tooltips.js b/shared-data/default-theme/html/jsapi/compose/tooltips.js
diff --git a/shared-data/default-theme/html/jsapi/crypto/find.js b/shared-data/default-theme/html/jsapi/crypto/find.js
diff --git a/shared-data/default-theme/html/jsapi/crypto/tooltips.js b/shared-data/default-theme/html/jsapi/crypto/tooltips.js
diff --git a/shared-data/default-theme/html/jsapi/global/eventlog.js b/shared-data/default-theme/html/jsapi/global/eventlog.js
diff --git a/shared-data/default-theme/html/jsapi/index.js b/shared-data/default-theme/html/jsapi/index.js
diff --git a/shared-data/default-theme/html/jsapi/message/message.js b/shared-data/default-theme/html/jsapi/message/message.js
diff --git a/shared-data/default-theme/html/jsapi/message/tooltips.js b/shared-data/default-theme/html/jsapi/message/tooltips.js
diff --git a/shared-data/default-theme/html/jsapi/pwa/manifest.json b/shared-data/default-theme/html/jsapi/pwa/manifest.json
diff --git a/shared-data/default-theme/html/jsapi/pwa/service-worker.js b/shared-data/default-theme/html/jsapi/pwa/service-worker.js
diff --git a/shared-data/default-theme/html/jsapi/search/bulk_actions.js b/shared-data/default-theme/html/jsapi/search/bulk_actions.js
diff --git a/shared-data/default-theme/html/jsapi/search/events.js b/shared-data/default-theme/html/jsapi/search/events.js
diff --git a/shared-data/default-theme/html/jsapi/search/init.js b/shared-data/default-theme/html/jsapi/search/init.js
diff --git a/shared-data/default-theme/html/jsapi/search/selection_actions.js b/shared-data/default-theme/html/jsapi/search/selection_actions.js
diff --git a/shared-data/default-theme/html/jsapi/templates/modal-composer-encryption-helper.html b/shared-data/default-theme/html/jsapi/templates/modal-composer-encryption-helper.html
diff --git a/shared-data/default-theme/html/jsapi/templates/modal-related-search.html b/shared-data/default-theme/html/jsapi/templates/modal-related-search.html
diff --git a/shared-data/default-theme/html/jsapi/templates/modal-search-keyservers.html b/shared-data/default-theme/html/jsapi/templates/modal-search-keyservers.html
diff --git a/shared-data/default-theme/html/jsapi/ui/events.js b/shared-data/default-theme/html/jsapi/ui/events.js
diff --git a/shared-data/default-theme/html/jsapi/ui/notifications.js b/shared-data/default-theme/html/jsapi/ui/notifications.js
diff --git a/shared-data/default-theme/html/layouts/content.html b/shared-data/default-theme/html/layouts/content.html
diff --git a/shared-data/default-theme/html/logs/network/index.html b/shared-data/default-theme/html/logs/network/index.html
diff --git a/shared-data/default-theme/html/message/index.html b/shared-data/default-theme/html/message/index.html
diff --git a/shared-data/default-theme/html/message/single.html b/shared-data/default-theme/html/message/single.html
diff --git a/shared-data/default-theme/html/partials/compose.html b/shared-data/default-theme/html/partials/compose.html
diff --git a/shared-data/default-theme/html/partials/head.html b/shared-data/default-theme/html/partials/head.html
diff --git a/shared-data/default-theme/html/partials/hidden.html b/shared-data/default-theme/html/partials/hidden.html
diff --git a/shared-data/default-theme/html/partials/pile_message.html b/shared-data/default-theme/html/partials/pile_message.html
diff --git a/shared-data/default-theme/html/partials/pile_threading.html b/shared-data/default-theme/html/partials/pile_threading.html
diff --git a/shared-data/default-theme/html/partials/search_item.html b/shared-data/default-theme/html/partials/search_item.html
diff --git a/shared-data/default-theme/html/partials/thread_message.html b/shared-data/default-theme/html/partials/thread_message.html
diff --git a/shared-data/default-theme/html/partials/thread_metadata.html b/shared-data/default-theme/html/partials/thread_metadata.html
diff --git a/shared-data/default-theme/html/partials/tools_default.html b/shared-data/default-theme/html/partials/tools_default.html
diff --git a/shared-data/default-theme/html/partials/tools_message.html b/shared-data/default-theme/html/partials/tools_message.html
diff --git a/shared-data/default-theme/html/partials/topbar.html b/shared-data/default-theme/html/partials/topbar.html
diff --git a/shared-data/default-theme/html/profiles/account-form.html b/shared-data/default-theme/html/profiles/account-form.html
diff --git a/shared-data/default-theme/html/settings/index.html b/shared-data/default-theme/html/settings/index.html
diff --git a/shared-data/default-theme/html/settings/plugins.html b/shared-data/default-theme/html/settings/plugins.html
diff --git a/shared-data/default-theme/html/settings/preferences.html b/shared-data/default-theme/html/settings/preferences.html
diff --git a/shared-data/default-theme/html/settings/privacy.html b/shared-data/default-theme/html/settings/privacy.html
diff --git a/shared-data/default-theme/html/settings/set/password/index.html b/shared-data/default-theme/html/settings/set/password/index.html
diff --git a/shared-data/default-theme/less/app/global.less b/shared-data/default-theme/less/app/global.less
diff --git a/shared-data/default-theme/less/app/mobile.less b/shared-data/default-theme/less/app/mobile.less
diff --git a/shared-data/default-theme/less/app/tablet.less b/shared-data/default-theme/less/app/tablet.less
diff --git a/shared-data/default-theme/less/app/topbar.less b/shared-data/default-theme/less/app/topbar.less
diff --git a/shared-data/locale/ar/LC_MESSAGES/mailpile.po b/shared-data/locale/ar/LC_MESSAGES/mailpile.po
diff --git a/shared-data/locale/da_DK/LC_MESSAGES/mailpile.po b/shared-data/locale/da_DK/LC_MESSAGES/mailpile.po
diff --git a/shared-data/locale/de/LC_MESSAGES/mailpile.po b/shared-data/locale/de/LC_MESSAGES/mailpile.po
diff --git a/shared-data/locale/el_GR/LC_MESSAGES/mailpile.po b/shared-data/locale/el_GR/LC_MESSAGES/mailpile.po
diff --git a/shared-data/locale/en_GB/LC_MESSAGES/mailpile.po b/shared-data/locale/en_GB/LC_MESSAGES/mailpile.po
diff --git a/shared-data/locale/es_ES/LC_MESSAGES/mailpile.po b/shared-data/locale/es_ES/LC_MESSAGES/mailpile.po
diff --git a/shared-data/locale/fr/LC_MESSAGES/mailpile.po b/shared-data/locale/fr/LC_MESSAGES/mailpile.po
diff --git a/shared-data/locale/fr_FR/LC_MESSAGES/mailpile.po b/shared-data/locale/fr_FR/LC_MESSAGES/mailpile.po
diff --git a/shared-data/locale/hr/LC_MESSAGES/mailpile.po b/shared-data/locale/hr/LC_MESSAGES/mailpile.po
diff --git a/shared-data/locale/is/LC_MESSAGES/mailpile.po b/shared-data/locale/is/LC_MESSAGES/mailpile.po
diff --git a/shared-data/locale/ja/LC_MESSAGES/mailpile.po b/shared-data/locale/ja/LC_MESSAGES/mailpile.po
diff --git a/shared-data/locale/lt/LC_MESSAGES/mailpile.po b/shared-data/locale/lt/LC_MESSAGES/mailpile.po
diff --git a/shared-data/locale/nb_NO/LC_MESSAGES/mailpile.po b/shared-data/locale/nb_NO/LC_MESSAGES/mailpile.po
diff --git a/shared-data/locale/nl_BE/LC_MESSAGES/mailpile.po b/shared-data/locale/nl_BE/LC_MESSAGES/mailpile.po
diff --git a/shared-data/locale/nl_NL/LC_MESSAGES/mailpile.po b/shared-data/locale/nl_NL/LC_MESSAGES/mailpile.po
diff --git a/shared-data/locale/pl/LC_MESSAGES/mailpile.po b/shared-data/locale/pl/LC_MESSAGES/mailpile.po
diff --git a/shared-data/locale/pt_BR/LC_MESSAGES/mailpile.po b/shared-data/locale/pt_BR/LC_MESSAGES/mailpile.po
diff --git a/shared-data/locale/ru_RU/LC_MESSAGES/mailpile.po b/shared-data/locale/ru_RU/LC_MESSAGES/mailpile.po
diff --git a/shared-data/locale/sq/LC_MESSAGES/mailpile.po b/shared-data/locale/sq/LC_MESSAGES/mailpile.po
diff --git a/shared-data/locale/sv/LC_MESSAGES/mailpile.po b/shared-data/locale/sv/LC_MESSAGES/mailpile.po
diff --git a/shared-data/locale/uk/LC_MESSAGES/mailpile.po b/shared-data/locale/uk/LC_MESSAGES/mailpile.po
diff --git a/shared-data/locale/zh_CN/LC_MESSAGES/mailpile.po b/shared-data/locale/zh_CN/LC_MESSAGES/mailpile.po
diff --git a/shared-data/mailpile-gui/mailpile-gui.py b/shared-data/mailpile-gui/mailpile-gui.py
diff --git a/shared-data/mailpile-gui/media/lock-closed.png b/shared-data/mailpile-gui/media/lock-closed.png
diff --git a/shared-data/mailpile-gui/media/lock-open.png b/shared-data/mailpile-gui/media/lock-open.png
diff --git a/shared-data/mailpile-gui/media/new-setup.png b/shared-data/mailpile-gui/media/new-setup.png
diff --git a/shared-data/mailpile-gui/media/remote-access-off.png b/shared-data/mailpile-gui/media/remote-access-off.png
diff --git a/shared-data/mailpile-gui/media/remote-access-on.png b/shared-data/mailpile-gui/media/remote-access-on.png
diff --git a/shared-data/multipile/README.md b/shared-data/multipile/README.md
diff --git a/shared-data/multipile/mailpile-admin.py b/shared-data/multipile/mailpile-admin.py
diff --git a/shared-data/multipile/mailpile-launcher.py b/shared-data/multipile/mailpile-launcher.py
diff --git a/shared-data/multipile/www/index.html b/shared-data/multipile/www/index.html
diff --git a/submodules/gui-o-mac-tic b/submodules/gui-o-mac-tic
diff --git a/submodules/gui-o-matic b/submodules/gui-o-matic