Android release v1.8.5

Desktop release v1.8.4
All: Security: Apply npm audit security fixes
2025-08-27 20:29:45 +02:00 · 2021-05-09 19:37:09 +02:00 · 2021-05-09 19:31:26 +02:00 · 2021-05-09 19:30:08 +02:00 · 2021-05-09 18:12:47 +02:00 · 2021-05-04 17:44:30 +02:00
133 changed files with 12502 additions and 6049 deletions
--- a/.eslintignore
+++ b/.eslintignore
@@ -1351,6 +1351,9 @@ packages/lib/services/synchronizer/migrations/2.js.map
 packages/lib/services/synchronizer/tools.d.ts
 packages/lib/services/synchronizer/tools.js
 packages/lib/services/synchronizer/tools.js.map
+packages/lib/services/synchronizer/utils/handleSyncStartupOperation.d.ts
+packages/lib/services/synchronizer/utils/handleSyncStartupOperation.js
+packages/lib/services/synchronizer/utils/handleSyncStartupOperation.js.map
 packages/lib/services/synchronizer/utils/types.d.ts
 packages/lib/services/synchronizer/utils/types.js
 packages/lib/services/synchronizer/utils/types.js.map
--- a/.gitignore
+++ b/.gitignore
@@ -1338,6 +1338,9 @@ packages/lib/services/synchronizer/migrations/2.js.map
 packages/lib/services/synchronizer/tools.d.ts
 packages/lib/services/synchronizer/tools.js
 packages/lib/services/synchronizer/tools.js.map
+packages/lib/services/synchronizer/utils/handleSyncStartupOperation.d.ts
+packages/lib/services/synchronizer/utils/handleSyncStartupOperation.js
+packages/lib/services/synchronizer/utils/handleSyncStartupOperation.js.map
 packages/lib/services/synchronizer/utils/types.d.ts
 packages/lib/services/synchronizer/utils/types.js
 packages/lib/services/synchronizer/utils/types.js.map
--- a/docs/api/get_started/plugins/index.html
+++ b/docs/api/get_started/plugins/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/get_started/plugins.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/api/overview/index.html
+++ b/docs/api/overview/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/overview.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/api/references/development_mode/index.html
+++ b/docs/api/references/development_mode/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/development_m
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/api/references/plugin_loading_rules/index.html
+++ b/docs/api/references/plugin_loading_rules/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_loadin
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/api/references/plugin_manifest/index.html
+++ b/docs/api/references/plugin_manifest/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_manife
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/api/references/plugin_theming/index.html
+++ b/docs/api/references/plugin_theming/index.html
@@ -0,0 +1,481 @@
+<!doctype html>
+<html>
+
+<!--
+
+!!! WARNING !!!
+
+This file was auto-generated from readme/api/references/plugin_theming.md and any manual change
+made to it will be overwritten. To make a change to this file please modify
+the source Markdown file:
+
+https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_theming.md
+
+-->
+
+<head>
+	<title>Plugin theming | Joplin</title>
+	<meta charset="utf-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<link rel="stylesheet" href="https://joplinapp.org/css/bootstrap.min.css">
+	<link rel="shortcut icon" type="image/x-icon" href="https://joplinapp.org/favicon.ico">
+	<!-- <link rel="stylesheet" href="https://joplinapp.org/css/fontawesome-all.min.css">  -->
+	<link rel="stylesheet" href="https://joplinapp.org/css/fork-awesome.min.css"> 
+	<script src="https://joplinapp.org/js/jquery-3.2.1.slim.min.js"></script>
+	<style>
+	body {
+		background-color: #F1F1F1;
+		color: #333333;
+	}
+
+	.root {
+		overflow: hidden;
+	}
+
+	a[href^="mailto:"] {
+		word-break: break-all;
+	}
+
+	table {
+		margin-bottom: 1em;
+	}
+	td, th {
+		padding: .8em;
+		border: 1px solid #ccc;
+	}
+
+	.page-markdown table pre,
+	.page-markdown table blockquote {
+		margin-bottom: 0;
+	}
+
+	.page-markdown table pre,
+	.page-markdown table blockquote {
+		margin-bottom: 0;
+	}
+
+	.page-markdown table pre {
+		background-color: rgba(0,0,0,0);
+		border: none;
+		margin: 0;
+		padding: 0;
+	}
+
+	h1, h2 {
+		border-bottom: 1px solid #eaecef;
+		padding-bottom: 0.3em;
+		font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+		font-weight: 600;
+		font-size: 2em;
+		margin-bottom: 16px;
+	}
+	h2 {
+		font-size: 1.6em;
+	}
+	h3 {
+		font-size: 1.3em;
+	}
+	code {
+		color: black;
+		background-color: #eee;
+		border: 1px solid #ccc;
+		font-size: .85em;
+	/*	word-break: break-all; */
+	}
+	pre code {
+		border: none;
+	}
+	pre {
+		font-size: .85em;
+	}
+	blockquote {
+		font-size: 1em;
+		color: #555;
+	};
+	#toc ul {
+		margin-bottom: 10px;
+	}
+	#toc > ul > li {
+		margin-bottom: 10px;
+	}
+	#toc {
+		padding-bottom: 1em;
+	}
+	.title {
+		display: flex;
+		align-items: center;
+	}
+	.title-icon {
+		display: flex;
+		height: 1em;
+	}
+	.title-text {
+		display: flex;
+		font-weight: normal;
+		margin-bottom: .2em;
+		margin-left: .5em;
+	}
+	.sub-title {
+		font-weight: normal;
+	}
+	.container {
+		background-color: white;
+		padding: 0;
+		box-shadow: 0 10px 20px #888888;
+	}
+	table.screenshots {
+		margin-top: 2em;
+		margin-bottom: 2em;
+	}
+	table.screenshots th {
+		height: 3em;
+		text-align: center;
+	}
+	table.screenshots th, 
+	table.screenshots td {
+		border: 1px solid #C2C2C2;
+	}
+	img[align="left"] {
+		margin-right: 10px;
+		margin-bottom: 10px;
+	}
+	.mobile-screenshot {
+		height: 40em;
+		padding: 1em;
+	}
+	.cli-screenshot-wrapper {
+		background-color: black;
+		vertical-align: top;
+		padding: 1em 2em 1em 1em;
+	}
+	.cli-screenshot {
+		font-family: "Monaco", "Inconsolata", "CONSOLAS", "Deja Vu Sans Mono", "Droid Sans Mono", "Andale Mono", monospace;
+		background-color: black;
+		color: white;
+		border: none;
+	}
+	.cli-screenshot .prompt {
+		color: #48C2F0;
+	}
+	.top-screenshot {
+		margin-top: 2em;
+		text-align: center;
+	}
+	.header {
+		position: relative;
+		padding-left: 2em;
+		padding-right: 2em;
+		padding-top: 1em;
+		padding-bottom: 1em;
+		color: white;
+		background-color: #2B2B3D;
+	}
+	.header a h1 {
+		color: white;
+	}
+	.header a:hover {
+		text-decoration: none;
+	}
+	.content {
+		padding-left: 2em;
+		padding-right: 2em;
+		padding-bottom: 2em;
+		padding-top: 2em;
+	}
+	.forkme {
+		position: absolute;
+		right: 0;
+		top:0;
+	}
+	.nav-wrapper {
+		position: relative;
+		width: inherit;
+	}
+	.nav {
+		background-color: black;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	.nav.sticky {
+		position:fixed;
+		top: 0;
+		width: inherit;
+		box-shadow: 0 0 10px #000000;
+	}
+	.nav a {
+		color: white;
+		display: inline-block;
+		padding: .6em .9em .6em .9em;
+	}
+	.nav ul {
+		padding-left: 2em;
+		margin-bottom: 0;
+		display: table-cell;
+		display: flex;
+		width: 100%;
+		/* For GSoC: */
+		min-width: 470px;
+	}
+	.nav ul li {
+		display: inline-block;
+		padding: 0;
+	}
+	.nav li.selected {
+		background-color: #222;
+		font-weight: bold;
+	}
+	.nav-right {
+		display: flex;
+		text-align: right;
+		vertical-align: middle;
+		line-height: 0;
+		margin-right: 10px;
+	}
+	.nav-right .share-btn {
+		display: none;
+	}
+	.nav-right .small-share-btn {
+		display: none;
+	}
+	.footer {
+		padding: 2em;
+		border-top: 1px solid #d4d4d4;
+		margin-top: 2em;
+		color: gray;
+		font-size: .9em;
+	}
+	a.heading-anchor {
+		display: inline-block;
+		opacity: 0;
+		width: 1.3em;
+		font-size: 0.7em;
+		margin-left: 0.4em;
+		line-height: 1em;
+		text-decoration: none;
+		transition: opacity 0.3s;
+	}
+	a.heading-anchor:hover,
+	h1:hover a.heading-anchor,
+	h2:hover a.heading-anchor,
+	h3:hover a.heading-anchor,
+	h4:hover a.heading-anchor,
+	h5:hover a.heading-anchor,
+	h6:hover a.heading-anchor {
+		opacity: 1;
+	}
+
+	@media (min-width: 992px) {
+		.content{
+			display: flex;
+		}
+
+		#toc{
+			display: block!important;
+			align-self: flex-start;
+			width: 300px;
+			position: sticky; top: 20px; left: 0;            
+		}
+
+		.main{
+			width: calc(100% - 300px);
+		}
+	}
+
+	.bottom-links {
+		display: flex;
+		justify-content: center;
+		border-top: 1px solid #d4d4d4;
+		margin-top: 30px;
+		padding-top: 25px;
+	}
+
+	@media all and (min-width: 400px) {
+		.nav-right .share-btn {
+			display: inline-block;
+		}
+		.nav-right .small-share-btn {
+			display: none;
+		}
+	}
+</style>
+</head>
+
+<body>
+
+<div class="container root page-plugin_theming">
+
+<div class="header">
+	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="https://joplinapp.org/images/ForkMe.png"/></a>
+	<a href="https://joplinapp.org"><h1 class="title"><img class="title-icon" src="https://joplinapp.org/images/Icon512.png"><span class="title-text">Joplin</span></h1></a>
+	<p class="sub-title">An open source note taking and to-do application with synchronisation capabilities</p>
+</div>
+
+<div class="nav-wrapper">
+	<div class="nav">
+		<ul>
+			<li class=""><a href="https:&#x2F;&#x2F;joplinapp.org/" title="Home"><i class="fa fa-home"></i></a></li>
+			<li><a href="https://discourse.joplinapp.org" title="Forum">Forum</a></li>
+			<li><a class="gsoc" href="https://joplinapp.org/gsoc2021/index/" title="Google Summer of Code 2021">GSoC 2021</a></li>
+		</ul>
+		<div class="nav-right">
+			<iframe class="share-btn share-btn-github" src="https://ghbtns.com/github-btn.html?user=laurent22&repo=joplin&type=star&count=true" frameborder="0" scrolling="0" width="115px" height="20px"></iframe>
+		</div>
+	</div>
+</div>
+
+<div class="content">
+	<div id="toc"><ul>
+<li>
+<p>Applications</p>
+<ul>
+<li><a href="https://joplinapp.org/desktop/">Desktop application</a></li>
+<li><a href="https://joplinapp.org/mobile/">Mobile applications</a></li>
+<li><a href="https://joplinapp.org/terminal/">Terminal application</a></li>
+<li><a href="https://joplinapp.org/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="https://joplinapp.org/markdown/">Markdown Guide</a></li>
+<li><a href="https://joplinapp.org/e2ee/">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/conflict/">What is a conflict?</a></li>
+<li><a href="https://joplinapp.org/debugging/">How to enable debug mode</a></li>
+<li><a href="https://joplinapp.org/rich_text_editor/">About the Rich Text editor limitations</a></li>
+<li><a href="https://joplinapp.org/faq/">FAQ</a></li>
+</ul>
+</li>
+<li>
+<p>Joplin API - Get Started</p>
+<ul>
+<li><a href="https://joplinapp.org/api/overview/">Joplin API Overview</a></li>
+<li><a href="https://joplinapp.org/api/get_started/plugins/">Plugin development</a></li>
+<li><a href="https://joplinapp.org/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="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/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="https://joplinapp.org/spec/e2ee/">End-to-end encryption spec</a></li>
+<li><a href="https://joplinapp.org/spec/history/">Note History spec</a></li>
+<li><a href="https://joplinapp.org/spec/sync_lock/">Sync Lock spec</a></li>
+<li><a href="https://joplinapp.org/spec/plugins/">Plugin Architecture spec</a></li>
+<li><a href="https://joplinapp.org/spec/search_sorting/">Search Sorting spec</a></li>
+<li><a href="https://joplinapp.org/spec/server_file_url_format/">Server: File URL Format</a></li>
+<li><a href="https://joplinapp.org/spec/server_delta_sync/">Server: Delta Sync</a></li>
+<li><a href="https://joplinapp.org/spec/server_sharing/">Server: Sharing</a></li>
+</ul>
+</li>
+<li>
+<p>Google Summer of Code 2021</p>
+<ul>
+<li><a href="https://joplinapp.org/gsoc2021/index/">Google Summer of Code 2021</a></li>
+<li><a href="https://joplinapp.org/gsoc2021/pull_request_guidelines/">How to submit a GSoC pull request</a></li>
+<li><a href="https://joplinapp.org/gsoc2021/ideas/">Project Ideas</a></li>
+</ul>
+</li>
+<li>
+<p>About</p>
+<ul>
+<li><a href="https://joplinapp.org/changelog/">Changelog (Desktop App)</a></li>
+<li><a href="https://joplinapp.org/changelog_cli/">Changelog (CLI App)</a></li>
+<li><a href="https://joplinapp.org/changelog_server/">Changelog (Server)</a></li>
+<li><a href="https://joplinapp.org/stats/">Stats</a></li>
+<li><a href="https://joplinapp.org/donate/">Donate</a></li>
+</ul>
+</li>
+</ul>
+</div>
+
+	<div class="main">
+<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>
+<hr>
+<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>
+<p>Plugins add custom content to the UI using<br>
+<a href="https://joplinapp.org/api/references/plugin_api/classes/joplinviewspanels.html">webview panels</a>.<br>
+The HTML content of a a panel is styled with CSS.</p>
+<p>To keep the look and feel of a plugin consistent with the rest of the Joplin UI,<br>
+you are automatically provided with variables derived from the current theme.</p>
+<p>Variables follow the naming convention <code>--joplin-{property}</code> and are used<br>
+in your plugin's stylesheet as shown here.</p>
+<pre><code class="language-css">/* webview.css */
+.container {
+	color: var(--joplin-color);
+	font-family: var(--joplin-font-family);
+}
+</code></pre>
+<h2>Icons<a name="icons" href="#icons" class="heading-anchor">🔗</a></h2>
+<p>In addition to variables, you have access to a set of standard font assets that ship with Joplin.<br>
+These include:</p>
+<ul>
+<li><a href="https://fonts.google.com/specimen/Roboto?preview.text_type=custom">Roboto</a> - (the standard UI font, <code>font-family</code> referenced above)</li>
+<li><a href="https://fontawesome.com/icons?d=gallery&amp;p=2&amp;m=free">Font Awesome</a> - icon library</li>
+<li><a href="https://icomoon.io/#preview-free">icoMoon</a> - icon library (subset, see <a href="https://github.com/laurent22/joplin/blob/dev/packages/app-desktop/style/icons/style.css">style.css</a>)</li>
+</ul>
+<p>To display an icon, use CSS and HTML like the following.</p>
+<pre><code class="language-css">/* style icons to match the theme */
+.toolbarIcon {
+    font-size: var(--joplin-toolbar-icon-size);
+}
+.primary {
+    color: var(--joplin-color);
+}
+.secondary {
+    color: var(--joplin-color-2);
+}
+</code></pre>
+<pre><code class="language-html">&lt;i class=&quot;toolbarIcon primary fas fa-music&quot;&gt;&lt;/i&gt; Font Awesome music icon
+&lt;br /&gt;
+&lt;i class=&quot;toolbarIcon secondary icon-notebooks&quot;&gt;&lt;/i&gt; icoMoon notebook icon
+</code></pre>
+
+		<div class="bottom-links">
+			<a href="https://github.com/laurent22/joplin/blob/dev/readme/api/references/plugin_theming.md">
+				<i class="fa fa-github"></i> Improve this doc
+			</a>
+		</div>
+<script>
+	function stickyHeader() { 
+		return; // Disabled
+
+		if ($(window).scrollTop() > 179) {
+			$('.nav').addClass('sticky'); 
+		} else {
+			$('.nav').removeClass('sticky');
+		}
+	}
+
+	$(window).scroll(function() {
+		stickyHeader();
+	});
+
+	(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>
+
+</div></div>
+
+<div class="footer">
+Copyright (C) 2016-2021 Laurent Cozic
+</div>
+</body>
+</html>
--- a/docs/api/references/rest_api/index.html
+++ b/docs/api/references/rest_api/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/references/rest_api.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
@@ -840,6 +841,16 @@ async function fetchAllNotes() {
 <td>int</td>
 <td></td>
 </tr>
+<tr>
+<td>is_linked_folder</td>
+<td>int</td>
+<td></td>
+</tr>
+<tr>
+<td>source_folder_owner_id</td>
+<td>text</td>
+<td></td>
+</tr>
 </tbody>
 </table>
 <h2>GET /folders<a name="get-folders" href="#get-folders" class="heading-anchor">🔗</a></h2>
--- a/docs/api/tutorials/toc_plugin/index.html
+++ b/docs/api/tutorials/toc_plugin/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/api/tutorials/toc_plugin.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/blog/20180621-182112/index.html
+++ b/docs/blog/20180621-182112/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180621-182112.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/blog/20180906-111039/index.html
+++ b/docs/blog/20180906-111039/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180906-111039.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/blog/20180916-210431/index.html
+++ b/docs/blog/20180916-210431/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180916-210431.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/blog/20180929-121053/index.html
+++ b/docs/blog/20180929-121053/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20180929-121053.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/blog/20181004-091123/index.html
+++ b/docs/blog/20181004-091123/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181004-091123.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/blog/20181101-174335/index.html
+++ b/docs/blog/20181101-174335/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181101-174335.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/blog/20181213-173459/index.html
+++ b/docs/blog/20181213-173459/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20181213-173459.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/blog/20190130-230218/index.html
+++ b/docs/blog/20190130-230218/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190130-230218.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/blog/20190404-074157/index.html
+++ b/docs/blog/20190404-074157/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190404-074157.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/blog/20190424-112410/index.html
+++ b/docs/blog/20190424-112410/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190424-112410.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/blog/20190523-231026/index.html
+++ b/docs/blog/20190523-231026/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190523-231026.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/blog/20190611-000711/index.html
+++ b/docs/blog/20190611-000711/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190611-000711.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/blog/20190613-202613/index.html
+++ b/docs/blog/20190613-202613/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190613-202613.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/blog/20190814-225957/index.html
+++ b/docs/blog/20190814-225957/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190814-225957.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/blog/20190925-000254/index.html
+++ b/docs/blog/20190925-000254/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190925-000254.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/blog/20190929-152834/index.html
+++ b/docs/blog/20190929-152834/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20190929-152834.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/blog/20191012-233121/index.html
+++ b/docs/blog/20191012-233121/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191012-233121.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/blog/20191014-165136/index.html
+++ b/docs/blog/20191014-165136/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191014-165136.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/blog/20191101-131852/index.html
+++ b/docs/blog/20191101-131852/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191101-131852.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/blog/20191117-183855/index.html
+++ b/docs/blog/20191117-183855/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191117-183855.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/blog/20191118-072700/index.html
+++ b/docs/blog/20191118-072700/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20191118-072700.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/blog/20200220-190804/index.html
+++ b/docs/blog/20200220-190804/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200220-190804.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/blog/20200301-125055/index.html
+++ b/docs/blog/20200301-125055/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200301-125055.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/blog/20200314-001555/index.html
+++ b/docs/blog/20200314-001555/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200314-001555.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/blog/20200406-224254/index.html
+++ b/docs/blog/20200406-224254/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/blog/20200406-224254.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/build_troubleshooting/index.html
+++ b/docs/build_troubleshooting/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/build_troubleshooting.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/changelog/index.html
+++ b/docs/changelog/index.html
--- a/docs/changelog_cli/index.html
+++ b/docs/changelog_cli/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_cli.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/changelog_server/index.html
+++ b/docs/changelog_server/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/changelog_server.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/clipper/index.html
+++ b/docs/clipper/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/clipper.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/conflict/index.html
+++ b/docs/conflict/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/conflict.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/debugging/index.html
+++ b/docs/debugging/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/debugging.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/desktop/index.html
+++ b/docs/desktop/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/desktop.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/donate/index.html
+++ b/docs/donate/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/donate.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/e2ee/index.html
+++ b/docs/e2ee/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/e2ee.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/faq/index.html
+++ b/docs/faq/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/faq.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/gsoc2020/ideas/index.html
+++ b/docs/gsoc2020/ideas/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/ideas.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/gsoc2020/index/index.html
+++ b/docs/gsoc2020/index/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2020/index.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/gsoc2021/ideas/index.html
+++ b/docs/gsoc2021/ideas/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/ideas.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/gsoc2021/index/index.html
+++ b/docs/gsoc2021/index/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/index.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/gsoc2021/pull_request_guidelines/index.html
+++ b/docs/gsoc2021/pull_request_guidelines/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsoc2021/pull_request_guidel
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/gsod2020/ideas/index.html
+++ b/docs/gsod2020/ideas/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/ideas.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/gsod2020/index/index.html
+++ b/docs/gsod2020/index/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/gsod2020/index.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/images/AllClients.jpg
+++ b/docs/images/AllClients.jpg
--- a/docs/images/DemoDesktop.png
+++ b/docs/images/DemoDesktop.png
--- a/docs/images/SubNotebooks.png
+++ b/docs/images/SubNotebooks.png
--- a/docs/index.html
+++ b/docs/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/README.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
@@ -839,9 +840,9 @@ Details:
 <td><code>notebook:books</code> limits the search scope within <code>books</code> and all its subnotebooks.<br><code>notebook:wheel*time</code> does a wildcard search.</td>
 </tr>
 <tr>
-<td><strong>created:</strong> <br> <strong>updated:</strong></td>
+<td><strong>created:</strong> <br> <strong>updated:</strong> <br> <strong>due:</strong></td>
 <td>Searches for notes created/updated on dates specified using YYYYMMDD format. You can also search relative to the current day, week, month, or year.</td>
-<td><code>created:20201218</code> will return notes created on or after December 18, 2020.<br><code>-updated:20201218</code> will return notes updated before December 18, 2020.<br><code>created:20200118 -created:20201215</code> will return notes created between January 18, 2020, and before December 15, 2020.<br><code>created:202001 -created:202003</code> will return notes created on or after January and before March 2020.<br><code>updated:1997 -updated:2020</code> will return all notes updated between the years 1997 and 2019.<br><code>created:day-2</code> searches for all notes created in the past two days.<br><code>updated:year-0</code> searches all notes updated in the current year.</td>
+<td><code>created:20201218</code> will return notes created on or after December 18, 2020.<br><code>-updated:20201218</code> will return notes updated before December 18, 2020.<br><code>created:20200118 -created:20201215</code> will return notes created between January 18, 2020, and before December 15, 2020.<br><code>created:202001 -created:202003</code> will return notes created on or after January and before March 2020.<br><code>updated:1997 -updated:2020</code> will return all notes updated between the years 1997 and 2019.<br><code>created:day-2</code> searches for all notes created in the past two days.<br><code>updated:year-0</code> searches all notes updated in the current year.<br><code>-due:day+7</code> will return all todos which are due or will be due in the next seven days.<br><code>-due:day-5</code> searches all todos that are overdue for more than 5 days.</td>
 </tr>
 <tr>
 <td><strong>type:</strong></td>
@@ -868,6 +869,11 @@ Details:
 <td>Filter by source URL</td>
 <td><code>sourceurl:https://www.google.com</code><br><code>sourceurl:*joplinapp.org</code> to perform a wildcard search.</td>
 </tr>
+<tr>
+<td><strong>id:</strong></td>
+<td>Filter by note ID</td>
+<td><code>id:9cbc1b4f242043a9b8a50627508bccd5</code> return a note with the specified id</td>
+</tr>
 </tbody>
 </table>
 <p>Note: In the CLI client you have to escape the query using <code>--</code> when using negated filters.<br>
@@ -881,7 +887,7 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <h2>Search order<a name="search-order" href="#search-order" class="heading-anchor">🔗</a></h2>
 <p>Notes are sorted by &quot;relevance&quot;. Currently it means the notes that contain the requested terms the most times are on top. For queries with multiple terms, it also matters how close to each other the terms are. This is a bit experimental so if you notice a search query that returns unexpected results, please report it in the forum, providing as many details as possible to replicate the issue.</p>
 <h1>Goto Anything<a name="goto-anything" href="#goto-anything" class="heading-anchor">🔗</a></h1>
-<p>In the desktop application, press <kbd>Ctrl+G</kbd> or <kbd>Cmd+G</kbd> and type a note title or part of its content to jump to it. Or type <kbd>#</kbd> followed by a tag name, or <kbd>@</kbd> followed by a notebook name.</p>
+<p>In the desktop application, press <kbd>Ctrl+P</kbd> or <kbd>Cmd+P</kbd> and type a note title or part of its content to jump to it. Or type <kbd>#</kbd> followed by a tag name, or <kbd>@</kbd> followed by a notebook name.</p>
 <h1>Privacy<a name="privacy" href="#privacy" class="heading-anchor">🔗</a></h1>
 <p>Joplin values your privacy and security by giving you complete control over your information and digital footprint.</p>
 <p>Joplin applications do not send any data to any service without your authorisation. Any data that Joplin saves, such as notes or images, are saved to your own device and you are free to delete this data at any time.</p>
@@ -982,7 +988,7 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/arableague.png" alt=""></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</a></td>
+<td><a href="mailto:Whaell@protonmail.com">Whaell O</a></td>
 <td>99%</td>
 </tr>
 <tr>
@@ -997,56 +1003,56 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <td>Bosnian (Bosna i Hercegovina)</td>
 <td><a href="https://github.com/laurent22/joplin/blob/dev/packages/tools/locales/bs_BA.po">bs_BA</a></td>
 <td><a href="mailto:dervis.t@pm.me">Derviš T.</a></td>
-<td>76%</td>
+<td>74%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/bg.png" alt=""></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>61%</td>
+<td>60%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/es/catalonia.png" alt=""></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>87%</td>
+<td>85%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/hr.png" alt=""></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>100%</td>
+<td>99%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/cz.png" alt=""></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:lukas@aiya.cz">Lukas Helebrandt</a></td>
-<td>90%</td>
+<td>89%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/dk.png" alt=""></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>75%</td>
+<td>96%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/de.png" alt=""></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@users.noreply.github.com">Ettore Atalan</a></td>
-<td>93%</td>
+<td><a href="mailto:atalanttore@googlemail.com">Atalanttore</a></td>
+<td>98%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/ee.png" alt=""></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>60%</td>
+<td>58%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/gb.png" alt=""></td>
@@ -1067,7 +1073,7 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <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:mario.campo@gmail.com">Mario Campo</a></td>
-<td>99%</td>
+<td>97%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/esperanto.png" alt=""></td>
@@ -1080,190 +1086,190 @@ Eg. <code>:search -- &quot;-tag:tag1&quot;</code>.</p>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/fi.png" alt=""></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></td>
-<td>91%</td>
+<td>mrkaato</td>
+<td>97%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/fr.png" alt=""></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>97%</td>
+<td>95%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/es/galicia.png" alt=""></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>40%</td>
+<td>39%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/id.png" alt=""></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:16875937+fathyar@users.noreply.github.com">Fathy AR</a></td>
-<td>95%</td>
+<td><a href="mailto:42007357+eresytter@users.noreply.github.com">eresytter</a></td>
+<td>96%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/it.png" alt=""></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:mailfilledwithspam@gmail.com">Alessandro Bernardello</a></td>
-<td>94%</td>
+<td>97%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/hu.png" alt=""></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>93%</td>
+<td>91%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/be.png" alt=""></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>97%</td>
+<td>95%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/nl.png" alt=""></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>91%</td>
+<td>98%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/no.png" alt=""></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>80%</td>
+<td>78%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/ir.png" alt=""></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>75%</td>
+<td>74%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/pl.png" alt=""></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>100%</td>
+<td>97%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/br.png" alt=""></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>100%</td>
+<td>97%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/pt.png" alt=""></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>100%</td>
+<td>97%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/ro.png" alt=""></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>70%</td>
+<td>68%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/si.png" alt=""></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></td>
-<td>39%</td>
+<td><a href="mailto:martin.korelic@protonmail.com">Martin Korelič</a></td>
+<td>99%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/se.png" alt=""></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>65%</td>
+<td>63%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/th.png" alt=""></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>48%</td>
+<td>47%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/vi.png" alt=""></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>77%</td>
+<td>75%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/tr.png" alt=""></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>99%</td>
+<td>97%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/ua.png" alt=""></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>100%</td>
+<td>97%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/gr.png" alt=""></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>87%</td>
+<td>85%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/ru.png" alt=""></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>99%</td>
+<td>97%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/rs.png" alt=""></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>75%</td>
+<td>73%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/cn.png" alt=""></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:zyangmath@gmail.com">Yang Zhang</a></td>
-<td>99%</td>
+<td>97%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/tw.png" alt=""></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:yaozeye@yahoo.co.jp">Yaoze Ye</a></td>
-<td>92%</td>
+<td>95%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/jp.png" alt=""></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>99%</td>
+<td>98%</td>
 </tr>
 <tr>
 <td><img src="https://joplinapp.org/images/flags/country-4x3/kr.png" alt=""></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>
-<td>100%</td>
+<td>97%</td>
 </tr>
 </tbody>
 </table>
--- a/docs/markdown/index.html
+++ b/docs/markdown/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/markdown.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/mobile/index.html
+++ b/docs/mobile/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/mobile.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/nextcloud_app/index.html
+++ b/docs/nextcloud_app/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/nextcloud_app.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/note_history/index.html
+++ b/docs/note_history/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/note_history.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/plugins/index.html
+++ b/docs/plugins/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/plugins.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/prereleases/index.html
+++ b/docs/prereleases/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/prereleases.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/privacy/index.html
+++ b/docs/privacy/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/privacy.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/rich_text_editor/index.html
+++ b/docs/rich_text_editor/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/rich_text_editor.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/schema/settings.json
+++ b/docs/schema/settings.json
@@ -17,7 +17,7 @@
 		"sync.target": {
 			"type": "integer",
 			"default": 7,
-			"description": "Synchronisation target",
+			"description": "Synchronisationsziel",
 			"enum": [
 				2,
 				3,
@@ -33,47 +33,52 @@
 			"default": 0,
 			"$comment": "private"
 		},
+		"sync.startupOperation": {
+			"type": "integer",
+			"default": 0,
+			"$comment": "private"
+		},
 		"sync.2.path": {
 			"type": "string",
 			"default": "",
-			"description": "Directory to synchronise with (absolute path). Attention: If you change this location, make sure you copy all your content to it before syncing, otherwise all files will be removed! See the FAQ for more details: https://joplinapp.org/faq/"
+			"description": "Verzeichnis, mit dem synchronisiert werden soll (absoluter Pfad). Attention: If you change this location, make sure you copy all your content to it before syncing, otherwise all files will be removed! See the FAQ for more details: https://joplinapp.org/faq/"
 		},
 		"sync.5.path": {
 			"type": "string",
 			"default": "",
-			"description": "Nextcloud WebDAV URL. Attention: If you change this location, make sure you copy all your content to it before syncing, otherwise all files will be removed! See the FAQ for more details: https://joplinapp.org/faq/"
+			"description": "Nextcloud-WebDAV-URL. Attention: If you change this location, make sure you copy all your content to it before syncing, otherwise all files will be removed! See the FAQ for more details: https://joplinapp.org/faq/"
 		},
 		"sync.5.username": {
 			"type": "string",
 			"default": "",
-			"description": "Nextcloud username"
+			"description": "Nextcloud-Benutzername"
 		},
 		"sync.5.password": {
 			"type": "string",
 			"default": "",
-			"description": "Nextcloud password",
+			"description": "Nextcloud-Passwort",
 			"$comment": "private"
 		},
 		"sync.6.path": {
 			"type": "string",
 			"default": "",
-			"description": "WebDAV URL. Attention: If you change this location, make sure you copy all your content to it before syncing, otherwise all files will be removed! See the FAQ for more details: https://joplinapp.org/faq/"
+			"description": "WebDAV-URL. Attention: If you change this location, make sure you copy all your content to it before syncing, otherwise all files will be removed! See the FAQ for more details: https://joplinapp.org/faq/"
 		},
 		"sync.6.username": {
 			"type": "string",
 			"default": "",
-			"description": "WebDAV username"
+			"description": "WebDAV-Benutzername"
 		},
 		"sync.6.password": {
 			"type": "string",
 			"default": "",
-			"description": "WebDAV password",
+			"description": "WebDAV-Passwort",
 			"$comment": "private"
 		},
 		"sync.8.path": {
 			"type": "string",
 			"default": "",
-			"description": "AWS S3 bucket. Attention: If you change this location, make sure you copy all your content to it before syncing, otherwise all files will be removed! See the FAQ for more details: https://joplinapp.org/faq/"
+			"description": "Amazon S3-Bucket. Attention: If you change this location, make sure you copy all your content to it before syncing, otherwise all files will be removed! See the FAQ for more details: https://joplinapp.org/faq/"
 		},
 		"sync.8.url": {
 			"type": "string",
@@ -83,33 +88,33 @@
 		"sync.8.username": {
 			"type": "string",
 			"default": "",
-			"description": "AWS key"
+			"description": "AWS-Schlüssel"
 		},
 		"sync.8.password": {
 			"type": "string",
 			"default": "",
-			"description": "AWS secret",
+			"description": "AWS-Geheimnis",
 			"$comment": "private"
 		},
 		"sync.9.path": {
 			"type": "string",
 			"default": "",
-			"description": "Joplin Server URL. Attention: If you change this location, make sure you copy all your content to it before syncing, otherwise all files will be removed! See the FAQ for more details: https://joplinapp.org/faq/"
+			"description": "Joplin-Server-URL. Attention: If you change this location, make sure you copy all your content to it before syncing, otherwise all files will be removed! See the FAQ for more details: https://joplinapp.org/faq/"
 		},
 		"sync.9.directory": {
 			"type": "string",
 			"default": "Apps/Joplin",
-			"description": "Joplin Server Directory"
+			"description": "Joplin-Server-Verzeichnis"
 		},
 		"sync.9.username": {
 			"type": "string",
 			"default": "",
-			"description": "Joplin Server username"
+			"description": "Joplin-Server-Benutzername"
 		},
 		"sync.9.password": {
 			"type": "string",
 			"default": "",
-			"description": "Joplin Server password",
+			"description": "Joplin-Server-Passwort",
 			"$comment": "private"
 		},
 		"sync.5.syncTargets": {
@@ -120,7 +125,7 @@
 		"sync.resourceDownloadMode": {
 			"type": "string",
 			"default": "always",
-			"description": "Attachment download behaviour. In \"Manual\" mode, attachments are downloaded only when you click on them. In \"Auto\", they are downloaded when you open the note. In \"Always\", all the attachments are downloaded whether you open the note or not.",
+			"description": "Verhalten für das Herunterladen von Anhängen. Im Modus „Manuell“ werden die Anhänge nur heruntergeladen, wenn du auf sie klickst. Bei „Automatisch“ werden sie heruntergeladen, sobald du die Notiz öffnest. Bei „Immer“ werden die Anhänge heruntergeladen, egal ob du die Notiz öffnest oder nicht.",
 			"enum": [
 				"always",
 				"manual",
@@ -195,7 +200,7 @@
 		"sync.maxConcurrentConnections": {
 			"type": "integer",
 			"default": 5,
-			"description": "Max concurrent connections",
+			"description": "Maximale Anzahl an gleichzeitigen Verbindungen",
 			"minimum": 1,
 			"maximum": 20
 		},
@@ -217,7 +222,7 @@
 		"locale": {
 			"type": "string",
 			"default": "en_GB",
-			"description": "Language",
+			"description": "Sprache",
 			"enum": [
 				"ar",
 				"eu",
@@ -265,7 +270,7 @@
 		"dateFormat": {
 			"type": "string",
 			"default": "DD/MM/YYYY",
-			"description": "Date format",
+			"description": "Datumsformat",
 			"enum": [
 				"DD/MM/YYYY",
 				"DD/MM/YY",
@@ -279,7 +284,7 @@
 		"timeFormat": {
 			"type": "string",
 			"default": "HH:mm",
-			"description": "Time format",
+			"description": "Zeitformat",
 			"enum": [
 				"HH:mm",
 				"h:mm A"
@@ -288,7 +293,7 @@
 		"theme": {
 			"type": "integer",
 			"default": 1,
-			"description": "Theme",
+			"description": "Design",
 			"enum": [
 				1,
 				2,
@@ -303,12 +308,12 @@
 		"themeAutoDetect": {
 			"type": "boolean",
 			"default": false,
-			"description": "Automatically switch theme to match system theme"
+			"description": "Automatisch das Design ändern, um es dem System-Design anzupassen"
 		},
 		"preferredLightTheme": {
 			"type": "integer",
 			"default": 1,
-			"description": "Preferred light theme",
+			"description": "Bevorzugtes helles Design",
 			"enum": [
 				1,
 				2,
@@ -323,7 +328,7 @@
 		"preferredDarkTheme": {
 			"type": "integer",
 			"default": 2,
-			"description": "Preferred dark theme",
+			"description": "Bevorzugtes dunkles Design",
 			"enum": [
 				1,
 				2,
@@ -343,7 +348,7 @@
 		"showNoteCounts": {
 			"type": "boolean",
 			"default": true,
-			"description": "Show note counts",
+			"description": "Notizanzahl anzeigen",
 			"$comment": "private"
 		},
 		"layoutButtonSequence": {
@@ -360,17 +365,17 @@
 		"uncompletedTodosOnTop": {
 			"type": "boolean",
 			"default": true,
-			"description": "Uncompleted to-dos on top"
+			"description": "Unvollständige Aufgaben oben"
 		},
 		"showCompletedTodos": {
 			"type": "boolean",
 			"default": true,
-			"description": "Show completed to-dos"
+			"description": "Abgeschlossene Aufgaben anzeigen"
 		},
 		"notes.sortOrder.field": {
 			"type": "string",
 			"default": "user_updated_time",
-			"description": "Sort notes by",
+			"description": "Sortiere Notizen nach",
 			"enum": [
 				"user_updated_time",
 				"user_created_time",
@@ -381,17 +386,17 @@
 		"editor.autoMatchingBraces": {
 			"type": "boolean",
 			"default": true,
-			"description": "Auto-pair braces, parenthesis, quotations, etc."
+			"description": "Automatisches Hinzufügen von geschweiften Klammern, runden Klammern, Anführungszeichen usw."
 		},
 		"notes.sortOrder.reverse": {
 			"type": "boolean",
 			"default": true,
-			"description": "Reverse sort order"
+			"description": "Sortierreihenfolge umkehren"
 		},
 		"folders.sortOrder.field": {
 			"type": "string",
 			"default": "title",
-			"description": "Sort notebooks by",
+			"description": "Notizbücher sortieren nach",
 			"enum": [
 				"title",
 				"last_note_user_updated_time"
@@ -400,12 +405,12 @@
 		"folders.sortOrder.reverse": {
 			"type": "boolean",
 			"default": false,
-			"description": "Reverse sort order"
+			"description": "Sortierreihenfolge umkehren"
 		},
 		"trackLocation": {
 			"type": "boolean",
 			"default": true,
-			"description": "Save geo-location with notes"
+			"description": "Momentanen Standort zusammen mit Notizen speichern"
 		},
 		"editor.beta": {
 			"type": "boolean",
@@ -416,7 +421,7 @@
 		"newTodoFocus": {
 			"type": "string",
 			"default": "title",
-			"description": "When creating a new to-do:",
+			"description": "Wenn eine neue Aufgabe erstellt wird:",
 			"enum": [
 				"title",
 				"body"
@@ -425,7 +430,7 @@
 		"newNoteFocus": {
 			"type": "string",
 			"default": "body",
-			"description": "When creating a new note:",
+			"description": "Wenn eine neue Notiz erstellt wird:",
 			"enum": [
 				"title",
 				"body"
@@ -454,107 +459,107 @@
 		"markdown.plugin.softbreaks": {
 			"type": "boolean",
 			"default": false,
-			"description": "Enable soft breaks"
+			"description": "Weiche Zeilenumbrüche aktivieren"
 		},
 		"markdown.plugin.typographer": {
 			"type": "boolean",
 			"default": false,
-			"description": "Enable typographer support"
+			"description": "Typographie-Unterstützung aktivieren"
 		},
 		"markdown.plugin.linkify": {
 			"type": "boolean",
 			"default": true,
-			"description": "Enable Linkify"
+			"description": "Linkify aktivieren"
 		},
 		"markdown.plugin.katex": {
 			"type": "boolean",
 			"default": true,
-			"description": "Enable math expressions"
+			"description": "Mathematische Ausdrücke aktivieren"
 		},
 		"markdown.plugin.fountain": {
 			"type": "boolean",
 			"default": false,
-			"description": "Enable Fountain syntax support"
+			"description": "Fountain-Syntaxunterstützung aktivieren"
 		},
 		"markdown.plugin.mermaid": {
 			"type": "boolean",
 			"default": true,
-			"description": "Enable Mermaid diagrams support"
+			"description": "Mermaid-Diagrammunterstützung aktivieren"
 		},
 		"markdown.plugin.audioPlayer": {
 			"type": "boolean",
 			"default": true,
-			"description": "Enable audio player"
+			"description": "Audiospieler aktivieren"
 		},
 		"markdown.plugin.videoPlayer": {
 			"type": "boolean",
 			"default": true,
-			"description": "Enable video player"
+			"description": "Videospieler aktivieren"
 		},
 		"markdown.plugin.pdfViewer": {
 			"type": "boolean",
 			"default": true,
-			"description": "Enable PDF viewer"
+			"description": "PDF-Betrachter aktivieren"
 		},
 		"markdown.plugin.mark": {
 			"type": "boolean",
 			"default": true,
-			"description": "Enable ==mark== syntax"
+			"description": "Syntax ==mark== aktivieren"
 		},
 		"markdown.plugin.footnote": {
 			"type": "boolean",
 			"default": true,
-			"description": "Enable footnotes"
+			"description": "Fußnoten aktivieren"
 		},
 		"markdown.plugin.toc": {
 			"type": "boolean",
 			"default": true,
-			"description": "Enable table of contents extension"
+			"description": "Inhaltsverzeichnis-Erweiterung aktivieren"
 		},
 		"markdown.plugin.sub": {
 			"type": "boolean",
 			"default": false,
-			"description": "Enable ~sub~ syntax"
+			"description": "Syntax ~sub~ aktivieren"
 		},
 		"markdown.plugin.sup": {
 			"type": "boolean",
 			"default": false,
-			"description": "Enable ^sup^ syntax"
+			"description": "Syntax ^sup^ aktivieren"
 		},
 		"markdown.plugin.deflist": {
 			"type": "boolean",
 			"default": false,
-			"description": "Enable deflist syntax"
+			"description": "Syntax deflist aktivieren"
 		},
 		"markdown.plugin.abbr": {
 			"type": "boolean",
 			"default": false,
-			"description": "Enable abbreviation syntax"
+			"description": "Abkürzungssyntax aktivieren"
 		},
 		"markdown.plugin.emoji": {
 			"type": "boolean",
 			"default": false,
-			"description": "Enable markdown emoji"
+			"description": "Markdown Emoji aktivieren"
 		},
 		"markdown.plugin.insert": {
 			"type": "boolean",
 			"default": false,
-			"description": "Enable ++insert++ syntax"
+			"description": "Syntax ++insert++ aktivieren"
 		},
 		"markdown.plugin.multitable": {
 			"type": "boolean",
 			"default": false,
-			"description": "Enable multimarkdown table extension"
+			"description": "Multimarkdown Tabellenerweiterung aktivieren"
 		},
 		"showTrayIcon": {
 			"type": "boolean",
 			"default": true,
-			"description": "Show tray icon. This will allow Joplin to run in the background. It is recommended to enable this setting so that your notes are constantly being synchronised, thus reducing the number of conflicts."
+			"description": "Taskleistensymbol anzeigen. Dadurch kann Joplin im Hintergrund laufen. Es wird empfohlen, diese Einstellung zu aktivieren, damit deine Notizen ständig synchronisiert werden und somit die Anzahl der Konflikte reduziert wird."
 		},
 		"startMinimized": {
 			"type": "boolean",
 			"default": false,
-			"description": "Start application minimised in the tray icon"
+			"description": "Anwendung minimiert als Taskleistensymbol starten"
 		},
 		"collapsedFolderIds": {
 			"type": "array",
@@ -606,19 +611,19 @@
 		"style.editor.fontSize": {
 			"type": "integer",
 			"default": 13,
-			"description": "Editor font size",
+			"description": "Schriftgröße im Editor",
 			"minimum": 4,
 			"maximum": 50
 		},
 		"style.editor.fontFamily": {
 			"type": "string",
 			"default": "",
-			"description": "Editor font family. If the font is incorrect or empty, it will default to a generic monospace font."
+			"description": "Schriftfamilie im Editor. Used for most text in the markdown editor. If not found, a generic proportional (variable width) font is used."
 		},
 		"style.editor.monospaceFontFamily": {
 			"type": "string",
 			"default": "",
-			"description": "Editor monospace font family. This should be a *monospace* font or some elements will render incorrectly. If the font is incorrect or empty, it will default to a generic monospace font."
+			"description": "Nichtproportionale Schriftfamilie im Editor. Used where a fixed width font is needed to lay out text legibly (e.g. tables, checkboxes, code). If not found, a generic monospace (fixed width) font is used."
 		},
 		"ui.layout": {
 			"type": "object",
@@ -628,12 +633,12 @@
 		"autoUpdateEnabled": {
 			"type": "boolean",
 			"default": false,
-			"description": "Automatically update the application"
+			"description": "Die Anwendung automatisch aktualisieren"
 		},
 		"autoUpdate.includePreReleases": {
 			"type": "boolean",
 			"default": false,
-			"description": "Get pre-releases when checking for updates. See the pre-release page for more details: https://joplinapp.org/prereleases"
+			"description": "Bei der Suche nach Aktualisierungen Vorabveröffentlichungen erhalten. Weitere Informationen findest Du auf der Vorabversionsseite: https://joplinapp.org/prereleases"
 		},
 		"clipperServer.autoStart": {
 			"type": "boolean",
@@ -643,7 +648,7 @@
 		"sync.interval": {
 			"type": "integer",
 			"default": 300,
-			"description": "Synchronisation interval",
+			"description": "Synchronisationsintervall",
 			"enum": [
 				0,
 				300,
@@ -657,7 +662,7 @@
 		"sync.mobileWifiOnly": {
 			"type": "boolean",
 			"default": false,
-			"description": "Synchronise only over WiFi connection"
+			"description": "Nur über WiFi-Verbindung synchronisieren"
 		},
 		"noteVisiblePanes": {
 			"type": "array",
@@ -680,12 +685,12 @@
 		"editor": {
 			"type": "string",
 			"default": "",
-			"description": "Text editor command. The editor command (may include arguments) that will be used to open a note. If none is provided it will try to auto-detect the default editor."
+			"description": "Texteditor-Befehl. Der Editor-Befehl (kann Kommandozeilenargumente enthalten), der zum Öffnen einer Notiz verwendet wird. Wenn keiner angegeben wird, wird versucht, den Standard-Editor automatisch zu erkennen."
 		},
 		"export.pdfPageSize": {
 			"type": "string",
 			"default": "A4",
-			"description": "Page size for PDF export",
+			"description": "Seitengröße für den PDF-Export",
 			"enum": [
 				"A4",
 				"Letter",
@@ -698,7 +703,7 @@
 		"export.pdfPageOrientation": {
 			"type": "string",
 			"default": "portrait",
-			"description": "Page orientation for PDF export",
+			"description": "Seitenausrichtung für den PDF-Export",
 			"enum": [
 				"portrait",
 				"landscape"
@@ -707,7 +712,7 @@
 		"editor.keyboardMode": {
 			"type": "string",
 			"default": "",
-			"description": "Keyboard Mode",
+			"description": "Tastatur-Modus",
 			"enum": [
 				"",
 				"emacs",
@@ -723,17 +728,17 @@
 		"net.customCertificates": {
 			"type": "string",
 			"default": "",
-			"description": "Custom TLS certificates. Comma-separated list of paths to directories to load the certificates from, or path to individual cert files. For example: /my/cert_dir, /other/custom.pem. Note that if you make changes to the TLS settings, you must save your changes before clicking on \"Check synchronisation configuration\"."
+			"description": "Benutzerdefinierte TLS-Zertifikate. Kommagetrennte Liste von Pfaden zu Verzeichnissen, aus denen die Zertifikate geladen werden, oder Pfad zu einzelnen Zertifikatsdateien. Zum Beispiel: /my/cert_dir, /other/custom.pem. Wenn du Änderungen an den TLS-Einstellungen vornimmst, musst du deine Änderungen speichern, bevor du auf „Synchronisierungskonfiguration prüfen“ klickst."
 		},
 		"net.ignoreTlsErrors": {
 			"type": "boolean",
 			"default": false,
-			"description": "Ignore TLS certificate errors"
+			"description": "TLS-Zertifikatfehler ignorieren"
 		},
 		"sync.wipeOutFailSafe": {
 			"type": "boolean",
 			"default": true,
-			"description": "Fail-safe. Fail-safe: Do not wipe out local data when sync target is empty (often the result of a misconfiguration or bug)"
+			"description": "Ausfallsicher. Ausfallsicher: Lösche nicht die lokalen Daten, wenn das Synchronisationsziel leer ist (oft ein Resultat von Fehlkonfiguration oder einem Programmfehler)"
 		},
 		"api.token": {
 			"type": "string",
@@ -743,7 +748,7 @@
 		"api.port": {
 			"type": "integer",
 			"default": null,
-			"description": "Specify the port that should be used by the API server. If not set, a default will be used."
+			"description": "Spezifiziere den Port, der vom API-Server verwendet werden soll. Wenn er nicht gesetzt ist, wird ein Standardwert verwendet."
 		},
 		"resourceService.lastProcessedChangeId": {
 			"type": "integer",
@@ -768,12 +773,12 @@
 		"revisionService.enabled": {
 			"type": "boolean",
 			"default": true,
-			"description": "Enable note history"
+			"description": "Notizenverlauf aktivieren"
 		},
 		"revisionService.ttlDays": {
 			"type": "integer",
 			"default": 90,
-			"description": "Keep note history for",
+			"description": "Notizenverlauf speichern für",
 			"minimum": 1,
 			"maximum": 730
 		},
@@ -827,17 +832,22 @@
 		"layout.folderList.factor": {
 			"type": "integer",
 			"default": 1,
-			"description": "Notebook list growth factor. The factor property sets how the item will grow or shrink to fit the available space in its container with respect to the other items. Thus an item with a factor of 2 will take twice as much space as an item with a factor of 1.Restart app to see changes."
+			"description": "Notizbuch-Listenwachstumsfaktor. Die Faktor-Eigenschaft legt fest, wie der Artikel wächst oder schrumpft, um dem verfügbaren Platz in seinem Container in Bezug auf die anderen Artikel zu entsprechen. Ein Element mit dem Faktor 2 benötigt also doppelt so viel Platz wie ein Element mit dem Faktor 1. Starten Sie die App neu, um Änderungen zu sehen."
 		},
 		"layout.noteList.factor": {
 			"type": "integer",
 			"default": 1,
-			"description": "Note list growth factor. The factor property sets how the item will grow or shrink to fit the available space in its container with respect to the other items. Thus an item with a factor of 2 will take twice as much space as an item with a factor of 1.Restart app to see changes."
+			"description": "Notiz-Listenwachstumsfaktor. Die Faktor-Eigenschaft legt fest, wie der Artikel wächst oder schrumpft, um dem verfügbaren Platz in seinem Container in Bezug auf die anderen Artikel zu entsprechen. Ein Element mit dem Faktor 2 benötigt also doppelt so viel Platz wie ein Element mit dem Faktor 1. Starten Sie die App neu, um Änderungen zu sehen."
 		},
 		"layout.note.factor": {
 			"type": "integer",
 			"default": 2,
-			"description": "Note area growth factor. The factor property sets how the item will grow or shrink to fit the available space in its container with respect to the other items. Thus an item with a factor of 2 will take twice as much space as an item with a factor of 1.Restart app to see changes."
+			"description": "Notiz-Flächenwachstumsfaktor. Die Faktor-Eigenschaft legt fest, wie der Artikel wächst oder schrumpft, um dem verfügbaren Platz in seinem Container in Bezug auf die anderen Artikel zu entsprechen. Ein Element mit dem Faktor 2 benötigt also doppelt so viel Platz wie ein Element mit dem Faktor 1. Starten Sie die App neu, um Änderungen zu sehen."
+		},
+		"isSafeMode": {
+			"type": "boolean",
+			"default": false,
+			"$comment": "private"
 		}
 	}
 }
--- a/docs/spec/e2ee/index.html
+++ b/docs/spec/e2ee/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/e2ee.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/spec/history/index.html
+++ b/docs/spec/history/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/history.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/spec/plugins/index.html
+++ b/docs/spec/plugins/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/plugins.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/spec/search_sorting/index.html
+++ b/docs/spec/search_sorting/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/search_sorting.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/spec/server_delta_sync/index.html
+++ b/docs/spec/server_delta_sync/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/server_delta_sync.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/spec/server_file_url_format/index.html
+++ b/docs/spec/server_file_url_format/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/server_file_url_format.
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/spec/server_sharing/index.html
+++ b/docs/spec/server_sharing/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/server_sharing.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/spec/sync_lock/index.html
+++ b/docs/spec/sync_lock/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/spec/sync_lock.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/stats/index.html
+++ b/docs/stats/index.html
--- a/docs/terminal/index.html
+++ b/docs/terminal/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/terminal.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/welcome/1_welcome_to_joplin/index.html
+++ b/docs/welcome/1_welcome_to_joplin/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/welcome/1_welcome_to_joplin.
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/welcome/2_importing_and_exporting_notes/index.html
+++ b/docs/welcome/2_importing_and_exporting_notes/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/welcome/2_importing_and_expo
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/welcome/3_synchronising_your_notes/index.html
+++ b/docs/welcome/3_synchronising_your_notes/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/welcome/3_synchronising_your
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/welcome/4_tips/index.html
+++ b/docs/welcome/4_tips/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/welcome/4_tips.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/docs/welcome/5_privacy/index.html
+++ b/docs/welcome/5_privacy/index.html
@@ -363,6 +363,7 @@ https://github.com/laurent22/joplin/blob/dev/readme/welcome/5_privacy.md
 <li><a href="https://joplinapp.org/api/references/rest_api/">Data API</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_manifest/">Plugin manifest</a></li>
 <li><a href="https://joplinapp.org/api/references/plugin_loading_rules/">Plugin loading rules</a></li>
+<li><a href="https://joplinapp.org/api/references/plugin_theming/">Plugin theming</a></li>
 </ul>
 </li>
 <li>
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
  },
  "license": "MIT",
  "scripts": {
+    "audit": "lerna-audit",
    "bootstrap": "lerna bootstrap --no-ci",
    "bootstrapIgnoreScripts": "lerna bootstrap --ignore-scripts --no-ci",
    "bootstrapServerOnly": "lerna bootstrap --no-ci --include-dependents --include-dependencies --scope @joplin/server",
@@ -62,8 +63,9 @@
    "gulp": "^4.0.2",
    "husky": "^3.0.2",
    "lerna": "^3.22.1",
+    "lerna-audit": "^1.3.2",
    "lint-staged": "^9.2.1",
-    "madge": "^4.0.0",
+    "madge": "^4.0.2",
    "typedoc": "^0.17.8",
    "typescript": "^4.0.5"
  }
--- a/packages/app-cli/package-lock.json
+++ b/packages/app-cli/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "joplin",
-  "version": "1.7.0",
+  "version": "1.8.0",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -4074,9 +4074,9 @@
      }
    },
    "hosted-git-info": {
-      "version": "2.8.5",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz",
-      "integrity": "sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==",
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
      "dev": true
    },
    "html-encoding-sniffer": {
@@ -4170,9 +4170,9 @@
      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
    },
    "ini": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
-      "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4="
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
    },
    "interpret": {
      "version": "1.2.0",
@@ -4666,8 +4666,7 @@
        },
        "y18n": {
          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-          "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+          "resolved": "",
          "dev": true
        },
        "yargs": {
@@ -5464,9 +5463,9 @@
          }
        },
        "y18n": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-          "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+          "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
          "dev": true
        },
        "yargs": {
@@ -5989,9 +5988,9 @@
      }
    },
    "lodash": {
-      "version": "4.17.20",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-      "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
      "dev": true
    },
    "lodash.sortby": {
@@ -7023,9 +7022,9 @@
      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
    },
    "querystringify": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
-      "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA=="
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
    },
    "rc": {
      "version": "1.2.8",
@@ -8587,9 +8586,9 @@
      }
    },
    "url-parse": {
-      "version": "1.4.7",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
-      "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.1.tgz",
+      "integrity": "sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==",
      "requires": {
        "querystringify": "^2.1.1",
        "requires-port": "^1.0.0"
--- a/packages/app-clipper/popup/package-lock.json
+++ b/packages/app-clipper/popup/package-lock.json
--- a/packages/app-clipper/popup/package.json
+++ b/packages/app-clipper/popup/package.json
@@ -41,7 +41,7 @@
    "react-redux": "^5.0.7",
    "redux": "^4.0.0",
    "resolve": "1.15.0",
-    "resolve-url-loader": "3.1.1",
+    "resolve-url-loader": "^3.1.3",
    "sass-loader": "8.0.2",
    "semver": "6.3.0",
    "style-loader": "1.1.3",
@@ -49,7 +49,7 @@
    "ts-pnp": "1.1.5",
    "url-loader": "2.3.0",
    "webpack": "4.41.5",
-    "webpack-dev-server": "3.10.1",
+    "webpack-dev-server": "^3.11.2",
    "webpack-manifest-plugin": "2.2.0",
    "workbox-webpack-plugin": "4.3.1"
  },
@@ -61,7 +61,7 @@
    "postinstall": "node postinstall.js && npm run build"
  },
  "devDependencies": {
-    "cra-build-watch": "^3.2.0",
+    "cra-build-watch": "^3.4.0",
    "fs-extra": "^6.0.1",
    "react-scripts": "^3.3.1"
  },
--- a/packages/app-desktop/checkForUpdates.js
+++ b/packages/app-desktop/checkForUpdates.js
@@ -29,41 +29,61 @@ function onCheckEnded() {
 	isCheckingForUpdate_ = false;
 }

+function getMajorMinorTagName(tagName) {
+	const s = tagName.split('.');
+	s.pop();
+	return s.join('.');
+}
+
 async function fetchLatestRelease(options) {
 	options = Object.assign({}, { includePreReleases: false }, options);

-	let json = null;
+	const response = await fetch('https://api.github.com/repos/laurent22/joplin/releases');

-	if (options.includePreReleases) {
-		// This end-point will include all releases, including pre-releases (but not draft), so we take
-		// whatever is the latest release. It might be the same as releases/latest, or it might be
-		// a pre-release.
-		const response = await fetch('https://api.github.com/repos/laurent22/joplin/releases');
-
-		if (!response.ok) {
-			const responseText = await response.text();
-			throw new Error(`Cannot get latest release info: ${responseText.substr(0,500)}`);
-		}
-
-		json = await response.json();
-		if (!json.length) throw new Error('Cannot get latest release info (JSON)');
-		json = json[0];
-	} else {
-		const response = await fetch('https://api.github.com/repos/laurent22/joplin/releases/latest');
-
-		if (!response.ok) {
-			const responseText = await response.text();
-			throw new Error(`Cannot get latest release info: ${responseText.substr(0,500)}`);
-		}
-
-		json = await response.json();
+	if (!response.ok) {
+		const responseText = await response.text();
+		throw new Error(`Cannot get latest release info: ${responseText.substr(0,500)}`);
+	}
+
+	const releases = await response.json();
+	if (!releases.length) throw new Error('Cannot get latest release info (JSON)');
+
+	let release = null;
+
+	if (options.includePreReleases) {
+		release = releases[0];
+	} else {
+		for (const r of releases) {
+			if (!r.prerelease) {
+				release = r;
+				break;
+			}
+		}
+	}
+
+	if (!release) throw new Error('Could not get tag name');
+
+	const version = release.tag_name.substr(1);
+
+	// We concatenate all the release notes of the major/minor versions
+	// corresponding to the latest version. For example, if the latest version
+	// is 1.8.3, we concatenate all the 1.8.x versions. This is so that no
+	// matter from which version you upgrade, you always see the full changes,
+	// with the latest changes being on top.
+
+	const fullReleaseNotes = [];
+	const majorMinorTagName = getMajorMinorTagName(release.tag_name);
+
+	for (const release of releases) {
+		if (getMajorMinorTagName(release.tag_name) === majorMinorTagName) {
+			fullReleaseNotes.push(release.body.trim());
+		}
 	}

-	const version = json.tag_name.substr(1);
 	let downloadUrl = null;
 	const platform = process.platform;
-	for (let i = 0; i < json.assets.length; i++) {
-		const asset = json.assets[i];
+	for (let i = 0; i < release.assets.length; i++) {
+		const asset = release.assets[i];
 		let found = false;
 		const ext = fileExtension(asset.name);
 		if (platform === 'win32' && ext === 'exe') {
@@ -84,12 +104,28 @@ async function fetchLatestRelease(options) {
 		}
 	}

+	function cleanUpReleaseNotes(releaseNotes) {
+		const lines = releaseNotes.join('\n\n* * *\n\n').split('\n');
+		const output = [];
+		for (const line of lines) {
+			const r = line
+				.replace(/\(#.* by .*\)/g, '') // Removes issue numbers and names - (#3157 by [@user](https://github.com/user))
+				.replace(/\([0-9a-z]{7}\)/g, '') // Removes commits - "sync state or data (a6caa35)"
+				.replace(/\(#[0-9]+\)/g, '') // Removes issue numbers - "(#4727)"
+				.replace(/ {2}/g, ' ')
+				.trim();
+
+			output.push(r);
+		}
+		return output.join('\n');
+	}
+
 	return {
 		version: version,
 		downloadUrl: downloadUrl,
-		notes: json.body,
-		pageUrl: json.html_url,
-		prerelease: json.prerelease,
+		notes: cleanUpReleaseNotes(fullReleaseNotes),
+		pageUrl: release.html_url,
+		prerelease: release.prerelease,
 	};
 }

@@ -151,13 +187,13 @@ function checkForUpdates(inBackground, window, logFilePath, options) {
 				type: 'info',
 				message: `${_('An update is available, do you want to download it now?')}`,
 				detail: `${_('Your version: %s', packageInfo.version)}\n${_('New version: %s', newVersionString)}${releaseNotes}`,
-				buttons: [_('Download'), _('Cancel')].concat(truncateReleaseNotes ? [_('Full Release Notes')] : []),
+				buttons: [_('Download'), _('Cancel'), _('Full changelog')],
 				cancelId: 1,
 			});

 			const buttonIndex = result.response;
 			if (buttonIndex === 0) require('electron').shell.openExternal(release.downloadUrl ? release.downloadUrl : release.pageUrl);
-			if (buttonIndex === 2) require('electron').shell.openExternal(release.pageUrl);
+			if (buttonIndex === 2) require('electron').shell.openExternal('https://joplinapp.org/changelog/');
 		}
 	}).catch(error => {
 		autoUpdateLogger_.error(error);
--- a/packages/app-desktop/gui/NoteEditor/utils/resourceHandling.ts
+++ b/packages/app-desktop/gui/NoteEditor/utils/resourceHandling.ts
@@ -5,7 +5,6 @@ import BaseModel from '@joplin/lib/BaseModel';
 import Resource from '@joplin/lib/models/Resource';
 const bridge = require('electron').remote.require('./bridge').default;
 import ResourceFetcher from '@joplin/lib/services/ResourceFetcher';
-import { reg } from '@joplin/lib/registry';
 import htmlUtils from '@joplin/lib/htmlUtils';
 import Logger from '@joplin/lib/Logger';
 const joplinRendererUtils = require('@joplin/renderer').utils;
@@ -14,6 +13,8 @@ const mimeUtils = require('@joplin/lib/mime-utils.js').mime;
 const md5 = require('md5');
 const path = require('path');

+const logger = Logger.create('resourceHandling');
+
 export async function handleResourceDownloadMode(noteBody: string) {
 	if (noteBody && Setting.value('sync.resourceDownloadMode') === 'auto') {
 		const resourceIds = await Note.linkedResourceIds(noteBody);
@@ -72,21 +73,21 @@ export async function commandAttachFileToBody(body: string, filePaths: string[]
 	for (let i = 0; i < filePaths.length; i++) {
 		const filePath = filePaths[i];
 		try {
-			reg.logger().info(`Attaching ${filePath}`);
+			logger.info(`Attaching ${filePath}`);
 			const newBody = await shim.attachFileToNoteBody(body, filePath, options.position, {
 				createFileURL: options.createFileURL,
 				resizeLargeImages: 'ask',
 			});

 			if (!newBody) {
-				reg.logger().info('File attachment was cancelled');
+				logger.info('File attachment was cancelled');
 				return null;
 			}

 			body = newBody;
-			reg.logger().info('File was attached.');
+			logger.info('File was attached.');
 		} catch (error) {
-			reg.logger().error(error);
+			logger.error(error);
 			bridge().showErrorMessageBox(error.message);
 		}
 	}
@@ -141,25 +142,24 @@ export async function processPastedHtml(html: string) {
 		if (!mappedResources[imageSrc]) {
 			try {
 				if (imageSrc.startsWith('file')) {
-					const imageFilePath = path.normalize(imageSrc.substr(7));
+					const imageFilePath = path.normalize(unescape(imageSrc).substr(7));
 					const resourceDirPath = path.normalize(Setting.value('resourceDir'));

 					if (imageFilePath.startsWith(resourceDirPath)) {
 						mappedResources[imageSrc] = imageSrc;
 					} else {
 						const createdResource = await shim.createResourceFromPath(imageFilePath);
-						mappedResources[imageSrc] = `file://${Resource.fullPath(createdResource)}`;
+						mappedResources[imageSrc] = `file://${escape(Resource.fullPath(createdResource))}`;
 					}
 				} else {
 					const filePath = `${Setting.value('tempDir')}/${md5(Date.now() + Math.random())}`;
 					await shim.fetchBlob(imageSrc, { path: filePath });
 					const createdResource = await shim.createResourceFromPath(filePath);
 					await shim.fsDriver().remove(filePath);
-					mappedResources[imageSrc] = `file://${Resource.fullPath(createdResource)}`;
+					mappedResources[imageSrc] = `file://${escape(Resource.fullPath(createdResource))}`;
 				}
-			} catch (err) {
-				const logger = Logger.create('resourceHandling');
-				logger.warn(`Error creating a resource for ${imageSrc}.`, err);
+			} catch (error) {
+				logger.warn(`Error creating a resource for ${imageSrc}.`, error);
 				mappedResources[imageSrc] = imageSrc;
 			}
 		}
--- a/packages/app-desktop/package-lock.json
+++ b/packages/app-desktop/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "@joplin/app-desktop",
-  "version": "1.8.3",
+  "version": "1.8.4",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -944,9 +944,9 @@
      },
      "dependencies": {
        "lodash": {
-          "version": "4.17.19",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
        },
        "to-fast-properties": {
          "version": "2.0.0",
@@ -1008,9 +1008,9 @@
      }
    },
    "@electron/get": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.12.2.tgz",
-      "integrity": "sha512-vAuHUbfvBQpYTJ5wB7uVIDq5c/Ry0fiTBMs7lnEYAo/qXXppIVcWdfBr57u6eRnKdVso7KSiH6p/LbQAG6Izrg==",
+      "version": "1.12.4",
+      "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.12.4.tgz",
+      "integrity": "sha512-6nr9DbJPUR9Xujw6zD3y+rS95TyItEVM0NVjt1EehY2vUWfIgPiIPVHxCvaTS0xr2B+DRxovYVKbuOWqC35kjg==",
      "dev": true,
      "requires": {
        "debug": "^4.1.1",
@@ -1020,7 +1020,7 @@
        "global-tunnel-ng": "^2.7.1",
        "got": "^9.6.0",
        "progress": "^2.0.3",
-        "sanitize-filename": "^1.6.2",
+        "semver": "^6.2.0",
        "sumchecker": "^3.0.1"
      },
      "dependencies": {
@@ -1045,9 +1045,9 @@
          }
        },
        "graceful-fs": {
-          "version": "4.2.4",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-          "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+          "version": "4.2.6",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
+          "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==",
          "dev": true
        },
        "ms": {
@@ -1055,6 +1055,12 @@
          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
          "dev": true
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
        }
      }
    },
@@ -2098,9 +2104,9 @@
      "dev": true
    },
    "@types/fs-extra": {
-      "version": "9.0.4",
-      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.4.tgz",
-      "integrity": "sha512-50GO5ez44lxK5MDH90DYHFFfqxH7+fTqEEnvguQRzJ/tY9qFrMSHLiYHite+F3SNmf7+LHC1eMXojuD+E3Qcyg==",
+      "version": "9.0.11",
+      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.11.tgz",
+      "integrity": "sha512-mZsifGG4QeQ7hlkhO56u7zt/ycBgGxSVsFI/6lGTU34VtwkiqrrSDgw0+ygs8kFGWcXnFQWMrzF2h7TtDFNixA==",
      "dev": true,
      "requires": {
        "@types/node": "*"
@@ -2562,21 +2568,21 @@
          }
        },
        "fs-extra": {
-          "version": "9.0.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz",
-          "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==",
+          "version": "9.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+          "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
          "dev": true,
          "requires": {
            "at-least-node": "^1.0.0",
            "graceful-fs": "^4.2.0",
            "jsonfile": "^6.0.1",
-            "universalify": "^1.0.0"
+            "universalify": "^2.0.0"
          }
        },
        "graceful-fs": {
-          "version": "4.2.4",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-          "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+          "version": "4.2.6",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
+          "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==",
          "dev": true
        },
        "jsonfile": {
@@ -2587,14 +2593,6 @@
          "requires": {
            "graceful-fs": "^4.1.6",
            "universalify": "^2.0.0"
-          },
-          "dependencies": {
-            "universalify": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-              "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-              "dev": true
-            }
          }
        },
        "ms": {
@@ -2604,15 +2602,18 @@
          "dev": true
        },
        "semver": {
-          "version": "7.3.2",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-          "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
-          "dev": true
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
        },
        "universalify": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
-          "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==",
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+          "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
          "dev": true
        }
      }
@@ -2769,11 +2770,6 @@
      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
      "dev": true
    },
-    "asap": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
-    },
    "asn1": {
      "version": "0.2.3",
      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
@@ -3203,8 +3199,7 @@
            },
            "ini": {
              "version": "1.3.5",
-              "resolved": false,
-              "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+              "resolved": "",
              "dev": true,
              "optional": true
            },
@@ -3265,8 +3260,7 @@
            },
            "mkdirp": {
              "version": "0.5.1",
-              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-              "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+              "resolved": "",
              "dev": true,
              "optional": true,
              "requires": {
@@ -3431,8 +3425,7 @@
              "dependencies": {
                "minimist": {
                  "version": "1.2.0",
-                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-                  "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+                  "resolved": "",
                  "dev": true,
                  "optional": true
                }
@@ -4283,9 +4276,9 @@
      }
    },
    "boolean": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.2.tgz",
-      "integrity": "sha512-RwywHlpCRc3/Wh81MiCKun4ydaIFyW5Ea6JbL6sRCVx5q5irDw7pMXBUFYF/jArQ6YrG36q0kpovc9P/Kd3I4g==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.3.tgz",
+      "integrity": "sha512-EqrTKXQX6Z3A2nRmMEIlAIfjQOgFnVO2nqZGpbcsPnYGWBwpFqzlrozU1dy+S2iqfYDLh26ef4KrgTxu9xQrxA==",
      "dev": true,
      "optional": true
    },
@@ -4364,9 +4357,9 @@
          "dev": true
        },
        "string-width": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
          "dev": true,
          "requires": {
            "emoji-regex": "^8.0.0",
@@ -4493,9 +4486,9 @@
          "dev": true
        },
        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
          "dev": true,
          "requires": {
            "ansi-styles": "^4.1.0",
@@ -4527,21 +4520,21 @@
          }
        },
        "fs-extra": {
-          "version": "9.0.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz",
-          "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==",
+          "version": "9.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+          "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
          "dev": true,
          "requires": {
            "at-least-node": "^1.0.0",
            "graceful-fs": "^4.2.0",
            "jsonfile": "^6.0.1",
-            "universalify": "^1.0.0"
+            "universalify": "^2.0.0"
          }
        },
        "graceful-fs": {
-          "version": "4.2.4",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-          "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+          "version": "4.2.6",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
+          "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==",
          "dev": true
        },
        "has-flag": {
@@ -4558,14 +4551,6 @@
          "requires": {
            "graceful-fs": "^4.1.6",
            "universalify": "^2.0.0"
-          },
-          "dependencies": {
-            "universalify": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-              "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-              "dev": true
-            }
          }
        },
        "ms": {
@@ -4600,9 +4585,9 @@
          }
        },
        "universalify": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
-          "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==",
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+          "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
          "dev": true
        }
      }
@@ -4673,9 +4658,9 @@
      },
      "dependencies": {
        "get-stream": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
-          "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
          "dev": true,
          "requires": {
            "pump": "^3.0.0"
@@ -5189,11 +5174,6 @@
        "is-plain-object": "^2.0.1"
      }
    },
-    "core-js": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
-      "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY="
-    },
    "core-util-is": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
@@ -5250,11 +5230,10 @@
      }
    },
    "create-react-class": {
-      "version": "15.6.3",
-      "resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.6.3.tgz",
-      "integrity": "sha512-M+/3Q6E6DLO6Yx3OwrWjwHBnvfXXYA7W+dFjt/ZDBemHO1DDZhsalX/NUtnTYclN6GfnBDRh4qRHjcDHmlJBJg==",
+      "version": "15.7.0",
+      "resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.7.0.tgz",
+      "integrity": "sha512-QZv4sFWG9S5RUvkTYWbflxeZX+JG7Cz0Tn33rQBJ+WFQTqTfUTjMjiv9tnfXazjsO5r0KhPs+AqCjyrQX6h2ng==",
      "requires": {
-        "fbjs": "^0.8.9",
        "loose-envify": "^1.3.1",
        "object-assign": "^4.1.1"
      }
@@ -5452,9 +5431,9 @@
      }
    },
    "defer-to-connect": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.1.tgz",
-      "integrity": "sha512-J7thop4u3mRTkYRQ+Vpfwy2G5Ehoy82I14+14W4YMDLKdWloI9gSzRbV30s/NckQGVJtPkWNcW4oMAUigTdqiQ==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
+      "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==",
      "dev": true
    },
    "define-properties": {
@@ -5545,9 +5524,9 @@
      "dev": true
    },
    "detect-node": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
-      "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.5.tgz",
+      "integrity": "sha512-qi86tE6hRcFHy8jI1m2VG+LaPUR1LhqDa5G8tVjuUXmOrpuAgqsA1pN0+ldgr3aKUH+QLI9hCY/OcRYisERejw==",
      "dev": true,
      "optional": true
    },
@@ -5572,21 +5551,21 @@
      },
      "dependencies": {
        "fs-extra": {
-          "version": "9.0.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz",
-          "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==",
+          "version": "9.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+          "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
          "dev": true,
          "requires": {
            "at-least-node": "^1.0.0",
            "graceful-fs": "^4.2.0",
            "jsonfile": "^6.0.1",
-            "universalify": "^1.0.0"
+            "universalify": "^2.0.0"
          }
        },
        "graceful-fs": {
-          "version": "4.2.4",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-          "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+          "version": "4.2.6",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
+          "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==",
          "dev": true
        },
        "iconv-lite": {
@@ -5606,20 +5585,12 @@
          "requires": {
            "graceful-fs": "^4.1.6",
            "universalify": "^2.0.0"
-          },
-          "dependencies": {
-            "universalify": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-              "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-              "dev": true
-            }
          }
        },
        "universalify": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
-          "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==",
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+          "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
          "dev": true
        }
      }
@@ -5659,9 +5630,9 @@
      }
    },
    "dotenv": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
-      "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==",
+      "version": "8.6.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz",
+      "integrity": "sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==",
      "dev": true
    },
    "dotenv-expand": {
@@ -5709,18 +5680,18 @@
      }
    },
    "ejs": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.5.tgz",
-      "integrity": "sha512-dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w==",
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.6.tgz",
+      "integrity": "sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw==",
      "dev": true,
      "requires": {
        "jake": "^10.6.1"
      }
    },
    "electron": {
-      "version": "10.1.6",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-10.1.6.tgz",
-      "integrity": "sha512-Wyiq5Fy64KAa51i72m+5zayYKSm9O5lnittUdaElAn3PAzGl3yDifYO2QsXR7k/iKxWVSROOPzf43mXYytL67Q==",
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-10.4.5.tgz",
+      "integrity": "sha512-sEJ71VvaPMm+Dqj/BncZVDoQRRKRO8SSQALcY1iiJL9Wuy8c1QAhm8LDOgqnwD0cf/9ZuN8Iqoq6gVJ206AzYw==",
      "dev": true,
      "requires": {
        "@electron/get": "^1.0.1",
@@ -5729,9 +5700,9 @@
      },
      "dependencies": {
        "@types/node": {
-          "version": "12.19.5",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.19.5.tgz",
-          "integrity": "sha512-Wgdl27uw/jUYUFyajUGKSjDNGxmJrZi9sjeG6UJImgUtKbJoO9aldx+1XODN1EpNDX9DirvbvHHmTsNlb8GwMA==",
+          "version": "12.20.12",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.12.tgz",
+          "integrity": "sha512-KQZ1al2hKOONAs2MFv+yTQP1LkDWMrRJ9YCVRalXltOfXsBmH5IownLxQaiq0lnAHwAViLnh2aTYqrPcRGEbgg==",
          "dev": true
        }
      }
@@ -5774,9 +5745,9 @@
          }
        },
        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
          "dev": true,
          "requires": {
            "ansi-styles": "^4.1.0",
@@ -5816,21 +5787,21 @@
          "dev": true
        },
        "fs-extra": {
-          "version": "9.0.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz",
-          "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==",
+          "version": "9.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+          "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
          "dev": true,
          "requires": {
            "at-least-node": "^1.0.0",
            "graceful-fs": "^4.2.0",
            "jsonfile": "^6.0.1",
-            "universalify": "^1.0.0"
+            "universalify": "^2.0.0"
          }
        },
        "graceful-fs": {
-          "version": "4.2.4",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-          "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+          "version": "4.2.6",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
+          "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==",
          "dev": true
        },
        "has-flag": {
@@ -5853,20 +5824,12 @@
          "requires": {
            "graceful-fs": "^4.1.6",
            "universalify": "^2.0.0"
-          },
-          "dependencies": {
-            "universalify": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-              "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-              "dev": true
-            }
          }
        },
        "string-width": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
          "dev": true,
          "requires": {
            "emoji-regex": "^8.0.0",
@@ -5893,9 +5856,9 @@
          }
        },
        "universalify": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
-          "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==",
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+          "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
          "dev": true
        },
        "wrap-ansi": {
@@ -5910,15 +5873,15 @@
          }
        },
        "y18n": {
-          "version": "5.0.5",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz",
-          "integrity": "sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==",
+          "version": "5.0.8",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+          "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
          "dev": true
        },
        "yargs": {
-          "version": "16.1.1",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.1.1.tgz",
-          "integrity": "sha512-hAD1RcFP/wfgfxgMVswPE+z3tlPFtxG8/yWUrG2i17sTWGCGqWnxKcLTF4cUKDUK8fzokwsmO9H0TDkRbMHy8w==",
+          "version": "16.2.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+          "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
          "dev": true,
          "requires": {
            "cliui": "^7.0.2",
@@ -6059,9 +6022,9 @@
          }
        },
        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
+          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
          "dev": true,
          "requires": {
            "ansi-styles": "^4.1.0",
@@ -6084,21 +6047,21 @@
          "dev": true
        },
        "fs-extra": {
-          "version": "9.0.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz",
-          "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==",
+          "version": "9.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+          "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
          "dev": true,
          "requires": {
            "at-least-node": "^1.0.0",
            "graceful-fs": "^4.2.0",
            "jsonfile": "^6.0.1",
-            "universalify": "^1.0.0"
+            "universalify": "^2.0.0"
          }
        },
        "graceful-fs": {
-          "version": "4.2.4",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-          "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+          "version": "4.2.6",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
+          "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==",
          "dev": true
        },
        "has-flag": {
@@ -6115,14 +6078,6 @@
          "requires": {
            "graceful-fs": "^4.1.6",
            "universalify": "^2.0.0"
-          },
-          "dependencies": {
-            "universalify": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-              "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-              "dev": true
-            }
          }
        },
        "supports-color": {
@@ -6135,9 +6090,9 @@
          }
        },
        "universalify": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
-          "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==",
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+          "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
          "dev": true
        }
      }
@@ -6999,30 +6954,6 @@
        "bser": "2.1.1"
      }
    },
-    "fbjs": {
-      "version": "0.8.16",
-      "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.16.tgz",
-      "integrity": "sha1-XmdDL1UNxBtXK/VYR7ispk5TN9s=",
-      "requires": {
-        "core-js": "^1.0.0",
-        "isomorphic-fetch": "^2.1.1",
-        "loose-envify": "^1.0.0",
-        "object-assign": "^4.1.0",
-        "promise": "^7.1.1",
-        "setimmediate": "^1.0.5",
-        "ua-parser-js": "^0.7.9"
-      },
-      "dependencies": {
-        "promise": {
-          "version": "7.3.1",
-          "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
-          "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
-          "requires": {
-            "asap": "~2.0.3"
-          }
-        }
-      }
-    },
    "fd-slicer": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
@@ -7040,9 +6971,9 @@
      "optional": true
    },
    "filelist": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.1.tgz",
-      "integrity": "sha512-8zSK6Nu0DQIC08mUC46sWGXi+q3GGpKydAG36k+JDba6VRpkevvOWUW5a/PhShij4+vHT9M+ghgG7eM+a9JDUQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.2.tgz",
+      "integrity": "sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ==",
      "dev": true,
      "requires": {
        "minimatch": "^3.0.4"
@@ -7718,8 +7649,7 @@
            },
            "ini": {
              "version": "1.3.5",
-              "resolved": false,
-              "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+              "resolved": "",
              "dev": true,
              "optional": true
            },
@@ -7963,8 +7893,7 @@
              "dependencies": {
                "minimist": {
                  "version": "1.2.0",
-                  "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-                  "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+                  "resolved": "",
                  "dev": true,
                  "optional": true
                }
@@ -8189,9 +8118,9 @@
      }
    },
    "global-agent": {
-      "version": "2.1.12",
-      "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-2.1.12.tgz",
-      "integrity": "sha512-caAljRMS/qcDo69X9BfkgrihGUgGx44Fb4QQToNQjsiWh+YlQ66uqYVAdA8Olqit+5Ng0nkz09je3ZzANMZcjg==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-2.2.0.tgz",
+      "integrity": "sha512-+20KpaW6DDLqhG7JDiJpD1JvNvb8ts+TNl7BPOYcURqCrXqnN1Vf+XVOrkKJAFPqfX+oEhsdzOj1hLWkBTdNJg==",
      "dev": true,
      "optional": true,
      "requires": {
@@ -8205,28 +8134,39 @@
      },
      "dependencies": {
        "core-js": {
-          "version": "3.7.0",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.7.0.tgz",
-          "integrity": "sha512-NwS7fI5M5B85EwpWuIwJN4i/fbisQUwLwiSNUWeXlkAZ0sbBjLEvLvFLf1uzAUV66PcEPt4xCGCmOZSxVf3xzA==",
+          "version": "3.12.1",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.12.1.tgz",
+          "integrity": "sha512-Ne9DKPHTObRuB09Dru5AjwKjY4cJHVGu+y5f7coGn1E9Grkc3p2iBwE9AI/nJzsE29mQF7oq+mhYYRqOMFN1Bw==",
          "dev": true,
          "optional": true
        },
        "semver": {
-          "version": "7.3.2",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-          "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
          "dev": true,
-          "optional": true
+          "optional": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
        }
      }
    },
    "global-dirs": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-2.0.1.tgz",
-      "integrity": "sha512-5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-2.1.0.tgz",
+      "integrity": "sha512-MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ==",
      "dev": true,
      "requires": {
-        "ini": "^1.3.5"
+        "ini": "1.3.7"
+      },
+      "dependencies": {
+        "ini": {
+          "version": "1.3.7",
+          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.7.tgz",
+          "integrity": "sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==",
+          "dev": true
+        }
      }
    },
    "global-modules": {
@@ -8273,9 +8213,9 @@
      "dev": true
    },
    "globalthis": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.1.tgz",
-      "integrity": "sha512-mJPRTc/P39NH/iNG4mXa9aIhNymaQikTrnspeCa2ZuJ+mH2QN/rXwtX3XwKrHqWgUQFbNZKtHM105aHzJalElw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.2.tgz",
+      "integrity": "sha512-ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ==",
      "dev": true,
      "optional": true,
      "requires": {
@@ -8308,17 +8248,6 @@
        "p-cancelable": "^1.0.0",
        "to-readable-stream": "^1.0.0",
        "url-parse-lax": "^3.0.0"
-      },
-      "dependencies": {
-        "get-stream": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-          "dev": true,
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        }
      }
    },
    "graceful-fs": {
@@ -8425,8 +8354,7 @@
        },
        "y18n": {
          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+          "resolved": "",
          "dev": true
        },
        "yargs": {
@@ -8634,9 +8562,9 @@
      }
    },
    "hosted-git-info": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.7.tgz",
-      "integrity": "sha512-fWqc0IcuXs+BmE9orLDyVykAG9GJtGLGuZAAqgcckPgv5xad4AcXGIv8galtQvlwutxSlaMcdw7BUtq2EIvqCQ==",
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.8.tgz",
+      "integrity": "sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw==",
      "dev": true,
      "requires": {
        "lru-cache": "^6.0.0"
@@ -8761,9 +8689,9 @@
      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
    },
    "ini": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
    },
    "interpret": {
      "version": "1.2.0",
@@ -9009,9 +8937,9 @@
      "dev": true
    },
    "is-path-inside": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz",
-      "integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
      "dev": true
    },
    "is-plain-obj": {
@@ -9115,9 +9043,9 @@
      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
    },
    "isbinaryfile": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.6.tgz",
-      "integrity": "sha512-ORrEy+SNVqUhrCaal4hA4fBzhggQQ+BaLntyPOdoEiwlKZW9BZiJXjg3RMiruE4tPEI3pyVPpySHQF/dKWperg==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.8.tgz",
+      "integrity": "sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w==",
      "dev": true
    },
    "isexe": {
@@ -9131,15 +9059,6 @@
      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
      "dev": true
    },
-    "isomorphic-fetch": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
-      "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
-      "requires": {
-        "node-fetch": "^1.0.1",
-        "whatwg-fetch": ">=0.10.0"
-      }
-    },
    "isstream": {
      "version": "0.1.2",
      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
@@ -11068,9 +10987,9 @@
      }
    },
    "lodash": {
-      "version": "4.17.19",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-      "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
    },
    "lodash-es": {
      "version": "4.17.4",
@@ -11459,9 +11378,9 @@
      }
    },
    "mime": {
-      "version": "2.4.6",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
-      "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
+      "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
      "dev": true
    },
    "mime-db": {
@@ -11887,9 +11806,9 @@
      },
      "dependencies": {
        "hosted-git-info": {
-          "version": "2.8.5",
-          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz",
-          "integrity": "sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==",
+          "version": "2.8.9",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+          "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
          "dev": true
        }
      }
@@ -13093,9 +13012,9 @@
      },
      "dependencies": {
        "json5": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
-          "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+          "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
          "dev": true,
          "requires": {
            "minimist": "^1.2.5"
@@ -13712,11 +13631,6 @@
        }
      }
    },
-    "setimmediate": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
-    },
    "shallowequal": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz",
@@ -14511,9 +14425,9 @@
          }
        },
        "graceful-fs": {
-          "version": "4.2.4",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-          "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+          "version": "4.2.6",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
+          "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==",
          "dev": true
        }
      }
@@ -14610,9 +14524,9 @@
      "dev": true
    },
    "tinymce": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-5.2.0.tgz",
-      "integrity": "sha512-Q7KAu9sLB6TBhKFdb2LHPGy770zkSEjpN1VRqZ6pxNuVQ0mbGWgMocHDvM9XL9yJaOhFrJP6s9XM7zG2gapGpA=="
+      "version": "5.8.0",
+      "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-5.8.0.tgz",
+      "integrity": "sha512-1bOI3k+1D76rVjAJC3XkHezXJVghurnKBDREF1STHBLTQUY17XTbaDNJUxNgJqJHa2xg1udd5I1bzdfSd77DGw=="
    },
    "tmpl": {
      "version": "1.0.4",
@@ -14815,11 +14729,6 @@
      "integrity": "sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ==",
      "dev": true
    },
-    "ua-parser-js": {
-      "version": "0.7.18",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.18.tgz",
-      "integrity": "sha512-LtzwHlVHwFGTptfNSgezHp7WUlwiqb0gA9AALRbKaERfxwJoiX0A73QbTToxteIAuIaFshhgIZfqK8s7clqgnA=="
-    },
    "unc-path-regex": {
      "version": "0.1.2",
      "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
@@ -15261,11 +15170,6 @@
        }
      }
    },
-    "whatwg-fetch": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz",
-      "integrity": "sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng=="
-    },
    "whatwg-mimetype": {
      "version": "2.3.0",
      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
@@ -15339,9 +15243,9 @@
          "dev": true
        },
        "string-width": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+          "version": "4.2.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
          "dev": true,
          "requires": {
            "emoji-regex": "^8.0.0",
@@ -15490,9 +15394,9 @@
      "dev": true
    },
    "y18n": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
      "dev": true
    },
    "yallist": {
--- a/packages/app-desktop/package.json
+++ b/packages/app-desktop/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@joplin/app-desktop",
-  "version": "1.8.3",
+  "version": "1.8.4",
  "description": "Joplin for Desktop",
  "main": "main.js",
  "private": true,
--- a/packages/app-mobile/android/app/build.gradle
+++ b/packages/app-mobile/android/app/build.gradle
@@ -141,8 +141,8 @@ android {
        applicationId "net.cozic.joplin"
        minSdkVersion rootProject.ext.minSdkVersion
        targetSdkVersion rootProject.ext.targetSdkVersion
-		versionCode 2097630
-		versionName "1.8.4"
+		versionCode 2097631
+		versionName "1.8.5"
 		ndk {
 			abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
 		}
--- a/packages/app-mobile/package-lock.json
+++ b/packages/app-mobile/package-lock.json
--- a/packages/app-mobile/pluginAssets/index.js
+++ b/packages/app-mobile/pluginAssets/index.js
@@ -1,5 +1,5 @@
 module.exports = {
-hash:"b95f9e5e2fcd1715be753f1c96235272", files: {
+hash:"45572502e8b0a8e9b85192de7291684c", files: {
 'highlight.js/atom-one-dark-reasonable.css': { data: require('./highlight.js/atom-one-dark-reasonable.css.base64.js'), mime: 'text/css', encoding: 'base64' },
 'highlight.js/atom-one-light.css': { data: require('./highlight.js/atom-one-light.css.base64.js'), mime: 'text/css', encoding: 'base64' },
 'katex/fonts/KaTeX_AMS-Regular.woff2': { data: require('./katex/fonts/KaTeX_AMS-Regular.woff2.base64.js'), mime: 'application/octet-stream', encoding: 'base64' },
--- a/packages/app-mobile/pluginAssets/katex/fonts/KaTeX_AMS-Regular.woff2.base64.js
+++ b/packages/app-mobile/pluginAssets/katex/fonts/KaTeX_AMS-Regular.woff2.base64.js
--- a/packages/app-mobile/pluginAssets/katex/fonts/KaTeX_Caligraphic-Bold.woff2.base64.js
+++ b/packages/app-mobile/pluginAssets/katex/fonts/KaTeX_Caligraphic-Bold.woff2.base64.js
--- a/packages/app-mobile/pluginAssets/katex/fonts/KaTeX_Caligraphic-Regular.woff2.base64.js
+++ b/packages/app-mobile/pluginAssets/katex/fonts/KaTeX_Caligraphic-Regular.woff2.base64.js
--- a/packages/app-mobile/pluginAssets/katex/fonts/KaTeX_Fraktur-Bold.woff2.base64.js
+++ b/packages/app-mobile/pluginAssets/katex/fonts/KaTeX_Fraktur-Bold.woff2.base64.js
--- a/packages/app-mobile/pluginAssets/katex/fonts/KaTeX_Fraktur-Regular.woff2.base64.js
+++ b/packages/app-mobile/pluginAssets/katex/fonts/KaTeX_Fraktur-Regular.woff2.base64.js
--- a/packages/app-mobile/pluginAssets/katex/fonts/KaTeX_Main-Bold.woff2.base64.js
+++ b/packages/app-mobile/pluginAssets/katex/fonts/KaTeX_Main-Bold.woff2.base64.js
--- a/packages/app-mobile/pluginAssets/katex/fonts/KaTeX_Main-BoldItalic.woff2.base64.js
+++ b/packages/app-mobile/pluginAssets/katex/fonts/KaTeX_Main-BoldItalic.woff2.base64.js
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Laurent Cozic	a76b4a0d3e	Android release v1.8.5	2021-05-09 19:37:09 +02:00
Laurent Cozic	97c538dc48	Desktop release v1.8.4	2021-05-09 19:31:26 +02:00
Laurent Cozic	0b67446ec0	All: Security: Apply npm audit security fixes	2021-05-09 19:30:08 +02:00
Laurent Cozic	4b26893b21	Desktop: Fixes #4919 : Make sure sync startup operations are cleared after startup	2021-05-09 18:12:47 +02:00
Laurent Cozic	4ea21e0c32	Desktop: Fixes #4916 : Ensure that image paths that contain spaces are pasted correctly in the Rich Text editor	2021-05-04 17:44:30 +02:00
Laurent Cozic	ebf92605ae	Update website	2021-05-04 16:02:57 +02:00
Laurent Cozic	606a64f49c	Fixed resource error handling	2021-05-04 16:00:40 +02:00
Laurent Cozic	f76f99b423	Desktop: Improve display of release notes for new versions	2021-05-04 15:53:44 +02:00
Laurent Cozic	1f9388d62c	Tools: Add pre-releases to stats and changelog	2021-05-04 13:34:32 +02:00