Publish

- joplin@2.2.2 - @joplin/app-clipper@1.0.9 - @joplin/app-desktop@2.2.7 - @joplin/app-mobile@0.8.10 - @joplin/fork-htmlparser2@4.1.31 - @joplin/fork-sax@1.2.35 - generator-joplin@2.2.2 - @joplin/lib@2.2.3 - @joplin/plugin-repo-cli@2.2.3 - @joplin/plugins@0.0.1 - @joplin/renderer@2.2.3 - @joplin/server@2.2.12 - @joplin/tools@2.2.3 - @joplin/turndown-plugin-gfm@1.0.35 - @joplin/turndown@4.0.53
ios-v12.2.1
2025-08-24 20:19:10 +02:00 · 2021-08-10 15:09:17 +01:00 · 2021-08-10 11:56:58 +01:00 · 2021-08-10 11:35:34 +01:00 · 2021-08-10 11:34:49 +01:00 · 2021-08-10 11:21:37 +01:00
565 changed files with 136503 additions and 116741 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
@@ -159,6 +162,9 @@ packages/app-desktop/commands/toggleSafeMode.js.map
 packages/app-desktop/gui/Button/Button.d.ts
 packages/app-desktop/gui/Button/Button.js
 packages/app-desktop/gui/Button/Button.js.map
+packages/app-desktop/gui/ClipperConfigScreen.d.ts
+packages/app-desktop/gui/ClipperConfigScreen.js
+packages/app-desktop/gui/ClipperConfigScreen.js.map
 packages/app-desktop/gui/ConfigScreen/ButtonBar.d.ts
 packages/app-desktop/gui/ConfigScreen/ButtonBar.js
 packages/app-desktop/gui/ConfigScreen/ButtonBar.js.map
@@ -195,6 +201,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 +276,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 +378,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 +729,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 +834,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 +876,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
@@ -870,6 +888,9 @@ packages/lib/commands/historyForward.js.map
 packages/lib/commands/synchronize.d.ts
 packages/lib/commands/synchronize.js
 packages/lib/commands/synchronize.js.map
+packages/lib/components/shared/encryption-config-shared.d.ts
+packages/lib/components/shared/encryption-config-shared.js
+packages/lib/components/shared/encryption-config-shared.js.map
 packages/lib/database.d.ts
 packages/lib/database.js
 packages/lib/database.js.map
@@ -1056,6 +1077,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
@@ -1293,6 +1317,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 +1443,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
@@ -1488,6 +1518,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 +1563,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 +1602,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 +1698,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 +1728,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
@@ -144,6 +147,9 @@ packages/app-desktop/commands/toggleSafeMode.js.map
 packages/app-desktop/gui/Button/Button.d.ts
 packages/app-desktop/gui/Button/Button.js
 packages/app-desktop/gui/Button/Button.js.map
+packages/app-desktop/gui/ClipperConfigScreen.d.ts
+packages/app-desktop/gui/ClipperConfigScreen.js
+packages/app-desktop/gui/ClipperConfigScreen.js.map
 packages/app-desktop/gui/ConfigScreen/ButtonBar.d.ts
 packages/app-desktop/gui/ConfigScreen/ButtonBar.js
 packages/app-desktop/gui/ConfigScreen/ButtonBar.js.map
@@ -180,6 +186,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 +261,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 +363,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 +714,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 +819,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 +861,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
@@ -855,6 +873,9 @@ packages/lib/commands/historyForward.js.map
 packages/lib/commands/synchronize.d.ts
 packages/lib/commands/synchronize.js
 packages/lib/commands/synchronize.js.map
+packages/lib/components/shared/encryption-config-shared.d.ts
+packages/lib/components/shared/encryption-config-shared.js
+packages/lib/components/shared/encryption-config-shared.js.map
 packages/lib/database.d.ts
 packages/lib/database.js
 packages/lib/database.js.map
@@ -1041,6 +1062,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
@@ -1278,6 +1302,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 +1428,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
@@ -1473,6 +1503,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 +1548,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 +1587,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 +1683,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 +1713,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
@@ -24,6 +24,10 @@ a {
 	padding-bottom: 225px;
 }

+.help-page-container img {
+	margin-bottom: 1rem;
+}
+
 .press-carousel .photo {
 	width: 123px;
 	height: 136px;
@@ -86,6 +90,12 @@ a {
 	color: #90b1d9;
 }

+blockquote {
+    border-left: .25em solid #e0e0e0;
+    padding: 0 1em;
+    opacity: .7;
+}
+
 .img-center {
 	display: block;
 	margin: auto;
@@ -147,14 +157,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 +381,10 @@ p,
 	margin-top: 40px;
 }

+#top-section-img img {
+	width: 100%;
+}
+
 .main-content {
 	flex: 1;
 }
@@ -416,6 +422,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;
@@ -785,7 +796,7 @@ footer .right-links a {
 	}

 	#top-section,
-	.page-container {
+	.help-page-container {
 		padding-top: 80px;
 	}

@@ -835,7 +846,7 @@ footer .right-links a {
 	margin-bottom: 0;
 }

-.page-container {
+.help-page-container {
 	padding-top: 90px;
 	padding-bottom: 50px;
 }
@@ -852,7 +863,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 +886,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 +901,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/DemoMobile.jpg
+++ b/Assets/WebsiteAssets/images/DemoMobile.jpg
--- 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/publish_note/Browser.jpg
+++ b/Assets/WebsiteAssets/images/publish_note/Browser.jpg
--- a/Assets/WebsiteAssets/images/publish_note/ContextMenu.jpg
+++ b/Assets/WebsiteAssets/images/publish_note/ContextMenu.jpg
--- a/Assets/WebsiteAssets/images/publish_note/Dialog.jpg
+++ b/Assets/WebsiteAssets/images/publish_note/Dialog.jpg
--- a/Assets/WebsiteAssets/images/share_notebook/Dialog.png
+++ b/Assets/WebsiteAssets/images/share_notebook/Dialog.png
--- a/Assets/WebsiteAssets/images/share_notebook/Notification.png
+++ b/Assets/WebsiteAssets/images/share_notebook/Notification.png
--- a/Assets/WebsiteAssets/images/share_notebook/Sidebar.png
+++ b/Assets/WebsiteAssets/images/share_notebook/Sidebar.png
--- a/Assets/WebsiteAssets/images/share_notebook/SidebarShared.png
+++ b/Assets/WebsiteAssets/images/share_notebook/SidebarShared.png
--- 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">
@@ -46,7 +53,7 @@ https://github.com/laurent22/joplin/blob/dev/{{{sourceMarkdownFile}}}
 				{{> navbar}}
 			{{/navbar}}

-			<div class="page-container page-{{sourceMarkdownName}}">
+			<div class="help-page-container page-{{sourceMarkdownName}}">
 				<div class="container">
 					<div class="row content-wrapper">
 						{{#showToc}}<div id="toc">{{{tocHtml}}}</div>{{/showToc}}
@@ -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
@@ -1,5 +1,5 @@
 <!-- DONATELINKS -->
-[![Donate using PayPal](https://joplinapp.org/images/badges/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=E8JMYD2LQ8MMA&lc=GB&item_name=Joplin+Development&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted) [![Sponsor on GitHub](https://joplinapp.org/images/badges/GitHub-Badge.svg)](https://github.com/sponsors/laurent22/) [![Become a patron](https://joplinapp.org/images/badges/Patreon-Badge.svg)](https://www.patreon.com/joplin) [![Donate using IBAN](https://joplinapp.org/images/badges/Donate-IBAN.svg)](https://joplinapp.org/donate/#donations)
+[![Donate using PayPal](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=E8JMYD2LQ8MMA&lc=GB&item_name=Joplin+Development&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted) [![Sponsor on GitHub](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg)](https://github.com/sponsors/laurent22/) [![Become a patron](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg)](https://www.patreon.com/joplin) [![Donate using IBAN](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg)](https://joplinapp.org/donate/#donations)
 <!-- DONATELINKS -->

 * * *
@@ -12,7 +12,7 @@ The notes can be [synchronised](#synchronisation) with various cloud services in

 The application is available for Windows, Linux, macOS, Android and iOS (the terminal app also works on FreeBSD). A [Web Clipper](https://github.com/laurent22/joplin/blob/dev/readme/clipper.md), to save web pages and screenshots from your browser, is also available for [Firefox](https://addons.mozilla.org/firefox/addon/joplin-web-clipper/) and [Chrome](https://chrome.google.com/webstore/detail/joplin-web-clipper/alofnhikmmkdbbbgpnglcpdollgjjfek?hl=en-GB).

-<div class="top-screenshot"><img src="https://joplinapp.org/images/home-top-img.png" style="max-width: 100%; max-height: 35em;"></div>
+<div class="top-screenshot"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/home-top-img.png" style="max-width: 100%; max-height: 35em;"></div>

 # Installation

@@ -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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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:

@@ -36,8 +36,8 @@ Linux | <a href='https://github.com/laurent22/joplin/releases/download/v2.1.8/Jo

 Operating System | Download | Alt. Download
 ---|---|---
-Android | <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> | or download the APK file: [64-bit](https://github.com/laurent22/joplin-android/releases/download/android-v2.1.4/joplin-v2.1.4.apk) [32-bit](https://github.com/laurent22/joplin-android/releases/download/android-v2.1.4/joplin-v2.1.4-32bit.apk)
-iOS | <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> | -
+Android | <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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeAndroid.png'/></a> | or download the APK file: [64-bit](https://github.com/laurent22/joplin-android/releases/download/android-v2.1.4/joplin-v2.1.4.apk) [32-bit](https://github.com/laurent22/joplin-android/releases/download/android-v2.1.4/joplin-v2.1.4-32bit.apk)
+iOS | <a href='https://itunes.apple.com/us/app/joplin/id1315599797'><img alt='Get it on the App Store' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/BadgeIOS.png'/></a> | -

 ## Terminal application

@@ -55,7 +55,6 @@ There are other ways to install the terminal application. However, they are not

 Operating system | Method
 -----------------|----------------
-macOS            | `brew install joplin`
 Arch Linux       | An Arch Linux package is available [here](https://aur.archlinux.org/packages/joplin/). To install it, use an AUR wrapper such as yay: `yay -S joplin`. Both the CLI tool (type `joplin`) and desktop app (type `joplin-desktop`) are packaged. You can also install a compiled version with the [chaotic-aur](https://wiki.archlinux.org/index.php/Unofficial_user_repositories#chaotic-aur) repository. For support, please go to the [GitHub repo](https://github.com/masterkorp/joplin-pkgbuild). If you are interested in [pre-release](https://joplinapp.org/prereleases/) you have [joplin-beta](https://aur.archlinux.org/packages/joplin-beta).

 ## Web Clipper
@@ -64,19 +63,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://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> <a href="https://tranio.com/italy/"><img title="Tranio" width="256" src="https://joplinapp.org/images/sponsors/Tranio.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
@@ -98,6 +99,11 @@ The Web Clipper is a browser extension that allows you to save web pages and scr
 	- [About the Rich Text editor limitations](https://github.com/laurent22/joplin/blob/dev/readme/rich_text_editor.md)
 	- [FAQ](https://github.com/laurent22/joplin/blob/dev/readme/faq.md)

+- Joplin Cloud
+
+	- [Sharing a notebook](https://github.com/laurent22/joplin/blob/dev/readme/share_notebook.md)
+	- [Publishing a note](https://github.com/laurent22/joplin/blob/dev/readme/publish_note.md)
+
 - Joplin API - Get Started

 	- [Joplin API Overview](https://github.com/laurent22/joplin/blob/dev/readme/api/overview.md)
@@ -163,7 +169,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.
@@ -220,7 +225,7 @@ If the **terminal client** has been installed, it is possible to also synchronis

 ## Nextcloud synchronisation

-<img src="https://joplinapp.org/images/nextcloud-logo-background.png" width="100" align="left"> <a href="https://nextcloud.com/">Nextcloud</a> is a self-hosted, private cloud solution. It can store documents, images and videos but also calendars, passwords and countless other things and can sync them to your laptop or phone. As you can host your own Nextcloud server, you own both the data on your device and infrastructure used for synchronisation. As such it is a good fit for Joplin. The platform is also well supported and with a strong community, so it is likely to be around for a while - since it's open source anyway, it is not a service that can be closed, it can exist on a server for as long as one chooses.
+<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/nextcloud-logo-background.png" width="100" align="left"> <a href="https://nextcloud.com/">Nextcloud</a> is a self-hosted, private cloud solution. It can store documents, images and videos but also calendars, passwords and countless other things and can sync them to your laptop or phone. As you can host your own Nextcloud server, you own both the data on your device and infrastructure used for synchronisation. As such it is a good fit for Joplin. The platform is also well supported and with a strong community, so it is likely to be around for a while - since it's open source anyway, it is not a service that can be closed, it can exist on a server for as long as one chooses.

 In the **desktop application** or **mobile application**, go to the Configuration screen and select Nextcloud as the synchronisation target. Then input the WebDAV URL (to get it, click on Settings in the bottom left corner of the page, in Nextcloud), this is normally `https://example.com/nextcloud/remote.php/webdav/Joplin` (**make sure to create the "Joplin" directory in Nextcloud**), and set the username and password. If it does not work, please [see this explanation](https://github.com/laurent22/joplin/issues/61#issuecomment-373282608) for more details.

@@ -277,7 +282,7 @@ In the **desktop application** or **mobile application**, select "AWS S3 (Beta)"
 - **AWS key & AWS secret:**  IAM user's programmatic access key.  To create a new key & secret, visit [IAM Security Credentials](https://console.aws.amazon.com/iam/home#/security_credentials).


-While creating a new Bucket for Joplin, disable **Bucket Versioning**, enable **Block all public access** and enable **Default encryption** with `Amazon S3 key (SSE-S3)`.  
+While creating a new Bucket for Joplin, disable **Bucket Versioning**, enable **Block all public access** and enable **Default encryption** with `Amazon S3 key (SSE-S3)`.

 To add a **Bucket Policy** from the AWS S3 Web Console, navigate to the **Permissions** tab. Temporarily disable **Block all public access**  to edit the Bucket policy, something along the lines of:
 ```
@@ -356,7 +361,7 @@ If for any reason the notifications do not work, please [open an issue](https://

 Sub-notebooks allow organising multiple notebooks into a tree of notebooks. For example it can be used to regroup all the notebooks related to work, to family or to a particular project under a parent notebook.

-![](https://joplinapp.org/images/SubNotebooks.png)
+![](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/SubNotebooks.png)

 - In the **desktop application**, to create a subnotebook, drag and drop it onto another notebook. To move it back to the root, drag and drop it on the "Notebooks" header. Currently only the desktop app can be used to organise the notebooks.
 - The **mobile application** supports displaying and collapsing/expanding the tree of notebooks, however it does not currently support moving the subnotebooks to different notebooks.
@@ -374,29 +379,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,47 +503,47 @@ 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/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/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/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/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/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/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/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/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/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/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/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/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/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/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%
+<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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 -->

 # Contributors
--- 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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/get_started/plugins.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/get_started/plugins.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-plugins">
+			<div class="help-page-container page-plugins">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/get_started/plugins.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/get_started/plugins.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Getting started with plugin development<a name="getting-started-with-plugin-development" href="#getting-started-with-plugin-development" class="heading-anchor">🔗</a></h1>
 <p>In this article you will learn the basic steps to build and test a plugin in Joplin.</p>
@@ -342,7 +363,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 +376,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/overview.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/overview.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-overview">
+			<div class="help-page-container page-overview">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/overview.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/overview.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Extending Joplin<a name="extending-joplin" href="#extending-joplin" class="heading-anchor">🔗</a></h1>
 <p>Joplin provides a number of extension points to allow third-party applications to access its data, or to develop plugins.</p>
@@ -320,7 +341,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 +354,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/development_m
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/development_m
 		</div>
 	</div>
 </div>
-			<div class="page-container page-development_mode">
+			<div class="help-page-container page-development_mode">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/development_m
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/development_m
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Development mode<a name="development-mode" href="#development-mode" class="heading-anchor">🔗</a></h1>
 <p>When experimenting with Joplin, for example when <a href="/api/get_started/plugins/">developing a plugin</a> or trying a theme, you might want to run Joplin in development mode. Doing this will open a second copy of Joplin using a different profile with test notes and notebooks, so you can experiment without risking changing or deleting your data.</p>
@@ -299,7 +320,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 +333,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_loadin
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_loadin
 		</div>
 	</div>
 </div>
-			<div class="page-container page-plugin_loading_rules">
+			<div class="help-page-container page-plugin_loading_rules">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_loadin
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_loadin
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Plugin Loading Rules<a name="plugin-loading-rules" href="#plugin-loading-rules" class="heading-anchor">🔗</a></h1>
 <p>When loading plugins from the profile <code>plugins</code> directory, Joplin will look at the following locations:</p>
@@ -305,7 +326,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 +339,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_manife
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_manife
 		</div>
 	</div>
 </div>
-			<div class="page-container page-plugin_manifest">
+			<div class="help-page-container page-plugin_manifest">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_manife
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_manife
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Plugin Manifest<a name="plugin-manifest" href="#plugin-manifest" class="heading-anchor">🔗</a></h1>
 <p>The manifest file is a JSON file that describes various properties of the plugin. If you use the Yeoman generator, it should be automatically generated based on the answers you've provided. The supported properties are:</p>
@@ -375,7 +396,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 +409,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_themin
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_themin
 		</div>
 	</div>
 </div>
-			<div class="page-container page-plugin_theming">
+			<div class="help-page-container page-plugin_theming">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_themin
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_themin
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Plugin theming<a name="plugin-theming" href="#plugin-theming" class="heading-anchor">🔗</a></h1>
 <h2>CSS<a name="css" href="#css" class="heading-anchor">🔗</a></h2>
@@ -335,7 +356,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 +369,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/rest_api.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/rest_api.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-rest_api">
+			<div class="help-page-container page-rest_api">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/rest_api.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/rest_api.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Joplin Data API<a name="joplin-data-api" href="#joplin-data-api" class="heading-anchor">🔗</a></h1>
 <p>This API is available when the clipper server is running. It provides access to the notes, notebooks, tags and other Joplin object via a REST API. Plugins can also access this API even when the clipper server is not running.</p>
@@ -961,7 +982,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 +995,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/tutorials/toc_plugin.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/tutorials/toc_plugin.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-toc_plugin">
+			<div class="help-page-container page-toc_plugin">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/tutorials/toc_plugin.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/tutorials/toc_plugin.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Creating a table of content plugin<a name="creating-a-table-of-content-plugin" href="#creating-a-table-of-content-plugin" class="heading-anchor">🔗</a></h1>
 <p>This tutorial will guide you through the steps to create a table of content plugin for Joplin. It will display a view next to the current note that will contain links to the sections of a note. It will be possible to click on one of the header to jump to the relevant section.</p>
@@ -569,7 +590,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 +603,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180621-182112.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180621-182112.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-20180621-182112">
+			<div class="help-page-container page-20180621-182112">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180621-182112.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180621-182112.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Web Clipper now available on Firefox and Chrome<a name="web-clipper-now-available-on-firefox-and-chrome" href="#web-clipper-now-available-on-firefox-and-chrome" class="heading-anchor">🔗</a></h1>
 <p><a href="https://github.com/laurent22/joplin/issues/135">One of the most requested feature</a>, the Web Clipper, is now available on the Firefox and Chrome store. It is possible to save a whole web page, or a simplified version of it, or a screenshot directly from the browser to Joplin. Like the rest of Joplin, the HTML page will be converted to Markdown, which means it can be easily edited and read even without a special viewer, and, since it's plain text, it also makes it easier to search and share the content.</p>
@@ -303,7 +324,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 +337,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180906-111039.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180906-111039.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-20180906-111039">
+			<div class="help-page-container page-20180906-111039">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180906-111039.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180906-111039.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>New iOS release with improved attachment support<a name="new-ios-release-with-improved-attachment-support" href="#new-ios-release-with-improved-attachment-support" class="heading-anchor">🔗</a></h1>
 <p><img src="images/20180906-111039_0.png" alt=""></p>
@@ -304,7 +325,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 +338,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180916-210431.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180916-210431.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-20180916-210431">
+			<div class="help-page-container page-20180916-210431">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180916-210431.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180916-210431.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Note properties in desktop application<a name="note-properties-in-desktop-application" href="#note-properties-in-desktop-application" class="heading-anchor">🔗</a></h1>
 <p><img src="images/20180916-210431_0.png" alt=""></p>
@@ -303,7 +324,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 +337,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180929-121053.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180929-121053.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-20180929-121053">
+			<div class="help-page-container page-20180929-121053">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180929-121053.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180929-121053.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>New release and many bug fixes<a name="new-release-and-many-bug-fixes" href="#new-release-and-many-bug-fixes" class="heading-anchor">🔗</a></h1>
 <p>Reliability and stability is an important feature of Joplin as the application can potentially manage thousands of notes spanning many years (My oldest note, imported from another software, is from October 1999!). A stable interface without too many glitches also makes for a more pleasant user experience. For these reasons, bug fixes are always given high priority in this project, and are usually worked on before any new feature is added. The latest release for instance pretty much only contains bug fixes - eight of them, including one security fix.</p>
@@ -303,7 +324,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 +337,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181004-091123.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181004-091123.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-20181004-091123">
+			<div class="help-page-container page-20181004-091123">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181004-091123.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181004-091123.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Joplin and Hacktobertfest 2018 🎃<a name="joplin-and-hacktobertfest-2018" href="#joplin-and-hacktobertfest-2018" class="heading-anchor">🔗</a></h1>
 <p>The <a href="https://hacktoberfest.digitalocean.com/">Hacktobertfest event</a>  has started - it allows you to contribute to Joplin and, at the end of  the month, after having done 5 PR, you'll earn a limited edition  T-shirt.</p>
@@ -305,7 +326,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 +339,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181101-174335.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181101-174335.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-20181101-174335">
+			<div class="help-page-container page-20181101-174335">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181101-174335.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181101-174335.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Hacktoberfest has now ended<a name="hacktoberfest-has-now-ended" href="#hacktoberfest-has-now-ended" class="heading-anchor">🔗</a></h1>
 <p>Hacktoberfest has now ended - many thanks to all those who have contributed. Some of the pull requests are not merged yet but they will be soon. For information, this is the number of pull requests per month on the project, so there was approximately a 30% increase in October:</p>
@@ -308,7 +329,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 +342,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181213-173459.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181213-173459.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-20181213-173459">
+			<div class="help-page-container page-20181213-173459">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181213-173459.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181213-173459.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Joplin is now featured on <a href="http://PrivacyTools.io">PrivacyTools.io</a><a name="joplin-is-now-featured-on-privacytools-io" href="#joplin-is-now-featured-on-privacytools-io" class="heading-anchor">🔗</a></h1>
 <p>Joplin is now <a href="https://www.privacytools.io/#notebook">featured on PrivacyTools.io</a>, a site dedicated to providing knowledge and tools to protect people's privacy against global mass surveillance. The app was kindly submitted by <a href="https://github.com/privacytoolsIO/privacytools.io/pull/659">Mats Estensen on GitHub</a> and accepted soon after.</p>
@@ -306,7 +327,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 +340,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190130-230218.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190130-230218.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-20190130-230218">
+			<div class="help-page-container page-20190130-230218">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190130-230218.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190130-230218.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>New search engine in Joplin<a name="new-search-engine-in-joplin" href="#new-search-engine-in-joplin" class="heading-anchor">🔗</a></h1>
 <p>The original search engine in Joplin was pretty limited - it would search for your exact query and that is it. For example if you search for &quot;recipe cake&quot; it would return results that contain exactly this word in this order and nothing else - it would not return &quot;apple cake recipe&quot; or &quot;recipe for birthday cake&quot;, thus forcing you to try various queries.</p>
@@ -306,7 +327,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 +340,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190404-074157.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190404-074157.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-20190404-074157">
+			<div class="help-page-container page-20190404-074157">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190404-074157.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190404-074157.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Markdown plugins and Goto Anything<a name="markdown-plugins-and-goto-anything" href="#markdown-plugins-and-goto-anything" class="heading-anchor">🔗</a></h1>
 <p>The latest release includes two relatively important new features:</p>
@@ -305,7 +326,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 +339,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190424-112410.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190424-112410.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-20190424-112410">
+			<div class="help-page-container page-20190424-112410">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190424-112410.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190424-112410.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>The Joplin forum is one year old<a name="the-joplin-forum-is-one-year-old" href="#the-joplin-forum-is-one-year-old" class="heading-anchor">🔗</a></h1>
 <p>Exactly one year ago, on 24 April 2018, the <a href="https://discourse.joplinapp.org/">Joplin forum</a> was created as a result of <a href="https://github.com/laurent22/joplin/issues/418">this post on GitHub</a>. Before this, the only way to discuss the project was indeed on the GitHub bug tracker, which is not ideal for general discussion about features, development and so on.</p>
@@ -305,7 +326,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 +339,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190523-231026.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190523-231026.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-20190523-231026">
+			<div class="help-page-container page-20190523-231026">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190523-231026.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190523-231026.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Note history now in Joplin<a name="note-history-now-in-joplin" href="#note-history-now-in-joplin" class="heading-anchor">🔗</a></h1>
 <p>The latest versions of Joplin adds support for note history. The applications (desktop, mobile and CLI) now preserve previous versions of the notes, so you can inspect or restore them later on as needed.</p>
@@ -315,7 +336,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 +349,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190611-000711.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190611-000711.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-20190611-000711">
+			<div class="help-page-container page-20190611-000711">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190611-000711.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190611-000711.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Changing attachment download behaviour to save disk space<a name="changing-attachment-download-behaviour-to-save-disk-space" href="#changing-attachment-download-behaviour-to-save-disk-space" class="heading-anchor">🔗</a></h1>
 <p>One issue that came up frequently in the forum is that Joplin's data can be very large, especially when the note collection includes many attachments (images, PDFs, etc.). This happens in particular when using the web clipper a lot, as each web page usually has many images included.</p>
@@ -305,7 +326,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 +339,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190613-202613.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190613-202613.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-20190613-202613">
+			<div class="help-page-container page-20190613-202613">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190613-202613.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190613-202613.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Customising your notes with the help of the development tools and CSS<a name="customising-your-notes-with-the-help-of-the-development-tools-and-css" href="#customising-your-notes-with-the-help-of-the-development-tools-and-css" class="heading-anchor">🔗</a></h1>
 <p>In Joplin desktop, it has been possible <a href="https://joplinapp.org/help/#custom-css">to customise the appearance of your notes</a> using CSS for quite some time.</p>
@@ -305,7 +326,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 +339,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190814-225957.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190814-225957.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-20190814-225957">
+			<div class="help-page-container page-20190814-225957">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190814-225957.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190814-225957.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Joplin now supports Fountain screenwriting markup language<a name="joplin-now-supports-fountain-screenwriting-markup-language" href="#joplin-now-supports-fountain-screenwriting-markup-language" class="heading-anchor">🔗</a></h1>
 <p><a href="https://fountain.io/">Fountain</a> is markup language for screenwriting. Similar to Markdown, it is a lightweight markup format, which allows editing screenplays in plain text.</p>
@@ -314,7 +335,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 +348,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190925-000254.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190925-000254.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-20190925-000254">
+			<div class="help-page-container page-20190925-000254">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190925-000254.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190925-000254.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>New icon for Joplin!<a name="new-icon-for-joplin" href="#new-icon-for-joplin" class="heading-anchor">🔗</a></h1>
 <p>The Joplin icon is going to change soon. The one we have now is something I put together quickly, not knowing if the project would interest someone, so I didn't want to spend too much time on it. Now that the project is more mature, it makes sense to start improving the visuals - first the icon, then the logo font, the website and finally the app UI (although these have already been improved little by little over the past year).</p>
@@ -319,7 +340,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 +353,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190929-152834.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190929-152834.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-20190929-152834">
+			<div class="help-page-container page-20190929-152834">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190929-152834.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190929-152834.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Hacktoberfest 2019 is coming soon!<a name="hacktoberfest-2019-is-coming-soon" href="#hacktoberfest-2019-is-coming-soon" class="heading-anchor">🔗</a></h1>
 <p>A word form @foxmask, our community manager!</p>
@@ -312,7 +333,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 +346,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191012-233121.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191012-233121.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-20191012-233121">
+			<div class="help-page-container page-20191012-233121">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191012-233121.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191012-233121.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Support for chemical equations using mhchem for Katex<a name="support-for-chemical-equations-using-mhchem-for-katex" href="#support-for-chemical-equations-using-mhchem-for-katex" class="heading-anchor">🔗</a></h1>
 <p>The next version of Joplin will feature support for chemical equations using mhchem for Katex.</p>
@@ -312,7 +333,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 +346,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191014-165136.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191014-165136.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-20191014-165136">
+			<div class="help-page-container page-20191014-165136">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191014-165136.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191014-165136.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>New Joplin icon, second round<a name="new-joplin-icon-second-round" href="#new-joplin-icon-second-round" class="heading-anchor">🔗</a></h1>
 <p>The quest for a <a href="https://www.patreon.com/posts/new-icon-for-30218482">new Joplin icon</a>  continue - first many thanks for the votes and feedback! It definitely  helped getting a better sense of what would make a great icon.</p>
@@ -304,7 +325,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 +338,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191101-131852.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191101-131852.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-20191101-131852">
+			<div class="help-page-container page-20191101-131852">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191101-131852.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191101-131852.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Hacktoberfest 2019 has now ended 🎃<a name="hacktoberfest-2019-has-now-ended" href="#hacktoberfest-2019-has-now-ended" class="heading-anchor">🔗</a></h1>
 <p>We got lots of great contributions for Hacktoberfest 2019, including:</p>
@@ -308,7 +329,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 +342,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191117-183855.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191117-183855.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-20191117-183855">
+			<div class="help-page-container page-20191117-183855">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191117-183855.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191117-183855.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>And the winner is...<a name="and-the-winner-is" href="#and-the-winner-is" class="heading-anchor">🔗</a></h1>
 <p>After much discussion and votes and new logo and icon for Joplin has finally been decided:</p>
@@ -313,7 +334,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 +347,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191118-072700.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191118-072700.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-20191118-072700">
+			<div class="help-page-container page-20191118-072700">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191118-072700.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191118-072700.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Joplin is looking into joining Google Summer of Code in 2020<a name="joplin-is-looking-into-joining-google-summer-of-code-in-2020" href="#joplin-is-looking-into-joining-google-summer-of-code-in-2020" class="heading-anchor">🔗</a></h1>
 <p><img src="images/20191118-072700_0.png" alt=""></p>
@@ -311,7 +332,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 +345,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200220-190804.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200220-190804.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-20200220-190804">
+			<div class="help-page-container page-20200220-190804">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200220-190804.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200220-190804.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>GSoC 2020: Joplin has been accepted as a mentor organization!<a name="gsoc-2020-joplin-has-been-accepted-as-a-mentor-organization" href="#gsoc-2020-joplin-has-been-accepted-as-a-mentor-organization" class="heading-anchor">🔗</a></h1>
 <p>Good news, our Google Summer of Code 2020 application <a href="https://summerofcode.withgoogle.com/organizations/?sp-search=joplin#6258880889225216">has been accepted</a>!</p>
@@ -303,7 +324,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 +337,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200301-125055.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200301-125055.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-20200301-125055">
+			<div class="help-page-container page-20200301-125055">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200301-125055.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200301-125055.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Large desktop update coming soon<a name="large-desktop-update-coming-soon" href="#large-desktop-update-coming-soon" class="heading-anchor">🔗</a></h1>
 <p>I haven't kept up with releases lately and thus the new one is quite big, it includes 8 new features, 3 security fixes, 19 improvements, and 29 bug fixes. Here's a summary of what to expect:</p>
@@ -319,7 +340,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 +353,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200314-001555.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200314-001555.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-20200314-001555">
+			<div class="help-page-container page-20200314-001555">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200314-001555.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200314-001555.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Experimental WYSIWYG editor in Joplin<a name="experimental-wysiwyg-editor-in-joplin" href="#experimental-wysiwyg-editor-in-joplin" class="heading-anchor">🔗</a></h1>
 <p>The latest pre-release of Joplin (<a href="https://github.com/laurent22/joplin/releases/tag/v1.0.194">v1.0.194</a>) includes a new WYSIWYG editor, a prototype for now, but a first step towards integrating this feature into Joplin.</p>
@@ -313,7 +334,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 +347,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200406-224254.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200406-224254.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-20200406-224254">
+			<div class="help-page-container page-20200406-224254">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200406-224254.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200406-224254.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Joplin informal encryption and security audit results<a name="joplin-informal-encryption-and-security-audit-results" href="#joplin-informal-encryption-and-security-audit-results" class="heading-anchor">🔗</a></h1>
 <p>Joplin encryption, and in particular the E2EE system used during synchronisation, was recently audited by Isaac Potoczny-Jones, CEO of <a href="https://tozny.com">Tozny</a> and this is what he had to say:</p>
@@ -331,7 +352,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 +365,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/build_troubleshooting.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/build_troubleshooting.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-build_troubleshooting">
+			<div class="help-page-container page-build_troubleshooting">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/build_troubleshooting.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/build_troubleshooting.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Desktop application<a name="desktop-application" href="#desktop-application" class="heading-anchor">🔗</a></h1>
 <h2>On Windows<a name="on-windows" href="#on-windows" class="heading-anchor">🔗</a></h2>
@@ -338,7 +359,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 +372,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-changelog">
+			<div class="help-page-container page-changelog">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,9 +283,45 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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.5">v2.2.5</a> (Pre-release) - 2021-08-07T10:35:24Z<a name="v2-2-5-https-github-com-laurent22-joplin-releases-tag-v2-2-5-pre-release-2021-08-07t10-35-24z" href="#v2-2-5-https-github-com-laurent22-joplin-releases-tag-v2-2-5-pre-release-2021-08-07t10-35-24z" class="heading-anchor">🔗</a></h2>
+<ul>
+<li>Improved: Remove template feature (replaced by template plugin) (e9d5901)</li>
+</ul>
+<h2><a href="https://github.com/laurent22/joplin/releases/tag/v2.2.4">v2.2.4</a> (Pre-release) - 2021-08-05T16:42:48Z<a name="v2-2-4-https-github-com-laurent22-joplin-releases-tag-v2-2-4-pre-release-2021-08-05t16-42-48z" href="#v2-2-4-https-github-com-laurent22-joplin-releases-tag-v2-2-4-pre-release-2021-08-05t16-42-48z" class="heading-anchor">🔗</a></h2>
+<p>IMPORTANT: If you are a plugin developer or if, as a user, you notice a plugin that no longer works, please read this post: <a href="https://discourse.joplinapp.org/t/19278">https://discourse.joplinapp.org/t/19278</a></p>
+<ul>
+<li>New: Plugins: Add ability to make dialogs fit the application window (<a href="https://github.com/laurent22/joplin/issues/5219">#5219</a> by <a href="https://github.com/Ahmad45123">@Ahmad45123</a>)</li>
+<li>New: Plugins: Add support for loading application chrome and note CSS from the plugin (07d2a60)</li>
+<li>New: Turn old plugin deprecation notices into errors (7f00e4e)</li>
+<li>Improved: Converted Clipper notification to a modal dialog that shows up in all screens (fb9ec10)</li>
+<li>Improved: GotoAnything sometimes is not working on first try (<a href="https://github.com/laurent22/joplin/issues/5184">#5184</a>)</li>
+<li>Improved: Increase space between paragraphs in viewer and Rich Text editor to match Markdown editor (<a href="https://github.com/laurent22/joplin/issues/5256">#5256</a>)</li>
+<li>Fixed: Disable &quot;Dropped file type is not supported&quot; notification in Rich Text editor (<a href="https://github.com/laurent22/joplin/issues/5268">#5268</a>)</li>
+<li>Fixed: Do not export share properties (<a href="https://github.com/laurent22/joplin/issues/5232">#5232</a>)</li>
+<li>Fixed: Fixed header spacing (regression) (d3cd843)</li>
+<li>Fixed: Fixed issue with orphaned resource being created in case of a resource conflict (<a href="https://github.com/laurent22/joplin/issues/5223">#5223</a>)</li>
+<li>Fixed: Fixed plugin state when it has been deleted outside the app (<a href="https://github.com/laurent22/joplin/issues/5253">#5253</a>)</li>
+<li>Fixed: Fixed recipient list colors in Share Notebook dialog (<a href="https://github.com/laurent22/joplin/issues/5258">#5258</a>)</li>
+<li>Fixed: Fixed share note color in note list (<a href="https://github.com/laurent22/joplin/issues/5259">#5259</a>)</li>
+<li>Fixed: Focus is lost while searching in all notes (<a href="https://github.com/laurent22/joplin/issues/5208">#5208</a>)</li>
+<li>Fixed: Import highlighted text from ENEX files (<a href="https://github.com/laurent22/joplin/issues/5213">#5213</a>)</li>
+<li>Fixed: Katex code could be broken after editing it in Rich Text editor (<a href="https://github.com/laurent22/joplin/issues/5241">#5241</a>)</li>
+</ul>
+<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 +3495,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 +3508,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_android.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_android.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-changelog_android">
+			<div class="help-page-container page-changelog_android">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_android.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,9 +283,16 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_android.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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 +375,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 +388,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_cli.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_cli.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-changelog_cli">
+			<div class="help-page-container page-changelog_cli">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_cli.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_cli.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Joplin terminal app changelog<a name="joplin-terminal-app-changelog" href="#joplin-terminal-app-changelog" class="heading-anchor">🔗</a></h1>
 <h2><a href="https://github.com/laurent22/joplin/releases/tag/cli-v2.1.2">cli-v2.1.2</a> - 2021-06-27T15:51:36Z<a name="cli-v2-1-2-https-github-com-laurent22-joplin-releases-tag-cli-v2-1-2-2021-06-27t15-51-36z" href="#cli-v2-1-2-https-github-com-laurent22-joplin-releases-tag-cli-v2-1-2-2021-06-27t15-51-36z" class="heading-anchor">🔗</a></h2>
@@ -616,7 +637,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 +650,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-changelog_server">
+			<div class="help-page-container page-changelog_server">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,9 +283,49 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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 +504,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 +517,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/clipper.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/clipper.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-clipper">
+			<div class="help-page-container page-clipper">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/clipper.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,11 +283,11 @@ https://github.com/laurent22/joplin/blob/dev/readme/clipper.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Joplin Web Clipper<a name="joplin-web-clipper" href="#joplin-web-clipper" class="heading-anchor">🔗</a></h1>
 <p>The Web Clipper is a browser extension that allows you to save web pages and screenshots from your browser. To start using it, open the Joplin desktop application, go to the <strong>Web Clipper Options</strong> and follow the instructions.</p>
-<img src="https://joplinapp.org/images/WebExtensionScreenshot.png" style="max-width: 50%; border: 1px solid gray;">
+<img src="/images/WebExtensionScreenshot.png" style="max-width: 50%; border: 1px solid gray;">
 <h1>Troubleshooting the web clipper service<a name="troubleshooting-the-web-clipper-service" href="#troubleshooting-the-web-clipper-service" class="heading-anchor">🔗</a></h1>
 <p>The web clipper extension and the Joplin application communicates via a service, which is started by the Joplin desktop app.</p>
 <p>However certain things can interfere with this service and prevent it from being accessible or from starting. If something does not work, check the following:</p>
@@ -329,7 +350,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 +363,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/conflict.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/conflict.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-conflict">
+			<div class="help-page-container page-conflict">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/conflict.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/conflict.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>What is a conflict?<a name="what-is-a-conflict" href="#what-is-a-conflict" class="heading-anchor">🔗</a></h1>
 <p>A conflict happens when one note or one attachment is modified in two different places, and then synchronised. In that case, it not possible to determine which version of the note or attachment you want to keep, and thus a conflict is generated.</p>
@@ -305,7 +326,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 +339,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=1628514896838"></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
@@ -24,6 +24,10 @@ a {
 	padding-bottom: 225px;
 }

+.help-page-container img {
+	margin-bottom: 1rem;
+}
+
 .press-carousel .photo {
 	width: 123px;
 	height: 136px;
@@ -86,6 +90,12 @@ a {
 	color: #90b1d9;
 }

+blockquote {
+    border-left: .25em solid #e0e0e0;
+    padding: 0 1em;
+    opacity: .7;
+}
+
 .img-center {
 	display: block;
 	margin: auto;
@@ -103,21 +113,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 +157,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 +297,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 +381,10 @@ p,
 	margin-top: 40px;
 }

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

+#multimedia-notes-section .frame-bg {
+	background-size: 100% 50%;
+	padding-bottom: 15px;
+}
+
 #multimedia-title {
 	margin-top: 100px;
 }
@@ -417,6 +422,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;
@@ -427,6 +437,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 +524,10 @@ p,
 	text-align: center;
 }

+.page-download .downloaded-filename {
+	font-weight: bold;
+}
+
@media (min-width: 767px) {
 	.content-wrapper{
 		display: flex;
@@ -580,151 +599,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 +744,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;
 	}

@@ -922,7 +796,7 @@ footer .right-links a {
 	}

 	#top-section,
-	.page-container {
+	.help-page-container {
 		padding-top: 80px;
 	}

@@ -957,18 +831,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,14 +839,14 @@ footer .right-links a {

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

 .plans-page .title-box p {
 	margin-bottom: 0;
 }

-.page-container {
+.help-page-container {
 	padding-top: 90px;
 	padding-bottom: 50px;
 }
@@ -1001,7 +863,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 +886,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 +901,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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/debugging.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/debugging.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-debugging">
+			<div class="help-page-container page-debugging">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/debugging.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,11 +283,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/debugging.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>How to enable debugging<a name="how-to-enable-debugging" href="#how-to-enable-debugging" class="heading-anchor">🔗</a></h1>
 <p>It is possible to get the apps to display or log more information that might help debug various issues.</p>
 <h2>Desktop application<a name="desktop-application" href="#desktop-application" class="heading-anchor">🔗</a></h2>
+<p>If the application starts with a white screen, open <strong>View &gt; Toggle Developer Tools</strong> in the menu. Then check in the console if there is any error or warning and please let us know about it.</p>
+<p>Otherwise, follow these instructions:</p>
 <ul>
 <li>Click on menu <strong>Help &gt; Open Profile Directory</strong> and add a file named &quot;flags.txt&quot; in your directory with the following content: <code>--open-dev-tools --debug --log-level debug</code></li>
 <li>Restart the application</li>
@@ -351,7 +374,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 +387,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/desktop.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/desktop.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-desktop">
+			<div class="help-page-container page-desktop">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/desktop.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,10 +283,10 @@ https://github.com/laurent22/joplin/blob/dev/readme/desktop.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Desktop application<a name="desktop-application" href="#desktop-application" class="heading-anchor">🔗</a></h1>
-<img src="https://joplinapp.org/images/DemoDesktop.png" style="max-width: 100%">
+<img src="/images/DemoDesktop.png" style="width: 100%">
 <p>For general information relevant to all the applications, see also <a href="https://joplinapp.org">Joplin home page</a>.</p>

 								<div class="bottom-links">
@@ -299,7 +320,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 +333,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/donate.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/donate.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-donate">
+			<div class="help-page-container page-donate">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/donate.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -275,15 +296,15 @@ https://github.com/laurent22/joplin/blob/dev/readme/donate.md
 <tbody>
 <tr>
 <td>Paypal</td>
-<td><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 on PayPal"></a></td>
+<td><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="/images/badges/Donate-PayPal-green.svg" alt="Donate on PayPal"></a></td>
 </tr>
 <tr>
 <td>GitHub Sponsor</td>
-<td><a href="https://github.com/sponsors/laurent22/"><img src="https://joplinapp.org/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a></td>
+<td><a href="https://github.com/sponsors/laurent22/"><img src="/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a></td>
 </tr>
 <tr>
 <td>Patreon</td>
-<td><a href="https://www.patreon.com/joplin"><img src="https://joplinapp.org/images/badges/Patreon-Badge.svg" alt="Become a patron"></a></td>
+<td><a href="https://www.patreon.com/joplin"><img src="/images/badges/Patreon-Badge.svg" alt="Become a patron"></a></td>
 </tr>
 <tr>
 <td>Bank Transfer</td>
@@ -330,7 +351,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 +364,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -179,7 +112,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/download.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-download">
+			<div class="help-page-container page-download">
 				<div class="container">
 					<div class="row content-wrapper">
 						
@@ -189,23 +122,22 @@ https://github.com/laurent22/joplin/blob/dev/readme/download.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/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='/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='/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='/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>
-<!-- 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>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='/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='/images/BadgeIOS.png'/></a><!-- MOBILE-DOWNLOAD-LINKS -->
+<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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/e2ee.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/e2ee.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-e2ee">
+			<div class="help-page-container page-e2ee">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/e2ee.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/e2ee.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>About End-To-End Encryption (E2EE)<a name="about-end-to-end-encryption-e2ee" href="#about-end-to-end-encryption-e2ee" class="heading-anchor">🔗</a></h1>
 <p>End-to-end encryption (E2EE) is a system where only the owner of the data (i.e. notes, notebooks, tags or resources) can read it. It prevents potential eavesdroppers - including telecom providers, internet providers, and even the developers of Joplin from being able to access the data.</p>
@@ -317,7 +338,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 +351,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-faq">
+			<div class="help-page-container page-faq">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>FAQ<a name="faq" href="#faq" class="heading-anchor">🔗</a></h1>
 <h2>Installer gets stuck on Windows<a name="installer-gets-stuck-on-windows" href="#installer-gets-stuck-on-windows" class="heading-anchor">🔗</a></h2>
@@ -395,7 +416,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 +429,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq_joplin_cloud.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq_joplin_cloud.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-faq_joplin_cloud">
+			<div class="help-page-container page-faq_joplin_cloud">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq_joplin_cloud.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,17 +283,28 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq_joplin_cloud.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </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 +337,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 +350,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/ideas.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/ideas.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-ideas">
+			<div class="help-page-container page-ideas">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/ideas.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/ideas.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>GSoC 2020 Ideas<a name="gsoc-2020-ideas" href="#gsoc-2020-ideas" class="heading-anchor">🔗</a></h1>
 <p>2020 is Joplin first round at Google Summer of Code. Detailed information on how to get involved and apply are given in the <a href="https://joplinapp.org/gsoc2020/index/">general Summer of Code introduction</a></p>
@@ -402,7 +423,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 +436,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/index.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/index.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-index">
+			<div class="help-page-container page-index">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/index.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/index.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Google Summer of Code 2020<a name="google-summer-of-code-2020" href="#google-summer-of-code-2020" class="heading-anchor">🔗</a></h1>
 <p>Joplin has a young but well proven history. It all started by single idea but is rising more and more commitment as well as demands.</p>
@@ -401,7 +422,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 +435,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/ideas.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/ideas.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-ideas">
+			<div class="help-page-container page-ideas">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/ideas.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/ideas.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>GSoC 2021 Ideas<a name="gsoc-2021-ideas" href="#gsoc-2021-ideas" class="heading-anchor">🔗</a></h1>
 <p>2021 is Joplin second round at Google Summer of Code. Detailed information on how to get involved and apply are given in the <a href="https://joplinapp.org/gsoc2021/index/">general Summer of Code introduction</a></p>
@@ -362,7 +383,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 +396,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/index.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/index.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-index">
+			<div class="help-page-container page-index">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/index.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/index.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Google Summer of Code 2021<a name="google-summer-of-code-2021" href="#google-summer-of-code-2021" class="heading-anchor">🔗</a></h1>
 <p>Joplin has a young but well proven history. It all started by single idea but is rising more and more commitment as well as demands.</p>
@@ -417,7 +438,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 +451,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/pull_request_guidel
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/pull_request_guidel
 		</div>
 	</div>
 </div>
-			<div class="page-container page-pull_request_guidelines">
+			<div class="help-page-container page-pull_request_guidelines">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/pull_request_guidel
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/pull_request_guidel
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Pull request guidelines<a name="pull-request-guidelines" href="#pull-request-guidelines" class="heading-anchor">🔗</a></h1>
 <p>Due to our limited resources and in order to give everyone a chance to submit a pull request, we have put restrictions in place this year. If you want to submit a pull request, please take into account the following rules:</p>
@@ -325,7 +346,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 +359,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/ideas.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/ideas.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-ideas">
+			<div class="help-page-container page-ideas">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/ideas.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/ideas.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>1.Idea - Create documenation hub<a name="1-idea-create-documenation-hub" href="#1-idea-create-documenation-hub" class="heading-anchor">🔗</a></h1>
 <ul>
@@ -327,7 +348,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 +361,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/index.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/index.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-index">
+			<div class="help-page-container page-index">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/index.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,7 +283,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/index.md
 								Running in prod mode!
 							</div>
 							<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>
+<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://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 </div>
 <h1>Google Season of Doc 2020<a name="google-season-of-doc-2020" href="#google-season-of-doc-2020" class="heading-anchor">🔗</a></h1>
 <p>Joplin has a young but well proven history. It all started by single idea but is rising more and more commitment as well as demands.</p>
@@ -387,7 +408,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 +421,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=1628514896838"></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=1628514896838">
 		<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=1628514896838" 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>
@@ -115,6 +122,13 @@ https://github.com/laurent22/joplin/blob/dev/README.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -169,7 +183,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>
@@ -179,7 +193,7 @@ https://github.com/laurent22/joplin/blob/dev/README.md
 		</div>
 	</div>
 </div>
-			<div class="page-container page-">
+			<div class="help-page-container page-">
 				<div class="container">
 					<div class="row content-wrapper">
 						<div id="toc"><div><ul>
@@ -205,6 +219,13 @@ https://github.com/laurent22/joplin/blob/dev/README.md
 </ul>
 </li>
 <li>
+<p>Joplin Cloud</p>
+<ul>
+<li><a href="/share_notebook/">Sharing a notebook</a></li>
+<li><a href="/publish_note/">Publishing a note</a></li>
+</ul>
+</li>
+<li>
 <p>Joplin API - Get Started</p>
 <ul>
 <li><a href="/api/overview/">Joplin API Overview</a></li>
@@ -262,14 +283,14 @@ https://github.com/laurent22/joplin/blob/dev/README.md
 								Running in prod mode!
 							</div>
 							<!-- DONATELINKS -->
-<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>
+<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="/images/badges/Donate-PayPal-green.svg" alt="Donate using PayPal"></a> <a href="https://github.com/sponsors/laurent22/"><img src="/images/badges/GitHub-Badge.svg" alt="Sponsor on GitHub"></a> <a href="https://www.patreon.com/joplin"><img src="/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://joplinapp.org/donate/#donations"><img src="/images/badges/Donate-IBAN.svg" alt="Donate using IBAN"></a></p>
 <!-- DONATELINKS -->
 <hr>
 <p><img width="64" src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/LinuxIcons/256x256.png" align="left" /> <strong>Joplin</strong> is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in <a href="#markdown">Markdown format</a>.</p>
 <p>Notes exported from Evernote via .enex files <a href="#importing">can be imported</a> into Joplin, including the formatted content (which is converted to Markdown), resources (images, attachments, etc.) and complete metadata (geolocation, updated time, created time, etc.). Plain Markdown files can also be imported.</p>
 <p>The notes can be <a href="#synchronisation">synchronised</a> with various cloud services including <a href="https://nextcloud.com/">Nextcloud</a>, Dropbox, OneDrive, WebDAV or the file system (for example with a network directory). When synchronising the notes, notebooks, tags and other metadata are saved to plain text files which can be easily inspected, backed up and moved around.</p>
 <p>The application is available for Windows, Linux, macOS, Android and iOS (the terminal app also works on FreeBSD). A <a href="/clipper/">Web Clipper</a>, to save web pages and screenshots from your browser, is also available for <a href="https://addons.mozilla.org/firefox/addon/joplin-web-clipper/">Firefox</a> and <a href="https://chrome.google.com/webstore/detail/joplin-web-clipper/alofnhikmmkdbbbgpnglcpdollgjjfek?hl=en-GB">Chrome</a>.</p>
-<div class="top-screenshot"><img src="https://joplinapp.org/images/home-top-img.png" style="max-width: 100%; max-height: 35em;"></div>
+<div class="top-screenshot"><img src="/images/home-top-img.png" style="max-width: 100%; max-height: 35em;"></div>
 <h1>Installation<a name="installation" href="#installation" class="heading-anchor">🔗</a></h1>
 <p>Three types of applications are available: for the <strong>desktop</strong> (Windows, macOS and Linux), for <strong>mobile</strong> (Android and iOS) and for <strong>terminal</strong> (Windows, macOS, Linux and FreeBSD). All applications have similar user interfaces and can synchronise with each other.</p>
 <h2>Desktop applications<a name="desktop-applications" href="#desktop-applications" class="heading-anchor">🔗</a></h2>
@@ -283,19 +304,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='/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='/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='/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>
@@ -310,12 +331,12 @@ https://github.com/laurent22/joplin/blob/dev/README.md
 <tbody>
 <tr>
 <td>Android</td>
-<td><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></td>
+<td><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='/images/BadgeAndroid.png'/></a></td>
 <td>or download the APK file: <a href="https://github.com/laurent22/joplin-android/releases/download/android-v2.1.4/joplin-v2.1.4.apk">64-bit</a> <a href="https://github.com/laurent22/joplin-android/releases/download/android-v2.1.4/joplin-v2.1.4-32bit.apk">32-bit</a></td>
 </tr>
 <tr>
 <td>iOS</td>
-<td><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></td>
+<td><a href='https://itunes.apple.com/us/app/joplin/id1315599797'><img alt='Get it on the App Store' height="40px" src='/images/BadgeIOS.png'/></a></td>
 <td>-</td>
 </tr>
 </tbody>
@@ -348,10 +369,6 @@ https://github.com/laurent22/joplin/blob/dev/README.md
 </thead>
 <tbody>
 <tr>
-<td>macOS</td>
-<td><code>brew install joplin</code></td>
-</tr>
-<tr>
 <td>Arch Linux</td>
 <td>An Arch Linux package is available <a href="https://aur.archlinux.org/packages/joplin/">here</a>. To install it, use an AUR wrapper such as yay: <code>yay -S joplin</code>. Both the CLI tool (type <code>joplin</code>) and desktop app (type <code>joplin-desktop</code>) are packaged. You can also install a compiled version with the <a href="https://wiki.archlinux.org/index.php/Unofficial_user_repositories#chaotic-aur">chaotic-aur</a> repository. For support, please go to the <a href="https://github.com/masterkorp/joplin-pkgbuild">GitHub repo</a>. If you are interested in <a href="https://joplinapp.org/prereleases/">pre-release</a> you have <a href="https://aur.archlinux.org/packages/joplin-beta">joplin-beta</a>.</td>
 </tr>
@@ -360,9 +377,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://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> <a href="https://tranio.com/italy/"><img title="Tranio" width="256" src="https://joplinapp.org/images/sponsors/Tranio.png"/></a></p>
+<!-- SPONSORS-ORG -->
 <hr>
-<!-- SPONSORS -->
+<!-- SPONSORS-GITHUB -->
 <table class="table">
 <thead>
 <tr>
@@ -381,31 +400,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>
@@ -429,7 +448,6 @@ https://github.com/laurent22/joplin/blob/dev/README.md
 <li>Supports multiple languages.</li>
 <li>External editor support - open notes in your favorite external editor with one click in Joplin.</li>
 <li>Extensible functionality through plugin and data APIs.</li>
-<li>Template support with data variables for auto creation of time &amp; dates.</li>
 <li>Custom CSS support for customisation of both the rendered markdown and overall user interface.</li>
 <li>Customisable layout allows toggling, movement and sizing of various elements.</li>
 <li>Keyboard shortcuts are editable and allow binding of most Joplin commands with export/import functionality.</li>
@@ -473,7 +491,7 @@ Joplin is also capable of exporting to a number of other formats including HTML
 <p>If the <strong>terminal client</strong> has been installed, it is possible to also synchronise outside of the user interface by typing <code>joplin sync</code> from the terminal. This can be used to setup a cron script to synchronise at a regular interval. For example, this would do it every 30 minutes:</p>
 <p><code>*/30 * * * * /path/to/joplin sync</code></p>
 <h2>Nextcloud synchronisation<a name="nextcloud-synchronisation" href="#nextcloud-synchronisation" class="heading-anchor">🔗</a></h2>
-<p><img src="https://joplinapp.org/images/nextcloud-logo-background.png" width="100" align="left"> <a href="https://nextcloud.com/">Nextcloud</a> is a self-hosted, private cloud solution. It can store documents, images and videos but also calendars, passwords and countless other things and can sync them to your laptop or phone. As you can host your own Nextcloud server, you own both the data on your device and infrastructure used for synchronisation. As such it is a good fit for Joplin. The platform is also well supported and with a strong community, so it is likely to be around for a while - since it's open source anyway, it is not a service that can be closed, it can exist on a server for as long as one chooses.</p>
+<p><img src="/images/nextcloud-logo-background.png" width="100" align="left"> <a href="https://nextcloud.com/">Nextcloud</a> is a self-hosted, private cloud solution. It can store documents, images and videos but also calendars, passwords and countless other things and can sync them to your laptop or phone. As you can host your own Nextcloud server, you own both the data on your device and infrastructure used for synchronisation. As such it is a good fit for Joplin. The platform is also well supported and with a strong community, so it is likely to be around for a while - since it's open source anyway, it is not a service that can be closed, it can exist on a server for as long as one chooses.</p>
 <p>In the <strong>desktop application</strong> or <strong>mobile application</strong>, go to the Configuration screen and select Nextcloud as the synchronisation target. Then input the WebDAV URL (to get it, click on Settings in the bottom left corner of the page, in Nextcloud), this is normally <code>https://example.com/nextcloud/remote.php/webdav/Joplin</code> (<strong>make sure to create the &quot;Joplin&quot; directory in Nextcloud</strong>), and set the username and password. If it does not work, please <a href="https://github.com/laurent22/joplin/issues/61#issuecomment-373282608">see this explanation</a> for more details.</p>
 <p>In the <strong>terminal application</strong>, you will need to set the <code>sync.target</code> config variable and all the <code>sync.5.path</code>, <code>sync.5.username</code> and <code>sync.5.password</code> config variables to, respectively the Nextcloud WebDAV URL, your username and your password. This can be done from the command line mode using:</p>
 <pre><code>:config sync.5.path https://example.com/nextcloud/remote.php/webdav/Joplin
@@ -566,7 +584,7 @@ Joplin is also capable of exporting to a number of other formats including HTML
 <p>If for any reason the notifications do not work, please <a href="https://github.com/laurent22/joplin/issues">open an issue</a>.</p>
 <h1>Sub-notebooks<a name="sub-notebooks" href="#sub-notebooks" class="heading-anchor">🔗</a></h1>
 <p>Sub-notebooks allow organising multiple notebooks into a tree of notebooks. For example it can be used to regroup all the notebooks related to work, to family or to a particular project under a parent notebook.</p>
-<p><img src="https://joplinapp.org/images/SubNotebooks.png" alt=""></p>
+<p><img src="/images/SubNotebooks.png" alt=""></p>
 <ul>
 <li>In the <strong>desktop application</strong>, to create a subnotebook, drag and drop it onto another notebook. To move it back to the root, drag and drop it on the &quot;Notebooks&quot; header. Currently only the desktop app can be used to organise the notebooks.</li>
 <li>The <strong>mobile application</strong> supports displaying and collapsing/expanding the tree of notebooks, however it does not currently support moving the subnotebooks to different notebooks.</li>
@@ -578,55 +596,6 @@ Joplin is also capable of exporting to a number of other formats including HTML
 <p>Rendered markdown can be customized by placing a userstyle file in the profile directory <code>~/.config/joplin-desktop/userstyle.css</code> (This path might be different on your device - check at the top of the <code>General</code> page of the Configuration menu for the exact path). This file supports standard CSS syntax. Joplin <em><strong>must</strong></em> be restarted for the new css to be applied, please ensure that Joplin is not closing to the tray, but is actually exiting. Note that this file is used for both displaying the notes and printing the notes. Be aware how the CSS may look printed (for example, printing white text over a black background is usually not wanted).</p>
 <p>The whole UI can be customized by placing a custom editor style file in the profile directory <code>~/.config/joplin-desktop/userchrome.css</code>.</p>
 <p>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.</p>
-<h1>Note templates<a name="note-templates" href="#note-templates" class="heading-anchor">🔗</a></h1>
-<p>In the <strong>desktop app</strong>, templates can be used to create new notes or to insert into existing ones by adding a template file to the <code>templates</code> directory (File &gt; Templates). For example creating the file <code>hours.md</code> in the <code>templates</code> directory with the contents:</p>
-<pre><code class="language-markdown">Date: {{date}}
-Hours:
-Details:
-</code></pre>
-<p>Templates can then be inserted from the menu (File-&gt;Templates).</p>
-<p>The currently supported template variables are:</p>
-<table class="table">
-<thead>
-<tr>
-<th>Variable</th>
-<th>Description</th>
-<th>Example</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td><code>{{date}}</code></td>
-<td>Today's date formatted based on the settings format</td>
-<td>2019-01-01</td>
-</tr>
-<tr>
-<td><code>{{time}}</code></td>
-<td>Current time formatted based on the settings format</td>
-<td>13:00</td>
-</tr>
-<tr>
-<td><code>{{datetime}}</code></td>
-<td>Current date and time formatted based on the settings format</td>
-<td>01/01/19 1:00 PM</td>
-</tr>
-<tr>
-<td><code>{{#custom_datetime}}</code></td>
-<td>Current date and/or time formatted based on a supplied string (using <a href="https://momentjs.com/">moment.js</a> formatting)</td>
-<td><code>{{#custom_datetime}}M d{{/custom_datetime}}</code></td>
-</tr>
-<tr>
-<td><code>{{bowm}}</code></td>
-<td>Date of the beginning of the week (when week starts on Monday) based on the settings format</td>
-<td></td>
-</tr>
-<tr>
-<td><code>{{bows}}</code></td>
-<td>Date of the beginning of the week (when week starts on Sunday) based on the settings format</td>
-<td></td>
-</tr>
-</tbody>
-</table>
 <h1>Plugins<a name="plugins" href="#plugins" class="heading-anchor">🔗</a></h1>
 <p>The <strong>desktop app</strong> 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 &amp; configured within the application via the <code>Plugins</code> 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.</p>
 <p>Plugins are currently maintained by the community in the <a href="https://discourse.joplinapp.org/c/plugins/18">Joplin Discourse 'plugins' category</a>.</p>
@@ -860,287 +829,287 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 </thead>
 <tbody>
 <tr>
-<td><img src="https://joplinapp.org/images/flags/country-4x3/arableague.png" width="16px"/></td>
+<td><img src="/images/flags/country-4x3/arableague.png" width="16px"/></td>
 <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>
+<td><img src="/images/flags/es/basque_country.png" width="16px"/></td>
 <td>Basque</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/eu.po">eu</a></td>
 <td>juan.abasolo@ehu.eus</td>
 <td>29%</td>
 </tr>
 <tr>
-<td><img src="https://joplinapp.org/images/flags/country-4x3/ba.png" width="16px"/></td>
+<td><img src="/images/flags/country-4x3/ba.png" width="16px"/></td>
 <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>
+<td><img src="/images/flags/country-4x3/bg.png" width="16px"/></td>
 <td>Bulgarian (България)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bg_BG.po">bg_BG</a></td>
 <td></td>
 <td>57%</td>
 </tr>
 <tr>
-<td><img src="https://joplinapp.org/images/flags/es/catalonia.png" width="16px"/></td>
+<td><img src="/images/flags/es/catalonia.png" width="16px"/></td>
 <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>
+<td><img src="/images/flags/country-4x3/hr.png" width="16px"/></td>
 <td>Croatian (Hrvatska)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/hr_HR.po">hr_HR</a></td>
 <td><a href="mailto:mail@milotype.de">Milo Ivir</a></td>
 <td>99%</td>
 </tr>
 <tr>
-<td><img src="https://joplinapp.org/images/flags/country-4x3/cz.png" width="16px"/></td>
+<td><img src="/images/flags/country-4x3/cz.png" width="16px"/></td>
 <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><img src="/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><img src="/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>
+<td><img src="/images/flags/country-4x3/ee.png" width="16px"/></td>
 <td>Eesti Keel (Eesti)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/et_EE.po">et_EE</a></td>
 <td></td>
 <td>56%</td>
 </tr>
 <tr>
-<td><img src="https://joplinapp.org/images/flags/country-4x3/gb.png" width="16px"/></td>
+<td><img src="/images/flags/country-4x3/gb.png" width="16px"/></td>
 <td>English (United Kingdom)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/en_GB.po">en_GB</a></td>
 <td></td>
 <td>100%</td>
 </tr>
 <tr>
-<td><img src="https://joplinapp.org/images/flags/country-4x3/us.png" width="16px"/></td>
+<td><img src="/images/flags/country-4x3/us.png" width="16px"/></td>
 <td>English (United States of America)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/en_US.po">en_US</a></td>
 <td></td>
 <td>100%</td>
 </tr>
 <tr>
-<td><img src="https://joplinapp.org/images/flags/country-4x3/es.png" width="16px"/></td>
+<td><img src="/images/flags/country-4x3/es.png" width="16px"/></td>
 <td>Español (España)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/es_ES.po">es_ES</a></td>
 <td><a href="mailto:francisco.m.collao@gmail.com">Francisco Mora</a></td>
 <td>99%</td>
 </tr>
 <tr>
-<td><img src="https://joplinapp.org/images/flags/esperanto.png" width="16px"/></td>
+<td><img src="/images/flags/esperanto.png" width="16px"/></td>
 <td>Esperanto</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/eo.po">eo</a></td>
 <td>Marton Paulo</td>
 <td>32%</td>
 </tr>
 <tr>
-<td><img src="https://joplinapp.org/images/flags/country-4x3/fi.png" width="16px"/></td>
+<td><img src="/images/flags/country-4x3/fi.png" width="16px"/></td>
 <td>Finnish (Suomi)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/fi_FI.po">fi_FI</a></td>
 <td>mrkaato</td>
 <td>93%</td>
 </tr>
 <tr>
-<td><img src="https://joplinapp.org/images/flags/country-4x3/fr.png" width="16px"/></td>
+<td><img src="/images/flags/country-4x3/fr.png" width="16px"/></td>
 <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>
+<td><img src="/images/flags/es/galicia.png" width="16px"/></td>
 <td>Galician (España)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/gl_ES.po">gl_ES</a></td>
 <td><a href="mailto:marcoslansgarza@gmail.com">Marcos Lans</a></td>
 <td>37%</td>
 </tr>
 <tr>
-<td><img src="https://joplinapp.org/images/flags/country-4x3/id.png" width="16px"/></td>
+<td><img src="/images/flags/country-4x3/id.png" width="16px"/></td>
 <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>
+<td><img src="/images/flags/country-4x3/it.png" width="16px"/></td>
 <td>Italiano (Italia)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/it_IT.po">it_IT</a></td>
 <td><a href="mailto:mannivuwiki@gmail.com">Manuel Tassi</a></td>
 <td>98%</td>
 </tr>
 <tr>
-<td><img src="https://joplinapp.org/images/flags/country-4x3/hu.png" width="16px"/></td>
+<td><img src="/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>
-<td><img src="https://joplinapp.org/images/flags/country-4x3/be.png" width="16px"/></td>
+<td><img src="/images/flags/country-4x3/be.png" width="16px"/></td>
 <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><img src="/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>
+<td><img src="/images/flags/country-4x3/no.png" width="16px"/></td>
 <td>Norwegian (Norge, Noreg)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/nb_NO.po">nb_NO</a></td>
 <td><a href="mailto:code@mxe.no">Mats Estensen</a></td>
 <td>75%</td>
 </tr>
 <tr>
-<td><img src="https://joplinapp.org/images/flags/country-4x3/ir.png" width="16px"/></td>
+<td><img src="/images/flags/country-4x3/ir.png" width="16px"/></td>
 <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>
+<td><img src="/images/flags/country-4x3/pl.png" width="16px"/></td>
 <td>Polski (Polska)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pl_PL.po">pl_PL</a></td>
 <td><a href="mailto:hello.konhi@gmail.com">konhi</a></td>
 <td>93%</td>
 </tr>
 <tr>
-<td><img src="https://joplinapp.org/images/flags/country-4x3/br.png" width="16px"/></td>
+<td><img src="/images/flags/country-4x3/br.png" width="16px"/></td>
 <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>
+<td><img src="/images/flags/country-4x3/pt.png" width="16px"/></td>
 <td>Português (Portugal)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/pt_PT.po">pt_PT</a></td>
 <td><a href="mailto:dcaveiro@yahoo.com">Diogo Caveiro</a></td>
 <td>93%</td>
 </tr>
 <tr>
-<td><img src="https://joplinapp.org/images/flags/country-4x3/ro.png" width="16px"/></td>
+<td><img src="/images/flags/country-4x3/ro.png" width="16px"/></td>
 <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>
+<td><img src="/images/flags/country-4x3/si.png" width="16px"/></td>
 <td>Slovenian (Slovenija)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/sl_SI.po">sl_SI</a></td>
 <td><a href="mailto:martin.korelic@protonmail.com">Martin Korelič</a></td>
 <td>94%</td>
 </tr>
 <tr>
-<td><img src="https://joplinapp.org/images/flags/country-4x3/se.png" width="16px"/></td>
+<td><img src="/images/flags/country-4x3/se.png" width="16px"/></td>
 <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><img src="/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>
+<td><img src="/images/flags/country-4x3/vi.png" width="16px"/></td>
 <td>Tiếng Việt</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/vi.po">vi</a></td>
 <td></td>
 <td>72%</td>
 </tr>
 <tr>
-<td><img src="https://joplinapp.org/images/flags/country-4x3/tr.png" width="16px"/></td>
+<td><img src="/images/flags/country-4x3/tr.png" width="16px"/></td>
 <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><img src="/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><img src="/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>
+<td><img src="/images/flags/country-4x3/ru.png" width="16px"/></td>
 <td>Русский (Россия)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ru_RU.po">ru_RU</a></td>
 <td><a href="mailto:thesermanarm@gmail.com">Sergey Segeda</a></td>
 <td>93%</td>
 </tr>
 <tr>
-<td><img src="https://joplinapp.org/images/flags/country-4x3/rs.png" width="16px"/></td>
+<td><img src="/images/flags/country-4x3/rs.png" width="16px"/></td>
 <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>
+<td><img src="/images/flags/country-4x3/cn.png" width="16px"/></td>
 <td>中文 (简体)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_CN.po">zh_CN</a></td>
 <td><a href="mailto:jackytsu@vip.qq.com">南宫小骏</a></td>
 <td>99%</td>
 </tr>
 <tr>
-<td><img src="https://joplinapp.org/images/flags/country-4x3/tw.png" width="16px"/></td>
+<td><img src="/images/flags/country-4x3/tw.png" width="16px"/></td>
 <td>中文 (繁體)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/zh_TW.po">zh_TW</a></td>
 <td><a href="mailto:BobChao%29%20%28bobchao@gmail.com">Po-Chiang Chao</a></td>
 <td>98%</td>
 </tr>
 <tr>
-<td><img src="https://joplinapp.org/images/flags/country-4x3/jp.png" width="16px"/></td>
+<td><img src="/images/flags/country-4x3/jp.png" width="16px"/></td>
 <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>
+<td><img src="/images/flags/country-4x3/kr.png" width="16px"/></td>
 <td>한국어</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/ko.po">ko</a></td>
 <td><a href="mailto:potatogim@potatogim.net">Ji-Hyeon Gim</a></td>
@@ -1716,7 +1685,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 +1698,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=1628514896838"></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/DemoMobile.jpg
+++ b/docs/images/DemoMobile.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/publish_note/Browser.jpg
+++ b/docs/images/publish_note/Browser.jpg
--- a/docs/images/publish_note/ContextMenu.jpg
+++ b/docs/images/publish_note/ContextMenu.jpg
--- a/docs/images/publish_note/Dialog.jpg
+++ b/docs/images/publish_note/Dialog.jpg
--- a/docs/images/share_notebook/Dialog.png
+++ b/docs/images/share_notebook/Dialog.png
--- a/docs/images/share_notebook/Notification.png
+++ b/docs/images/share_notebook/Notification.png
--- a/docs/images/share_notebook/Sidebar.png
+++ b/docs/images/share_notebook/Sidebar.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Laurent Cozic	b490537c26	Publish - joplin@2.2.2 - @joplin/app-clipper@1.0.9 - @joplin/app-desktop@2.2.7 - @joplin/app-mobile@0.8.10 - @joplin/fork-htmlparser2@4.1.31 - @joplin/fork-sax@1.2.35 - generator-joplin@2.2.2 - @joplin/lib@2.2.3 - @joplin/plugin-repo-cli@2.2.3 - @joplin/plugins@0.0.1 - @joplin/renderer@2.2.3 - @joplin/server@2.2.12 - @joplin/tools@2.2.3 - @joplin/turndown-plugin-gfm@1.0.35 - @joplin/turndown@4.0.53	2021-08-10 15:09:17 +01:00
Laurent Cozic	c3263a132f	ios-v12.2.1	2021-08-10 11:56:58 +01:00
Laurent Cozic	eef6530c95	Plugin Generator release v2.2.1	2021-08-10 11:35:34 +01:00
Laurent Cozic	bac0d68156	Plugins: Updated types	2021-08-10 11:34:49 +01:00
Laurent Cozic	97349ceb6a	CLI v2.2.1	2021-08-10 11:21:37 +01:00
Laurent Cozic	f2351cbf32	Releasing sub-packages	2021-08-10 11:17:53 +01:00
Laurent Cozic	37ade59fca	Releasing sub-packages	2021-08-10 11:12:36 +01:00
Laurent Cozic	212dacdfbe	Android 2.2.3	2021-08-09 19:49:05 +01:00
Laurent Cozic	34d3e8f027	Android release v2.2.3	2021-08-09 19:35:43 +01:00
Laurent Cozic	2d7c8c599a	Android 2.2.2	2021-08-09 19:28:58 +01:00
Laurent Cozic	70c1e7ae28	Android release v2.2.2	2021-08-09 19:15:42 +01:00
Laurent Cozic	60aca7beec	Desktop release v2.2.6	2021-08-09 19:06:07 +01:00
Laurent Cozic	8589f39afe	Merge branch 'dev' into release-2.2	2021-08-09 19:05:46 +01:00
Laurent Cozic	6632d67a64	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-08-09 19:05:00 +01:00
Ahmad Mamdouh	e7260d7498	Plugins: Hide note list menu items for commands that are disabled (#5270 )	2021-08-09 19:04:40 +01:00
Lee Matos	d2e2866995	All: Resolves #4810 , Resolves #4610 : Fix AWS S3 sync error and upgrade framework to v3 (#5212 )	2021-08-09 19:03:03 +01:00
Laurent Cozic	f14c74d802	Server: Disable upload for accounts with subscription failed payments	2021-08-09 19:00:22 +01:00
Laurent Cozic	391204c31e	Server: Allow setting email key to prevent the same email to be sent multiple times	2021-08-09 16:55:04 +01:00
Laurent Cozic	b3cec3be37	Update website	2021-08-09 14:15:17 +01:00
Laurent Cozic	d2afd9980c	Update website	2021-08-09 13:19:08 +01:00
Laurent Cozic	96c7a18d5b	Doc: Update image links	2021-08-09 13:17:58 +01:00
Laurent Cozic	dfcafd8254	Merge branch 'dev' of github.com:laurent22/joplin into dev	2021-08-09 13:17:34 +01:00
Helmut K. C. Tessarek	6a17f717cf	Doc: remove brew install method	2021-08-09 07:46:03 -04:00
Laurent Cozic	fdd77b8e88	Doc: Fixed blockquote style	2021-08-09 11:57:34 +01:00
Laurent Cozic	41f4e037b5	Doc: Added doc for publishing note	2021-08-09 11:56:48 +01:00
Laurent Cozic	7061d6c05d	Doc: Add Share Notebook doc	2021-08-09 11:48:29 +01:00
Lee Matos	f90885709c	Mobile: Resolves #4588 : Make sync icon spin in the right direction (#5275 )	2021-08-08 18:41:28 +01:00
Alec	071e1649bc	All: Resolves #5244 : Handles OneDrive throttling responses and sets User-Agent based on Microsoft best practices (#5246 )	2021-08-08 18:38:04 +01:00
Laurent Cozic	c3f10d31cb	Chore: Convert E2EE related files to TypeScript	2021-08-07 12:22:37 +01:00
Laurent Cozic	3fb77c4e37	Tools: Trying to fix macOS tests on CI	2021-08-06 18:37:58 +01:00
Laurent Cozic	f9cfefdb29	Desktop: Resolves #5273 : Prevent plugins from crashing the application	2021-08-06 13:08:32 +01:00
Laurent Cozic	153216c236	Desktop release v2.2.5	2021-08-06 11:05:10 +01:00
Laurent Cozic	517deade20	Merge branch 'dev' into release-2.2	2021-08-06 11:04:59 +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	daadc3309b	Desktop release v2.2.4	2021-08-05 16:04:42 +01:00
Laurent Cozic	dbe7146bdd	Merge branch 'dev' into release-2.2	2021-08-05 16:04:28 +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	f2818a653b	Desktop release v2.2.3	2021-08-05 15:09:58 +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	bddbc0b54e	ios-v12.1.2	2021-07-06 11:32:25 +01:00