Merge branch 'dev' into e2ee_info_json

Desktop: Resolves #5273 : Prevent plugins from crashing the application
Desktop: Remove template feature (replaced by template plugin)
2025-12-26 23:38:08 +02:00 · 2021-08-06 16:44:59 +01:00 · 2021-08-06 13:08:32 +01:00 · 2021-08-06 10:58:32 +01:00 · 2021-08-05 18:18:27 -04:00 · 2021-08-05 17:32:00 +01:00
482 changed files with 127871 additions and 116092 deletions
--- a/.eslintignore
+++ b/.eslintignore
@@ -69,6 +69,9 @@ readme/
 packages/app-cli/app/LinkSelector.d.ts
 packages/app-cli/app/LinkSelector.js
 packages/app-cli/app/LinkSelector.js.map
+packages/app-cli/app/command-e2ee.d.ts
+packages/app-cli/app/command-e2ee.js
+packages/app-cli/app/command-e2ee.js.map
 packages/app-cli/app/command-settingschema.d.ts
 packages/app-cli/app/command-settingschema.js
 packages/app-cli/app/command-settingschema.js.map
@@ -195,6 +198,9 @@ packages/app-desktop/gui/DialogTitle.js.map
 packages/app-desktop/gui/DropboxLoginScreen.d.ts
 packages/app-desktop/gui/DropboxLoginScreen.js
 packages/app-desktop/gui/DropboxLoginScreen.js.map
+packages/app-desktop/gui/EncryptionConfigScreen.d.ts
+packages/app-desktop/gui/EncryptionConfigScreen.js
+packages/app-desktop/gui/EncryptionConfigScreen.js.map
 packages/app-desktop/gui/ErrorBoundary.d.ts
 packages/app-desktop/gui/ErrorBoundary.js
 packages/app-desktop/gui/ErrorBoundary.js.map
@@ -267,9 +273,6 @@ packages/app-desktop/gui/MainScreen/commands/renameTag.js.map
 packages/app-desktop/gui/MainScreen/commands/search.d.ts
 packages/app-desktop/gui/MainScreen/commands/search.js
 packages/app-desktop/gui/MainScreen/commands/search.js.map
-packages/app-desktop/gui/MainScreen/commands/selectTemplate.d.ts
-packages/app-desktop/gui/MainScreen/commands/selectTemplate.js
-packages/app-desktop/gui/MainScreen/commands/selectTemplate.js.map
 packages/app-desktop/gui/MainScreen/commands/setTags.d.ts
 packages/app-desktop/gui/MainScreen/commands/setTags.js
 packages/app-desktop/gui/MainScreen/commands/setTags.js.map
@@ -372,6 +375,9 @@ packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.js.map
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/styles/index.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/styles/index.js
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/styles/index.js.map
+packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/openEditDialog.d.ts
+packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/openEditDialog.js
+packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/openEditDialog.js.map
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupToolbarButtons.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupToolbarButtons.js
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupToolbarButtons.js.map
@@ -720,6 +726,9 @@ packages/app-mobile/components/screens/Note.js.map
 packages/app-mobile/components/screens/UpgradeSyncTargetScreen.d.ts
 packages/app-mobile/components/screens/UpgradeSyncTargetScreen.js
 packages/app-mobile/components/screens/UpgradeSyncTargetScreen.js.map
+packages/app-mobile/components/screens/encryption-config.d.ts
+packages/app-mobile/components/screens/encryption-config.js
+packages/app-mobile/components/screens/encryption-config.js.map
 packages/app-mobile/root.d.ts
 packages/app-mobile/root.js
 packages/app-mobile/root.js.map
@@ -822,6 +831,9 @@ packages/lib/BaseSyncTarget.js.map
 packages/lib/ClipperServer.d.ts
 packages/lib/ClipperServer.js
 packages/lib/ClipperServer.js.map
+packages/lib/CssUtils.d.ts
+packages/lib/CssUtils.js
+packages/lib/CssUtils.js.map
 packages/lib/HtmlToMd.d.ts
 packages/lib/HtmlToMd.js
 packages/lib/HtmlToMd.js.map
@@ -861,6 +873,9 @@ packages/lib/Synchronizer.js.map
 packages/lib/TaskQueue.d.ts
 packages/lib/TaskQueue.js
 packages/lib/TaskQueue.js.map
+packages/lib/array.d.ts
+packages/lib/array.js
+packages/lib/array.js.map
 packages/lib/commands/historyBackward.d.ts
 packages/lib/commands/historyBackward.js
 packages/lib/commands/historyBackward.js.map
@@ -936,6 +951,9 @@ packages/lib/markdownUtils2.test.js.map
 packages/lib/markupLanguageUtils.d.ts
 packages/lib/markupLanguageUtils.js
 packages/lib/markupLanguageUtils.js.map
+packages/lib/migrations/40.d.ts
+packages/lib/migrations/40.js
+packages/lib/migrations/40.js.map
 packages/lib/models/Alarm.d.ts
 packages/lib/models/Alarm.js
 packages/lib/models/Alarm.js.map
@@ -1056,6 +1074,9 @@ packages/lib/services/DecryptionWorker.js.map
 packages/lib/services/EncryptionService.d.ts
 packages/lib/services/EncryptionService.js
 packages/lib/services/EncryptionService.js.map
+packages/lib/services/EncryptionService.test.d.ts
+packages/lib/services/EncryptionService.test.js
+packages/lib/services/EncryptionService.test.js.map
 packages/lib/services/ExternalEditWatcher.d.ts
 packages/lib/services/ExternalEditWatcher.js
 packages/lib/services/ExternalEditWatcher.js.map
@@ -1077,6 +1098,9 @@ packages/lib/services/KvStore.js.map
 packages/lib/services/MigrationService.d.ts
 packages/lib/services/MigrationService.js
 packages/lib/services/MigrationService.js.map
+packages/lib/services/MigrationService.test.d.ts
+packages/lib/services/MigrationService.test.js
+packages/lib/services/MigrationService.test.js.map
 packages/lib/services/NavService.d.ts
 packages/lib/services/NavService.js
 packages/lib/services/NavService.js.map
@@ -1149,6 +1173,9 @@ packages/lib/services/database/types.js.map
 packages/lib/services/debug/populateDatabase.d.ts
 packages/lib/services/debug/populateDatabase.js
 packages/lib/services/debug/populateDatabase.js.map
+packages/lib/services/e2ee/utils.d.ts
+packages/lib/services/e2ee/utils.js
+packages/lib/services/e2ee/utils.js.map
 packages/lib/services/interop/InteropService.d.ts
 packages/lib/services/interop/InteropService.js
 packages/lib/services/interop/InteropService.js.map
@@ -1293,6 +1320,9 @@ packages/lib/services/plugins/api/JoplinViewsPanels.js.map
 packages/lib/services/plugins/api/JoplinViewsToolbarButtons.d.ts
 packages/lib/services/plugins/api/JoplinViewsToolbarButtons.js
 packages/lib/services/plugins/api/JoplinViewsToolbarButtons.js.map
+packages/lib/services/plugins/api/JoplinWindow.d.ts
+packages/lib/services/plugins/api/JoplinWindow.js
+packages/lib/services/plugins/api/JoplinWindow.js.map
 packages/lib/services/plugins/api/JoplinWorkspace.d.ts
 packages/lib/services/plugins/api/JoplinWorkspace.js
 packages/lib/services/plugins/api/JoplinWorkspace.js.map
@@ -1416,6 +1446,9 @@ packages/lib/services/searchengine/queryBuilder.js.map
 packages/lib/services/share/ShareService.d.ts
 packages/lib/services/share/ShareService.js
 packages/lib/services/share/ShareService.js.map
+packages/lib/services/share/ShareService.test.d.ts
+packages/lib/services/share/ShareService.test.js
+packages/lib/services/share/ShareService.test.js.map
 packages/lib/services/share/reducer.d.ts
 packages/lib/services/share/reducer.js
 packages/lib/services/share/reducer.js.map
@@ -1437,6 +1470,9 @@ packages/lib/services/synchronizer/LockHandler.js.map
 packages/lib/services/synchronizer/MigrationHandler.d.ts
 packages/lib/services/synchronizer/MigrationHandler.js
 packages/lib/services/synchronizer/MigrationHandler.js.map
+packages/lib/services/synchronizer/MigrationHandler.test.d.ts
+packages/lib/services/synchronizer/MigrationHandler.test.js
+packages/lib/services/synchronizer/MigrationHandler.test.js.map
 packages/lib/services/synchronizer/Synchronizer.basics.test.d.ts
 packages/lib/services/synchronizer/Synchronizer.basics.test.js
 packages/lib/services/synchronizer/Synchronizer.basics.test.js.map
@@ -1470,12 +1506,15 @@ packages/lib/services/synchronizer/migrations/1.js.map
 packages/lib/services/synchronizer/migrations/2.d.ts
 packages/lib/services/synchronizer/migrations/2.js
 packages/lib/services/synchronizer/migrations/2.js.map
+packages/lib/services/synchronizer/migrations/3.d.ts
+packages/lib/services/synchronizer/migrations/3.js
+packages/lib/services/synchronizer/migrations/3.js.map
+packages/lib/services/synchronizer/syncTargetInfoUtils.d.ts
+packages/lib/services/synchronizer/syncTargetInfoUtils.js
+packages/lib/services/synchronizer/syncTargetInfoUtils.js.map
 packages/lib/services/synchronizer/synchronizer_LockHandler.test.d.ts
 packages/lib/services/synchronizer/synchronizer_LockHandler.test.js
 packages/lib/services/synchronizer/synchronizer_LockHandler.test.js.map
-packages/lib/services/synchronizer/synchronizer_MigrationHandler.test.d.ts
-packages/lib/services/synchronizer/synchronizer_MigrationHandler.test.js
-packages/lib/services/synchronizer/synchronizer_MigrationHandler.test.js.map
 packages/lib/services/synchronizer/tools.d.ts
 packages/lib/services/synchronizer/tools.js
 packages/lib/services/synchronizer/tools.js.map
@@ -1488,6 +1527,9 @@ packages/lib/services/synchronizer/utils/types.js.map
 packages/lib/shim.d.ts
 packages/lib/shim.js
 packages/lib/shim.js.map
+packages/lib/testing/syncTargetUtils.d.ts
+packages/lib/testing/syncTargetUtils.js
+packages/lib/testing/syncTargetUtils.js.map
 packages/lib/testing/test-utils-synchronizer.d.ts
 packages/lib/testing/test-utils-synchronizer.js
 packages/lib/testing/test-utils-synchronizer.js.map
@@ -1530,6 +1572,9 @@ packages/lib/time.js.map
 packages/lib/utils/credentialFiles.d.ts
 packages/lib/utils/credentialFiles.js
 packages/lib/utils/credentialFiles.js.map
+packages/lib/utils/joplinCloud.d.ts
+packages/lib/utils/joplinCloud.js
+packages/lib/utils/joplinCloud.js.map
 packages/lib/uuid.d.ts
 packages/lib/uuid.js
 packages/lib/uuid.js.map
@@ -1566,6 +1611,9 @@ packages/plugin-repo-cli/lib/types.js.map
 packages/plugin-repo-cli/lib/updateReadme.d.ts
 packages/plugin-repo-cli/lib/updateReadme.js
 packages/plugin-repo-cli/lib/updateReadme.js.map
+packages/plugin-repo-cli/lib/updateReadme.test.d.ts
+packages/plugin-repo-cli/lib/updateReadme.test.js
+packages/plugin-repo-cli/lib/updateReadme.test.js.map
 packages/plugins/ToggleSidebars/api/index.d.ts
 packages/plugins/ToggleSidebars/api/index.js
 packages/plugins/ToggleSidebars/api/index.js.map
@@ -1659,6 +1707,9 @@ packages/tools/buildServerDocker.js.map
 packages/tools/generate-database-types.d.ts
 packages/tools/generate-database-types.js
 packages/tools/generate-database-types.js.map
+packages/tools/generate-images.d.ts
+packages/tools/generate-images.js
+packages/tools/generate-images.js.map
 packages/tools/lerna-add.d.ts
 packages/tools/lerna-add.js
 packages/tools/lerna-add.js.map
@@ -1686,9 +1737,6 @@ packages/tools/update-readme-sponsors.js.map
 packages/tools/website/build.d.ts
 packages/tools/website/build.js
 packages/tools/website/build.js.map
-packages/tools/website/utils/plans.d.ts
-packages/tools/website/utils/plans.js
-packages/tools/website/utils/plans.js.map
 packages/tools/website/utils/pressCarousel.d.ts
 packages/tools/website/utils/pressCarousel.js
 packages/tools/website/utils/pressCarousel.js.map
--- a/.gitignore
+++ b/.gitignore
@@ -54,6 +54,9 @@ lerna-debug.log
 packages/app-cli/app/LinkSelector.d.ts
 packages/app-cli/app/LinkSelector.js
 packages/app-cli/app/LinkSelector.js.map
+packages/app-cli/app/command-e2ee.d.ts
+packages/app-cli/app/command-e2ee.js
+packages/app-cli/app/command-e2ee.js.map
 packages/app-cli/app/command-settingschema.d.ts
 packages/app-cli/app/command-settingschema.js
 packages/app-cli/app/command-settingschema.js.map
@@ -180,6 +183,9 @@ packages/app-desktop/gui/DialogTitle.js.map
 packages/app-desktop/gui/DropboxLoginScreen.d.ts
 packages/app-desktop/gui/DropboxLoginScreen.js
 packages/app-desktop/gui/DropboxLoginScreen.js.map
+packages/app-desktop/gui/EncryptionConfigScreen.d.ts
+packages/app-desktop/gui/EncryptionConfigScreen.js
+packages/app-desktop/gui/EncryptionConfigScreen.js.map
 packages/app-desktop/gui/ErrorBoundary.d.ts
 packages/app-desktop/gui/ErrorBoundary.js
 packages/app-desktop/gui/ErrorBoundary.js.map
@@ -252,9 +258,6 @@ packages/app-desktop/gui/MainScreen/commands/renameTag.js.map
 packages/app-desktop/gui/MainScreen/commands/search.d.ts
 packages/app-desktop/gui/MainScreen/commands/search.js
 packages/app-desktop/gui/MainScreen/commands/search.js.map
-packages/app-desktop/gui/MainScreen/commands/selectTemplate.d.ts
-packages/app-desktop/gui/MainScreen/commands/selectTemplate.js
-packages/app-desktop/gui/MainScreen/commands/selectTemplate.js.map
 packages/app-desktop/gui/MainScreen/commands/setTags.d.ts
 packages/app-desktop/gui/MainScreen/commands/setTags.js
 packages/app-desktop/gui/MainScreen/commands/setTags.js.map
@@ -357,6 +360,9 @@ packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/TinyMCE.js.map
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/styles/index.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/styles/index.js
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/styles/index.js.map
+packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/openEditDialog.d.ts
+packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/openEditDialog.js
+packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/openEditDialog.js.map
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupToolbarButtons.d.ts
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupToolbarButtons.js
 packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/utils/setupToolbarButtons.js.map
@@ -705,6 +711,9 @@ packages/app-mobile/components/screens/Note.js.map
 packages/app-mobile/components/screens/UpgradeSyncTargetScreen.d.ts
 packages/app-mobile/components/screens/UpgradeSyncTargetScreen.js
 packages/app-mobile/components/screens/UpgradeSyncTargetScreen.js.map
+packages/app-mobile/components/screens/encryption-config.d.ts
+packages/app-mobile/components/screens/encryption-config.js
+packages/app-mobile/components/screens/encryption-config.js.map
 packages/app-mobile/root.d.ts
 packages/app-mobile/root.js
 packages/app-mobile/root.js.map
@@ -807,6 +816,9 @@ packages/lib/BaseSyncTarget.js.map
 packages/lib/ClipperServer.d.ts
 packages/lib/ClipperServer.js
 packages/lib/ClipperServer.js.map
+packages/lib/CssUtils.d.ts
+packages/lib/CssUtils.js
+packages/lib/CssUtils.js.map
 packages/lib/HtmlToMd.d.ts
 packages/lib/HtmlToMd.js
 packages/lib/HtmlToMd.js.map
@@ -846,6 +858,9 @@ packages/lib/Synchronizer.js.map
 packages/lib/TaskQueue.d.ts
 packages/lib/TaskQueue.js
 packages/lib/TaskQueue.js.map
+packages/lib/array.d.ts
+packages/lib/array.js
+packages/lib/array.js.map
 packages/lib/commands/historyBackward.d.ts
 packages/lib/commands/historyBackward.js
 packages/lib/commands/historyBackward.js.map
@@ -921,6 +936,9 @@ packages/lib/markdownUtils2.test.js.map
 packages/lib/markupLanguageUtils.d.ts
 packages/lib/markupLanguageUtils.js
 packages/lib/markupLanguageUtils.js.map
+packages/lib/migrations/40.d.ts
+packages/lib/migrations/40.js
+packages/lib/migrations/40.js.map
 packages/lib/models/Alarm.d.ts
 packages/lib/models/Alarm.js
 packages/lib/models/Alarm.js.map
@@ -1041,6 +1059,9 @@ packages/lib/services/DecryptionWorker.js.map
 packages/lib/services/EncryptionService.d.ts
 packages/lib/services/EncryptionService.js
 packages/lib/services/EncryptionService.js.map
+packages/lib/services/EncryptionService.test.d.ts
+packages/lib/services/EncryptionService.test.js
+packages/lib/services/EncryptionService.test.js.map
 packages/lib/services/ExternalEditWatcher.d.ts
 packages/lib/services/ExternalEditWatcher.js
 packages/lib/services/ExternalEditWatcher.js.map
@@ -1062,6 +1083,9 @@ packages/lib/services/KvStore.js.map
 packages/lib/services/MigrationService.d.ts
 packages/lib/services/MigrationService.js
 packages/lib/services/MigrationService.js.map
+packages/lib/services/MigrationService.test.d.ts
+packages/lib/services/MigrationService.test.js
+packages/lib/services/MigrationService.test.js.map
 packages/lib/services/NavService.d.ts
 packages/lib/services/NavService.js
 packages/lib/services/NavService.js.map
@@ -1134,6 +1158,9 @@ packages/lib/services/database/types.js.map
 packages/lib/services/debug/populateDatabase.d.ts
 packages/lib/services/debug/populateDatabase.js
 packages/lib/services/debug/populateDatabase.js.map
+packages/lib/services/e2ee/utils.d.ts
+packages/lib/services/e2ee/utils.js
+packages/lib/services/e2ee/utils.js.map
 packages/lib/services/interop/InteropService.d.ts
 packages/lib/services/interop/InteropService.js
 packages/lib/services/interop/InteropService.js.map
@@ -1278,6 +1305,9 @@ packages/lib/services/plugins/api/JoplinViewsPanels.js.map
 packages/lib/services/plugins/api/JoplinViewsToolbarButtons.d.ts
 packages/lib/services/plugins/api/JoplinViewsToolbarButtons.js
 packages/lib/services/plugins/api/JoplinViewsToolbarButtons.js.map
+packages/lib/services/plugins/api/JoplinWindow.d.ts
+packages/lib/services/plugins/api/JoplinWindow.js
+packages/lib/services/plugins/api/JoplinWindow.js.map
 packages/lib/services/plugins/api/JoplinWorkspace.d.ts
 packages/lib/services/plugins/api/JoplinWorkspace.js
 packages/lib/services/plugins/api/JoplinWorkspace.js.map
@@ -1401,6 +1431,9 @@ packages/lib/services/searchengine/queryBuilder.js.map
 packages/lib/services/share/ShareService.d.ts
 packages/lib/services/share/ShareService.js
 packages/lib/services/share/ShareService.js.map
+packages/lib/services/share/ShareService.test.d.ts
+packages/lib/services/share/ShareService.test.js
+packages/lib/services/share/ShareService.test.js.map
 packages/lib/services/share/reducer.d.ts
 packages/lib/services/share/reducer.js
 packages/lib/services/share/reducer.js.map
@@ -1422,6 +1455,9 @@ packages/lib/services/synchronizer/LockHandler.js.map
 packages/lib/services/synchronizer/MigrationHandler.d.ts
 packages/lib/services/synchronizer/MigrationHandler.js
 packages/lib/services/synchronizer/MigrationHandler.js.map
+packages/lib/services/synchronizer/MigrationHandler.test.d.ts
+packages/lib/services/synchronizer/MigrationHandler.test.js
+packages/lib/services/synchronizer/MigrationHandler.test.js.map
 packages/lib/services/synchronizer/Synchronizer.basics.test.d.ts
 packages/lib/services/synchronizer/Synchronizer.basics.test.js
 packages/lib/services/synchronizer/Synchronizer.basics.test.js.map
@@ -1455,12 +1491,15 @@ packages/lib/services/synchronizer/migrations/1.js.map
 packages/lib/services/synchronizer/migrations/2.d.ts
 packages/lib/services/synchronizer/migrations/2.js
 packages/lib/services/synchronizer/migrations/2.js.map
+packages/lib/services/synchronizer/migrations/3.d.ts
+packages/lib/services/synchronizer/migrations/3.js
+packages/lib/services/synchronizer/migrations/3.js.map
+packages/lib/services/synchronizer/syncTargetInfoUtils.d.ts
+packages/lib/services/synchronizer/syncTargetInfoUtils.js
+packages/lib/services/synchronizer/syncTargetInfoUtils.js.map
 packages/lib/services/synchronizer/synchronizer_LockHandler.test.d.ts
 packages/lib/services/synchronizer/synchronizer_LockHandler.test.js
 packages/lib/services/synchronizer/synchronizer_LockHandler.test.js.map
-packages/lib/services/synchronizer/synchronizer_MigrationHandler.test.d.ts
-packages/lib/services/synchronizer/synchronizer_MigrationHandler.test.js
-packages/lib/services/synchronizer/synchronizer_MigrationHandler.test.js.map
 packages/lib/services/synchronizer/tools.d.ts
 packages/lib/services/synchronizer/tools.js
 packages/lib/services/synchronizer/tools.js.map
@@ -1473,6 +1512,9 @@ packages/lib/services/synchronizer/utils/types.js.map
 packages/lib/shim.d.ts
 packages/lib/shim.js
 packages/lib/shim.js.map
+packages/lib/testing/syncTargetUtils.d.ts
+packages/lib/testing/syncTargetUtils.js
+packages/lib/testing/syncTargetUtils.js.map
 packages/lib/testing/test-utils-synchronizer.d.ts
 packages/lib/testing/test-utils-synchronizer.js
 packages/lib/testing/test-utils-synchronizer.js.map
@@ -1515,6 +1557,9 @@ packages/lib/time.js.map
 packages/lib/utils/credentialFiles.d.ts
 packages/lib/utils/credentialFiles.js
 packages/lib/utils/credentialFiles.js.map
+packages/lib/utils/joplinCloud.d.ts
+packages/lib/utils/joplinCloud.js
+packages/lib/utils/joplinCloud.js.map
 packages/lib/uuid.d.ts
 packages/lib/uuid.js
 packages/lib/uuid.js.map
@@ -1551,6 +1596,9 @@ packages/plugin-repo-cli/lib/types.js.map
 packages/plugin-repo-cli/lib/updateReadme.d.ts
 packages/plugin-repo-cli/lib/updateReadme.js
 packages/plugin-repo-cli/lib/updateReadme.js.map
+packages/plugin-repo-cli/lib/updateReadme.test.d.ts
+packages/plugin-repo-cli/lib/updateReadme.test.js
+packages/plugin-repo-cli/lib/updateReadme.test.js.map
 packages/plugins/ToggleSidebars/api/index.d.ts
 packages/plugins/ToggleSidebars/api/index.js
 packages/plugins/ToggleSidebars/api/index.js.map
@@ -1644,6 +1692,9 @@ packages/tools/buildServerDocker.js.map
 packages/tools/generate-database-types.d.ts
 packages/tools/generate-database-types.js
 packages/tools/generate-database-types.js.map
+packages/tools/generate-images.d.ts
+packages/tools/generate-images.js
+packages/tools/generate-images.js.map
 packages/tools/lerna-add.d.ts
 packages/tools/lerna-add.js
 packages/tools/lerna-add.js.map
@@ -1671,9 +1722,6 @@ packages/tools/update-readme-sponsors.js.map
 packages/tools/website/build.d.ts
 packages/tools/website/build.js
 packages/tools/website/build.js.map
-packages/tools/website/utils/plans.d.ts
-packages/tools/website/utils/plans.js
-packages/tools/website/utils/plans.js.map
 packages/tools/website/utils/pressCarousel.d.ts
 packages/tools/website/utils/pressCarousel.js
 packages/tools/website/utils/pressCarousel.js.map
--- a/Assets/ImageSources/WebsiteTopImage.png
+++ b/Assets/ImageSources/WebsiteTopImage.png
--- a/Assets/WebsiteAssets/css/site.css
+++ b/Assets/WebsiteAssets/css/site.css
@@ -147,14 +147,6 @@ h6:hover a.heading-anchor {
 	padding-right: 0px;
 }

-.img-fluid {
-	image-rendering: -moz-crisp-edges; /* Firefox */
-	image-rendering: -o-crisp-edges; /* Opera */
-	image-rendering: -webkit-optimize-contrast; /* Webkit (non-standard naming) */
-	image-rendering: crisp-edges;
-	-ms-interpolation-mode: nearest-neighbor; /* IE (non-standard property) */
-}
-
 img[align="left"] {
 	margin-right: 10px;
 	margin-bottom: 10px;
@@ -379,6 +371,10 @@ p,
 	margin-top: 40px;
 }

+#top-section-img img {
+	width: 100%;
+}
+
 .main-content {
 	flex: 1;
 }
@@ -416,6 +412,11 @@ p,
 	background-size: contain;
 }

+#work-together-section .frame-bg {
+	background-size: 100% 50%;
+	padding-bottom: 5px;
+}
+
 /* save-web-section  */
 #save-web-section {
 	padding-top: 80px;
@@ -852,7 +853,7 @@ footer .right-links a {
 	padding: 30px 20px;
 	padding-bottom: 30px;
 	margin-bottom: 50px;
-	margin-top: 60px;
+	margin-top: 40px;
 }

 .price-container p {
@@ -875,7 +876,7 @@ footer .right-links a {
 .price-container-blue {
 	background: linear-gradient(251.85deg, #0b4f99 -11.85%, #002d61 104.73%);
 	box-shadow: 0px 4px 16px rgba(105, 132, 172, 0.13);
-	margin-top: 40px;
+	margin-top: 30px;
 	padding-top: 50px;
 	color: white;
 }
@@ -890,6 +891,44 @@ footer .right-links a {
 	margin-bottom: 1em;
 }

+.plan-group {
+	justify-content: center;
+}
+
+.plan-group .plan-price-yearly-per-year {
+	display: flex;
+	justify-content: flex-end;
+	margin-top: -20px;
+	margin-bottom: 10px;
+}
+
+.plan-group .plan-price-yearly-per-year .per-year {
+	bottom: 0;
+}
+
+.plan-group.plan-prices-monthly .plan-price-yearly {
+	display: none;
+}
+
+.plan-group.plan-prices-monthly .plan-price-yearly-per-year {
+	display: none;
+}
+
+.plan-group.plan-prices-yearly .plan-price-monthly {
+	text-decoration: line-through;
+	opacity: 0.7;
+	font-size: 16px;
+	font-weight: normal;
+}
+
+.plan-group.plan-prices-yearly .account-type-3 .plan-price-monthly {
+	display: none;
+}
+
+.plan-group.plan-prices-yearly .plan-price-monthly .per-month {
+	display: none;
+}
+
 .price-row .plan-type {
 	display: flex;
 	align-items: center;
--- a/Assets/WebsiteAssets/images/home-top-img-2x.png
+++ b/Assets/WebsiteAssets/images/home-top-img-2x.png
--- a/Assets/WebsiteAssets/images/home-top-img-2x.webp
+++ b/Assets/WebsiteAssets/images/home-top-img-2x.webp
--- a/Assets/WebsiteAssets/images/home-top-img-4x.webp
+++ b/Assets/WebsiteAssets/images/home-top-img-4x.webp
--- a/Assets/WebsiteAssets/images/home-top-img.png
+++ b/Assets/WebsiteAssets/images/home-top-img.png
--- a/Assets/WebsiteAssets/images/home-top-img.webp
+++ b/Assets/WebsiteAssets/images/home-top-img.webp
--- a/Assets/WebsiteAssets/images/sponsors/HostingDe.png
+++ b/Assets/WebsiteAssets/images/sponsors/HostingDe.png
--- a/Assets/WebsiteAssets/templates/front.mustache
+++ b/Assets/WebsiteAssets/templates/front.mustache
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 	<head>
+		{{> gaOptimize}}
 		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
@@ -9,7 +10,7 @@
 		<link rel="icon" href="{{imageBaseUrl}}/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Jopli website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link rel="stylesheet" href="{{cssBaseUrl}}/fontawesome-all.min.css?t={{buildTime}}">
 		<link
 			rel="stylesheet"
@@ -23,6 +24,11 @@
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
+		<script
+			src="{{jsBaseUrl}}/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 		<link rel="stylesheet" href="{{cssBaseUrl}}/site.css?t={{buildTime}}" as="style" />
 		<title>Joplin</title>
 	</head>
@@ -55,12 +61,19 @@
 									<a href="{{baseUrl}}/plans/" class="button-link btn-trans plans-button">Sign up with Joplin Cloud</a>
 								{{/showJoplinCloudLinks}}
 							</p>
-							<img
-								src="{{imageBaseUrl}}/home-top-img.png"
-								alt=""
-								class="img-fluid img-center"
-								id="top-section-img"
-							/>
+
+							<picture class="img-fluid img-center" id="top-section-img">
+								<source type="image/webp" srcset="
+									{{imageBaseUrl}}/home-top-img-4x.webp 4820w,
+									{{imageBaseUrl}}/home-top-img-2x.webp 2388w,
+									{{imageBaseUrl}}/home-top-img.webp 1205w
+								">
+								<source type="image/png" srcset="
+									{{imageBaseUrl}}/home-top-img-2x.png 2388w,
+									{{imageBaseUrl}}/home-top-img.png 1205w
+								">
+								<img id="top-section-img-img" src="{{imageBaseUrl}}/home-top-img-2x.png">
+							</picture>
 						</div>
 					</div>
 				</div>
@@ -106,12 +119,13 @@
 						<div class="col-6 d-none d-md-block"></div>
 						<div class="col-12 col-md-6">
 							<div class="ml-30 ml-mobile-0">
-								<h2>Work together</h2>
+								<h2>Work <span class="frame-bg frame-bg-yellow">together</span></h2>
 								<p>
 									With Joplin Cloud, share your notes with your friends, family
 									or colleagues and collaborate on them.
 								</p>
-								<br />
+								<p>You can also publish a note to the internet and share the URL with others.</p>
+								<br/>
 								<p>
 									<a href="{{baseUrl}}/plans/" class="button-link btn-blue">Try it now</a>
 								</p>
@@ -395,11 +409,6 @@
 			rel="preload"
 			as="script"
 		></script>
-		<script
-			src="{{jsBaseUrl}}/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
 		<script src="{{jsBaseUrl}}/script.js?t={{buildTime}}"></script>
 		{{> analytics}}
 	</body>
--- a/Assets/WebsiteAssets/templates/main-new.mustache
+++ b/Assets/WebsiteAssets/templates/main-new.mustache
@@ -14,6 +14,7 @@ https://github.com/laurent22/joplin/blob/dev/{{{sourceMarkdownFile}}}
 -->

 	<head>
+		{{> gaOptimize}}
 		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
@@ -22,7 +23,7 @@ https://github.com/laurent22/joplin/blob/dev/{{{sourceMarkdownFile}}}
 		<link rel="icon" href="{{imageBaseUrl}}/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="{{cssBaseUrl}}/bootstrap5.0.2.min.css"
@@ -38,6 +39,12 @@ https://github.com/laurent22/joplin/blob/dev/{{{sourceMarkdownFile}}}
 		/>
 		<link rel="stylesheet" href="{{cssBaseUrl}}/site.css?t={{buildTime}}" as="style" />
 		<title>{{pageTitle}}</title>
+
+		<script
+			src="{{jsBaseUrl}}/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-{{env}}">
 		<div class="container-fluid generic-template {{pageName}}-page" id="main-container">
@@ -102,11 +109,6 @@ https://github.com/laurent22/joplin/blob/dev/{{{sourceMarkdownFile}}}
 			</footer>
 		</div>

-		<script
-			src="{{jsBaseUrl}}/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
 		<script src="{{jsBaseUrl}}/script.js?t={{buildTime}}"></script>

 		{{> analytics}}
--- a/Assets/WebsiteAssets/templates/partials/gaOptimize.mustache
+++ b/Assets/WebsiteAssets/templates/partials/gaOptimize.mustache
@@ -0,0 +1,2 @@
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>
--- a/Assets/WebsiteAssets/templates/partials/plan.mustache
+++ b/Assets/WebsiteAssets/templates/partials/plan.mustache
@@ -1,12 +1,22 @@
-<div class="col-12 col-lg-4">
+<div class="col-12 col-lg-4 account-type-{{priceMonthly.accountType}}">
 	<div class="price-container {{#featured}}price-container-blue{{/featured}}">
 		<div class="price-row">
 			<div class="plan-type">
 				<img src="{{imageBaseUrl}}/{{iconName}}.png"/>&nbsp;{{title}}
 			</div>

-			<div class="plan-price">
-				{{price}}<sub class="per-month">&nbsp;/month</sub>
+			<div class="plan-price plan-price-monthly">
+				{{priceMonthly.formattedMonthlyAmount}}<sub class="per-month">&nbsp;/month</sub>
+			</div>
+
+			<div class="plan-price plan-price-yearly">
+				{{priceYearly.formattedMonthlyAmount}}<sub class="per-month">&nbsp;/month</sub>
+			</div>
+		</div>
+
+		<div class="plan-price-yearly-per-year">
+			<div>
+				({{priceYearly.formattedAmount}}<sub class="per-year">&nbsp;/year</sub>)
 			</div>
 		</div>

@@ -19,25 +29,34 @@
 		{{/featuresOff}}
 		
 		<p class="text-center subscribe-wrapper">
-			<a id="subscribeButton-{{name}}" href="{{cfaUrl}}" class="button-link btn-white">{{cfaLabel}}</a>
+			<a id="subscribeButton-{{name}}" href="{{cfaUrl}}" class="button-link btn-white subscribeButton">{{cfaLabel}}</a>
 		</p>
 	</div>

 	<script>
 		(function() {
-			const stripePriceId = '{{{stripePriceId}}}';
+			const stripePricesIds = {
+				monthly: '{{{priceMonthly.id}}}',
+				yearly: '{{{priceYearly.id}}}',
+			};
 			const planName = '{{{name}}}';
 			const buttonId = 'subscribeButton-' + planName;
 			const buttonElement = document.getElementById(buttonId);

-			if (stripePriceId) {
+			if (stripePricesIds.monthly) {
 				function handleResult() {
 					console.info('Redirected to checkout');
 				}

 				buttonElement.addEventListener("click", function(evt) {
 					evt.preventDefault();
-					const priceId = '{{{stripePriceId}}}';
+
+					const priceId = stripePricesIds[subscriptionPeriod];
+
+					if (!priceId) {
+						console.error('Invalid period: ' + subscriptionPeriod);
+						return;
+					}

 					createCheckoutSession(priceId).then(function(data) {
 						stripe.redirectToCheckout({
--- a/Assets/WebsiteAssets/templates/partials/supportButton.mustache
+++ b/Assets/WebsiteAssets/templates/partials/supportButton.mustache
@@ -1,3 +1,3 @@
 <a class="button-link btn-blue sponsor-button" href="{{baseUrl}}/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>
--- a/Assets/WebsiteAssets/templates/plans.mustache
+++ b/Assets/WebsiteAssets/templates/plans.mustache
@@ -10,8 +10,30 @@
 				</p>
 			</div>
 		</div>
+
+		<noscript>
+			<div class="alert alert-danger alert-env-dev" role="alert" style='text-align: center; margin-top: 10px;'>
+				To use this page please enable JavaScript!
+			</div>
+		</noscript>
+
+		<div style="display: flex; justify-content: center; margin-top: 1.2em">	
+			<div class="form-check form-check-inline">
+				<input id="pay-monthly-radio" class="form-check-input" type="radio" name="pay-radio" checked value="monthly">
+				<label style="font-weight: bold" class="form-check-label" for="pay-monthly-radio">
+					Pay Monthly
+				</label>
+			</div>
+
+			<div class="form-check form-check-inline">
+				<input id="pay-yearly-radio" class="form-check-input" type="radio" name="pay-radio" value="yearly">
+				<label style="font-weight: bold" class="form-check-label" for="pay-yearly-radio">
+					Pay Yearly
+				</label>
+			</div>	
+		</div>
 		
-		<div class="row">
+		<div class="row plan-group plan-prices-monthly">
 			{{#plans.basic}}
 				{{> plan}}
 			{{/plans.basic}}
@@ -33,22 +55,65 @@
 	<script src="https://js.stripe.com/v3/"></script>

 	<script>
-	var stripe = Stripe('{{{stripeConfig.publishableKey}}}');
+		const urlQuery = new URLSearchParams(location.search);
+		let subscriptionPeriod = 'monthly';
+		var stripe = Stripe('{{{stripeConfig.publishableKey}}}');

-	var createCheckoutSession = function(priceId) {
-		console.info('Creating Stripe session for price:', priceId);
+		let checkoutSessionUser = null;

-		return fetch("{{{stripeConfig.webhookBaseUrl}}}/stripe/createCheckoutSession", {
-			method: "POST",
-			headers: {
-				"Content-Type": "application/json"
-			},
-			body: JSON.stringify({
-				priceId: priceId
-			})
-		}).then(function(result) {
-			return result.json();
+		// Temporary setup to allow Beta users to start their subscription.
+		function setupBetaHandling(query) {
+			let accountType = Number(query.get('account_type'));
+			if (isNaN(accountType)) accountType = 1;
+
+			const email = query.get('email');
+			if (!email) return;
+		
+			$('.account-type-3').css('display', 'none');
+			$('.subscribeButton').text('Buy now');
+			
+			if (accountType === 2) {
+				$('.account-type-1').css('display', 'none');
+			}
+
+			checkoutSessionUser = { email, accountType };
+		}
+
+		var createCheckoutSession = function(priceId) {
+			const coupon = urlQuery.get('coupon') || '';
+
+			console.info('Creating Stripe session for price:', priceId, 'Coupon:', coupon);
+
+			return fetch("{{{stripeConfig.webhookBaseUrl}}}/stripe/createCheckoutSession", {
+				method: "POST",
+				headers: {
+					"Content-Type": "application/json"
+				},
+				body: JSON.stringify({
+					priceId: priceId,
+					coupon: coupon,
+					email: checkoutSessionUser ? checkoutSessionUser.email : '',
+				})
+			}).then(async function(result) {
+				if (!result.ok) {
+					console.error('Could not create Stripe checkout session', await result.text());
+					alert('The checkout session could not be created. Please contact support@joplincloud.com for support.');
+				} else {
+					return result.json();
+				}
+			});
+		};
+
+		$(() => {
+			$("input[name='pay-radio']").change(function() {
+				const period = $("input[type='radio'][name='pay-radio']:checked").val();
+				subscriptionPeriod = period;
+			
+				$('.plan-group').removeClass(period === 'monthly' ? 'plan-prices-yearly' : 'plan-prices-monthly');
+				$('.plan-group').addClass('plan-prices-' + period);
+			});
+
+			setupBetaHandling(urlQuery);
 		});
-	};
 	</script>
 </div>
--- a/README.md
+++ b/README.md
@@ -22,11 +22,11 @@ Three types of applications are available: for the **desktop** (Windows, macOS a

 Operating System | Download
 ---|---
-Windows (32 and 64-bit) | <a href='https://github.com/laurent22/joplin/releases/download/v2.1.8/Joplin-Setup-2.1.8.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a>
-macOS | <a href='https://github.com/laurent22/joplin/releases/download/v2.1.8/Joplin-2.1.8.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a>
-Linux | <a href='https://github.com/laurent22/joplin/releases/download/v2.1.8/Joplin-2.1.8.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a>
+Windows (32 and 64-bit) | <a href='https://github.com/laurent22/joplin/releases/download/v2.1.9/Joplin-Setup-2.1.9.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a>
+macOS | <a href='https://github.com/laurent22/joplin/releases/download/v2.1.9/Joplin-2.1.9.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a>
+Linux | <a href='https://github.com/laurent22/joplin/releases/download/v2.1.9/Joplin-2.1.9.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a>

-**On Windows**, you may also use the <a href='https://github.com/laurent22/joplin/releases/download/v2.1.8/JoplinPortable.exe'>Portable version</a>. The [portable application](https://en.wikipedia.org/wiki/Portable_application) allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called "JoplinProfile" next to the executable file.
+**On Windows**, you may also use the <a href='https://github.com/laurent22/joplin/releases/download/v2.1.9/JoplinPortable.exe'>Portable version</a>. The [portable application](https://en.wikipedia.org/wiki/Portable_application) allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called "JoplinProfile" next to the executable file.

 **On Linux**, the recommended way is to use the following installation script as it will handle the desktop icon too:

@@ -64,19 +64,21 @@ The Web Clipper is a browser extension that allows you to save web pages and scr

 # Sponsors

-<a href="https://seirei.ne.jp"><img title="Serei Network" width="256" src="https://joplinapp.org/images/sponsors/SeireiNetwork.png"/></a> <a href="https://usrigging.com/"><img title="U.S. Ringing Supply" width="256" src="https://joplinapp.org/images/sponsors/RingingSupply.svg"/></a> <a href="https://tranio.com/italy/"><img title="Tranio" width="256" src="https://joplinapp.org/images/sponsors/Tranio.png"/></a>
+<!-- SPONSORS-ORG -->
+<a href="https://www.hosting.de/nextcloud/?mtm_campaign=managed-nextcloud&amp;mtm_kwd=joplinapp&amp;mtm_source=joplinapp-github&amp;mtm_medium=banner"><img title="Hosting.de" width="256" src="https://joplinapp.org/images/sponsors/HostingDe.png"/></a> <a href="https://tranio.com/italy/"><img title="Tranio" width="256" src="https://joplinapp.org/images/sponsors/Tranio.png"/></a> <a href="https://usrigging.com/"><img title="U.S. Ringing Supply" width="256" src="https://joplinapp.org/images/sponsors/RingingSupply.svg"/></a> <a href="https://seirei.ne.jp"><img title="Serei Network" width="256" src="https://joplinapp.org/images/sponsors/SeireiNetwork.png"/></a>
+<!-- SPONSORS-ORG -->

 * * *

-<!-- SPONSORS -->
+<!-- SPONSORS-GITHUB -->
 |       |       |       |       |
 | :---: | :---: | :---: | :---: |
 | <img width="50" src="https://avatars2.githubusercontent.com/u/215668?s=96&v=4"/></br>[avanderberg](https://github.com/avanderberg) | <img width="50" src="https://avatars2.githubusercontent.com/u/3061769?s=96&v=4"/></br>[c-nagy](https://github.com/c-nagy) | <img width="50" src="https://avatars2.githubusercontent.com/u/70780798?s=96&v=4"/></br>[cabottech](https://github.com/cabottech) | <img width="50" src="https://avatars2.githubusercontent.com/u/67130?s=96&v=4"/></br>[chr15m](https://github.com/chr15m) |
-| <img width="50" src="https://avatars2.githubusercontent.com/u/4862947?s=96&v=4"/></br>[chrootlogin](https://github.com/chrootlogin) | <img width="50" src="https://avatars2.githubusercontent.com/u/1307332?s=96&v=4"/></br>[dbrandonjohnson](https://github.com/dbrandonjohnson) | <img width="50" src="https://avatars2.githubusercontent.com/u/1439535?s=96&v=4"/></br>[fbloise](https://github.com/fbloise) | <img width="50" src="https://avatars2.githubusercontent.com/u/38898566?s=96&v=4"/></br>[h4sh5](https://github.com/h4sh5) |
-| <img width="50" src="https://avatars2.githubusercontent.com/u/37297218?s=96&v=4"/></br>[Jesssullivan](https://github.com/Jesssullivan) | <img width="50" src="https://avatars2.githubusercontent.com/u/1248504?s=96&v=4"/></br>[joesfer](https://github.com/joesfer) | <img width="50" src="https://avatars2.githubusercontent.com/u/24908652?s=96&v=4"/></br>[konishi-t](https://github.com/konishi-t) | <img width="50" src="https://avatars2.githubusercontent.com/u/1788010?s=96&v=4"/></br>[maxtruxa](https://github.com/maxtruxa) |
-| <img width="50" src="https://avatars2.githubusercontent.com/u/29300939?s=96&v=4"/></br>[mcejp](https://github.com/mcejp) | <img width="50" src="https://avatars2.githubusercontent.com/u/1168659?s=96&v=4"/></br>[nicholashead](https://github.com/nicholashead) | <img width="50" src="https://avatars2.githubusercontent.com/u/5782817?s=96&v=4"/></br>[piccobit](https://github.com/piccobit) | <img width="50" src="https://avatars2.githubusercontent.com/u/47742?s=96&v=4"/></br>[ravenscroftj](https://github.com/ravenscroftj) |
-| <img width="50" src="https://avatars2.githubusercontent.com/u/73081837?s=96&v=4"/></br>[thismarty](https://github.com/thismarty) | <img width="50" src="https://avatars2.githubusercontent.com/u/15859362?s=96&v=4"/></br>[thomasbroussard](https://github.com/thomasbroussard) |       |       |
-<!-- SPONSORS -->
+| <img width="50" src="https://avatars2.githubusercontent.com/u/4862947?s=96&v=4"/></br>[chrootlogin](https://github.com/chrootlogin) | <img width="50" src="https://avatars2.githubusercontent.com/u/82579431?s=96&v=4"/></br>[clmntsl](https://github.com/clmntsl) | <img width="50" src="https://avatars2.githubusercontent.com/u/1307332?s=96&v=4"/></br>[dbrandonjohnson](https://github.com/dbrandonjohnson) | <img width="50" src="https://avatars2.githubusercontent.com/u/1439535?s=96&v=4"/></br>[fbloise](https://github.com/fbloise) |
+| <img width="50" src="https://avatars2.githubusercontent.com/u/38898566?s=96&v=4"/></br>[h4sh5](https://github.com/h4sh5) | <img width="50" src="https://avatars2.githubusercontent.com/u/37297218?s=96&v=4"/></br>[Jesssullivan](https://github.com/Jesssullivan) | <img width="50" src="https://avatars2.githubusercontent.com/u/1248504?s=96&v=4"/></br>[joesfer](https://github.com/joesfer) | <img width="50" src="https://avatars2.githubusercontent.com/u/24908652?s=96&v=4"/></br>[konishi-t](https://github.com/konishi-t) |
+| <img width="50" src="https://avatars2.githubusercontent.com/u/1788010?s=96&v=4"/></br>[maxtruxa](https://github.com/maxtruxa) | <img width="50" src="https://avatars2.githubusercontent.com/u/29300939?s=96&v=4"/></br>[mcejp](https://github.com/mcejp) | <img width="50" src="https://avatars2.githubusercontent.com/u/1168659?s=96&v=4"/></br>[nicholashead](https://github.com/nicholashead) | <img width="50" src="https://avatars2.githubusercontent.com/u/5782817?s=96&v=4"/></br>[piccobit](https://github.com/piccobit) |
+| <img width="50" src="https://avatars2.githubusercontent.com/u/47742?s=96&v=4"/></br>[ravenscroftj](https://github.com/ravenscroftj) | <img width="50" src="https://avatars2.githubusercontent.com/u/73081837?s=96&v=4"/></br>[thismarty](https://github.com/thismarty) | <img width="50" src="https://avatars2.githubusercontent.com/u/15859362?s=96&v=4"/></br>[thomasbroussard](https://github.com/thomasbroussard) |       |
+<!-- SPONSORS-GITHUB -->

 <!-- TOC -->
 # Table of contents
@@ -163,7 +165,6 @@ The Web Clipper is a browser extension that allows you to save web pages and scr
 - Supports multiple languages.
 - External editor support - open notes in your favorite external editor with one click in Joplin.
 - Extensible functionality through plugin and data APIs.
- Template support with data variables for auto creation of time & dates.
 - Custom CSS support for customisation of both the rendered markdown and overall user interface.
 - Customisable layout allows toggling, movement and sizing of various elements.
 - Keyboard shortcuts are editable and allow binding of most Joplin commands with export/import functionality.
@@ -374,29 +375,6 @@ The whole UI can be customized by placing a custom editor style file in the prof

 Important: userstyle.css and userchrome.css are provided for your convenience, but they are advanced settings, and styles you define may break from one version to the next. If you want to use them, please know that it might require regular development work from you to keep them working. The Joplin team cannot make a commitment to keep the application HTML structure stable.

-# Note templates
-
-In the **desktop app**, templates can be used to create new notes or to insert into existing ones by adding a template file to the `templates` directory (File > Templates). For example creating the file `hours.md` in the `templates` directory with the contents:
-
-```markdown
-Date: {{date}}
-Hours:
-Details:
-```
-
-Templates can then be inserted from the menu (File->Templates).
-
-The currently supported template variables are:
-
-| Variable | Description | Example |
-| --- | --- | --- |
-| `{{date}}` | Today's date formatted based on the settings format | 2019-01-01 |
-| `{{time}}` | Current time formatted based on the settings format | 13:00 |
-| `{{datetime}}` | Current date and time formatted based on the settings format | 01/01/19 1:00 PM |
-| `{{#custom_datetime}}` | Current date and/or time formatted based on a supplied string (using [moment.js](https://momentjs.com/) formatting) | `{{#custom_datetime}}M d{{/custom_datetime}}` |
-| `{{bowm}}` | Date of the beginning of the week (when week starts on Monday) based on the settings format | |
-| `{{bows}}` | Date of the beginning of the week (when week starts on Sunday) based on the settings format | |
-
 # Plugins

 The **desktop app** has the ability to extend beyond its standard functionality by the way of plugins. These plugins adhere to the Joplin plugin API and can be installed & configured within the application via the `Plugins` page in the Configuration screen. This menu allows the manual installation of the plugin using the single 'Joplin Plugin Archive' (*.jpl) file. Once the application is reloaded the plugins will appear within the plugins menu where they can be toggled on/off or removed entirely.
@@ -521,46 +499,46 @@ Current translations:
 <!-- LOCALE-TABLE-AUTO-GENERATED -->
 &nbsp;  |  Language  |  Po File  |  Last translator  |  Percent done
 ---|---|---|---|---
-<img src="https://joplinapp.org/images/flags/country-4x3/arableague.png" width="16px"/>  |  Arabic  |  [ar](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ar.po)  |  [Whaell O](mailto:Whaell@protonmail.com)  |  95%
+<img src="https://joplinapp.org/images/flags/country-4x3/arableague.png" width="16px"/>  |  Arabic  |  [ar](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ar.po)  |  [Whaell O](mailto:Whaell@protonmail.com)  |  94%
 <img src="https://joplinapp.org/images/flags/es/basque_country.png" width="16px"/>  |  Basque  |  [eu](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/eu.po)  |  juan.abasolo@ehu.eus  |  29%
-<img src="https://joplinapp.org/images/flags/country-4x3/ba.png" width="16px"/>  |  Bosnian (Bosna i Hercegovina)  |  [bs_BA](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bs_BA.po)  |  [Derviš T.](mailto:dervis.t@pm.me)  |  74%
+<img src="https://joplinapp.org/images/flags/country-4x3/ba.png" width="16px"/>  |  Bosnian (Bosna i Hercegovina)  |  [bs_BA](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bs_BA.po)  |  [Derviš T.](mailto:dervis.t@pm.me)  |  73%
 <img src="https://joplinapp.org/images/flags/country-4x3/bg.png" width="16px"/>  |  Bulgarian (България)  |  [bg_BG](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bg_BG.po)  |    |  57%
-<img src="https://joplinapp.org/images/flags/es/catalonia.png" width="16px"/>  |  Catalan  |  [ca](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ca.po)  |  jmontane, 2019  |  82%
+<img src="https://joplinapp.org/images/flags/es/catalonia.png" width="16px"/>  |  Catalan  |  [ca](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ca.po)  |  jmontane, 2019  |  99%
 <img src="https://joplinapp.org/images/flags/country-4x3/hr.png" width="16px"/>  |  Croatian (Hrvatska)  |  [hr_HR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/hr_HR.po)  |  [Milo Ivir](mailto:mail@milotype.de)  |  99%
-<img src="https://joplinapp.org/images/flags/country-4x3/cz.png" width="16px"/>  |  Czech (Česká republika)  |  [cs_CZ](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/cs_CZ.po)  |  [Michal Stanke](mailto:michal@stanke.cz)  |  99%
-<img src="https://joplinapp.org/images/flags/country-4x3/dk.png" width="16px"/>  |  Dansk (Danmark)  |  [da_DK](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/da_DK.po)  |  Mustafa Al-Dailemi (dailemi@hotmail.com)Language-Team:  |  99%
-<img src="https://joplinapp.org/images/flags/country-4x3/de.png" width="16px"/>  |  Deutsch (Deutschland)  |  [de_DE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/de_DE.po)  |  [Atalanttore](mailto:atalanttore@googlemail.com)  |  94%
+<img src="https://joplinapp.org/images/flags/country-4x3/cz.png" width="16px"/>  |  Czech (Česká republika)  |  [cs_CZ](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/cs_CZ.po)  |  [Michal Stanke](mailto:michal@stanke.cz)  |  98%
+<img src="https://joplinapp.org/images/flags/country-4x3/dk.png" width="16px"/>  |  Dansk (Danmark)  |  [da_DK](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/da_DK.po)  |  Mustafa Al-Dailemi (dailemi@hotmail.com)Language-Team:  |  98%
+<img src="https://joplinapp.org/images/flags/country-4x3/de.png" width="16px"/>  |  Deutsch (Deutschland)  |  [de_DE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/de_DE.po)  |  [Atalanttore](mailto:atalanttore@googlemail.com)  |  99%
 <img src="https://joplinapp.org/images/flags/country-4x3/ee.png" width="16px"/>  |  Eesti Keel (Eesti)  |  [et_EE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/et_EE.po)  |    |  56%
 <img src="https://joplinapp.org/images/flags/country-4x3/gb.png" width="16px"/>  |  English (United Kingdom)  |  [en_GB](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/en_GB.po)  |    |  100%
 <img src="https://joplinapp.org/images/flags/country-4x3/us.png" width="16px"/>  |  English (United States of America)  |  [en_US](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/en_US.po)  |    |  100%
 <img src="https://joplinapp.org/images/flags/country-4x3/es.png" width="16px"/>  |  Español (España)  |  [es_ES](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/es_ES.po)  |  [Francisco Mora](mailto:francisco.m.collao@gmail.com)  |  99%
 <img src="https://joplinapp.org/images/flags/esperanto.png" width="16px"/>  |  Esperanto  |  [eo](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/eo.po)  |  Marton Paulo  |  32%
 <img src="https://joplinapp.org/images/flags/country-4x3/fi.png" width="16px"/>  |  Finnish (Suomi)  |  [fi_FI](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fi_FI.po)  |  mrkaato  |  93%
-<img src="https://joplinapp.org/images/flags/country-4x3/fr.png" width="16px"/>  |  Français (France)  |  [fr_FR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fr_FR.po)  |  Laurent Cozic  |  98%
+<img src="https://joplinapp.org/images/flags/country-4x3/fr.png" width="16px"/>  |  Français (France)  |  [fr_FR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fr_FR.po)  |  Laurent Cozic  |  97%
 <img src="https://joplinapp.org/images/flags/es/galicia.png" width="16px"/>  |  Galician (España)  |  [gl_ES](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/gl_ES.po)  |  [Marcos Lans](mailto:marcoslansgarza@gmail.com)  |  37%
-<img src="https://joplinapp.org/images/flags/country-4x3/id.png" width="16px"/>  |  Indonesian (Indonesia)  |  [id_ID](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/id_ID.po)  |  [eresytter](mailto:42007357+eresytter@users.noreply.github.com)  |  92%
+<img src="https://joplinapp.org/images/flags/country-4x3/id.png" width="16px"/>  |  Indonesian (Indonesia)  |  [id_ID](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/id_ID.po)  |  [eresytter](mailto:42007357+eresytter@users.noreply.github.com)  |  91%
 <img src="https://joplinapp.org/images/flags/country-4x3/it.png" width="16px"/>  |  Italiano (Italia)  |  [it_IT](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/it_IT.po)  |  [Manuel Tassi](mailto:mannivuwiki@gmail.com)  |  98%
-<img src="https://joplinapp.org/images/flags/country-4x3/hu.png" width="16px"/>  |  Magyar (Magyarország)  |  [hu_HU](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/hu_HU.po)  |  [Szőke Sándor](mailto:mail@szokesandor.hu)  |  87%
-<img src="https://joplinapp.org/images/flags/country-4x3/be.png" width="16px"/>  |  Nederlands (België, Belgique, Belgien)  |  [nl_BE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_BE.po)  |    |  91%
-<img src="https://joplinapp.org/images/flags/country-4x3/nl.png" width="16px"/>  |  Nederlands (Nederland)  |  [nl_NL](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_NL.po)  |  [MetBril](mailto:metbril@users.noreply.github.com)  |  94%
+<img src="https://joplinapp.org/images/flags/country-4x3/hu.png" width="16px"/>  |  Magyar (Magyarország)  |  [hu_HU](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/hu_HU.po)  |  [Magyari Balázs](mailto:balmag@gmail.com)  |  87%
+<img src="https://joplinapp.org/images/flags/country-4x3/be.png" width="16px"/>  |  Nederlands (België, Belgique, Belgien)  |  [nl_BE](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_BE.po)  |    |  90%
+<img src="https://joplinapp.org/images/flags/country-4x3/nl.png" width="16px"/>  |  Nederlands (Nederland)  |  [nl_NL](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_NL.po)  |  [MetBril](mailto:metbril@users.noreply.github.com)  |  93%
 <img src="https://joplinapp.org/images/flags/country-4x3/no.png" width="16px"/>  |  Norwegian (Norge, Noreg)  |  [nb_NO](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nb_NO.po)  |  [Mats Estensen](mailto:code@mxe.no)  |  75%
-<img src="https://joplinapp.org/images/flags/country-4x3/ir.png" width="16px"/>  |  Persian  |  [fa](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fa.po)  |  [Kourosh Firoozbakht](mailto:kourox@protonmail.com)  |  71%
+<img src="https://joplinapp.org/images/flags/country-4x3/ir.png" width="16px"/>  |  Persian  |  [fa](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fa.po)  |  [Kourosh Firoozbakht](mailto:kourox@protonmail.com)  |  70%
 <img src="https://joplinapp.org/images/flags/country-4x3/pl.png" width="16px"/>  |  Polski (Polska)  |  [pl_PL](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pl_PL.po)  |  [konhi](mailto:hello.konhi@gmail.com)  |  93%
-<img src="https://joplinapp.org/images/flags/country-4x3/br.png" width="16px"/>  |  Português (Brasil)  |  [pt_BR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_BR.po)  |  [Nicolas Suzuki](mailto:nicolas.suzuki@pm.me)  |  93%
+<img src="https://joplinapp.org/images/flags/country-4x3/br.png" width="16px"/>  |  Português (Brasil)  |  [pt_BR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_BR.po)  |  [Nicolas Suzuki](mailto:nicolas.suzuki@pm.me)  |  98%
 <img src="https://joplinapp.org/images/flags/country-4x3/pt.png" width="16px"/>  |  Português (Portugal)  |  [pt_PT](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_PT.po)  |  [Diogo Caveiro](mailto:dcaveiro@yahoo.com)  |  93%
-<img src="https://joplinapp.org/images/flags/country-4x3/ro.png" width="16px"/>  |  Română  |  [ro](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ro.po)  |  [Cristi Duluta](mailto:cristi.duluta@gmail.com)  |  66%
+<img src="https://joplinapp.org/images/flags/country-4x3/ro.png" width="16px"/>  |  Română  |  [ro](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ro.po)  |  [Cristi Duluta](mailto:cristi.duluta@gmail.com)  |  65%
 <img src="https://joplinapp.org/images/flags/country-4x3/si.png" width="16px"/>  |  Slovenian (Slovenija)  |  [sl_SI](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sl_SI.po)  |  [Martin Korelič](mailto:martin.korelic@protonmail.com)  |  94%
-<img src="https://joplinapp.org/images/flags/country-4x3/se.png" width="16px"/>  |  Svenska  |  [sv](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sv.po)  |  [Jonatan Nyberg](mailto:jonatan@autistici.org)  |  61%
-<img src="https://joplinapp.org/images/flags/country-4x3/th.png" width="16px"/>  |  Thai (ประเทศไทย)  |  [th_TH](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/th_TH.po)  |    |  45%
+<img src="https://joplinapp.org/images/flags/country-4x3/se.png" width="16px"/>  |  Svenska  |  [sv](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sv.po)  |  [Jonatan Nyberg](mailto:jonatan@autistici.org)  |  98%
+<img src="https://joplinapp.org/images/flags/country-4x3/th.png" width="16px"/>  |  Thai (ประเทศไทย)  |  [th_TH](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/th_TH.po)  |    |  44%
 <img src="https://joplinapp.org/images/flags/country-4x3/vi.png" width="16px"/>  |  Tiếng Việt  |  [vi](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/vi.po)  |    |  72%
-<img src="https://joplinapp.org/images/flags/country-4x3/tr.png" width="16px"/>  |  Türkçe (Türkiye)  |  [tr_TR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/tr_TR.po)  |  [Arda Kılıçdağı](mailto:arda@kilicdagi.com)  |  93%
-<img src="https://joplinapp.org/images/flags/country-4x3/ua.png" width="16px"/>  |  Ukrainian (Україна)  |  [uk_UA](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/uk_UA.po)  |  [Vyacheslav Andreykiv](mailto:vandreykiv@gmail.com)  |  93%
-<img src="https://joplinapp.org/images/flags/country-4x3/gr.png" width="16px"/>  |  Ελληνικά (Ελλάδα)  |  [el_GR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/el_GR.po)  |  [Harris Arvanitis](mailto:xaris@tuta.io)  |  96%
+<img src="https://joplinapp.org/images/flags/country-4x3/tr.png" width="16px"/>  |  Türkçe (Türkiye)  |  [tr_TR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/tr_TR.po)  |  [Arda Kılıçdağı](mailto:arda@kilicdagi.com)  |  99%
+<img src="https://joplinapp.org/images/flags/country-4x3/ua.png" width="16px"/>  |  Ukrainian (Україна)  |  [uk_UA](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/uk_UA.po)  |  [Vyacheslav Andreykiv](mailto:vandreykiv@gmail.com)  |  92%
+<img src="https://joplinapp.org/images/flags/country-4x3/gr.png" width="16px"/>  |  Ελληνικά (Ελλάδα)  |  [el_GR](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/el_GR.po)  |  [Harris Arvanitis](mailto:xaris@tuta.io)  |  95%
 <img src="https://joplinapp.org/images/flags/country-4x3/ru.png" width="16px"/>  |  Русский (Россия)  |  [ru_RU](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ru_RU.po)  |  [Sergey Segeda](mailto:thesermanarm@gmail.com)  |  93%
-<img src="https://joplinapp.org/images/flags/country-4x3/rs.png" width="16px"/>  |  српски језик (Србија)  |  [sr_RS](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sr_RS.po)  |    |  70%
+<img src="https://joplinapp.org/images/flags/country-4x3/rs.png" width="16px"/>  |  српски језик (Србија)  |  [sr_RS](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sr_RS.po)  |    |  83%
 <img src="https://joplinapp.org/images/flags/country-4x3/cn.png" width="16px"/>  |  中文 (简体)  |  [zh_CN](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_CN.po)  |  [南宫小骏](mailto:jackytsu@vip.qq.com)  |  99%
 <img src="https://joplinapp.org/images/flags/country-4x3/tw.png" width="16px"/>  |  中文 (繁體)  |  [zh_TW](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_TW.po)  |  [Po-Chiang Chao](mailto:BobChao%29%20%28bobchao@gmail.com)  |  98%
-<img src="https://joplinapp.org/images/flags/country-4x3/jp.png" width="16px"/>  |  日本語 (日本)  |  [ja_JP](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ja_JP.po)  |  [genneko](mailto:genneko217@gmail.com)  |  96%
+<img src="https://joplinapp.org/images/flags/country-4x3/jp.png" width="16px"/>  |  日本語 (日本)  |  [ja_JP](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ja_JP.po)  |  [genneko](mailto:genneko217@gmail.com)  |  99%
 <img src="https://joplinapp.org/images/flags/country-4x3/kr.png" width="16px"/>  |  한국어  |  [ko](https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ko.po)  |  [Ji-Hyeon Gim](mailto:potatogim@potatogim.net)  |  98%
 <!-- LOCALE-TABLE-AUTO-GENERATED -->

--- a/docs/api/get_started/plugins/index.html
+++ b/docs/api/get_started/plugins/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/get_started/plugins.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/get_started/plugins.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/get_started/plugins.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Getting started with plugin development | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/get_started/plugins.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/get_started/plugins.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/get_started/plugins.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -342,7 +349,7 @@ This should be the path to your main plugin directory, i.e. <code>path/to/your/r
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -355,19 +362,16 @@ This should be the path to your main plugin directory, i.e. <code>path/to/your/r
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/api/overview/index.html
+++ b/docs/api/overview/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/overview.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/overview.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/overview.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Extending Joplin | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/overview.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/overview.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/overview.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -320,7 +327,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/overview.md
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -333,19 +340,16 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/overview.md
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/api/references/development_mode/index.html
+++ b/docs/api/references/development_mode/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/development_m
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/development_m
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/development_m
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Development mode | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/development_m
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/development_m
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/development_m
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -299,7 +306,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/development_m
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -312,19 +319,16 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/development_m
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/api/references/plugin_api/assets/js/search.json
+++ b/docs/api/references/plugin_api/assets/js/search.json
--- a/docs/api/references/plugin_api/classes/joplin.html
+++ b/docs/api/references/plugin_api/classes/joplin.html
@@ -109,6 +109,7 @@
 								<li class="tsd-kind-get-signature tsd-parent-kind-class"><a href="joplin.html#plugins" class="tsd-kind-icon">plugins</a></li>
 								<li class="tsd-kind-get-signature tsd-parent-kind-class"><a href="joplin.html#settings" class="tsd-kind-icon">settings</a></li>
 								<li class="tsd-kind-get-signature tsd-parent-kind-class"><a href="joplin.html#views" class="tsd-kind-icon">views</a></li>
+								<li class="tsd-kind-get-signature tsd-parent-kind-class"><a href="joplin.html#window" class="tsd-kind-icon">window</a></li>
 								<li class="tsd-kind-get-signature tsd-parent-kind-class"><a href="joplin.html#workspace" class="tsd-kind-icon">workspace</a></li>
 							</ul>
 						</section>
@@ -265,6 +266,24 @@
    <h4 class="tsd-returns-title">Returns <a href="joplinviews.html" class="tsd-signature-type">joplin.views</a></h4>


+-->
+						</li>
+					</ul>
+				</section>
+				<section class="tsd-panel tsd-member tsd-kind-get-signature tsd-parent-kind-class">
+					<a name="window" class="tsd-anchor"></a>
+					<h3>window</h3>
+					<ul class="tsd-signatures tsd-kind-get-signature tsd-parent-kind-class">
+						<li class="tsd-signature tsd-kind-icon"><span class="tsd-signature-symbol">get</span> window<span class="tsd-signature-symbol">(</span><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">: </span><a href="joplinwindow.html" class="tsd-signature-type">joplin.window</a></li>
+					</ul>
+					<ul class="tsd-descriptions">
+						<li class="tsd-description">
+							<aside class="tsd-sources">
+							</aside>
+							<!-- JOPLINCHANGE
+    <h4 class="tsd-returns-title">Returns <a href="joplinwindow.html" class="tsd-signature-type">joplin.window</a></h4>
+
+
 -->
 						</li>
 					</ul>
@@ -373,6 +392,9 @@
 							<li class=" tsd-kind-get-signature tsd-parent-kind-class">
 								<a href="joplin.html#views" class="tsd-kind-icon">views</a>
 							</li>
+							<li class=" tsd-kind-get-signature tsd-parent-kind-class">
+								<a href="joplin.html#window" class="tsd-kind-icon">window</a>
+							</li>
 							<li class=" tsd-kind-get-signature tsd-parent-kind-class">
 								<a href="joplin.html#workspace" class="tsd-kind-icon">workspace</a>
 							</li>
--- a/docs/api/references/plugin_api/classes/joplinviewsdialogs.html
+++ b/docs/api/references/plugin_api/classes/joplinviewsdialogs.html
@@ -121,6 +121,7 @@
 								<li class="tsd-kind-method tsd-parent-kind-class"><a href="joplinviewsdialogs.html#create" class="tsd-kind-icon">create</a></li>
 								<li class="tsd-kind-method tsd-parent-kind-class"><a href="joplinviewsdialogs.html#open" class="tsd-kind-icon">open</a></li>
 								<li class="tsd-kind-method tsd-parent-kind-class"><a href="joplinviewsdialogs.html#setbuttons" class="tsd-kind-icon">set<wbr>Buttons</a></li>
+								<li class="tsd-kind-method tsd-parent-kind-class"><a href="joplinviewsdialogs.html#setfittocontent" class="tsd-kind-icon">set<wbr>Fit<wbr>ToContent</a></li>
 								<li class="tsd-kind-method tsd-parent-kind-class"><a href="joplinviewsdialogs.html#sethtml" class="tsd-kind-icon">set<wbr>Html</a></li>
 								<li class="tsd-kind-method tsd-parent-kind-class"><a href="joplinviewsdialogs.html#showmessagebox" class="tsd-kind-icon">show<wbr>Message<wbr>Box</a></li>
 							</ul>
@@ -250,6 +251,45 @@
    <h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">Promise</span><span class="tsd-signature-symbol">&lt;</span><a href="../interfaces/buttonspec.html" class="tsd-signature-type">ButtonSpec</a><span class="tsd-signature-symbol">[]</span><span class="tsd-signature-symbol">&gt;</span></h4>


+-->
+						</li>
+					</ul>
+				</section>
+				<section class="tsd-panel tsd-member tsd-kind-method tsd-parent-kind-class">
+					<a name="setfittocontent" class="tsd-anchor"></a>
+					<h3>set<wbr>Fit<wbr>ToContent</h3>
+					<ul class="tsd-signatures tsd-kind-method tsd-parent-kind-class">
+						<li class="tsd-signature tsd-kind-icon">set<wbr>Fit<wbr>ToContent<span class="tsd-signature-symbol">(</span>handle<span class="tsd-signature-symbol">: </span><a href="../globals.html#viewhandle" class="tsd-signature-type">ViewHandle</a>, status<span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">boolean</span><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">Promise</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type">boolean</span><span class="tsd-signature-symbol">&gt;</span></li>
+					</ul>
+					<ul class="tsd-descriptions">
+						<li class="tsd-description">
+							<aside class="tsd-sources">
+							</aside>
+							<div class="tsd-comment tsd-typography">
+								<div class="lead">
+									<p>Toggle on whether to fit the dialog size to the content or not.
+										When set to false, the dialog stretches to fill the application
+									window.</p>
+								</div>
+								<dl class="tsd-comment-tags">
+									<dt>default</dt>
+									<dd><p>true</p>
+									</dd>
+								</dl>
+							</div>
+							<h4 class="tsd-parameters-title">Parameters</h4>
+							<ul class="tsd-parameters">
+								<li>
+									<h5>handle: <a href="../globals.html#viewhandle" class="tsd-signature-type">ViewHandle</a></h5>
+								</li>
+								<li>
+									<h5>status: <span class="tsd-signature-type">boolean</span></h5>
+								</li>
+							</ul>
+							<!-- JOPLINCHANGE
+    <h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">Promise</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type">boolean</span><span class="tsd-signature-symbol">&gt;</span></h4>
+
+
 -->
 						</li>
 					</ul>
@@ -349,6 +389,9 @@
 							<li class=" tsd-kind-method tsd-parent-kind-class">
 								<a href="joplinviewsdialogs.html#setbuttons" class="tsd-kind-icon">set<wbr>Buttons</a>
 							</li>
+							<li class=" tsd-kind-method tsd-parent-kind-class">
+								<a href="joplinviewsdialogs.html#setfittocontent" class="tsd-kind-icon">set<wbr>Fit<wbr>ToContent</a>
+							</li>
 							<li class=" tsd-kind-method tsd-parent-kind-class">
 								<a href="joplinviewsdialogs.html#sethtml" class="tsd-kind-icon">set<wbr>Html</a>
 							</li>
--- a/docs/api/references/plugin_api/classes/joplinwindow.html
+++ b/docs/api/references/plugin_api/classes/joplinwindow.html
@@ -0,0 +1,224 @@
+<!doctype html>
+<html class="default no-js">
+<head>
+	<meta charset="utf-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<title>joplin.window | Joplin Plugin API Documentation</title>
+	<meta name="description" content="Documentation for Joplin Plugin API Documentation">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<link rel="stylesheet" href="../assets/css/main.css">
+</head>
+<body>
+<header>
+	<div class="tsd-page-toolbar">
+		<div class="container">
+			<div class="table-wrap">
+				<div class="table-cell" id="tsd-search" data-index="../assets/js/search.json" data-base="..">
+					<div class="field">
+						<label for="tsd-search-field" class="tsd-widget search no-caption">Search</label>
+						<input id="tsd-search-field" type="text" />
+					</div>
+					<ul class="results">
+						<li class="state loading">Preparing search index...</li>
+						<li class="state failure">The search index is not available</li>
+					</ul>
+					<a href="joplin.html" class="title">Joplin Plugin API Documentation</a>
+				</div>
+				<div class="table-cell" id="tsd-widgets">
+					<div id="tsd-filter">
+						<a href="#" class="tsd-widget options no-caption" data-toggle="options">Options</a>
+						<div class="tsd-filter-group">
+							<div class="tsd-select" id="tsd-filter-visibility">
+								<span class="tsd-select-label">All</span>
+								<ul class="tsd-select-list">
+									<li data-value="public">Public</li>
+									<li data-value="protected">Public/Protected</li>
+									<li data-value="private" class="selected">All</li>
+								</ul>
+							</div>
+							<input type="checkbox" id="tsd-filter-inherited" checked />
+							<label class="tsd-widget" for="tsd-filter-inherited">Inherited</label>
+						</div>
+					</div>
+					<a href="#" class="tsd-widget menu no-caption" data-toggle="menu">Menu</a>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="tsd-page-title">
+		<div class="container">
+			<ul class="tsd-breadcrumb">
+				<!--
+        <li>
+            <a href="../globals.html">Globals</a>
+        </li>
+-->
+				<li>
+					<a href="joplinwindow.html">joplin.window</a>
+				</li>
+			</ul>
+			<h1><!-- Class  -->joplin.window</h1>
+		</div>
+	</div>
+</header>
+<div class="container container-main">
+	<div class="row">
+		<div class="col-8 col-content">
+			<!--
+    <section class="tsd-panel tsd-hierarchy">
+        <h3>Hierarchy</h3>
+        <ul class="tsd-hierarchy">
+        <li>
+                <span class="target">JoplinWindow</span>
+
+        </li>
+</ul>
+
+    </section>
+    -->
+			<section class="tsd-panel-group tsd-index-group">
+				<h2>Index</h2>
+				<section class="tsd-panel tsd-index-panel">
+					<div class="tsd-index-content">
+						<section class="tsd-index-section ">
+						</section>
+						<section class="tsd-index-section ">
+							<h3>Methods</h3>
+							<ul class="tsd-index-list">
+								<li class="tsd-kind-method tsd-parent-kind-class"><a href="joplinwindow.html#loadchromecssfile" class="tsd-kind-icon">load<wbr>Chrome<wbr>Css<wbr>File</a></li>
+								<li class="tsd-kind-method tsd-parent-kind-class"><a href="joplinwindow.html#loadnotecssfile" class="tsd-kind-icon">load<wbr>Note<wbr>Css<wbr>File</a></li>
+							</ul>
+						</section>
+					</div>
+				</section>
+			</section>
+			<section class="tsd-panel-group tsd-member-group ">
+			</section>
+			<section class="tsd-panel-group tsd-member-group ">
+				<h2>Methods</h2>
+				<section class="tsd-panel tsd-member tsd-kind-method tsd-parent-kind-class">
+					<a name="loadchromecssfile" class="tsd-anchor"></a>
+					<h3>load<wbr>Chrome<wbr>Css<wbr>File</h3>
+					<ul class="tsd-signatures tsd-kind-method tsd-parent-kind-class">
+						<li class="tsd-signature tsd-kind-icon">load<wbr>Chrome<wbr>Css<wbr>File<span class="tsd-signature-symbol">(</span>filePath<span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">string</span><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">Promise</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type">void</span><span class="tsd-signature-symbol">&gt;</span></li>
+					</ul>
+					<ul class="tsd-descriptions">
+						<li class="tsd-description">
+							<aside class="tsd-sources">
+							</aside>
+							<div class="tsd-comment tsd-typography">
+								<div class="lead">
+									<p>Loads a chrome CSS file. It will apply to the window UI elements, except
+										for the note viewer. It is the same as the &quot;Custom stylesheet for
+										Joplin-wide app styles&quot; setting. See the <a href="https://github.com/laurent22/joplin/tree/dev/packages/app-cli/tests/support/plugins/load_css">Load CSS Demo</a>
+									for an example.</p>
+								</div>
+							</div>
+							<h4 class="tsd-parameters-title">Parameters</h4>
+							<ul class="tsd-parameters">
+								<li>
+									<h5>filePath: <span class="tsd-signature-type">string</span></h5>
+								</li>
+							</ul>
+							<!-- JOPLINCHANGE
+    <h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">Promise</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type">void</span><span class="tsd-signature-symbol">&gt;</span></h4>
+
+
+-->
+						</li>
+					</ul>
+				</section>
+				<section class="tsd-panel tsd-member tsd-kind-method tsd-parent-kind-class">
+					<a name="loadnotecssfile" class="tsd-anchor"></a>
+					<h3>load<wbr>Note<wbr>Css<wbr>File</h3>
+					<ul class="tsd-signatures tsd-kind-method tsd-parent-kind-class">
+						<li class="tsd-signature tsd-kind-icon">load<wbr>Note<wbr>Css<wbr>File<span class="tsd-signature-symbol">(</span>filePath<span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">string</span><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">Promise</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type">void</span><span class="tsd-signature-symbol">&gt;</span></li>
+					</ul>
+					<ul class="tsd-descriptions">
+						<li class="tsd-description">
+							<aside class="tsd-sources">
+							</aside>
+							<div class="tsd-comment tsd-typography">
+								<div class="lead">
+									<p>Loads a note CSS file. It will apply to the note viewer, as well as any
+										exported or printed note. It is the same as the &quot;Custom stylesheet for
+										rendered Markdown&quot; setting. See the <a href="https://github.com/laurent22/joplin/tree/dev/packages/app-cli/tests/support/plugins/load_css">Load CSS Demo</a>
+									for an example.</p>
+								</div>
+							</div>
+							<h4 class="tsd-parameters-title">Parameters</h4>
+							<ul class="tsd-parameters">
+								<li>
+									<h5>filePath: <span class="tsd-signature-type">string</span></h5>
+								</li>
+							</ul>
+							<!-- JOPLINCHANGE
+    <h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">Promise</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type">void</span><span class="tsd-signature-symbol">&gt;</span></h4>
+
+
+-->
+						</li>
+					</ul>
+				</section>
+			</section>
+		</div>
+		<div class="col-4 col-menu menu-sticky-wrap menu-highlight">
+			<!--
+            <nav class="tsd-navigation primary">
+                <ul>
+                                    <li class="globals  ">
+                <a href="../globals.html"><em>Globals</em></a>
+            </li>
+                </ul>
+            </nav>
+            -->
+			<nav class="tsd-navigation secondary menu-sticky">
+				<ul class="before-current">
+				</ul>
+				<ul class="current">
+					<li class="current tsd-kind-class">
+						<a href="joplinwindow.html" class="tsd-kind-icon">joplin.window</a>
+						<ul>
+							<li class=" tsd-kind-constructor tsd-parent-kind-class">
+								<a href="joplinwindow.html#constructor" class="tsd-kind-icon">constructor</a>
+							</li>
+							<li class=" tsd-kind-method tsd-parent-kind-class">
+								<a href="joplinwindow.html#loadchromecssfile" class="tsd-kind-icon">load<wbr>Chrome<wbr>Css<wbr>File</a>
+							</li>
+							<li class=" tsd-kind-method tsd-parent-kind-class">
+								<a href="joplinwindow.html#loadnotecssfile" class="tsd-kind-icon">load<wbr>Note<wbr>Css<wbr>File</a>
+							</li>
+						</ul>
+					</li>
+				</ul>
+				<ul class="after-current">
+				</ul>
+			</nav>
+		</div>
+	</div>
+</div>
+<!-- JOPLINCHANGE
+<footer class="with-border-bottom">
+    <div class="container">
+        <h2>Legend</h2>
+        <div class="tsd-legend-group">
+                <ul class="tsd-legend">
+                        <li class="tsd-kind-property tsd-parent-kind-interface"><span class="tsd-kind-icon">Property</span></li>
+                        <li class="tsd-kind-method tsd-parent-kind-interface"><span class="tsd-kind-icon">Method</span></li>
+                </ul>
+                <ul class="tsd-legend">
+                        <li class="tsd-kind-constructor tsd-parent-kind-class"><span class="tsd-kind-icon">Constructor</span></li>
+                        <li class="tsd-kind-method tsd-parent-kind-class"><span class="tsd-kind-icon">Method</span></li>
+                </ul>
+        </div>
+    </div>
+</footer>
+
+    <div class="container tsd-generator">
+        <p>Generated using <a href="https://typedoc.org/" target="_blank">TypeDoc</a></p>
+    </div>
+-->
+<div class="overlay"></div>
+<script src="../assets/js/main.js"></script>
+</body>
+</html>
--- a/docs/api/references/plugin_api/globals.html
+++ b/docs/api/references/plugin_api/globals.html
@@ -96,6 +96,7 @@
 								<li class="tsd-kind-class"><a href="classes/joplinviewsmenus.html" class="tsd-kind-icon">Joplin<wbr>Views<wbr>Menus</a></li>
 								<li class="tsd-kind-class"><a href="classes/joplinviewspanels.html" class="tsd-kind-icon">Joplin<wbr>Views<wbr>Panels</a></li>
 								<li class="tsd-kind-class"><a href="classes/joplinviewstoolbarbuttons.html" class="tsd-kind-icon">Joplin<wbr>Views<wbr>Toolbar<wbr>Buttons</a></li>
+								<li class="tsd-kind-class"><a href="classes/joplinwindow.html" class="tsd-kind-icon">Joplin<wbr>Window</a></li>
 								<li class="tsd-kind-class"><a href="classes/joplinworkspace.html" class="tsd-kind-icon">Joplin<wbr>Workspace</a></li>
 							</ul>
 						</section>
@@ -113,6 +114,7 @@
 								<li class="tsd-kind-interface"><a href="interfaces/exportcontext.html" class="tsd-kind-icon">Export<wbr>Context</a></li>
 								<li class="tsd-kind-interface"><a href="interfaces/exportmodule.html" class="tsd-kind-icon">Export<wbr>Module</a></li>
 								<li class="tsd-kind-interface"><a href="interfaces/exportoptions.html" class="tsd-kind-icon">Export<wbr>Options</a></li>
+								<li class="tsd-kind-interface"><a href="interfaces/implementation.html" class="tsd-kind-icon">Implementation</a></li>
 								<li class="tsd-kind-interface"><a href="interfaces/importcontext.html" class="tsd-kind-icon">Import<wbr>Context</a></li>
 								<li class="tsd-kind-interface"><a href="interfaces/importmodule.html" class="tsd-kind-icon">Import<wbr>Module</a></li>
 								<li class="tsd-kind-interface"><a href="interfaces/itemchangeevent.html" class="tsd-kind-icon">Item<wbr>Change<wbr>Event</a></li>
@@ -431,6 +433,9 @@
 					<li class=" tsd-kind-class">
 						<a href="classes/joplinviewstoolbarbuttons.html" class="tsd-kind-icon">joplin.views.toolbarButtons</a>
 					</li>
+					<li class=" tsd-kind-class">
+						<a href="classes/joplinwindow.html" class="tsd-kind-icon">joplin.window</a>
+					</li>
 					<li class=" tsd-kind-class">
 						<a href="classes/joplinworkspace.html" class="tsd-kind-icon">joplin.workspace</a>
 					</li>
@@ -467,6 +472,9 @@
 					<li class=" tsd-kind-interface">
 						<a href="interfaces/exportoptions.html" class="tsd-kind-icon">ExportOptions</a>
 					</li>
+					<li class=" tsd-kind-interface">
+						<a href="interfaces/implementation.html" class="tsd-kind-icon">Implementation</a>
+					</li>
 					<li class=" tsd-kind-interface">
 						<a href="interfaces/importcontext.html" class="tsd-kind-icon">ImportContext</a>
 					</li>
--- a/docs/api/references/plugin_api/index.html
+++ b/docs/api/references/plugin_api/index.html
@@ -149,6 +149,9 @@
 					<li class=" tsd-kind-class">
 						<a href="classes/joplinviewstoolbarbuttons.html" class="tsd-kind-icon">joplin.views.toolbarButtons</a>
 					</li>
+					<li class=" tsd-kind-class">
+						<a href="classes/joplinwindow.html" class="tsd-kind-icon">joplin.window</a>
+					</li>
 					<li class=" tsd-kind-class">
 						<a href="classes/joplinworkspace.html" class="tsd-kind-icon">joplin.workspace</a>
 					</li>
@@ -185,6 +188,9 @@
 					<li class=" tsd-kind-interface">
 						<a href="interfaces/exportoptions.html" class="tsd-kind-icon">ExportOptions</a>
 					</li>
+					<li class=" tsd-kind-interface">
+						<a href="interfaces/implementation.html" class="tsd-kind-icon">Implementation</a>
+					</li>
 					<li class=" tsd-kind-interface">
 						<a href="interfaces/importcontext.html" class="tsd-kind-icon">ImportContext</a>
 					</li>
--- a/docs/api/references/plugin_api/interfaces/implementation.html
+++ b/docs/api/references/plugin_api/interfaces/implementation.html
@@ -0,0 +1,176 @@
+<!doctype html>
+<html class="default no-js">
+<head>
+	<meta charset="utf-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<title>Implementation | Joplin Plugin API Documentation</title>
+	<meta name="description" content="Documentation for Joplin Plugin API Documentation">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<link rel="stylesheet" href="../assets/css/main.css">
+</head>
+<body>
+<header>
+	<div class="tsd-page-toolbar">
+		<div class="container">
+			<div class="table-wrap">
+				<div class="table-cell" id="tsd-search" data-index="../assets/js/search.json" data-base="..">
+					<div class="field">
+						<label for="tsd-search-field" class="tsd-widget search no-caption">Search</label>
+						<input id="tsd-search-field" type="text" />
+					</div>
+					<ul class="results">
+						<li class="state loading">Preparing search index...</li>
+						<li class="state failure">The search index is not available</li>
+					</ul>
+					<a href="../classes/joplin.html" class="title">Joplin Plugin API Documentation</a>
+				</div>
+				<div class="table-cell" id="tsd-widgets">
+					<div id="tsd-filter">
+						<a href="#" class="tsd-widget options no-caption" data-toggle="options">Options</a>
+						<div class="tsd-filter-group">
+							<div class="tsd-select" id="tsd-filter-visibility">
+								<span class="tsd-select-label">All</span>
+								<ul class="tsd-select-list">
+									<li data-value="public">Public</li>
+									<li data-value="protected">Public/Protected</li>
+									<li data-value="private" class="selected">All</li>
+								</ul>
+							</div>
+							<input type="checkbox" id="tsd-filter-inherited" checked />
+							<label class="tsd-widget" for="tsd-filter-inherited">Inherited</label>
+						</div>
+					</div>
+					<a href="#" class="tsd-widget menu no-caption" data-toggle="menu">Menu</a>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="tsd-page-title">
+		<div class="container">
+			<ul class="tsd-breadcrumb">
+				<!--
+        <li>
+            <a href="../globals.html">Globals</a>
+        </li>
+-->
+				<li>
+					<a href="implementation.html">Implementation</a>
+				</li>
+			</ul>
+			<h1><!-- Interface  -->Implementation</h1>
+		</div>
+	</div>
+</header>
+<div class="container container-main">
+	<div class="row">
+		<div class="col-8 col-content">
+			<!--
+    <section class="tsd-panel tsd-hierarchy">
+        <h3>Hierarchy</h3>
+        <ul class="tsd-hierarchy">
+        <li>
+                <span class="target">Implementation</span>
+
+        </li>
+</ul>
+
+    </section>
+    -->
+			<section class="tsd-panel-group tsd-index-group">
+				<h2>Index</h2>
+				<section class="tsd-panel tsd-index-panel">
+					<div class="tsd-index-content">
+						<section class="tsd-index-section ">
+							<h3>Methods</h3>
+							<ul class="tsd-index-list">
+								<li class="tsd-kind-method tsd-parent-kind-interface"><a href="implementation.html#injectcustomstyles" class="tsd-kind-icon">inject<wbr>Custom<wbr>Styles</a></li>
+							</ul>
+						</section>
+					</div>
+				</section>
+			</section>
+			<section class="tsd-panel-group tsd-member-group ">
+				<h2>Methods</h2>
+				<section class="tsd-panel tsd-member tsd-kind-method tsd-parent-kind-interface">
+					<a name="injectcustomstyles" class="tsd-anchor"></a>
+					<h3>inject<wbr>Custom<wbr>Styles</h3>
+					<ul class="tsd-signatures tsd-kind-method tsd-parent-kind-interface">
+						<li class="tsd-signature tsd-kind-icon">inject<wbr>Custom<wbr>Styles<span class="tsd-signature-symbol">(</span>elementId<span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">string</span>, cssFilePath<span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">string</span><span class="tsd-signature-symbol">)</span><span class="tsd-signature-symbol">: </span><span class="tsd-signature-type">Promise</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type">void</span><span class="tsd-signature-symbol">&gt;</span></li>
+					</ul>
+					<ul class="tsd-descriptions">
+						<li class="tsd-description">
+							<aside class="tsd-sources">
+							</aside>
+							<h4 class="tsd-parameters-title">Parameters</h4>
+							<ul class="tsd-parameters">
+								<li>
+									<h5>elementId: <span class="tsd-signature-type">string</span></h5>
+								</li>
+								<li>
+									<h5>cssFilePath: <span class="tsd-signature-type">string</span></h5>
+								</li>
+							</ul>
+							<!-- JOPLINCHANGE
+    <h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">Promise</span><span class="tsd-signature-symbol">&lt;</span><span class="tsd-signature-type">void</span><span class="tsd-signature-symbol">&gt;</span></h4>
+
+
+-->
+						</li>
+					</ul>
+				</section>
+			</section>
+		</div>
+		<div class="col-4 col-menu menu-sticky-wrap menu-highlight">
+			<!--
+            <nav class="tsd-navigation primary">
+                <ul>
+                                    <li class="globals  ">
+                <a href="../globals.html"><em>Globals</em></a>
+            </li>
+                </ul>
+            </nav>
+            -->
+			<nav class="tsd-navigation secondary menu-sticky">
+				<ul class="before-current">
+				</ul>
+				<ul class="current">
+					<li class="current tsd-kind-interface">
+						<a href="implementation.html" class="tsd-kind-icon">Implementation</a>
+						<ul>
+							<li class=" tsd-kind-method tsd-parent-kind-interface">
+								<a href="implementation.html#injectcustomstyles" class="tsd-kind-icon">inject<wbr>Custom<wbr>Styles</a>
+							</li>
+						</ul>
+					</li>
+				</ul>
+				<ul class="after-current">
+				</ul>
+			</nav>
+		</div>
+	</div>
+</div>
+<!-- JOPLINCHANGE
+<footer class="with-border-bottom">
+    <div class="container">
+        <h2>Legend</h2>
+        <div class="tsd-legend-group">
+                <ul class="tsd-legend">
+                        <li class="tsd-kind-property tsd-parent-kind-interface"><span class="tsd-kind-icon">Property</span></li>
+                        <li class="tsd-kind-method tsd-parent-kind-interface"><span class="tsd-kind-icon">Method</span></li>
+                </ul>
+                <ul class="tsd-legend">
+                        <li class="tsd-kind-constructor tsd-parent-kind-class"><span class="tsd-kind-icon">Constructor</span></li>
+                        <li class="tsd-kind-method tsd-parent-kind-class"><span class="tsd-kind-icon">Method</span></li>
+                </ul>
+        </div>
+    </div>
+</footer>
+
+    <div class="container tsd-generator">
+        <p>Generated using <a href="https://typedoc.org/" target="_blank">TypeDoc</a></p>
+    </div>
+-->
+<div class="overlay"></div>
+<script src="../assets/js/main.js"></script>
+</body>
+</html>
--- a/docs/api/references/plugin_loading_rules/index.html
+++ b/docs/api/references/plugin_loading_rules/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_loadin
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_loadin
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_loadin
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Plugin Loading Rules | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_loadin
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_loadin
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_loadin
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -305,7 +312,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_loadin
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -318,19 +325,16 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_loadin
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/api/references/plugin_manifest/index.html
+++ b/docs/api/references/plugin_manifest/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_manife
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_manife
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_manife
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Plugin Manifest | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_manife
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_manife
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_manife
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -375,7 +382,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_manife
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -388,19 +395,16 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_manife
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/api/references/plugin_theming/index.html
+++ b/docs/api/references/plugin_theming/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_themin
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_themin
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_themin
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Plugin theming | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_themin
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_themin
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_themin
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -335,7 +342,7 @@ These include:</p>
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -348,19 +355,16 @@ These include:</p>
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/api/references/rest_api/index.html
+++ b/docs/api/references/rest_api/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/rest_api.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/rest_api.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/rest_api.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Joplin Data API | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/rest_api.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/rest_api.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/rest_api.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -961,7 +968,7 @@ async function fetchAllNotes() {
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -974,19 +981,16 @@ async function fetchAllNotes() {
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/api/tutorials/toc_plugin/index.html
+++ b/docs/api/tutorials/toc_plugin/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/tutorials/toc_plugin.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/tutorials/toc_plugin.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/tutorials/toc_plugin.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Creating a table of content plugin | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/tutorials/toc_plugin.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/tutorials/toc_plugin.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/tutorials/toc_plugin.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -569,7 +576,7 @@ document.addEventListener('click', event =&gt; {
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -582,19 +589,16 @@ document.addEventListener('click', event =&gt; {
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/blog/20180621-182112/index.html
+++ b/docs/blog/20180621-182112/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180621-182112.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180621-182112.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180621-182112.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Web Clipper now available on Firefox and Chrome | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180621-182112.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180621-182112.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180621-182112.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -303,7 +310,7 @@ published_at: 2018-06-21T17:21:12.000+00:00</p>
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -316,19 +323,16 @@ published_at: 2018-06-21T17:21:12.000+00:00</p>
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/blog/20180906-111039/index.html
+++ b/docs/blog/20180906-111039/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180906-111039.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180906-111039.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180906-111039.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>New iOS release with improved attachment support | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180906-111039.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180906-111039.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180906-111039.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -304,7 +311,7 @@ published_at: 2018-09-06T10:10:39.000+00:00</p>
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -317,19 +324,16 @@ published_at: 2018-09-06T10:10:39.000+00:00</p>
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/blog/20180916-210431/index.html
+++ b/docs/blog/20180916-210431/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180916-210431.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180916-210431.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180916-210431.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Note properties in desktop application | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180916-210431.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180916-210431.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180916-210431.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -303,7 +310,7 @@ published_at: 2018-09-16T20:04:31.000+00:00</p>
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -316,19 +323,16 @@ published_at: 2018-09-16T20:04:31.000+00:00</p>
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/blog/20180929-121053/index.html
+++ b/docs/blog/20180929-121053/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180929-121053.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180929-121053.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180929-121053.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>New release and many bug fixes | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180929-121053.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180929-121053.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180929-121053.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -303,7 +310,7 @@ published_at: 2018-09-29T11:10:53.000+00:00</p>
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -316,19 +323,16 @@ published_at: 2018-09-29T11:10:53.000+00:00</p>
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/blog/20181004-091123/index.html
+++ b/docs/blog/20181004-091123/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181004-091123.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181004-091123.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181004-091123.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Joplin and Hacktobertfest 2018 🎃 | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181004-091123.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181004-091123.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181004-091123.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -305,7 +312,7 @@ published_at: 2018-10-04T08:11:23.000+00:00</p>
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -318,19 +325,16 @@ published_at: 2018-10-04T08:11:23.000+00:00</p>
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/blog/20181101-174335/index.html
+++ b/docs/blog/20181101-174335/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181101-174335.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181101-174335.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181101-174335.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Hacktoberfest has now ended | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181101-174335.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181101-174335.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181101-174335.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -308,7 +315,7 @@ published_at: 2018-11-01T17:43:35.000+00:00</p>
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -321,19 +328,16 @@ published_at: 2018-11-01T17:43:35.000+00:00</p>
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/blog/20181213-173459/index.html
+++ b/docs/blog/20181213-173459/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181213-173459.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181213-173459.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181213-173459.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Joplin is now featured on PrivacyTools.io | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181213-173459.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181213-173459.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181213-173459.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -306,7 +313,7 @@ published_at: 2018-12-13T17:34:59.000+00:00</p>
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -319,19 +326,16 @@ published_at: 2018-12-13T17:34:59.000+00:00</p>
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/blog/20190130-230218/index.html
+++ b/docs/blog/20190130-230218/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190130-230218.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190130-230218.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190130-230218.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>New search engine in Joplin | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190130-230218.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190130-230218.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190130-230218.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -306,7 +313,7 @@ published_at: 2019-01-30T23:02:18.000+00:00</p>
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -319,19 +326,16 @@ published_at: 2019-01-30T23:02:18.000+00:00</p>
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/blog/20190404-074157/index.html
+++ b/docs/blog/20190404-074157/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190404-074157.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190404-074157.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190404-074157.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Markdown plugins and Goto Anything | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190404-074157.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190404-074157.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190404-074157.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -305,7 +312,7 @@ published_at: 2019-04-04T06:41:57.000+00:00</p>
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -318,19 +325,16 @@ published_at: 2019-04-04T06:41:57.000+00:00</p>
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/blog/20190424-112410/index.html
+++ b/docs/blog/20190424-112410/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190424-112410.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190424-112410.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190424-112410.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>The Joplin forum is one year old | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190424-112410.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190424-112410.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190424-112410.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -305,7 +312,7 @@ published_at: 2019-04-24T10:24:10.000+00:00</p>
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -318,19 +325,16 @@ published_at: 2019-04-24T10:24:10.000+00:00</p>
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/blog/20190523-231026/index.html
+++ b/docs/blog/20190523-231026/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190523-231026.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190523-231026.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190523-231026.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Note history now in Joplin | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190523-231026.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190523-231026.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190523-231026.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -315,7 +322,7 @@ published_at: 2019-05-23T22:10:26.000+00:00</p>
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -328,19 +335,16 @@ published_at: 2019-05-23T22:10:26.000+00:00</p>
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/blog/20190611-000711/index.html
+++ b/docs/blog/20190611-000711/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190611-000711.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190611-000711.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190611-000711.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Changing attachment download behaviour to save disk space | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190611-000711.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190611-000711.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190611-000711.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -305,7 +312,7 @@ published_at: 2019-06-10T23:07:11.000+00:00</p>
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -318,19 +325,16 @@ published_at: 2019-06-10T23:07:11.000+00:00</p>
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/blog/20190613-202613/index.html
+++ b/docs/blog/20190613-202613/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190613-202613.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190613-202613.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190613-202613.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Customising your notes with the help of the development tools and CSS | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190613-202613.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190613-202613.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190613-202613.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -305,7 +312,7 @@ published_at: 2019-06-13T19:26:13.000+00:00</p>
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -318,19 +325,16 @@ published_at: 2019-06-13T19:26:13.000+00:00</p>
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/blog/20190814-225957/index.html
+++ b/docs/blog/20190814-225957/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190814-225957.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190814-225957.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190814-225957.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Joplin now supports Fountain screenwriting markup language | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190814-225957.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190814-225957.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190814-225957.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -314,7 +321,7 @@ published_at: 2019-08-14T21:59:57.000+00:00</p>
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -327,19 +334,16 @@ published_at: 2019-08-14T21:59:57.000+00:00</p>
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/blog/20190925-000254/index.html
+++ b/docs/blog/20190925-000254/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190925-000254.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190925-000254.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190925-000254.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>New icon for Joplin! | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190925-000254.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190925-000254.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190925-000254.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -319,7 +326,7 @@ published_at: 2019-09-24T23:02:54.000+00:00</p>
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -332,19 +339,16 @@ published_at: 2019-09-24T23:02:54.000+00:00</p>
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/blog/20190929-152834/index.html
+++ b/docs/blog/20190929-152834/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190929-152834.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190929-152834.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190929-152834.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Hacktoberfest 2019 is coming soon! | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190929-152834.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190929-152834.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190929-152834.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -312,7 +319,7 @@ published_at: 2019-09-29T14:28:34.000+00:00</p>
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -325,19 +332,16 @@ published_at: 2019-09-29T14:28:34.000+00:00</p>
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/blog/20191012-233121/index.html
+++ b/docs/blog/20191012-233121/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191012-233121.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191012-233121.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191012-233121.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Support for chemical equations using mhchem for Katex | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191012-233121.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191012-233121.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191012-233121.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -312,7 +319,7 @@ published_at: 2019-10-12T22:31:21.000+00:00</p>
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -325,19 +332,16 @@ published_at: 2019-10-12T22:31:21.000+00:00</p>
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/blog/20191014-165136/index.html
+++ b/docs/blog/20191014-165136/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191014-165136.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191014-165136.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191014-165136.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>New Joplin icon, second round | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191014-165136.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191014-165136.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191014-165136.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -304,7 +311,7 @@ published_at: 2019-10-14T15:51:36.000+00:00</p>
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -317,19 +324,16 @@ published_at: 2019-10-14T15:51:36.000+00:00</p>
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/blog/20191101-131852/index.html
+++ b/docs/blog/20191101-131852/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191101-131852.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191101-131852.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191101-131852.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Hacktoberfest 2019 has now ended 🎃 | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191101-131852.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191101-131852.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191101-131852.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -308,7 +315,7 @@ published_at: 2019-11-01T13:18:52.000+00:00</p>
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -321,19 +328,16 @@ published_at: 2019-11-01T13:18:52.000+00:00</p>
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/blog/20191117-183855/index.html
+++ b/docs/blog/20191117-183855/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191117-183855.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191117-183855.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191117-183855.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>And the winner is... | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191117-183855.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191117-183855.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191117-183855.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -313,7 +320,7 @@ published_at: 2019-11-17T18:38:55.000+00:00</p>
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -326,19 +333,16 @@ published_at: 2019-11-17T18:38:55.000+00:00</p>
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/blog/20191118-072700/index.html
+++ b/docs/blog/20191118-072700/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191118-072700.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191118-072700.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191118-072700.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Joplin is looking into joining Google Summer of Code in 2020 | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191118-072700.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191118-072700.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191118-072700.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -311,7 +318,7 @@ published_at: 2019-11-18T07:27:00.000+00:00</p>
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -324,19 +331,16 @@ published_at: 2019-11-18T07:27:00.000+00:00</p>
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/blog/20200220-190804/index.html
+++ b/docs/blog/20200220-190804/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200220-190804.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200220-190804.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200220-190804.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>GSoC 2020: Joplin has been accepted as a mentor organization! | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200220-190804.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200220-190804.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200220-190804.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -303,7 +310,7 @@ published_at: 2020-02-20T19:08:04.000+00:00</p>
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -316,19 +323,16 @@ published_at: 2020-02-20T19:08:04.000+00:00</p>
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/blog/20200301-125055/index.html
+++ b/docs/blog/20200301-125055/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200301-125055.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200301-125055.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200301-125055.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Large desktop update coming soon | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200301-125055.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200301-125055.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200301-125055.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -319,7 +326,7 @@ published_at: 2020-03-01T12:50:55.000+00:00</p>
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -332,19 +339,16 @@ published_at: 2020-03-01T12:50:55.000+00:00</p>
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/blog/20200314-001555/index.html
+++ b/docs/blog/20200314-001555/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200314-001555.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200314-001555.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200314-001555.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Experimental WYSIWYG editor in Joplin | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200314-001555.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200314-001555.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200314-001555.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -313,7 +320,7 @@ published_at: 2020-03-14T00:15:55.000+00:00</p>
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -326,19 +333,16 @@ published_at: 2020-03-14T00:15:55.000+00:00</p>
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/blog/20200406-224254/index.html
+++ b/docs/blog/20200406-224254/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200406-224254.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200406-224254.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200406-224254.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Joplin informal encryption and security audit results | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200406-224254.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200406-224254.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200406-224254.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -331,7 +338,7 @@ published_at: 2020-04-06T21:42:54.000+00:00</p>
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -344,19 +351,16 @@ published_at: 2020-04-06T21:42:54.000+00:00</p>
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/build_troubleshooting/index.html
+++ b/docs/build_troubleshooting/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/build_troubleshooting.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/build_troubleshooting.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/build_troubleshooting.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Desktop application | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/build_troubleshooting.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/build_troubleshooting.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/build_troubleshooting.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -338,7 +345,7 @@ pod install
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -351,19 +358,16 @@ pod install
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/changelog/index.html
+++ b/docs/changelog/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Joplin changelog | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -265,6 +272,18 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog.md
 <p><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=E8JMYD2LQ8MMA&amp;lc=GB&amp;item_name=Joplin+Development&amp;currency_code=EUR&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted"><img src="https://joplinapp.org/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://joplinapp.org/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://joplinapp.org/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://joplinapp.org/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Joplin changelog<a name="joplin-changelog" href="#joplin-changelog" class="heading-anchor">🔗</a></h1>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/v2.2.2">v2.2.2</a> (Pre-release) - 2021-07-19T10:28:35Z<a name="v2-2-2-https-github-com-laurent22-joplin-releases-tag-v2-2-2-pre-release-2021-07-19t10-28-35z" href="#v2-2-2-https-github-com-laurent22-joplin-releases-tag-v2-2-2-pre-release-2021-07-19t10-28-35z" class="heading-anchor">🔗</a></h2>
+<p>Attention: The default font size has been changed in the Markdown editor. You can change it back in Config &gt; Appearance &gt; Editor font size.</p>
+<ul>
+<li>Improved: Ensure that timestamps are not changed when sharing or unsharing a note (cafaa9c)</li>
+<li>Improved: Make Markdown editor styling closer to view styling (<a href="https://github.com/laurent22/joplin/issues/5174">#5174</a>)</li>
+<li>Improved: Make sure clipper authorisation notification is displayed, even when in config screen (b2de27b)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/v2.1.9">v2.1.9</a> - 2021-07-19T10:28:43Z<a name="v2-1-9-https-github-com-laurent22-joplin-releases-tag-v2-1-9-2021-07-19t10-28-43z" href="#v2-1-9-https-github-com-laurent22-joplin-releases-tag-v2-1-9-2021-07-19t10-28-43z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Improved: Ensure that timestamps are not changed when sharing or unsharing a note (cafaa9c)</li>
+<li>Improved: Make sure clipper authorisation notification is displayed, even when in config screen (b2de27b)</li>
+</ul>
 <h2><a href="https://github.com/laurent22/joplin/releases/tag/v2.2.1">v2.2.1</a> (Pre-release) - 2021-07-09T17:38:25Z<a name="v2-2-1-https-github-com-laurent22-joplin-releases-tag-v2-2-1-pre-release-2021-07-09t17-38-25z" href="#v2-2-1-https-github-com-laurent22-joplin-releases-tag-v2-2-1-pre-release-2021-07-09t17-38-25z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>New: Add keyboard shortcuts for inserting lists in Rich Text editor (<a href="https://github.com/laurent22/joplin/issues/5137">#5137</a> by Philipp Keck)</li>
@@ -3438,7 +3457,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog.md
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -3451,19 +3470,16 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog.md
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/changelog_android/index.html
+++ b/docs/changelog_android/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_android.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_android.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_android.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Joplin Android app changelog | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_android.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_android.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_android.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -265,6 +272,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_android.md
 <p><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=E8JMYD2LQ8MMA&amp;lc=GB&amp;item_name=Joplin+Development&amp;currency_code=EUR&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted"><img src="https://joplinapp.org/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://joplinapp.org/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://joplinapp.org/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://joplinapp.org/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Joplin Android app changelog<a name="joplin-android-app-changelog" href="#joplin-android-app-changelog" class="heading-anchor">🔗</a></h1>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/android-v2.2.1">android-v2.2.1</a> (Pre-release) - 2021-07-13T17:37:38Z<a name="android-v2-2-1-https-github-com-laurent22-joplin-releases-tag-android-v2-2-1-pre-release-2021-07-13t17-37-38z" href="#android-v2-2-1-https-github-com-laurent22-joplin-releases-tag-android-v2-2-1-pre-release-2021-07-13t17-37-38z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>New: Added improved editor (beta)</li>
+<li>Improved: Disable backup to Google Drive (#5114 by Roman Musin)</li>
+<li>Improved: Interpret only valid search filters (#5103) (#3871 by <a href="https://github.com/JackGruber">@JackGruber</a>)</li>
+<li>Improved: Removed old editor code (e01a175)</li>
+</ul>
 <h2><a href="https://github.com/laurent22/joplin/releases/tag/android-v2.1.4">android-v2.1.4</a> - 2021-07-03T08:31:36Z<a name="android-v2-1-4-https-github-com-laurent22-joplin-releases-tag-android-v2-1-4-2021-07-03t08-31-36z" href="#android-v2-1-4-https-github-com-laurent22-joplin-releases-tag-android-v2-1-4-2021-07-03t08-31-36z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>Fixed: Fixes #5133: Items keep being uploaded to Joplin Server after a note has been shared.</li>
@@ -347,7 +361,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_android.md
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -360,19 +374,16 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_android.md
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/changelog_cli/index.html
+++ b/docs/changelog_cli/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_cli.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_cli.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_cli.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Joplin terminal app changelog | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_cli.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_cli.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_cli.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -616,7 +623,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_cli.md
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -629,19 +636,16 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_cli.md
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/changelog_server/index.html
+++ b/docs/changelog_server/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Joplin Server Changelog | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -265,6 +272,46 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md
 <p><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=E8JMYD2LQ8MMA&amp;lc=GB&amp;item_name=Joplin+Development&amp;currency_code=EUR&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted"><img src="https://joplinapp.org/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://joplinapp.org/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://joplinapp.org/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://joplinapp.org/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Joplin Server Changelog<a name="joplin-server-changelog" href="#joplin-server-changelog" class="heading-anchor">🔗</a></h1>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.2.11-beta">server-v2.2.11-beta</a> (Pre-release) - 2021-08-03T18:48:00Z<a name="server-v2-2-11-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-2-11-beta-pre-release-2021-08-03t18-48-00z" href="#server-v2-2-11-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-2-11-beta-pre-release-2021-08-03t18-48-00z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Improved: Disable beta account once expired (785248b)</li>
+<li>Improved: Handle beta user upgrade (8910c87)</li>
+<li>Improved: Prevent duplicate Stripe subscriptions and improved Stripe workflow testing (6ac22ed)</li>
+<li>Fixed: Fixed support emails (724aa72)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.2.10">server-v2.2.10</a> - 2021-08-01T10:04:53Z<a name="server-v2-2-10-https-github-com-laurent22-joplin-releases-tag-server-v2-2-10-2021-08-01t10-04-53z" href="#server-v2-2-10-https-github-com-laurent22-joplin-releases-tag-server-v2-2-10-2021-08-01t10-04-53z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Improved: Allows providing a coupon when creating the Stripe checkout session (b5b6111)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.2.9-beta">server-v2.2.9-beta</a> (Pre-release) - 2021-07-31T13:52:53Z<a name="server-v2-2-9-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-2-9-beta-pre-release-2021-07-31t13-52-53z" href="#server-v2-2-9-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-2-9-beta-pre-release-2021-07-31t13-52-53z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>New: Add Docker major, minor and beta version tags (#5237 by <a href="https://github.com/JackGruber">@JackGruber</a>)</li>
+<li>New: Add support for Stripe yearly subscriptions (f2547fe)</li>
+<li>Improved: Improve installation instructions (53b4d7a)</li>
+<li>Fixed: Fixed certain URLs (282f782)</li>
+<li>Fixed: Published notes that contain non-alphabetical characters could end up being truncated (#5229)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.2.8-beta">server-v2.2.8-beta</a> (Pre-release) - 2021-07-24T16:55:58Z<a name="server-v2-2-8-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-2-8-beta-pre-release-2021-07-24t16-55-58z" href="#server-v2-2-8-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-2-8-beta-pre-release-2021-07-24t16-55-58z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>New: Added form tokens to prevent CSRF attacks (19b45de)</li>
+<li>Improved: Allow admin to change Stripe subscription (75a421e)</li>
+<li>Improved: Allow enabling or disabling a user. Handle cancelling subscription. (27c3cbd)</li>
+<li>Improved: Allow user to upgrade account (e83ab93)</li>
+<li>Improved: Allow users to cancel Stripe subscription (b7e9848)</li>
+<li>Improved: Clarify error message when user info cannot be saved (4567b78)</li>
+<li>Improved: Explain how to use Joplin Server with a Joplin app (3f993af)</li>
+<li>Improved: Handle Stripe webhook receiving multiple times the same event (252d069)</li>
+<li>Improved: Make sure email URLs are displayed as clickable links (7245aea)</li>
+<li>Improved: Moved email templates to separate files (6a93cb2)</li>
+<li>Improved: Set default of env SUPPORT_EMAIL to &quot;SUPPORT_EMAIL&quot; to make it clear it needs to be set (92520e5)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.2.7-beta">server-v2.2.7-beta</a> (Pre-release) - 2021-07-11T17:31:42Z<a name="server-v2-2-7-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-2-7-beta-pre-release-2021-07-11t17-31-42z" href="#server-v2-2-7-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-2-7-beta-pre-release-2021-07-11t17-31-42z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>New: Added support for resetting user password (62b6198)</li>
+<li>Improved: Check password complexity (240cb35)</li>
+<li>Improved: Disallow changing email address until a secure solution to change it is implemented (f8d2c26)</li>
+<li>Fixed: Fixed mail queue as some emails were not being processed (89f4ca1)</li>
+</ul>
 <h2><a href="https://github.com/laurent22/joplin/releases/tag/server-v2.2.6-beta">server-v2.2.6-beta</a> (Pre-release) - 2021-07-09T15:57:47Z<a name="server-v2-2-6-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-2-6-beta-pre-release-2021-07-09t15-57-47z" href="#server-v2-2-6-beta-https-github-com-laurent22-joplin-releases-tag-server-v2-2-6-beta-pre-release-2021-07-09t15-57-47z" class="heading-anchor">🔗</a></h2>
 <ul>
 <li>New: Add Docker image labels (#5158 by <a href="https://github.com/JackGruber">@JackGruber</a>)</li>
@@ -443,7 +490,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -456,19 +503,16 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/clipper/index.html
+++ b/docs/clipper/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/clipper.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/clipper.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/clipper.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Joplin Web Clipper | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/clipper.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/clipper.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/clipper.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -329,7 +336,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/clipper.md
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -342,19 +349,16 @@ https://github.com/laurent22/joplin/blob/dev/readme/clipper.md
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/conflict/index.html
+++ b/docs/conflict/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/conflict.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/conflict.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/conflict.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>What is a conflict? | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/conflict.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/conflict.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/conflict.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -305,7 +312,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/conflict.md
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -318,19 +325,16 @@ https://github.com/laurent22/joplin/blob/dev/readme/conflict.md
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/css/site.css
+++ b/docs/css/site.css
@@ -103,21 +103,21 @@ a {
 	font-size: 16px !important;
 }

-.donate-button i {
+.sponsor-button i {
 	font-size: 0.8em;
 }

-.donate-button .heart-full {
+.sponsor-button .heart-full {
 	position: absolute;
 	opacity: 0;
 }

-.donate-button:hover .heart-full {
+.sponsor-button:hover .heart-full {
 	position: static;
 	opacity: 1;
 }

-.donate-button:hover .heart-line {
+.sponsor-button:hover .heart-line {
 	position: absolute;
 	opacity: 0;
 }
@@ -147,14 +147,6 @@ h6:hover a.heading-anchor {
 	padding-right: 0px;
 }

-.img-fluid {
-	image-rendering: -moz-crisp-edges; /* Firefox */
-	image-rendering: -o-crisp-edges; /* Opera */
-	image-rendering: -webkit-optimize-contrast; /* Webkit (non-standard naming) */
-	image-rendering: crisp-edges;
-	-ms-interpolation-mode: nearest-neighbor; /* IE (non-standard property) */
-}
-
 img[align="left"] {
 	margin-right: 10px;
 	margin-bottom: 10px;
@@ -295,12 +287,6 @@ p,
 	text-decoration: underline;
 }

-/* #nav-section .button-link {
-	padding: 15px;
-	min-width: 200px;
-	text-decoration: none;
-} */
-
 #nav-section {
 	box-shadow: 0 3px 11px 0 rgba(0,0,0,0.1);
 }
@@ -385,6 +371,10 @@ p,
 	margin-top: 40px;
 }

+#top-section-img img {
+	width: 100%;
+}
+
 .main-content {
 	flex: 1;
 }
@@ -399,6 +389,11 @@ p,
 	background-size: contain;
 }

+#multimedia-notes-section .frame-bg {
+	background-size: 100% 50%;
+	padding-bottom: 15px;
+}
+
 #multimedia-title {
 	margin-top: 100px;
 }
@@ -427,6 +422,11 @@ p,
 	background-position: left bottom;
 }

+#save-web-section .frame-bg {
+	background-size: 100% 50%;
+	padding-bottom: 12px;
+}
+
 #save-web-title {
 	margin-top: 50px;
 }
@@ -509,6 +509,10 @@ p,
 	text-align: center;
 }

+.page-download .downloaded-filename {
+	font-weight: bold;
+}
+
@media (min-width: 767px) {
 	.content-wrapper{
 		display: flex;
@@ -580,151 +584,6 @@ footer .right-links a {
 	margin-left: 15px;
 }

-/* responsive */
-
-/*
-@media (min-width: 1200px) and (max-width: 1799px) {
-	#nav-section a {
-		margin-left: 80px;
-	}
-
-	#your-note-section {
-		background-size: contain;
-		background-position: bottom;
-	}
-}
-
-@media (min-width: 768px) and (max-width: 1199px) {
-	#nav-section a {
-		margin-left: 30px;
-	}
-
-	#nav-section.with-profile a {
-		margin-left: 20px;
-	}
-
-	#nav-section .button-link {
-		padding: 8px;
-		min-width: 160px;
-		text-decoration: none;
-	}
-
-	.front-page h1 {
-		font-size: 2.7em;
-	}
-	
-	.front-page h2 {
-		font-size: 2.3em;
-		border-bottom: none;
-	}
-	
-	.front-page p {
-		font-size: 1.1em;
-	}
-
-	.front-page .button-link {
-		font-size: 1.1em;
-	}
-
-	.button-link {
-		min-width: 200px;
-		padding: 15px 22px;
-	}
-
-	#top-section,
-	#save-web-section,
-	#your-note-section {
-		background-image: inherit;
-	}
-
-	#top-section-img {
-		margin-bottom: -154px;
-		margin-top: 30px;
-	}
-
-	#work-together-section,
-	#save-web-section,
-	#your-data-section,
-	#your-note-section {
-		padding-top: 50px;
-		padding-bottom: 50px;
-	}
-
-	#your-note-section {
-		padding-bottom: 20px;
-	}
-
-	#save-web-title,
-	#customise-it-title {
-		margin-top: 0px;
-	}
-
-	#multimedia-notes-section {
-		padding-top: 200px;
-	}
-	#multimedia-title {
-		margin-top: 20px;
-	}
-
-	footer .button-link {
-		padding: 10px 15px;
-		font-size: 16px;
-	}
-}
-
-@media (min-width: 1700px) {
-	#plans-section {
-		background-image: url("../images/price-bg-left.png"),
-			url("../images/price-bg-right.png");
-		background-repeat: no-repeat, no-repeat;
-		background-position: left, right;
-		background-size: contain;
-	}
-}
-
-@media (min-width: 992px) and (max-width: 1200px) {
-	.price-container-blue {
-		min-height: 785px;
-	}
-
-	.price-container .plan-type img {
-		width: 55px;
-	}
-
-	.price-container p.plan-type {
-		font-size: 18px;
-	}
-	.price-container p.price {
-		font-size: 20px;
-		margin-top: -20px;
-	}
-}
-
-@media (max-width: 991px) {
-	.frame-bg {
-		padding-bottom: 8px;
-	}
-
-	#work-together-section {
-		padding-bottom: 0px;
-	}
-	.price-container {
-		max-width: 400px;
-		margin: auto;
-		margin-bottom: 20px;
-		margin-top: 20px;
-		min-height: inherit;
-	}
-	.price-container-blue {
-		padding: 30px 20px;
-	}
-
-	#in-the-press-section .carousel-item {
-		min-height: 650px;
-	}
-}
-*/
-
 /*****************************************************************
 IN THE PRESS
 The "In the press" section height needs to be adjusted as the
@@ -870,7 +729,7 @@ footer .right-links a {
 		margin-bottom: 1em;
 	}

-	#menu-mobile .menu-mobile-buttons .donate-button {
+	#menu-mobile .menu-mobile-buttons .sponsor-button {
 		margin-left: .5em;
 	}

@@ -957,18 +816,6 @@ footer .right-links a {
 PLANS PAGE
 *****************************************************************/

-/* .plans-page {
-	background-image: url("../images/price-bg-left.png"),
-		url("../images/price-bg-right.png");
-	background-repeat: no-repeat, no-repeat;
-	background-position: left, right;
-	background-size: contain;
-} */
-
-/* #plans-section.env-prod .alert-env-mode {
-	display: none;
-} */
-
 #plans-section .sub-title {
 	max-width: 800px;
 	margin-left: auto;
@@ -977,7 +824,7 @@ footer .right-links a {

 .plans-page h1 {
 	font-size: 2.2em;
-	margin-top:0;
+	/* margin-top:0; */
 }

 .plans-page .title-box p {
@@ -1001,7 +848,7 @@ footer .right-links a {
 	padding: 30px 20px;
 	padding-bottom: 30px;
 	margin-bottom: 50px;
-	margin-top: 60px;
+	margin-top: 40px;
 }

 .price-container p {
@@ -1024,7 +871,7 @@ footer .right-links a {
 .price-container-blue {
 	background: linear-gradient(251.85deg, #0b4f99 -11.85%, #002d61 104.73%);
 	box-shadow: 0px 4px 16px rgba(105, 132, 172, 0.13);
-	margin-top: 40px;
+	margin-top: 30px;
 	padding-top: 50px;
 	color: white;
 }
@@ -1039,6 +886,44 @@ footer .right-links a {
 	margin-bottom: 1em;
 }

+.plan-group {
+	justify-content: center;
+}
+
+.plan-group .plan-price-yearly-per-year {
+	display: flex;
+	justify-content: flex-end;
+	margin-top: -20px;
+	margin-bottom: 10px;
+}
+
+.plan-group .plan-price-yearly-per-year .per-year {
+	bottom: 0;
+}
+
+.plan-group.plan-prices-monthly .plan-price-yearly {
+	display: none;
+}
+
+.plan-group.plan-prices-monthly .plan-price-yearly-per-year {
+	display: none;
+}
+
+.plan-group.plan-prices-yearly .plan-price-monthly {
+	text-decoration: line-through;
+	opacity: 0.7;
+	font-size: 16px;
+	font-weight: normal;
+}
+
+.plan-group.plan-prices-yearly .account-type-3 .plan-price-monthly {
+	display: none;
+}
+
+.plan-group.plan-prices-yearly .plan-price-monthly .per-month {
+	display: none;
+}
+
 .price-row .plan-type {
 	display: flex;
 	align-items: center;
--- a/docs/debugging/index.html
+++ b/docs/debugging/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/debugging.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/debugging.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/debugging.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>How to enable debugging | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/debugging.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/debugging.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/debugging.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -351,7 +358,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/debugging.md
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -364,19 +371,16 @@ https://github.com/laurent22/joplin/blob/dev/readme/debugging.md
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/desktop/index.html
+++ b/docs/desktop/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/desktop.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/desktop.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/desktop.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Desktop application | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/desktop.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/desktop.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/desktop.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -299,7 +306,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/desktop.md
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -312,19 +319,16 @@ https://github.com/laurent22/joplin/blob/dev/readme/desktop.md
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/donate/index.html
+++ b/docs/donate/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/donate.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/donate.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/donate.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Support Joplin development | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/donate.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/donate.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/donate.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -330,7 +337,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/donate.md
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -343,19 +350,16 @@ https://github.com/laurent22/joplin/blob/dev/readme/donate.md
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/download/index.html
+++ b/docs/download/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/download.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/download.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/download.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
-		<title>Download Joplin | Joplin</title>
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
+		<title>Downloading Joplin... | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/download.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,89 +94,15 @@ https://github.com/laurent22/joplin/blob/dev/readme/download.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
-<li>
-<p>Applications</p>
-<ul>
-<li><a href="/desktop/">Desktop application</a></li>
-<li><a href="/mobile/">Mobile applications</a></li>
-<li><a href="/terminal/">Terminal application</a></li>
-<li><a href="/clipper/">Web Clipper</a></li>
-</ul>
-</li>
-<li>
-<p>Support</p>
-<ul>
-<li><a href="https://discourse.joplinapp.org">Joplin Forum</a></li>
-<li><a href="/markdown/">Markdown Guide</a></li>
-<li><a href="/e2ee/">How to enable end-to-end encryption</a></li>
-<li><a href="/conflict/">What is a conflict?</a></li>
-<li><a href="/debugging/">How to enable debug mode</a></li>
-<li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
-<li><a href="/faq/">FAQ</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - Get Started</p>
-<ul>
-<li><a href="/api/overview/">Joplin API Overview</a></li>
-<li><a href="/api/get_started/plugins/">Plugin development</a></li>
-<li><a href="/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
-<li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="/api/references/rest_api/">Data API</a></li>
-<li><a href="/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
-<li><a href="/api/references/plugin_theming/">Plugin theming</a></li>
-</ul>
-</li>
-<li>
-<p>Development</p>
-<ul>
-<li><a href="https://github.com/laurent22/joplin/blob/dev/BUILD.md">How to build the apps</a></li>
-<li><a href="/spec/e2ee/">End-to-end encryption spec</a></li>
-<li><a href="/spec/history/">Note History spec</a></li>
-<li><a href="/spec/sync_lock/">Sync Lock spec</a></li>
-<li><a href="/spec/plugins/">Plugin Architecture spec</a></li>
-<li><a href="/spec/search_sorting/">Search Sorting spec</a></li>
-<li><a href="/spec/server_file_url_format/">Server: File URL Format</a></li>
-<li><a href="/spec/server_delta_sync/">Server: Delta Sync</a></li>
-<li><a href="/spec/server_sharing/">Server: Sharing</a></li>
-</ul>
-</li>
-<li>
-<p>Google Summer of Code 2021</p>
-<ul>
-<li><a href="/gsoc2021/index/">Google Summer of Code 2021</a></li>
-<li><a href="/gsoc2021/pull_request_guidelines/">How to submit a GSoC pull request</a></li>
-<li><a href="/gsoc2021/ideas/">Project Ideas</a></li>
-</ul>
-</li>
-<li>
-<p>About</p>
-<ul>
-<li><a href="/changelog/">Changelog (Desktop App)</a></li>
-<li><a href="/changelog_cli/">Changelog (CLI App)</a></li>
-<li><a href="/changelog_server/">Changelog (Server)</a></li>
-<li><a href="/stats/">Stats</a></li>
-<li><a href="/donate/">Donate</a></li>
-</ul>
-</li>
-</ul>
-</div></div>
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -191,21 +124,20 @@ https://github.com/laurent22/joplin/blob/dev/readme/download.md
 							<div class="donate-links">
 <p><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=E8JMYD2LQ8MMA&amp;lc=GB&amp;item_name=Joplin+Development&amp;currency_code=EUR&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted"><img src="https://joplinapp.org/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://joplinapp.org/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://joplinapp.org/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://joplinapp.org/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
-<h1>Download Joplin<a name="download-joplin" href="#download-joplin" class="heading-anchor">🔗</a></h1>
+<h1>Downloading Joplin...<a name="downloading-joplin" href="#downloading-joplin" class="heading-anchor">🔗</a></h1>
 <div class="intro">
-Thank you for downloading the Joplin desktop app!
-<p>If your download didn't start, <a href="#" class="download-click-here">click here</a>.</p>
+Your download of <span class="downloaded-filename">Joplin</span> is in progress. If your download didn't start, <a href="#" class="download-click-here">click here</a>.
 </div>
 <div class="get-it-desktop">
-<h2>Get it on desktop<a name="get-it-on-desktop" href="#get-it-on-desktop" class="heading-anchor">🔗</a></h2>
+<h2>Joplin App for Desktop<a name="joplin-app-for-desktop" href="#joplin-app-for-desktop" class="heading-anchor">🔗</a></h2>
 <p>Access your notes on Windows, macOS or Linux.</p>
-<!-- DESKTOP-DOWNLOAD-LINKS --><a href='https://github.com/laurent22/joplin/releases/download/v2.1.8/Joplin-Setup-2.1.8.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a> <a href='https://github.com/laurent22/joplin/releases/download/v2.1.8/Joplin-2.1.8.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a> <a href='https://github.com/laurent22/joplin/releases/download/v2.1.8/Joplin-2.1.8.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a><!-- DESKTOP-DOWNLOAD-LINKS -->
+<!-- DESKTOP-DOWNLOAD-LINKS --><a href='https://github.com/laurent22/joplin/releases/download/v2.1.9/Joplin-Setup-2.1.9.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a> <a href='https://github.com/laurent22/joplin/releases/download/v2.1.9/Joplin-2.1.9.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a> <a href='https://github.com/laurent22/joplin/releases/download/v2.1.9/Joplin-2.1.9.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a><!-- DESKTOP-DOWNLOAD-LINKS -->
 </div>
-<h2>Get it on mobile<a name="get-it-on-mobile" href="#get-it-on-mobile" class="heading-anchor">🔗</a></h2>
-<p>To access your notes on your mobile or tablet, get the Android or iOS apps!</p>
+<h2>Joplin App for Mobile<a name="joplin-app-for-mobile" href="#joplin-app-for-mobile" class="heading-anchor">🔗</a></h2>
+<p>Access your notes on your phone or tablet from the Android and iOS apps.</p>
 <!-- MOBILE-DOWNLOAD-LINKS --><a href='https://play.google.com/store/apps/details?id=net.cozic.joplin&utm_source=GitHub&utm_campaign=README&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' height="40px" src='https://joplinapp.org/images/BadgeAndroid.png'/></a> <a href='https://itunes.apple.com/us/app/joplin/id1315599797'><img alt='Get it on the App Store' height="40px" src='https://joplinapp.org/images/BadgeIOS.png'/></a><!-- MOBILE-DOWNLOAD-LINKS -->
-<h2>More download options<a name="more-download-options" href="#more-download-options" class="heading-anchor">🔗</a></h2>
-<p>For other download options, such as the portable application, terminal application or Android APK file, please <a href="/help/#installation">follow this link</a>.</p>
+<h2>More Joplin Versions<a name="more-joplin-versions" href="#more-joplin-versions" class="heading-anchor">🔗</a></h2>
+<p>For other options, such as the portable application, terminal application or Android APK file, see the <a href="/help/#installation">full installation details</a>.</p>

 								<div class="bottom-links">
 									<a href="https://github.com/laurent22/joplin/blob/dev/readme/download.md">
@@ -238,7 +170,7 @@ Thank you for downloading the Joplin desktop app!
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -251,19 +183,16 @@ Thank you for downloading the Joplin desktop app!
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/e2ee/index.html
+++ b/docs/e2ee/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/e2ee.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/e2ee.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/e2ee.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>About End-To-End Encryption (E2EE) | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/e2ee.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/e2ee.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/e2ee.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -317,7 +324,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/e2ee.md
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -330,19 +337,16 @@ https://github.com/laurent22/joplin/blob/dev/readme/e2ee.md
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/faq/index.html
+++ b/docs/faq/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>FAQ | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -395,7 +402,7 @@ on this server.&lt;/p&gt;
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -408,19 +415,16 @@ on this server.&lt;/p&gt;
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/faq_joplin_cloud/index.html
+++ b/docs/faq_joplin_cloud/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq_joplin_cloud.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq_joplin_cloud.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq_joplin_cloud.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>FAQ | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq_joplin_cloud.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq_joplin_cloud.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq_joplin_cloud.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -266,13 +273,24 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq_joplin_cloud.md
 </div>
 <h1>FAQ<a name="faq" href="#faq" class="heading-anchor">🔗</a></h1>
 <h2>What is Joplin Cloud?<a name="what-is-joplin-cloud" href="#what-is-joplin-cloud" class="heading-anchor">🔗</a></h2>
-<p>Joplin supports various ways to synchronise data with cloud file hosting services. It does that in a generic way, which allows it to support many providers. However there are limits to what can be done in such a generic way - for example, certain performance optimisations are not possible, and more advanced features such as the ability to publish notes or share notebooks cannot be implemented.</p>
-<p>This is where Joplin Cloud comes into place. It is a solution developed specifically for Joplin and as such offers various improvements, such as improved synchronisation performances, support for publishing notes, and sharing and collaborating on notebooks.</p>
-<p>Moreover, by getting a subscription you are supporting the development of the project as a whole, including the open source applications. Such support helps in the long term to provide bug and security fixes, add new features, and provide support.</p>
+<p>Joplin Cloud allows you to synchronise your notes automatically to all your devices. Moreover, this service gives you access to additional features:</p>
+<ul>
+<li>
+<p>Publish a note to the internet and share it with others. The published note will be updated automatically whenever you make a change.</p>
+</li>
+<li>
+<p>Collaborate on a notebook with other Joplin Cloud users. You can share a notebook with other users who will then have full access to it - they can read, change or add more notes, images or documents to the notebook. This is convenient to work on ideas or on a project with others.</p>
+</li>
+<li>
+<p>Improved sync performances. Compared to other sync options, Joplin Cloud, being developed specifically for Joplin, is faster and consumes less resources.</p>
+</li>
+</ul>
+<p>Moreover, by getting a subscription you are supporting the development of the project as a whole, including the open source applications. Such support needed in the long term to provide bug and security fixes, add new features, and provide support.</p>
 <h2>What if I exceed the storage space?<a name="what-if-i-exceed-the-storage-space" href="#what-if-i-exceed-the-storage-space" class="heading-anchor">🔗</a></h2>
 <p>If you exceed the storage space, you will not be able to upload new notes. You may however delete notes and attachments so as to free up space. If you are on a Basic plan, you may also upgrade to Pro. If you are on a Pro or Business plan please contact us and let us know that you need more space and we will increase your storage space.</p>
 <h2>Do you offer discounts?<a name="do-you-offer-discounts" href="#do-you-offer-discounts" class="heading-anchor">🔗</a></h2>
-<p>We can offer discounts for students, schools and universities, or nonprofit organisations. To get this discount please contact us.</p>
+<p>We offer a 50% discount to students. To claim it, please <a href="mailto:support@joplincloud.com">contact us</a> from your university or school email address. You will then receive a URL you can use to subscribe to Joplin Cloud while benefiting from the 50% discount. This is valid for a whole year and can be renewed for as long as you are in education by contacting us again.</p>
+<p>We may also offer bulk discounts for companies, associations and nonprofit organisations. Please <a href="mailto:support@joplincloud.com">contact us</a> for more details.</p>

 								<div class="bottom-links">
 									<a href="https://github.com/laurent22/joplin/blob/dev/readme/faq_joplin_cloud.md">
@@ -305,7 +323,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq_joplin_cloud.md
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -318,19 +336,16 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq_joplin_cloud.md
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/gsoc2020/ideas/index.html
+++ b/docs/gsoc2020/ideas/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/ideas.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/ideas.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/ideas.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>GSoC 2020 Ideas | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/ideas.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/ideas.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/ideas.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -402,7 +409,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/ideas.md
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -415,19 +422,16 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/ideas.md
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/gsoc2020/index/index.html
+++ b/docs/gsoc2020/index/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/index.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/index.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/index.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Google Summer of Code 2020 | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/index.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/index.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/index.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -401,7 +408,7 @@ There could be exceptional reason to accept proposal what cannot be finished ove
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -414,19 +421,16 @@ There could be exceptional reason to accept proposal what cannot be finished ove
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/gsoc2021/ideas/index.html
+++ b/docs/gsoc2021/ideas/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/ideas.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/ideas.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/ideas.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>GSoC 2021 Ideas | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/ideas.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/ideas.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/ideas.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -362,7 +369,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/ideas.md
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -375,19 +382,16 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/ideas.md
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/gsoc2021/index/index.html
+++ b/docs/gsoc2021/index/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/index.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/index.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/index.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Google Summer of Code 2021 | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/index.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/index.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/index.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -417,7 +424,7 @@ There could be exceptional reason to accept proposal what cannot be finished ove
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -430,19 +437,16 @@ There could be exceptional reason to accept proposal what cannot be finished ove
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/gsoc2021/pull_request_guidelines/index.html
+++ b/docs/gsoc2021/pull_request_guidelines/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/pull_request_guidel
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/pull_request_guidel
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/pull_request_guidel
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Pull request guidelines | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/pull_request_guidel
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/pull_request_guidel
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/pull_request_guidel
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -325,7 +332,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/pull_request_guidel
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -338,19 +345,16 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/pull_request_guidel
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/gsod2020/ideas/index.html
+++ b/docs/gsod2020/ideas/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/ideas.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/ideas.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/ideas.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>1.Idea - Create documenation hub | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/ideas.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/ideas.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/ideas.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -327,7 +334,7 @@ Task is to find a toolset to structure them and make the knowledge buried in the
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -340,19 +347,16 @@ Task is to find a toolset to structure them and make the knowledge buried in the
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/gsod2020/index/index.html
+++ b/docs/gsod2020/index/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/index.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/index.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/index.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Google Season of Doc 2020 | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/index.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/index.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/index.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -387,7 +394,7 @@ The procedure reflects some of the lessons learnt in the GSOC 2020 campaign, so
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -400,19 +407,16 @@ The procedure reflects some of the lessons learnt in the GSOC 2020 campaign, so
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/help/index.html
+++ b/docs/help/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/README.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/README.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/README.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Joplin - an open source note taking and to-do application with synchronisation capabilities</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/README.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/README.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/README.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -283,19 +290,19 @@ https://github.com/laurent22/joplin/blob/dev/README.md
 <tbody>
 <tr>
 <td>Windows (32 and 64-bit)</td>
-<td><a href='https://github.com/laurent22/joplin/releases/download/v2.1.8/Joplin-Setup-2.1.8.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a></td>
+<td><a href='https://github.com/laurent22/joplin/releases/download/v2.1.9/Joplin-Setup-2.1.9.exe'><img alt='Get it on Windows' width="134px" src='https://joplinapp.org/images/BadgeWindows.png'/></a></td>
 </tr>
 <tr>
 <td>macOS</td>
-<td><a href='https://github.com/laurent22/joplin/releases/download/v2.1.8/Joplin-2.1.8.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a></td>
+<td><a href='https://github.com/laurent22/joplin/releases/download/v2.1.9/Joplin-2.1.9.dmg'><img alt='Get it on macOS' width="134px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a></td>
 </tr>
 <tr>
 <td>Linux</td>
-<td><a href='https://github.com/laurent22/joplin/releases/download/v2.1.8/Joplin-2.1.8.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a></td>
+<td><a href='https://github.com/laurent22/joplin/releases/download/v2.1.9/Joplin-2.1.9.AppImage'><img alt='Get it on Linux' width="134px" src='https://joplinapp.org/images/BadgeLinux.png'/></a></td>
 </tr>
 </tbody>
 </table>
-<p><strong>On Windows</strong>, you may also use the <a href='https://github.com/laurent22/joplin/releases/download/v2.1.8/JoplinPortable.exe'>Portable version</a>. The <a href="https://en.wikipedia.org/wiki/Portable_application">portable application</a> allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called &quot;JoplinProfile&quot; next to the executable file.</p>
+<p><strong>On Windows</strong>, you may also use the <a href='https://github.com/laurent22/joplin/releases/download/v2.1.9/JoplinPortable.exe'>Portable version</a>. The <a href="https://en.wikipedia.org/wiki/Portable_application">portable application</a> allows installing the software on a portable device such as a USB key. Simply copy the file JoplinPortable.exe in any directory on that USB key ; the application will then create a directory called &quot;JoplinProfile&quot; next to the executable file.</p>
 <p><strong>On Linux</strong>, the recommended way is to use the following installation script as it will handle the desktop icon too:</p>
 <pre><code style="word-break: break-all">wget -O - https://raw.githubusercontent.com/laurent22/joplin/dev/Joplin_install_and_update.sh | bash</code></pre>
 <h2>Mobile applications<a name="mobile-applications" href="#mobile-applications" class="heading-anchor">🔗</a></h2>
@@ -360,9 +367,11 @@ https://github.com/laurent22/joplin/blob/dev/README.md
 <h2>Web Clipper<a name="web-clipper" href="#web-clipper" class="heading-anchor">🔗</a></h2>
 <p>The Web Clipper is a browser extension that allows you to save web pages and screenshots from your browser. For more information on how to install and use it, see the <a href="/clipper/">Web Clipper Help Page</a>.</p>
 <h1>Sponsors<a name="sponsors" href="#sponsors" class="heading-anchor">🔗</a></h1>
-<p><a href="https://seirei.ne.jp"><img title="Serei Network" width="256" src="https://joplinapp.org/images/sponsors/SeireiNetwork.png"/></a> <a href="https://usrigging.com/"><img title="U.S. Ringing Supply" width="256" src="https://joplinapp.org/images/sponsors/RingingSupply.svg"/></a> <a href="https://tranio.com/italy/"><img title="Tranio" width="256" src="https://joplinapp.org/images/sponsors/Tranio.png"/></a></p>
+<!-- SPONSORS-ORG -->
+<p><a href="https://www.hosting.de/nextcloud/?mtm_campaign=managed-nextcloud&amp;mtm_kwd=joplinapp&amp;mtm_source=joplinapp-github&amp;mtm_medium=banner"><img title="Hosting.de" width="256" src="https://joplinapp.org/images/sponsors/HostingDe.png"/></a> <a href="https://tranio.com/italy/"><img title="Tranio" width="256" src="https://joplinapp.org/images/sponsors/Tranio.png"/></a> <a href="https://usrigging.com/"><img title="U.S. Ringing Supply" width="256" src="https://joplinapp.org/images/sponsors/RingingSupply.svg"/></a> <a href="https://seirei.ne.jp"><img title="Serei Network" width="256" src="https://joplinapp.org/images/sponsors/SeireiNetwork.png"/></a></p>
+<!-- SPONSORS-ORG -->
 <hr>
-<!-- SPONSORS -->
+<!-- SPONSORS-GITHUB -->
 <table class="table">
 <thead>
 <tr>
@@ -381,31 +390,31 @@ https://github.com/laurent22/joplin/blob/dev/README.md
 </tr>
 <tr>
 <td style="text-align:center"><img width="50" src="https://avatars2.githubusercontent.com/u/4862947?s=96&v=4"/></br><a href="https://github.com/chrootlogin">chrootlogin</a></td>
+<td style="text-align:center"><img width="50" src="https://avatars2.githubusercontent.com/u/82579431?s=96&v=4"/></br><a href="https://github.com/clmntsl">clmntsl</a></td>
 <td style="text-align:center"><img width="50" src="https://avatars2.githubusercontent.com/u/1307332?s=96&v=4"/></br><a href="https://github.com/dbrandonjohnson">dbrandonjohnson</a></td>
 <td style="text-align:center"><img width="50" src="https://avatars2.githubusercontent.com/u/1439535?s=96&v=4"/></br><a href="https://github.com/fbloise">fbloise</a></td>
-<td style="text-align:center"><img width="50" src="https://avatars2.githubusercontent.com/u/38898566?s=96&v=4"/></br><a href="https://github.com/h4sh5">h4sh5</a></td>
 </tr>
 <tr>
+<td style="text-align:center"><img width="50" src="https://avatars2.githubusercontent.com/u/38898566?s=96&v=4"/></br><a href="https://github.com/h4sh5">h4sh5</a></td>
 <td style="text-align:center"><img width="50" src="https://avatars2.githubusercontent.com/u/37297218?s=96&v=4"/></br><a href="https://github.com/Jesssullivan">Jesssullivan</a></td>
 <td style="text-align:center"><img width="50" src="https://avatars2.githubusercontent.com/u/1248504?s=96&v=4"/></br><a href="https://github.com/joesfer">joesfer</a></td>
 <td style="text-align:center"><img width="50" src="https://avatars2.githubusercontent.com/u/24908652?s=96&v=4"/></br><a href="https://github.com/konishi-t">konishi-t</a></td>
-<td style="text-align:center"><img width="50" src="https://avatars2.githubusercontent.com/u/1788010?s=96&v=4"/></br><a href="https://github.com/maxtruxa">maxtruxa</a></td>
 </tr>
 <tr>
+<td style="text-align:center"><img width="50" src="https://avatars2.githubusercontent.com/u/1788010?s=96&v=4"/></br><a href="https://github.com/maxtruxa">maxtruxa</a></td>
 <td style="text-align:center"><img width="50" src="https://avatars2.githubusercontent.com/u/29300939?s=96&v=4"/></br><a href="https://github.com/mcejp">mcejp</a></td>
 <td style="text-align:center"><img width="50" src="https://avatars2.githubusercontent.com/u/1168659?s=96&v=4"/></br><a href="https://github.com/nicholashead">nicholashead</a></td>
 <td style="text-align:center"><img width="50" src="https://avatars2.githubusercontent.com/u/5782817?s=96&v=4"/></br><a href="https://github.com/piccobit">piccobit</a></td>
-<td style="text-align:center"><img width="50" src="https://avatars2.githubusercontent.com/u/47742?s=96&v=4"/></br><a href="https://github.com/ravenscroftj">ravenscroftj</a></td>
 </tr>
 <tr>
+<td style="text-align:center"><img width="50" src="https://avatars2.githubusercontent.com/u/47742?s=96&v=4"/></br><a href="https://github.com/ravenscroftj">ravenscroftj</a></td>
 <td style="text-align:center"><img width="50" src="https://avatars2.githubusercontent.com/u/73081837?s=96&v=4"/></br><a href="https://github.com/thismarty">thismarty</a></td>
 <td style="text-align:center"><img width="50" src="https://avatars2.githubusercontent.com/u/15859362?s=96&v=4"/></br><a href="https://github.com/thomasbroussard">thomasbroussard</a></td>
 <td style="text-align:center"></td>
-<td style="text-align:center"></td>
 </tr>
 </tbody>
 </table>
-<!-- SPONSORS -->
+<!-- SPONSORS-GITHUB -->
 <h1>Features<a name="features" href="#features" class="heading-anchor">🔗</a></h1>
 <ul>
 <li>Desktop, mobile and terminal applications.</li>
@@ -864,7 +873,7 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <td>Arabic</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ar.po">ar</a></td>
 <td><a href="mailto:Whaell@protonmail.com">Whaell O</a></td>
-<td>95%</td>
+<td>94%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/es/basque_country.png" width="16px"/></td>
@@ -878,7 +887,7 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <td>Bosnian (Bosna i Hercegovina)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bs_BA.po">bs_BA</a></td>
 <td><a href="mailto:dervis.t@pm.me">Derviš T.</a></td>
-<td>74%</td>
+<td>73%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/bg.png" width="16px"/></td>
@@ -892,7 +901,7 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <td>Catalan</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ca.po">ca</a></td>
 <td>jmontane, 2019</td>
-<td>82%</td>
+<td>99%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/hr.png" width="16px"/></td>
@@ -906,21 +915,21 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <td>Czech (Česká republika)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/cs_CZ.po">cs_CZ</a></td>
 <td><a href="mailto:michal@stanke.cz">Michal Stanke</a></td>
-<td>99%</td>
+<td>98%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/dk.png" width="16px"/></td>
 <td>Dansk (Danmark)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/da_DK.po">da_DK</a></td>
 <td>Mustafa Al-Dailemi (<a href="mailto:dailemi@hotmail.com">dailemi@hotmail.com</a>)Language-Team:</td>
-<td>99%</td>
+<td>98%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/de.png" width="16px"/></td>
 <td>Deutsch (Deutschland)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/de_DE.po">de_DE</a></td>
 <td><a href="mailto:atalanttore@googlemail.com">Atalanttore</a></td>
-<td>94%</td>
+<td>99%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/ee.png" width="16px"/></td>
@@ -969,7 +978,7 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <td>Français (France)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fr_FR.po">fr_FR</a></td>
 <td>Laurent Cozic</td>
-<td>98%</td>
+<td>97%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/es/galicia.png" width="16px"/></td>
@@ -983,7 +992,7 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <td>Indonesian (Indonesia)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/id_ID.po">id_ID</a></td>
 <td><a href="mailto:42007357+eresytter@users.noreply.github.com">eresytter</a></td>
-<td>92%</td>
+<td>91%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/it.png" width="16px"/></td>
@@ -996,7 +1005,7 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/hu.png" width="16px"/></td>
 <td>Magyar (Magyarország)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/hu_HU.po">hu_HU</a></td>
-<td><a href="mailto:mail@szokesandor.hu">Szőke Sándor</a></td>
+<td><a href="mailto:balmag@gmail.com">Magyari Balázs</a></td>
 <td>87%</td>
 </tr>
 <tr>
@@ -1004,14 +1013,14 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <td>Nederlands (België, Belgique, Belgien)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_BE.po">nl_BE</a></td>
 <td></td>
-<td>91%</td>
+<td>90%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/nl.png" width="16px"/></td>
 <td>Nederlands (Nederland)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nl_NL.po">nl_NL</a></td>
 <td><a href="mailto:metbril@users.noreply.github.com">MetBril</a></td>
-<td>94%</td>
+<td>93%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/no.png" width="16px"/></td>
@@ -1025,7 +1034,7 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <td>Persian</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fa.po">fa</a></td>
 <td><a href="mailto:kourox@protonmail.com">Kourosh Firoozbakht</a></td>
-<td>71%</td>
+<td>70%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/pl.png" width="16px"/></td>
@@ -1039,7 +1048,7 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <td>Português (Brasil)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_BR.po">pt_BR</a></td>
 <td><a href="mailto:nicolas.suzuki@pm.me">Nicolas Suzuki</a></td>
-<td>93%</td>
+<td>98%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/pt.png" width="16px"/></td>
@@ -1053,7 +1062,7 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <td>Română</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ro.po">ro</a></td>
 <td><a href="mailto:cristi.duluta@gmail.com">Cristi Duluta</a></td>
-<td>66%</td>
+<td>65%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/si.png" width="16px"/></td>
@@ -1067,14 +1076,14 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <td>Svenska</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sv.po">sv</a></td>
 <td><a href="mailto:jonatan@autistici.org">Jonatan Nyberg</a></td>
-<td>61%</td>
+<td>98%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/th.png" width="16px"/></td>
 <td>Thai (ประเทศไทย)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/th_TH.po">th_TH</a></td>
 <td></td>
-<td>45%</td>
+<td>44%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/vi.png" width="16px"/></td>
@@ -1088,21 +1097,21 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <td>Türkçe (Türkiye)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/tr_TR.po">tr_TR</a></td>
 <td><a href="mailto:arda@kilicdagi.com">Arda Kılıçdağı</a></td>
-<td>93%</td>
+<td>99%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/ua.png" width="16px"/></td>
 <td>Ukrainian (Україна)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/uk_UA.po">uk_UA</a></td>
 <td><a href="mailto:vandreykiv@gmail.com">Vyacheslav Andreykiv</a></td>
-<td>93%</td>
+<td>92%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/gr.png" width="16px"/></td>
 <td>Ελληνικά (Ελλάδα)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/el_GR.po">el_GR</a></td>
 <td><a href="mailto:xaris@tuta.io">Harris Arvanitis</a></td>
-<td>96%</td>
+<td>95%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/ru.png" width="16px"/></td>
@@ -1116,7 +1125,7 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <td>српски језик (Србија)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sr_RS.po">sr_RS</a></td>
 <td></td>
-<td>70%</td>
+<td>83%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/cn.png" width="16px"/></td>
@@ -1137,7 +1146,7 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <td>日本語 (日本)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ja_JP.po">ja_JP</a></td>
 <td><a href="mailto:genneko217@gmail.com">genneko</a></td>
-<td>96%</td>
+<td>99%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/kr.png" width="16px"/></td>
@@ -1716,7 +1725,7 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -1729,19 +1738,16 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/images/JoplinMobileUI.jpg
+++ b/docs/images/JoplinMobileUI.jpg
--- a/docs/images/home-top-img-2x.png
+++ b/docs/images/home-top-img-2x.png
--- a/docs/images/home-top-img-2x.webp
+++ b/docs/images/home-top-img-2x.webp
--- a/docs/images/home-top-img-4x.webp
+++ b/docs/images/home-top-img-4x.webp
--- a/docs/images/home-top-img.png
+++ b/docs/images/home-top-img.png
--- a/docs/images/home-top-img.webp
+++ b/docs/images/home-top-img.webp
--- a/docs/images/sponsors/HostingDe.png
+++ b/docs/images/sponsors/HostingDe.png
--- a/docs/index.html
+++ b/docs/index.html
@@ -1,7 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -9,8 +10,8 @@
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Jopli website" />
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<meta name="description" content="Joplin, the open source note-taking application" />
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
@@ -23,7 +24,12 @@
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Joplin</title>
 	</head>
 	<body class="front-page website-env-prod">
@@ -45,8 +51,8 @@
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -74,89 +80,15 @@
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
-<li>
-<p>Applications</p>
-<ul>
-<li><a href="/desktop/">Desktop application</a></li>
-<li><a href="/mobile/">Mobile applications</a></li>
-<li><a href="/terminal/">Terminal application</a></li>
-<li><a href="/clipper/">Web Clipper</a></li>
-</ul>
-</li>
-<li>
-<p>Support</p>
-<ul>
-<li><a href="https://discourse.joplinapp.org">Joplin Forum</a></li>
-<li><a href="/markdown/">Markdown Guide</a></li>
-<li><a href="/e2ee/">How to enable end-to-end encryption</a></li>
-<li><a href="/conflict/">What is a conflict?</a></li>
-<li><a href="/debugging/">How to enable debug mode</a></li>
-<li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
-<li><a href="/faq/">FAQ</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - Get Started</p>
-<ul>
-<li><a href="/api/overview/">Joplin API Overview</a></li>
-<li><a href="/api/get_started/plugins/">Plugin development</a></li>
-<li><a href="/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
-<li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="/api/references/rest_api/">Data API</a></li>
-<li><a href="/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
-<li><a href="/api/references/plugin_theming/">Plugin theming</a></li>
-</ul>
-</li>
-<li>
-<p>Development</p>
-<ul>
-<li><a href="https://github.com/laurent22/joplin/blob/dev/BUILD.md">How to build the apps</a></li>
-<li><a href="/spec/e2ee/">End-to-end encryption spec</a></li>
-<li><a href="/spec/history/">Note History spec</a></li>
-<li><a href="/spec/sync_lock/">Sync Lock spec</a></li>
-<li><a href="/spec/plugins/">Plugin Architecture spec</a></li>
-<li><a href="/spec/search_sorting/">Search Sorting spec</a></li>
-<li><a href="/spec/server_file_url_format/">Server: File URL Format</a></li>
-<li><a href="/spec/server_delta_sync/">Server: Delta Sync</a></li>
-<li><a href="/spec/server_sharing/">Server: Sharing</a></li>
-</ul>
-</li>
-<li>
-<p>Google Summer of Code 2021</p>
-<ul>
-<li><a href="/gsoc2021/index/">Google Summer of Code 2021</a></li>
-<li><a href="/gsoc2021/pull_request_guidelines/">How to submit a GSoC pull request</a></li>
-<li><a href="/gsoc2021/ideas/">Project Ideas</a></li>
-</ul>
-</li>
-<li>
-<p>About</p>
-<ul>
-<li><a href="/changelog/">Changelog (Desktop App)</a></li>
-<li><a href="/changelog_cli/">Changelog (CLI App)</a></li>
-<li><a href="/changelog_server/">Changelog (Server)</a></li>
-<li><a href="/stats/">Stats</a></li>
-<li><a href="/donate/">Donate</a></li>
-</ul>
-</li>
-</ul>
-</div></div>
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -184,13 +116,21 @@
 							<br />
 							<p class="text-center">
 								<a href="/download/" class="button-link btn-blue download-button">Download the app</a>
+									<a href="/plans/" class="button-link btn-trans plans-button">Sign up with Joplin Cloud</a>
 							</p>
-							<img
-								src="&#x2F;images/home-top-img.png"
-								alt=""
-								class="img-fluid img-center"
-								id="top-section-img"
-							/>
+
+							<picture class="img-fluid img-center" id="top-section-img">
+								<source type="image/webp" srcset="
+									&#x2F;images/home-top-img-4x.webp 4820w,
+									&#x2F;images/home-top-img-2x.webp 2388w,
+									&#x2F;images/home-top-img.webp 1205w
+								">
+								<source type="image/png" srcset="
+									&#x2F;images/home-top-img-2x.png 2388w,
+									&#x2F;images/home-top-img.png 1205w
+								">
+								<img id="top-section-img-img" src="&#x2F;images/home-top-img-2x.png">
+							</picture>
 						</div>
 					</div>
 				</div>
@@ -202,7 +142,7 @@
 						<div class="col-12 col-md-5 col-xxl-6">
 							<div class="ml-30 ml-mobile-0">
 								<h2 id="multimedia-title">
-									Multimedia <span class="frame-bg frame-bg-yellow">notes</span>
+									<span class="frame-bg frame-bg-yellow">Multimedia</span> notes
 								</h2>
 								<p id="multimedia-text">
 									Images, videos, PDFs and audio files are supported. Create
@@ -229,6 +169,35 @@
 				</div>
 			</div>

+			<div id="work-together-section" class="gray-bg">
+				<div class="container">
+					<div class="row">
+						<div class="col-6 d-none d-md-block"></div>
+						<div class="col-12 col-md-6">
+							<div class="ml-30 ml-mobile-0">
+								<h2>Work together</h2>
+								<p>
+									With Joplin Cloud, share your notes with your friends, family
+									or colleagues and collaborate on them.
+								</p>
+								<br />
+								<p>
+									<a href="/plans/" class="button-link btn-blue">Try it now</a>
+								</p>
+								<br class="d-block d-md-none" />
+								<br class="d-block d-md-none" />
+								<div class="text-center">
+									<img
+										src="&#x2F;images/work-together-img.png"
+										alt=""
+										class="img-fluid d-block-inline d-md-none"
+									/>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>

 			<div id="save-web-section" class="blue-bg">
 				<div class="container">
@@ -236,9 +205,7 @@
 						<div class="col-12 col-md-6">
 							<div class="ml-30 ml-mobile-0">
 								<h2 id="save-web-title">
-									Save web pages <br /><span class="frame-bg frame-bg-blue"
-										>as notes</span
-									>
+									Save <span class="frame-bg frame-bg-blue">web pages</span> <br />as notes
 								</h2>
 								<p>
 									Use the web clipper extension, available on Chrome and
@@ -309,7 +276,7 @@
 					<div class="row">
 						<div class="col-12">
 							<h2 class="text-center">
-								<span class="frame-bg frame-bg-blue-lg">Your notes,</span> everywhere you are.
+								Your notes, <span class="frame-bg frame-bg-blue-lg">everywhere</span> you are
 							</h2>
 							<p class="text-center" id="your-note-text">
 								Access your notes from your computer, phone or tablet by synchronising with various services, including Joplin Cloud, Dropbox and OneDrive. The app is available on Windows, macOS, Linux, Android and iOS. A terminal app is also available!
@@ -331,7 +298,7 @@
 						<div class="col-12 col-md-6">
 							<br class="d-block d-md-none" />
 							<div class="ml-30 ml-mobile-0">
-								<h2>100% your data</h2>
+								<h2>100% <span class="frame-bg frame-bg-yellow-lg">your data</span></h2>
 								<p>
 									The app is open source and your notes are saved to an open
 									format, so you'll always have access to them. Uses End-To-End Encryption (E2EE) to secure your notes and ensure no-one but
@@ -598,6 +565,7 @@

 							<div class="text-center sponsors-org">
 									<a class="sponsor-org-item" href="https:&#x2F;&#x2F;seirei.ne.jp"><img title="Serei Network" src="&#x2F;images/sponsors/SeireiNetwork.png"></a>
+									<a class="sponsor-org-item" href="https:&#x2F;&#x2F;www.hosting.de&#x2F;nextcloud&#x2F;?mtm_campaign&#x3D;managed-nextcloud&amp;mtm_kwd&#x3D;joplinapp&amp;mtm_source&#x3D;joplinapp-webseite&amp;mtm_medium&#x3D;banner"><img title="Hosting.de" src="&#x2F;images/sponsors/HostingDe.png"></a>
 									<a class="sponsor-org-item" href="https:&#x2F;&#x2F;usrigging.com&#x2F;"><img title="U.S. Ringing Supply" src="&#x2F;images/sponsors/RingingSupply.svg"></a>
 									<a class="sponsor-org-item" href="https:&#x2F;&#x2F;tranio.com&#x2F;italy&#x2F;"><img title="Tranio" src="&#x2F;images/sponsors/Tranio.png"></a>
 							</div>
@@ -693,6 +661,11 @@
 											<img width="50" src="https://avatars2.githubusercontent.com/u/24908652?s=96&amp;v=4">
 										</a>
 									</div>
+									<div class="sponsor-github-item">
+										<a href="https://github.com/clmntsl" title="clmntsl">
+											<img width="50" src="https://avatars2.githubusercontent.com/u/82579431?s=96&amp;v=4">
+										</a>
+									</div>
 							</div>
 							<br />
 						</div>
@@ -723,7 +696,7 @@
 								/>
 							</a>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6">
 							<p class="text-right text-center-sm right-links">
@@ -741,18 +714,15 @@
 			rel="preload"
 			as="script"
 		></script>
-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>
 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/js/script.js
+++ b/docs/js/script.js
@@ -6,6 +6,12 @@ function getOs() {
 	return null;
 }

+function getFilename(path) {
+	if (!path) return '';
+	const s = path.split('/');
+	return s.pop();
+}
+
 function getMobileOs() {
 	var userAgent = navigator.userAgent || navigator.vendor || window.opera;

@@ -64,9 +70,17 @@ function setupDownloadPage() {
 	} else {
 		const os = getOs();
 		if (!os || !downloadLinks[os]) {
+			// If we don't know, display the section to manually download the app
 			$('.page-download .get-it-desktop').show();
+		} else if (os === 'linux') {
+			// If it's Linux, the user should probably install it using the
+			// install script so we redirect to the install section
+			window.location = 'https://joplinapp.org/help/#desktop-applications';
 		} else {
-			window.location = downloadLinks[os];
+			// Otherwise, start the download
+			const downloadLink = downloadLinks[os];
+			$('.downloaded-filename').text(getFilename(downloadLink));
+			window.location = downloadLink;
 		}
 	}
 }
--- a/docs/markdown/index.html
+++ b/docs/markdown/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/markdown.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/markdown.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/markdown.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Markdown Guide | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/markdown.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/markdown.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/markdown.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -622,7 +629,7 @@ graph TD;
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -635,19 +642,16 @@ graph TD;
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/mobile/index.html
+++ b/docs/mobile/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/mobile.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/mobile.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/mobile.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Mobile app | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/mobile.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/mobile.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/mobile.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -298,7 +305,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/mobile.md
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -311,19 +318,16 @@ https://github.com/laurent22/joplin/blob/dev/readme/mobile.md
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/nextcloud_app/index.html
+++ b/docs/nextcloud_app/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/nextcloud_app.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/nextcloud_app.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/nextcloud_app.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Joplin Web API for Nextcloud | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/nextcloud_app.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/nextcloud_app.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/nextcloud_app.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -337,7 +344,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/nextcloud_app.md
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -350,19 +357,16 @@ https://github.com/laurent22/joplin/blob/dev/readme/nextcloud_app.md
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/note_history/index.html
+++ b/docs/note_history/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/note_history.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/note_history.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/note_history.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Note History | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/note_history.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/note_history.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/note_history.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -312,7 +319,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/note_history.md
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -325,19 +332,16 @@ https://github.com/laurent22/joplin/blob/dev/readme/note_history.md
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/plans/index.html
+++ b/docs/plans/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Joplin Cloud Plans | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template plans-page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,89 +94,15 @@ https://github.com/laurent22/joplin/blob/dev/
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
-<li>
-<p>Applications</p>
-<ul>
-<li><a href="/desktop/">Desktop application</a></li>
-<li><a href="/mobile/">Mobile applications</a></li>
-<li><a href="/terminal/">Terminal application</a></li>
-<li><a href="/clipper/">Web Clipper</a></li>
-</ul>
-</li>
-<li>
-<p>Support</p>
-<ul>
-<li><a href="https://discourse.joplinapp.org">Joplin Forum</a></li>
-<li><a href="/markdown/">Markdown Guide</a></li>
-<li><a href="/e2ee/">How to enable end-to-end encryption</a></li>
-<li><a href="/conflict/">What is a conflict?</a></li>
-<li><a href="/debugging/">How to enable debug mode</a></li>
-<li><a href="/rich_text_editor/">About the Rich Text editor limitations</a></li>
-<li><a href="/faq/">FAQ</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - Get Started</p>
-<ul>
-<li><a href="/api/overview/">Joplin API Overview</a></li>
-<li><a href="/api/get_started/plugins/">Plugin development</a></li>
-<li><a href="/api/tutorials/toc_plugin/">Plugin tutorial</a></li>
-</ul>
-</li>
-<li>
-<p>Joplin API - References</p>
-<ul>
-<li><a href="https://joplinapp.org/api/references/plugin_api/classes/joplin.html">Plugin API</a></li>
-<li><a href="/api/references/rest_api/">Data API</a></li>
-<li><a href="/api/references/plugin_manifest/">Plugin manifest</a></li>
-<li><a href="/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
-<li><a href="/api/references/plugin_theming/">Plugin theming</a></li>
-</ul>
-</li>
-<li>
-<p>Development</p>
-<ul>
-<li><a href="https://github.com/laurent22/joplin/blob/dev/BUILD.md">How to build the apps</a></li>
-<li><a href="/spec/e2ee/">End-to-end encryption spec</a></li>
-<li><a href="/spec/history/">Note History spec</a></li>
-<li><a href="/spec/sync_lock/">Sync Lock spec</a></li>
-<li><a href="/spec/plugins/">Plugin Architecture spec</a></li>
-<li><a href="/spec/search_sorting/">Search Sorting spec</a></li>
-<li><a href="/spec/server_file_url_format/">Server: File URL Format</a></li>
-<li><a href="/spec/server_delta_sync/">Server: Delta Sync</a></li>
-<li><a href="/spec/server_sharing/">Server: Sharing</a></li>
-</ul>
-</li>
-<li>
-<p>Google Summer of Code 2021</p>
-<ul>
-<li><a href="/gsoc2021/index/">Google Summer of Code 2021</a></li>
-<li><a href="/gsoc2021/pull_request_guidelines/">How to submit a GSoC pull request</a></li>
-<li><a href="/gsoc2021/ideas/">Project Ideas</a></li>
-</ul>
-</li>
-<li>
-<p>About</p>
-<ul>
-<li><a href="/changelog/">Changelog (Desktop App)</a></li>
-<li><a href="/changelog_cli/">Changelog (CLI App)</a></li>
-<li><a href="/changelog_server/">Changelog (Server)</a></li>
-<li><a href="/stats/">Stats</a></li>
-<li><a href="/donate/">Donate</a></li>
-</ul>
-</li>
-</ul>
-</div></div>
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -200,18 +133,50 @@ https://github.com/laurent22/joplin/blob/dev/
 				</p>
 			</div>
 		</div>
+
+		<noscript>
+			<div class="alert alert-danger alert-env-dev" role="alert" style='text-align: center; margin-top: 10px;'>
+				To use this page please enable JavaScript!
+			</div>
+		</noscript>
+
+		<div style="display: flex; justify-content: center; margin-top: 1.2em">	
+			<div class="form-check form-check-inline">
+				<input id="pay-monthly-radio" class="form-check-input" type="radio" name="pay-radio" checked value="monthly">
+				<label style="font-weight: bold" class="form-check-label" for="pay-monthly-radio">
+					Pay Monthly
+				</label>
+			</div>
+
+			<div class="form-check form-check-inline">
+				<input id="pay-yearly-radio" class="form-check-input" type="radio" name="pay-radio" value="yearly">
+				<label style="font-weight: bold" class="form-check-label" for="pay-yearly-radio">
+					Pay Yearly
+				</label>
+			</div>	
+		</div>
 		
-		<div class="row">
-<div class="col-12 col-lg-4">
+		<div class="row plan-group plan-prices-monthly">
+<div class="col-12 col-lg-4 account-type-1">
 	<div class="price-container ">
 		<div class="price-row">
 			<div class="plan-type">
 				<img src="&#x2F;images/basic-icon.png"/>&nbsp;Basic
 			</div>

-			<div class="plan-price">
+			<div class="plan-price plan-price-monthly">
 				1.99€<sub class="per-month">&nbsp;/month</sub>
 			</div>
+
+			<div class="plan-price plan-price-yearly">
+				1.49€<sub class="per-month">&nbsp;/month</sub>
+			</div>
+		</div>
+
+		<div class="plan-price-yearly-per-year">
+			<div>
+				(17.88€<sub class="per-year">&nbsp;/year</sub>)
+			</div>
 		</div>

 			<p><i class="fas fa-check feature feature-on"></i>Max 10 MB per note or attachment</p>
@@ -225,25 +190,34 @@ https://github.com/laurent22/joplin/blob/dev/
 			<p class="unchecked-text"><i class="fas fa-times feature feature-off"></i>Priority support</p>
 		
 		<p class="text-center subscribe-wrapper">
-			<a id="subscribeButton-basic" href="" class="button-link btn-white">Try it now</a>
+			<a id="subscribeButton-basic" href="" class="button-link btn-white subscribeButton">Try it now</a>
 		</p>
 	</div>

 	<script>
 		(function() {
-			const stripePriceId = 'price_1JAzWBLx4fybOTqJw64zxJRJ';
+			const stripePricesIds = {
+				monthly: 'price_1JAzWBLx4fybOTqJw64zxJRJ',
+				yearly: 'price_1JJIPZLx4fybOTqJHvxiQ7bV',
+			};
 			const planName = 'basic';
 			const buttonId = 'subscribeButton-' + planName;
 			const buttonElement = document.getElementById(buttonId);

-			if (stripePriceId) {
+			if (stripePricesIds.monthly) {
 				function handleResult() {
 					console.info('Redirected to checkout');
 				}

 				buttonElement.addEventListener("click", function(evt) {
 					evt.preventDefault();
-					const priceId = 'price_1JAzWBLx4fybOTqJw64zxJRJ';
+
+					const priceId = stripePricesIds[subscriptionPeriod];
+
+					if (!priceId) {
+						console.error('Invalid period: ' + subscriptionPeriod);
+						return;
+					}

 					createCheckoutSession(priceId).then(function(data) {
 						stripe.redirectToCheckout({
@@ -256,16 +230,26 @@ https://github.com/laurent22/joplin/blob/dev/
 		})();
 	</script>
 </div>
-<div class="col-12 col-lg-4">
+<div class="col-12 col-lg-4 account-type-2">
 	<div class="price-container price-container-blue">
 		<div class="price-row">
 			<div class="plan-type">
 				<img src="&#x2F;images/pro-icon.png"/>&nbsp;Pro
 			</div>

-			<div class="plan-price">
+			<div class="plan-price plan-price-monthly">
 				5.99€<sub class="per-month">&nbsp;/month</sub>
 			</div>
+
+			<div class="plan-price plan-price-yearly">
+				4.79€<sub class="per-month">&nbsp;/month</sub>
+			</div>
+		</div>
+
+		<div class="plan-price-yearly-per-year">
+			<div>
+				(57.48€<sub class="per-year">&nbsp;/year</sub>)
+			</div>
 		</div>

 			<p><i class="fas fa-check feature feature-on"></i>Max 200 MB per note or attachment</p>
@@ -279,25 +263,34 @@ https://github.com/laurent22/joplin/blob/dev/
 			<p class="unchecked-text"><i class="fas fa-times feature feature-off"></i>Priority support</p>
 		
 		<p class="text-center subscribe-wrapper">
-			<a id="subscribeButton-pro" href="" class="button-link btn-white">Try it now</a>
+			<a id="subscribeButton-pro" href="" class="button-link btn-white subscribeButton">Try it now</a>
 		</p>
 	</div>

 	<script>
 		(function() {
-			const stripePriceId = 'price_1JB1OVLx4fybOTqJOvp3NGM6';
+			const stripePricesIds = {
+				monthly: 'price_1JB1OVLx4fybOTqJOvp3NGM6',
+				yearly: 'price_1JJIQ7Lx4fybOTqJsQNv1QUp',
+			};
 			const planName = 'pro';
 			const buttonId = 'subscribeButton-' + planName;
 			const buttonElement = document.getElementById(buttonId);

-			if (stripePriceId) {
+			if (stripePricesIds.monthly) {
 				function handleResult() {
 					console.info('Redirected to checkout');
 				}

 				buttonElement.addEventListener("click", function(evt) {
 					evt.preventDefault();
-					const priceId = 'price_1JB1OVLx4fybOTqJOvp3NGM6';
+
+					const priceId = stripePricesIds[subscriptionPeriod];
+
+					if (!priceId) {
+						console.error('Invalid period: ' + subscriptionPeriod);
+						return;
+					}

 					createCheckoutSession(priceId).then(function(data) {
 						stripe.redirectToCheckout({
@@ -310,16 +303,26 @@ https://github.com/laurent22/joplin/blob/dev/
 		})();
 	</script>
 </div>
-<div class="col-12 col-lg-4">
+<div class="col-12 col-lg-4 account-type-3">
 	<div class="price-container ">
 		<div class="price-row">
 			<div class="plan-type">
 				<img src="&#x2F;images/business-icon.png"/>&nbsp;Business
 			</div>

-			<div class="plan-price">
+			<div class="plan-price plan-price-monthly">
 				49.99€<sub class="per-month">&nbsp;/month</sub>
 			</div>
+
+			<div class="plan-price plan-price-yearly">
+				39.99€<sub class="per-month">&nbsp;/month</sub>
+			</div>
+		</div>
+
+		<div class="plan-price-yearly-per-year">
+			<div>
+				(479.88€<sub class="per-year">&nbsp;/year</sub>)
+			</div>
 		</div>

 			<p><i class="fas fa-check feature feature-on"></i>Max 200 MB per note or attachment</p>
@@ -333,25 +336,34 @@ https://github.com/laurent22/joplin/blob/dev/

 		
 		<p class="text-center subscribe-wrapper">
-			<a id="subscribeButton-business" href="mailto:business@joplincloud.com?subject&#x3D;Joplin%20Cloud%20Business%20Account%20Order&amp;body&#x3D;Hello%2C%0A%0AThis%20is%20an%20automatically%20generated%20email.%20The%20Business%20feature%20is%20coming%20soon%2C%20and%20in%20the%20meantime%20we%20offer%20a%20business%20discount%20if%20you%20would%20like%20to%20register%20multiple%20users.%0A%0AIf%20so%20please%20let%20us%20know%20the%20following%20details%20and%20we%20will%20get%20back%20to%20you%20as%20soon%20as%20possible%3A%0A%0A-%20Name%3A%20%0A%0A-%20Email%3A%20%0A%0A-%20Number%20of%20users%3A%20" class="button-link btn-white">Contact us</a>
+			<a id="subscribeButton-business" href="mailto:business@joplincloud.com?subject&#x3D;Joplin%20Cloud%20Business%20Account%20Order&amp;body&#x3D;Hello%2C%0A%0AThis%20is%20an%20automatically%20generated%20email.%20The%20Business%20feature%20is%20coming%20soon%2C%20and%20in%20the%20meantime%20we%20offer%20a%20business%20discount%20if%20you%20would%20like%20to%20register%20multiple%20users.%0A%0AIf%20so%20please%20let%20us%20know%20the%20following%20details%20and%20we%20will%20get%20back%20to%20you%20as%20soon%20as%20possible%3A%0A%0A-%20Name%3A%20%0A%0A-%20Email%3A%20%0A%0A-%20Number%20of%20users%3A%20" class="button-link btn-white subscribeButton">Contact us</a>
 		</p>
 	</div>

 	<script>
 		(function() {
-			const stripePriceId = '';
+			const stripePricesIds = {
+				monthly: '',
+				yearly: '',
+			};
 			const planName = 'business';
 			const buttonId = 'subscribeButton-' + planName;
 			const buttonElement = document.getElementById(buttonId);

-			if (stripePriceId) {
+			if (stripePricesIds.monthly) {
 				function handleResult() {
 					console.info('Redirected to checkout');
 				}

 				buttonElement.addEventListener("click", function(evt) {
 					evt.preventDefault();
-					const priceId = '';
+
+					const priceId = stripePricesIds[subscriptionPeriod];
+
+					if (!priceId) {
+						console.error('Invalid period: ' + subscriptionPeriod);
+						return;
+					}

 					createCheckoutSession(priceId).then(function(data) {
 						stripe.redirectToCheckout({
@@ -368,13 +380,24 @@ https://github.com/laurent22/joplin/blob/dev/
 		<div class="row">
 			<h1>FAQ</h1>
 <h2>What is Joplin Cloud?</h2>
-<p>Joplin supports various ways to synchronise data with cloud file hosting services. It does that in a generic way, which allows it to support many providers. However there are limits to what can be done in such a generic way - for example, certain performance optimisations are not possible, and more advanced features such as the ability to publish notes or share notebooks cannot be implemented.</p>
-<p>This is where Joplin Cloud comes into place. It is a solution developed specifically for Joplin and as such offers various improvements, such as improved synchronisation performances, support for publishing notes, and sharing and collaborating on notebooks.</p>
-<p>Moreover, by getting a subscription you are supporting the development of the project as a whole, including the open source applications. Such support helps in the long term to provide bug and security fixes, add new features, and provide support.</p>
+<p>Joplin Cloud allows you to synchronise your notes automatically to all your devices. Moreover, this service gives you access to additional features:</p>
+<ul>
+<li>
+<p>Publish a note to the internet and share it with others. The published note will be updated automatically whenever you make a change.</p>
+</li>
+<li>
+<p>Collaborate on a notebook with other Joplin Cloud users. You can share a notebook with other users who will then have full access to it - they can read, change or add more notes, images or documents to the notebook. This is convenient to work on ideas or on a project with others.</p>
+</li>
+<li>
+<p>Improved sync performances. Compared to other sync options, Joplin Cloud, being developed specifically for Joplin, is faster and consumes less resources.</p>
+</li>
+</ul>
+<p>Moreover, by getting a subscription you are supporting the development of the project as a whole, including the open source applications. Such support needed in the long term to provide bug and security fixes, add new features, and provide support.</p>
 <h2>What if I exceed the storage space?</h2>
 <p>If you exceed the storage space, you will not be able to upload new notes. You may however delete notes and attachments so as to free up space. If you are on a Basic plan, you may also upgrade to Pro. If you are on a Pro or Business plan please contact us and let us know that you need more space and we will increase your storage space.</p>
 <h2>Do you offer discounts?</h2>
-<p>We can offer discounts for students, schools and universities, or nonprofit organisations. To get this discount please contact us.</p>
+<p>We offer a 50% discount to students. To claim it, please <a href="mailto:support@joplincloud.com">contact us</a> from your university or school email address. You will then receive a URL you can use to subscribe to Joplin Cloud while benefiting from the 50% discount. This is valid for a whole year and can be renewed for as long as you are in education by contacting us again.</p>
+<p>We may also offer bulk discounts for companies, associations and nonprofit organisations. Please <a href="mailto:support@joplincloud.com">contact us</a> for more details.</p>

 		</div>
 	</div>
@@ -382,23 +405,66 @@ https://github.com/laurent22/joplin/blob/dev/
 	<script src="https://js.stripe.com/v3/"></script>

 	<script>
-	var stripe = Stripe('pk_live_51IvkOPLx4fybOTqJow8RFsWs0eDznPeBlXMw6s8SIDQeCM8bAFNYlBdDsyonAwRcJgBCoSlvFzAbhJgLFxzzTu4r0006aw846C');
+		const urlQuery = new URLSearchParams(location.search);
+		let subscriptionPeriod = 'monthly';
+		var stripe = Stripe('pk_live_51IvkOPLx4fybOTqJow8RFsWs0eDznPeBlXMw6s8SIDQeCM8bAFNYlBdDsyonAwRcJgBCoSlvFzAbhJgLFxzzTu4r0006aw846C');

-	var createCheckoutSession = function(priceId) {
-		console.info('Creating Stripe session for price:', priceId);
+		let checkoutSessionUser = null;

-		return fetch("https://joplincloud.com/stripe/createCheckoutSession", {
-			method: "POST",
-			headers: {
-				"Content-Type": "application/json"
-			},
-			body: JSON.stringify({
-				priceId: priceId
-			})
-		}).then(function(result) {
-			return result.json();
+		// Temporary setup to allow Beta users to start their subscription.
+		function setupBetaHandling(query) {
+			let accountType = Number(query.get('account_type'));
+			if (isNaN(accountType)) accountType = 1;
+
+			const email = query.get('email');
+			if (!email) return;
+		
+			$('.account-type-3').css('display', 'none');
+			$('.subscribeButton').text('Buy now');
+			
+			if (accountType === 2) {
+				$('.account-type-1').css('display', 'none');
+			}
+
+			checkoutSessionUser = { email, accountType };
+		}
+
+		var createCheckoutSession = function(priceId) {
+			const coupon = urlQuery.get('coupon') || '';
+
+			console.info('Creating Stripe session for price:', priceId, 'Coupon:', coupon);
+
+			return fetch("https://joplincloud.com/stripe/createCheckoutSession", {
+				method: "POST",
+				headers: {
+					"Content-Type": "application/json"
+				},
+				body: JSON.stringify({
+					priceId: priceId,
+					coupon: coupon,
+					email: checkoutSessionUser ? checkoutSessionUser.email : '',
+				})
+			}).then(async function(result) {
+				if (!result.ok) {
+					console.error('Could not create Stripe checkout session', await result.text());
+					alert('The checkout session could not be created. Please contact support@joplincloud.com for support.');
+				} else {
+					return result.json();
+				}
+			});
+		};
+
+		$(() => {
+			$("input[name='pay-radio']").change(function() {
+				const period = $("input[type='radio'][name='pay-radio']:checked").val();
+				subscriptionPeriod = period;
+			
+				$('.plan-group').removeClass(period === 'monthly' ? 'plan-prices-yearly' : 'plan-prices-monthly');
+				$('.plan-group').addClass('plan-prices-' + period);
+			});
+
+			setupBetaHandling(urlQuery);
 		});
-	};
 	</script>
 </div>

@@ -428,7 +494,7 @@ https://github.com/laurent22/joplin/blob/dev/
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -441,19 +507,16 @@ https://github.com/laurent22/joplin/blob/dev/
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/plugins/index.html
+++ b/docs/plugins/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/plugins.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/plugins.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/plugins.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Plugins | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/plugins.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/plugins.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/plugins.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -310,7 +317,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/plugins.md
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -323,19 +330,16 @@ https://github.com/laurent22/joplin/blob/dev/readme/plugins.md
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/prereleases/index.html
+++ b/docs/prereleases/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/prereleases.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/prereleases.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/prereleases.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Getting pre-releases | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/prereleases.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/prereleases.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/prereleases.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -301,7 +308,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/prereleases.md
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -314,19 +321,16 @@ https://github.com/laurent22/joplin/blob/dev/readme/prereleases.md
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/privacy/index.html
+++ b/docs/privacy/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/privacy.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/privacy.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/privacy.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Joplin Privacy Policy | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/privacy.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/privacy.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/privacy.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -300,7 +307,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/privacy.md
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -313,19 +320,16 @@ https://github.com/laurent22/joplin/blob/dev/readme/privacy.md
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/rich_text_editor/index.html
+++ b/docs/rich_text_editor/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/rich_text_editor.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/rich_text_editor.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/rich_text_editor.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>About the Rich Text editor | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/rich_text_editor.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/rich_text_editor.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/rich_text_editor.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -322,7 +329,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/rich_text_editor.md
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -335,19 +342,16 @@ https://github.com/laurent22/joplin/blob/dev/readme/rich_text_editor.md
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/docs/schema/settings.json
+++ b/docs/schema/settings.json
@@ -448,7 +448,7 @@
 		"editor.beta": {
 			"type": "boolean",
 			"default": false,
-			"description": "Opt-in to the editor beta. This beta adds list continuation, Markdown preview, and Markdown shortcuts. If you find bugs, please report them in the Discourse forum.",
+			"description": "Opt-in to the editor beta. This beta adds list continuation and syntax highlighting. If you find bugs, please report them in the Discourse forum.",
 			"$comment": "private"
 		},
 		"newTodoFocus": {
@@ -648,7 +648,7 @@
 		},
 		"style.editor.fontSize": {
 			"type": "integer",
-			"default": 13,
+			"default": 15,
 			"description": "Editor font size",
 			"minimum": 4,
 			"maximum": 50
--- a/docs/spec/clipper_auth/index.html
+++ b/docs/spec/clipper_auth/index.html
@@ -14,7 +14,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/clipper_auth.md
 -->

 	<head>
-		<meta
+<!-- Donate button A/B testing -->
+<script async src="https://www.googleoptimize.com/optimize.js?id=OPT-PW3ZPK3"></script>		<meta
 			charset="utf-8"
 			http-equiv="X-UA-Compatible"
 			content="IE=edge,chrome=1"
@@ -22,13 +23,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/clipper_auth.md
 		<link rel="icon" href="&#x2F;images/favicon.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
-		<meta name="description" content="Joplin website" />
+		<meta name="description" content="Joplin, the open source note-taking application" />
 		<link
 			rel="stylesheet"
 			href="&#x2F;css/bootstrap5.0.2.min.css"
 			as="style"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1626024662523">
+		<link rel="stylesheet" href="&#x2F;css/fontawesome-all.min.css?t=1628159924590">
 		<link
 			href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700&display=swap"
 			rel="stylesheet"
@@ -36,8 +37,14 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/clipper_auth.md
 			media="all"
 			onload="this.media='all'; this.onload = null"
 		/>
-		<link rel="stylesheet" href="&#x2F;css/site.css?t=1626024662523" as="style" />
+		<link rel="stylesheet" href="&#x2F;css/site.css?t=1628159924590" as="style" />
 		<title>Clipper authorisation mechanism | Joplin</title>
+
+		<script
+			src="&#x2F;js/jquery-3.6.0.min.js"
+			rel="preload"
+			as="script"
+		></script>
 	</head>
 	<body class="website-env-prod">
 		<div class="container-fluid generic-template -page" id="main-container">
@@ -58,8 +65,8 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/clipper_auth.md
 			<div class="col-9 text-right d-none d-md-block">
 				<a href="/help/" class="fw500">Help</a>
 				<a href="https:&#x2F;&#x2F;discourse.joplinapp.org&#x2F;" class="fw500">Forum</a>
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>			</div>
 			<div class="col-9 text-right d-block d-md-none">
 				<span class="pointer"
@@ -87,12 +94,12 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/clipper_auth.md
 						</div>

 						<div class="menu-mobile-buttons">
-<a class="button-link btn-blue donate-button" href="/donate">
-	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support
+<a href="/plans/" class="button-link btn-trans plans-button">Joplin Cloud</a><a class="button-link btn-blue sponsor-button" href="/donate">
+	<i class="fas fa-heart heart-full"></i><i class="far fa-heart heart-line"></i>&nbsp;Support us
 </a>						</div>
 					</div>

-					<div id="toc-mobile"><div><ul>
+						<div id="toc-mobile"><div><ul>
 <li>
 <p>Applications</p>
 <ul>
@@ -169,7 +176,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/clipper_auth.md
 					
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
-							Copyright (C) 2016-2021 Laurent&nbsp;Cozic
+							Copyright &copy; 2016-2021 Laurent&nbsp;Cozic
 							<br/>
 							<a href="/privacy/" class="fw500">Privacy Policy</a>
 						</p>
@@ -323,7 +330,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/clipper_auth.md
 								alt=""
 							/>
 							<br class="d-block d-md-none" />
-							<p class="text-center-sm">Copyright (C) 2016-2021 Laurent Cozic</p>
+							<p class="text-center-sm">Copyright &copy; 2016-2021 Laurent Cozic</p>
 						</div>
 						<div class="col-12 col-md-6 right-links">
 							<p class="text-right text-center-sm">
@@ -336,19 +343,16 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/clipper_auth.md
 			</footer>
 		</div>

-		<script
-			src="&#x2F;js/jquery-3.6.0.min.js"
-			rel="preload"
-			as="script"
-		></script>
-		<script src="&#x2F;js/script.js?t=1626024662523"></script>
+		<script src="&#x2F;js/script.js?t=1628159924590"></script>

 <script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-	ga('create', 'UA-103586105-1', 'auto');
-	ga('send', 'pageview');
+	if (window.location.hostname !== 'localhost') {
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		ga('create', 'UA-103586105-1', 'auto');
+		ga('send', 'pageview');
+	}
 </script>	</body>
 </html>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Laurent Cozic	118d65e819	Merge branch 'dev' into e2ee_info_json	2021-08-06 16:44:59 +01:00
Laurent Cozic	f9cfefdb29	Desktop: Resolves #5273 : Prevent plugins from crashing the application	2021-08-06 13:08:32 +01:00
Laurent Cozic	e9d590169b	Desktop: Remove template feature (replaced by template plugin)	2021-08-06 10:58:32 +01:00
Abhinav Sharma	b0609319fd	Doc: add mobile UI infographic to readme/mobile.md (#5252 ) * Update mobile.md Add mobile interface * Update mobile.md * Add joplin_mobile_ui.jpg * Delete file * Add JoplinMobileUI * Delete file * Add JoplinMobileUI * Update mobile.md * Add JoplinMobileUI.jpg * Update mobile.md * Delete Assets/JoplinMobileui.jpg * Add JoplinMobileUI.jpg * Update mobile.md * Delete JoplinMobileUI.jpg	2021-08-05 18:18:27 -04:00
Laurent Cozic	fa9c08be06	Plugin Repo: Added plugin download links on README page	2021-08-05 17:32:00 +01:00
Laurent Cozic	b3ce5fbc48	Doc: Added debug info	2021-08-05 16:04:08 +01:00
Laurent Cozic	87298db0ec	fix import	2021-08-05 16:01:46 +01:00
Laurent Cozic	d7d05f85ff	Should wait when copying file	2021-08-05 15:08:57 +01:00
Laurent Cozic	5b7a5de826	Desktop: Resolves #5184 : GotoAnything sometimes is not working on first try	2021-08-05 14:40:54 +01:00
Laurent Cozic	69f0578ca9	Tools: Do not run slow updateIgnored script when running desktop app in dev mode	2021-08-05 14:35:58 +01:00
Laurent Cozic	6e82c8a8f9	Desktop: Fixes #5208 : Focus is lost while searching in all notes	2021-08-05 14:35:08 +01:00
Laurent Cozic	f08af4d036	All: Fixes #5223 : Fixed issue with orphaned resource being created in case of a resource conflict	2021-08-05 14:25:25 +01:00
Laurent Cozic	d3cd843fc8	Desktop: Fixed header spacing (regression)	2021-08-05 12:50:41 +01:00
Laurent Cozic	3348b4f6f8	Desktop: Fixes #5253 : Fixed plugin state when it has been deleted outside the app	2021-08-05 12:48:39 +01:00
Laurent Cozic	5d176b5bc8	Desktop: Resolves #5256 : Increase space between paragraphs in viewer and Rich Text editor to match Markdown editor	2021-08-05 12:30:00 +01:00
Laurent Cozic	854b83039e	Desktop: Fixes #5258 : Fixed recipient list colors in Share Notebook dialog	2021-08-05 12:23:10 +01:00
Laurent Cozic	73e67deb37	Desktop: Fixes #5259 : Fixed share note color in note list	2021-08-05 12:16:02 +01:00
Laurent Cozic	bde39bf6b3	Desktop: Fixes #5268 : Disable "Dropped file type is not supported" notification in Rich Text editor	2021-08-05 12:09:21 +01:00
Laurent Cozic	7f00e4ea5b	Desktop: Turn old plugin deprecation notices into errors	2021-08-05 12:02:03 +01:00
Laurent Cozic	8471be16aa	Doc: Improved "work together" section	2021-08-05 11:45:06 +01:00
Laurent Cozic	b8c40da858	Update website	2021-08-05 11:39:00 +01:00
Laurent Cozic	4d3eff3682	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-08-05 11:38:22 +01:00
Laurent Cozic	a16046e8a1	Doc: Updated FAQ	2021-08-05 11:37:49 +01:00
Alexander Dawson	ceb57b515d	All: Translation: Update nb_NO.po (#5263 )	2021-08-04 07:24:26 -04:00
Laurent Cozic	c4fcfec581	Server: Clarify beta transition message	2021-08-04 09:34:35 +01:00
Laurent Cozic	2a9654f9ab	Server v2.2.11	2021-08-03 19:48:07 +01:00
Laurent Cozic	724aa726ca	Server: Fixed support emails	2021-08-03 19:47:18 +01:00
Laurent Cozic	0fc4bc05f6	typo	2021-08-03 19:43:20 +01:00
Laurent Cozic	db0e0ee17e	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-08-03 18:25:13 +01:00
Laurent Cozic	6ac22ed0a0	Server: Prevent duplicate Stripe subscriptions and improved Stripe workflow testing	2021-08-03 18:24:33 +01:00
Abdullah Ibnu Hibban	4cfb804d61	All: Translation: Update id_ID.po (thanks to eresytter) (#5251 )	2021-08-03 12:54:20 -04:00
reportxx	a3c1be405e	All: Translation: Update sv.po (#5262 ) Please merge this pr to update the Swedish translation.	2021-08-03 12:53:29 -04:00
Laurent Cozic	1f1ee5c3c2	Doc: Add Joplin Cloud student discount info	2021-08-03 17:45:51 +01:00
Laurent Cozic	785248b27f	Server: Disable beta account once expired	2021-08-02 17:56:25 +01:00
Laurent Cozic	89d4d5e642	Update website	2021-08-02 17:44:21 +01:00
Laurent Cozic	8910c87d15	Server: Handle beta user upgrade	2021-08-02 17:43:18 +01:00
Laurent Cozic	447cb2d92d	Server v2.2.10	2021-08-01 11:05:29 +01:00
Laurent Cozic	b5b6111e83	Server: Allows providing a coupon when creating the Stripe checkout session	2021-07-31 17:05:39 +01:00
Laurent Cozic	23553b70e0	Server v2.2.9	2021-07-31 14:53:29 +01:00
Laurent Cozic	03822487ec	Update website	2021-07-31 14:46:37 +01:00
Laurent Cozic	ef35b30645	Doc: Switch to prod mode	2021-07-31 14:45:39 +01:00
Laurent Cozic	edf07488f4	Update website	2021-07-31 14:44:00 +01:00
Laurent Cozic	4f02c7359b	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-07-31 14:43:32 +01:00
Laurent Cozic	f2547fed8d	Server: Add support for Stripe yearly subscriptions	2021-07-31 14:42:56 +01:00
Helmut K. C. Tessarek	d3a449a86e	All: Translation: Update da_DK.po (thanks ERYpTION)	2021-07-28 13:26:22 -04:00
Laurent Cozic	c76ed7f8ac	Update translations	2021-07-28 13:35:40 +01:00
Laurent Cozic	e9c11f5ac3	Tools: Filtered out problem files from translation build	2021-07-28 13:33:57 +01:00
Laurent Cozic	5c7fa587c0	Tools: Filtered out problem files from translation build	2021-07-28 13:25:49 +01:00
Laurent Cozic	6d86db3cb0	Update website	2021-07-26 18:22:25 +01:00
Laurent Cozic	361802273d	Doc: Added sponsors and automatically build sponsor list on README	2021-07-26 18:21:19 +01:00
Laurent Cozic	8920db5537	Desktop: Fixes #5241 : Katex code could be broken after editing it in Rich Text editor	2021-07-26 14:50:31 +01:00
Helmut K. C. Tessarek	d5fcffbac1	All: Translation: Update en_US.po	2021-07-25 19:18:01 -04:00
Helmut K. C. Tessarek	15edd4dfce	Update translations	2021-07-25 19:11:51 -04:00
Laurent Cozic	8b08f0d2b3	Fixed config	2021-07-25 14:21:41 +01:00
Laurent Cozic	fb9ec105df	Desktop: Converted Clipper notification to a modal dialog that shows up in all screens	2021-07-25 13:15:56 +01:00
Laurent Cozic	53b4d7af68	Server: Improve installation instructions	2021-07-25 12:03:23 +01:00
Laurent Cozic	3a3aa701ac	Desktop, Cli: Fixes #5232 : Do not export share properties	2021-07-25 11:51:50 +01:00
Laurent Cozic	830712a3bb	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-07-25 11:15:54 +01:00
Laurent Cozic	dd1f90819c	Server: Fixes #5229 : Published notes that contain non-alphabetical characters could end up being truncated	2021-07-25 11:13:27 +01:00
JackGruber	2ed8ac91a9	Server: Add Docker major, minor and beta version tags (#5237 )	2021-07-25 10:38:36 +01:00
Helmut K. C. Tessarek	31c3093700	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-07-24 19:11:27 -04:00
Vaso3	769094f002	All: Translation: Update sr_RS.po (#5234 ) * Update sr_RS.po Added and improved translation in the first 3k lines of the file * Update sr_RS.po Added translation. * Update sr_RS.po Few minor changes and fixed broken string. * Update sr_RS.po Some more corrections * Update sr_RS.po * Update sr_RS.po	2021-07-24 19:10:34 -04:00
Helmut K. C. Tessarek	a60d9fa61f	All: Translation: Update pt_BR.po (thanks kuroppi)	2021-07-24 18:28:20 -04:00
Laurent Cozic	6499ca8e61	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-07-24 18:57:29 +01:00
Laurent Cozic	2b64b320fb	Fixed tests	2021-07-24 18:56:30 +01:00
Laurent Cozic	282f782d50	Server: Fixed certain URLs	2021-07-24 18:34:42 +01:00
Laurent Cozic	5fcf2e48b3	Server v2.2.8	2021-07-24 17:56:36 +01:00
Laurent Cozic	63d4ccdc61	Merge branch 'dev' into release-2.2	2021-07-24 17:55:41 +01:00
Laurent Cozic	19b45de298	Server: Added form tokens to prevent CSRF attacks	2021-07-24 17:45:30 +01:00
Laurent Cozic	b7e9848428	Server: Allow users to cancel Stripe subscription	2021-07-24 16:44:50 +01:00
Laurent Cozic	3f993af7fd	Server: Explain how to use Joplin Server with a Joplin app	2021-07-24 15:14:07 +01:00
Laurent Cozic	e1bd127b23	Update website	2021-07-24 11:15:07 +01:00
Ahmad Mamdouh	d3c1edc3ee	Fix wrong variable name (#5235 )	2021-07-24 10:41:39 +01:00
Vaso3	471c06b3fd	All: Translation: Update sr_RS.po (#5218 ) * Update sr_RS.po Added and improved translation in the first 3k lines of the file * Update sr_RS.po Added translation. * Update sr_RS.po Few minor changes and fixed broken string.	2021-07-23 15:51:51 -04:00
Laurent Cozic	e83ab93644	Server: Allow user to upgrade account	2021-07-23 20:34:30 +01:00
Laurent Cozic	75a421edb1	Server: Allow admin to change Stripe subscription	2021-07-23 17:03:49 +01:00
Laurent Cozic	07d2a60c75	Plugins: Add support for loading application chrome and note CSS from the plugin	2021-07-23 11:05:21 +01:00
Laurent Cozic	252d0695a4	Server: Handle Stripe webhook receiving multiple times the same event	2021-07-22 21:54:21 +01:00
Laurent Cozic	27c3cbdf8f	Server: Allow enabling or disabling a user. Handle cancelling subscription.	2021-07-22 17:32:10 +01:00
Laurent Cozic	2b378880ce	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-07-22 17:30:50 +01:00
David Beale	52e1a05f4d	Tools: Remove es module entry points from Turndown packages, as they are not being included in the dist (#5226 )	2021-07-22 10:51:19 +01:00
Ahmad Mamdouh	c89037b4a2	Plugins: Add ability to make dialogs fit the application window (#5219 )	2021-07-22 10:21:57 +01:00
reportxx	f611d7734b	All: Translation: Update sv.po (#5221 )	2021-07-21 14:27:50 -04:00
Laurent Cozic	aadace42a2	Doc: Set website description meta tag	2021-07-21 16:19:01 +01:00
balmag	366ef025dc	All: Translation: Update hu_HU.po (#5215 ) Update Hungarian language file	2021-07-20 13:09:18 -04:00
Laurent Cozic	75cc73cc0c	Desktop, Cli: Fixes #5213 : Import highlighted text from ENEX files	2021-07-20 10:39:20 +01:00
Laurent Cozic	b6cf9d1d5a	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-07-19 18:14:56 +01:00
Laurent Cozic	29a181f88f	Doc: Remove image-rendering CSS	2021-07-19 17:33:34 +01:00
milotype	9ac56b3754	All: Translation: Update hr_HR.po (#5206 )	2021-07-19 10:37:27 -04:00
Laurent Cozic	48d6c74a49	Update website	2021-07-19 14:47:33 +01:00
Laurent Cozic	d4cdebafeb	Doc: Automatic generation of responsive images	2021-07-19 14:37:59 +01:00
Laurent Cozic	ea5a296d1f	Update website	2021-07-19 11:01:01 +01:00
Laurent Cozic	1194f6879f	Doc: Display Joplin Cloud links	2021-07-19 10:58:21 +01:00
Laurent Cozic	37ad6132b8	Desktop release v2.2.2	2021-07-19 10:45:30 +01:00
Laurent Cozic	2d92a0f1a0	Merge branch 'dev' into release-2.2	2021-07-19 10:45:03 +01:00
Laurent Cozic	d469ac174c	Merge branch 'release-2.1' into dev	2021-07-19 10:42:22 +01:00
Laurent Cozic	882d66383b	Desktop release v2.1.9	2021-07-19 10:40:12 +01:00
Laurent Cozic	cafaa9cac5	All: Ensure that timestamps are not changed when sharing or unsharing a note	2021-07-19 10:27:43 +01:00
Laurent Cozic	b2de27b6fc	Desktop: Make sure clipper authorisation notification is displayed, even when in config screen	2021-07-19 09:46:32 +01:00
小骏	73c75a8071	All: Translation: Update zh_CN.po (#5203 ) * update zh_CN.po * update zh_CN.po * update zh_CN.po * update zh_CN.po	2021-07-18 14:52:14 -04:00
balmag	d2df19ed0c	All: Translation: Update hu_HU.po (#5195 )	2021-07-16 17:11:43 -04:00
Helmut K. C. Tessarek	62903874b5	Update translations	2021-07-16 14:18:48 -04:00
Laurent Cozic	bad1bd0fc3	Update website	2021-07-16 18:07:43 +01:00
Laurent Cozic	36948732d6	Doc: Added higher res screenshot for 4k screens	2021-07-16 18:06:41 +01:00
Laurent Cozic	f3e5a22ff2	Update website	2021-07-16 17:32:38 +01:00
Laurent Cozic	e5d71d0cae	Doc: Add Donate button A/B testing	2021-07-16 17:32:01 +01:00
Laurent Cozic	eb0dd8dcd2	Update website	2021-07-16 17:14:56 +01:00
Laurent Cozic	f3a69184b5	Doc: Rename "Support" to "Support us"	2021-07-16 17:14:12 +01:00
Laurent Cozic	4567b78f0c	Server: Clarify error message when user info cannot be saved	2021-07-16 17:05:15 +01:00
Laurent Cozic	92520e58fb	Server: Set default of env SUPPORT_EMAIL to "SUPPORT_EMAIL" to make it clear it needs to be set	2021-07-16 16:56:21 +01:00
Laurent Cozic	7245aead39	Server: Make sure email URLs are displayed as clickable links	2021-07-16 16:37:18 +01:00
Laurent Cozic	9823ac3379	Tools: Fixed server test user creation	2021-07-16 16:35:58 +01:00
Laurent Cozic	7a164b9b87	Fixing mobile build	2021-07-16 15:50:33 +01:00
Laurent Cozic	e125430748	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-07-16 14:32:09 +01:00
Laurent Cozic	ed8a928a8e	Fix mobile build	2021-07-16 14:30:52 +01:00
Roman Musin	7f709c210c	Remove unused condition in synchronizer (#5194 )	2021-07-16 11:48:54 +01:00
Laurent	8e4be78013	Desktop: Make Markdown editor styling closer to view styling (#5174 )	2021-07-16 11:32:29 +01:00
Laurent Cozic	4e0ff1f81f	Desktop release v2.2.1	2021-07-09 18:09:39 +01:00
Laurent Cozic	d302eb6fc1	Merge branch 'dev' into e2ee_info_json	2021-07-09 15:46:32 +01:00
Laurent Cozic	bddbc0b54e	ios-v12.1.2	2021-07-06 11:32:25 +01:00
Laurent Cozic	b92427dca3	Merge branch 'dev' into e2ee_info_json	2021-07-02 17:26:34 +01:00
Laurent Cozic	4e0e159427	test	2021-07-02 17:25:27 +01:00
Laurent Cozic	b87f673317	Merge branch 'dev' into e2ee_info_json	2021-06-27 16:56:51 +01:00
Laurent Cozic	9b15b9b8eb	fix	2021-06-27 13:48:58 +01:00
Laurent Cozic	2a78f606be	handle existing master keys	2021-06-27 11:19:29 +01:00
Laurent Cozic	5801f2373e	Merge branch 'dev' into e2ee_info_json	2021-06-26 22:19:03 +01:00
Laurent Cozic	1bf17a6d87	tets	2021-06-26 22:13:38 +01:00
Laurent Cozic	05e4b32d9b	tests	2021-06-26 18:18:10 +01:00
Laurent Cozic	400ede122d	refactor	2021-06-25 14:51:36 +01:00
Laurent Cozic	0d930128c4	refactor	2021-06-24 08:23:08 +01:00
Laurent Cozic	c8ad3ffaf0	Move sync target info handling to separate class	2021-06-23 19:38:17 +01:00