diff --git a/Tools/build-all.sh b/Tools/build-all.sh
index bc748edbf7..74713ee570 100755
--- a/Tools/build-all.sh
+++ b/Tools/build-all.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-"$ROOT_DIR/../CliClient/run.sh" apidoc > "$ROOT_DIR/../readme/api.md" && node "$ROOT_DIR/update-readme-download.js" && node "$ROOT_DIR/build-release-stats.js" && node "$ROOT_DIR/build-welcome.js" && node "$ROOT_DIR/build-website.js" && git add -A && git commit -m "Update website" && git pull && git push
\ No newline at end of file
+node "$ROOT_DIR/update-readme-download.js" && node "$ROOT_DIR/build-release-stats.js" && node "$ROOT_DIR/build-welcome.js" && node "$ROOT_DIR/build-website.js" && git add -A && git commit -m "Update website" && git pull && git push
\ No newline at end of file
diff --git a/docs/api/index.html b/docs/api/index.html
index 3dd9ed69a5..4dd3efe487 100644
--- a/docs/api/index.html
+++ b/docs/api/index.html
@@ -5,10 +5,10 @@
 	<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://joplin.cozic.net/css/bootstrap.min.css">
+	<link rel="stylesheet" href="https://joplinapp.org/css/bootstrap.min.css">
 	<link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
-	<link rel="stylesheet" href="https://joplin.cozic.net/css/fontawesome-all.min.css"> 
-	<script src="https://joplin.cozic.net/js/jquery-3.2.1.slim.min.js"></script>
+	<link rel="stylesheet" href="https://joplinapp.org/css/fontawesome-all.min.css"> 
+	<script src="https://joplinapp.org/js/jquery-3.2.1.slim.min.js"></script>
 	<style>
 	body {
 		background-color: #F1F1F1;
@@ -196,22 +196,22 @@
 <div class="container">
 
 <div class="header">
-	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="https://joplin.cozic.net/images/ForkMe.png"/></a>
-	<a href="https://joplin.cozic.net"><h1 id="joplin"><img class="title-icon" src="https://joplin.cozic.net/images/Icon512.png">oplin</h1></a>
+	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="https://joplinapp.org/images/ForkMe.png"/></a>
+	<a href="https://joplinapp.org"><h1 id="joplin"><img class="title-icon" src="https://joplinapp.org/images/Icon512.png">oplin</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;joplin.cozic.net/" title="Home"><i class="fa fa-home"></i></a></li>
+			<li class=""><a href="https:&#x2F;&#x2F;joplinapp.org/" title="Home"><i class="fa fa-home"></i></a></li>
 			<li><a href="https://discourse.joplin.cozic.net" title="Forum">Forum</a></li>
 			<li><a class="help" href="#" title="Menu">Menu</a></li>
 		</ul>
 		<div class="nav-right">
 			<!--
-				<iframe class="share-btn" src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplin.cozic.net&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
-				<iframe class="share-btn" src="https://platform.twitter.com/widgets/tweet_button.html?url=http%3A%2F%2Fjoplin.cozic.net" width="62" height="20" title="Tweet" style="border: 0; overflow: hidden;"></iframe>
+				<iframe class="share-btn" src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplinapp.org&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
+				<iframe class="share-btn" src="https://platform.twitter.com/widgets/tweet_button.html?url=http%3A%2F%2Fjoplinapp.org" width="62" height="20" title="Tweet" style="border: 0; overflow: hidden;"></iframe>
 			-->
 			<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="100px" height="20px"></iframe>
 		</div>
@@ -223,485 +223,33 @@
 <li>
 <p>Applications</p>
 <ul>
-<li><a href="https://joplin.cozic.net/desktop">Desktop application</a></li>
-<li><a href="https://joplin.cozic.net/mobile">Mobile applications</a></li>
-<li><a href="https://joplin.cozic.net/terminal">Terminal application</a></li>
-<li><a href="https://joplin.cozic.net/clipper">Web Clipper</a></li>
+<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.joplin.cozic.net">Joplin Forum</a></li>
-<li><a href="https://joplin.cozic.net/e2ee">How to enable end-to-end encryption</a></li>
-<li><a href="https://joplin.cozic.net/spec">End-to-end encryption spec</a></li>
-<li><a href="https://joplin.cozic.net/debugging">How to enable debug mode</a></li>
-<li><a href="https://joplin.cozic.net/api">API documentation</a></li>
-<li><a href="https://joplin.cozic.net/faq">FAQ</a></li>
+<li><a href="https://joplinapp.org/e2ee">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/spec">End-to-end encryption spec</a></li>
+<li><a href="https://joplinapp.org/debugging">How to enable debug mode</a></li>
+<li><a href="https://joplinapp.org/api">API documentation</a></li>
+<li><a href="https://joplinapp.org/faq">FAQ</a></li>
 </ul>
 </li>
 <li>
 <p>About</p>
 <ul>
-<li><a href="https://joplin.cozic.net/changelog">Changelog</a></li>
-<li><a href="https://joplin.cozic.net/stats">Stats</a></li>
-<li><a href="https://joplin.cozic.net/donate">Donate</a></li>
+<li><a href="https://joplinapp.org/changelog">Changelog</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>
-<h1 id="joplin-api">Joplin API</h1>
-<p>When the Web Clipper service is enabled, Joplin exposes a <a href="https://en.wikipedia.org/wiki/Representational_state_transfer">REST API</a> which allows third-party applications to access Joplin&#39;s data and to create, modify or delete notes, notebooks, resources or tags.</p>
-<p>In order to use it, you&#39;ll first need to find on which port the service is running. To do so, open the Web Clipper Options in Joplin and if the service is running it should tell you on which port. Normally it runs on port <strong>41184</strong>. If you want to find it programmatically, you may follow this kind of algorithm:</p>
-<pre><code class="lang-javascript">let port = null;
-for (let portToTest = 41184; portToTest &lt;= 41194; portToTest++) {
-    const result = pingPort(portToTest); // Call GET /ping
-    if (result == &#39;JoplinClipperServer&#39;) {
-        port = portToTest; // Found the port
-        break;
-    }
-}
-</code></pre>
-<h1 id="authorisation">Authorisation</h1>
-<p>To prevent unauthorised applications from accessing the API, the calls must be authentified. To do so, you must provide a token as a query parameter for each API call. You can get this token from the Joplin desktop application, on the Web Clipper Options screen.</p>
-<p>This would be an example of valid cURL call using a token:</p>
-<pre><code>curl http://localhost:41184/notes?token=ABCD123ABCD123ABCD123ABCD123ABCD123
-</code></pre><p>In the documentation below, the token will not be specified every time however you will need to include it.</p>
-<h1 id="using-the-api">Using the API</h1>
-<p>All the calls, unless noted otherwise, receives and send <strong>JSON data</strong>. For example to create a new note:</p>
-<pre><code>curl --data &#39;{ &quot;title&quot;: &quot;My note&quot;, &quot;body&quot;: &quot;Some note in **Markdown**&quot;}&#39; http://localhost:41184/notes
-</code></pre><p>In the documentation below, the calls may include special parameters such as :id or :note_id. You would replace this with the item ID or note ID.</p>
-<p>For example, for the endpoint <code>DELETE /tags/:id/notes/:note_id</code>, to remove the tag with ID &quot;ABCD1234&quot; from the note with ID &quot;EFGH789&quot;, you would run for example:</p>
-<pre><code>curl -X DELETE http://localhost:41184/tags/ABCD1234/notes/EFGH789
-</code></pre><p>The four verbs supported by the API are the following ones:</p>
-<ul>
-<li><strong>GET</strong>: To retrieve items (notes, notebooks, etc.).</li>
-<li><strong>POST</strong>: To create new items. In general most item properties are optional. If you omit any, a default value will be used.</li>
-<li><strong>PUT</strong>: To update an item. Note in a REST API, traditionally PUT is used to completely replace an item, however in this API it will only replace the properties that are provided. For example if you PUT {&quot;title&quot;: &quot;my new title&quot;}, only the &quot;title&quot; property will be changed. The other properties will be left untouched (they won&#39;t be cleared nor changed).</li>
-<li><strong>DELETE</strong>: To delete items.</li>
-</ul>
-<h1 id="filtering-data">Filtering data</h1>
-<p>You can change the fields that will be returned by the API using the <code>fields=</code> query parameter, which takes a list of comma separated fields. For example, to get the longitude and latitude of a note, use this:</p>
-<pre><code>curl http://localhost:41184/notes/ABCD123?fields=longitude,latitude
-</code></pre><p>To get the IDs only of all the tags:</p>
-<pre><code>curl http://localhost:41184/tags?fields=id
-</code></pre><h1 id="error-handling">Error handling</h1>
-<p>In case of an error, an HTTP status code &gt;= 400 will be returned along with a JSON object that provides more info about the error. The JSON object is in the format <code>{ &quot;error&quot;: &quot;description of error&quot; }</code>.</p>
-<h1 id="about-the-property-types">About the property types</h1>
-<ul>
-<li>Text is UTF-8.</li>
-<li>All date/time are Unix timestamps in milliseconds.</li>
-<li>Booleans are integer values 0 or 1.</li>
-</ul>
-<h1 id="testing-if-the-service-is-available">Testing if the service is available</h1>
-<p>Call <strong>GET /ping</strong> to check if the service is available. It should return &quot;JoplinClipperServer&quot; if it works.</p>
-<h1 id="searching">Searching</h1>
-<p>Call <strong>GET /search?query=YOUR_QUERY</strong> to search for notes. This end-point supports the <code>field</code> parameter which is recommended to use so that you only get the data that you need. The query syntax is as described in the main documentation: <a href="https://joplin.cozic.net/#searching">https://joplin.cozic.net/#searching</a></p>
-<h1 id="notes">Notes</h1>
-<h2 id="properties">Properties</h2>
-<table>
-<thead>
-<tr>
-<th>Name</th>
-<th>Type</th>
-<th>Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>id</td>
-<td>text</td>
-<td></td>
-</tr>
-<tr>
-<td>parent_id</td>
-<td>text</td>
-<td>ID of the notebook that contains this note. Change this ID to move the note to a different notebook.</td>
-</tr>
-<tr>
-<td>title</td>
-<td>text</td>
-<td>The note title.</td>
-</tr>
-<tr>
-<td>body</td>
-<td>text</td>
-<td>The note body, in Markdown. May also contain HTML.</td>
-</tr>
-<tr>
-<td>created_time</td>
-<td>int</td>
-<td>When the note was created.</td>
-</tr>
-<tr>
-<td>updated_time</td>
-<td>int</td>
-<td>When the note was last updated.</td>
-</tr>
-<tr>
-<td>is_conflict</td>
-<td>int</td>
-<td>Tells whether the note is a conflict or not.</td>
-</tr>
-<tr>
-<td>latitude</td>
-<td>numeric</td>
-<td></td>
-</tr>
-<tr>
-<td>longitude</td>
-<td>numeric</td>
-<td></td>
-</tr>
-<tr>
-<td>altitude</td>
-<td>numeric</td>
-<td></td>
-</tr>
-<tr>
-<td>author</td>
-<td>text</td>
-<td></td>
-</tr>
-<tr>
-<td>source_url</td>
-<td>text</td>
-<td>The full URL where the note comes from.</td>
-</tr>
-<tr>
-<td>is_todo</td>
-<td>int</td>
-<td>Tells whether this note is a todo or not.</td>
-</tr>
-<tr>
-<td>todo_due</td>
-<td>int</td>
-<td>When the todo is due. An alarm will be triggered on that date.</td>
-</tr>
-<tr>
-<td>todo_completed</td>
-<td>int</td>
-<td>Tells whether todo is completed or not. This is a timestamp in milliseconds.</td>
-</tr>
-<tr>
-<td>source</td>
-<td>text</td>
-<td></td>
-</tr>
-<tr>
-<td>source_application</td>
-<td>text</td>
-<td></td>
-</tr>
-<tr>
-<td>application_data</td>
-<td>text</td>
-<td></td>
-</tr>
-<tr>
-<td>order</td>
-<td>int</td>
-<td></td>
-</tr>
-<tr>
-<td>user_created_time</td>
-<td>int</td>
-<td>When the note was created. It may differ from created_time as it can be manually set by the user.</td>
-</tr>
-<tr>
-<td>user_updated_time</td>
-<td>int</td>
-<td>When the note was last updated. It may differ from updated_time as it can be manually set by the user.</td>
-</tr>
-<tr>
-<td>encryption_cipher_text</td>
-<td>text</td>
-<td></td>
-</tr>
-<tr>
-<td>encryption_applied</td>
-<td>int</td>
-<td></td>
-</tr>
-<tr>
-<td>body_html</td>
-<td>text</td>
-<td>Note body, in HTML format</td>
-</tr>
-<tr>
-<td>base_url</td>
-<td>text</td>
-<td>If <code>body_html</code> is provided and contains relative URLs, provide the <code>base_url</code> parameter too so that all the URLs can be converted to absolute ones. The base URL is basically where the HTML was fetched from, minus the query (everything after the &#39;?&#39;). For example if the original page was <code>https://stackoverflow.com/search?q=%5Bjava%5D+test</code>, the base URL is <code>https://stackoverflow.com/search</code>.</td>
-</tr>
-<tr>
-<td>image_data_url</td>
-<td>text</td>
-<td>An image to attach to the note, in <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs">Data URL</a> format.</td>
-</tr>
-<tr>
-<td>crop_rect</td>
-<td>text</td>
-<td>If an image is provided, you can also specify an optional rectangle that will be used to crop the image. In format <code>{ x: x, y: y, width: width, height: height }</code></td>
-</tr>
-</tbody>
-</table>
-<h2 id="get-notes">GET /notes</h2>
-<p>Gets all notes</p>
-<h2 id="get-notes-id">GET /notes/:id</h2>
-<p>Gets note with ID :id</p>
-<h2 id="get-notes-id-tags">GET /notes/:id/tags</h2>
-<p>Gets all the tags attached to this note.</p>
-<h2 id="post-notes">POST /notes</h2>
-<p>Creates a new note</p>
-<p>You can either specify the note body as Markdown by setting the <code>body</code> parameter, or in HTML by setting the <code>body_html</code>.</p>
-<p>Examples:</p>
-<ul>
-<li><p>Create a note from some Markdown text</p>
-<pre><code>curl --data &#39;{ &quot;title&quot;: &quot;My note&quot;, &quot;body&quot;: &quot;Some note in **Markdown**&quot;}&#39; http://127.0.0.1:41184/notes
-</code></pre></li>
-<li><p>Create a note from some HTML</p>
-<pre><code>curl --data &#39;{ &quot;title&quot;: &quot;My note&quot;, &quot;body_html&quot;: &quot;Some note in &lt;b&gt;HTML&lt;/b&gt;&quot;}&#39; http://127.0.0.1:41184/notes
-</code></pre></li>
-<li><p>Create a note and attach an image to it:</p>
-<pre><code>curl --data &#39;{ &quot;title&quot;: &quot;Image test&quot;, &quot;body&quot;: &quot;Here is Joplin icon:&quot;, &quot;image_data_url&quot;: &quot;data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAIAAABLbSncAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAANZJREFUeNoAyAA3/wFwtO3K6gUB/vz2+Prw9fj/+/r+/wBZKAAExOgF4/MC9ff+MRH6Ui4E+/0Bqc/zutj6AgT+/Pz7+vv7++nu82c4DlMqCvLs8goA/gL8/fz09fb59vXa6vzZ6vjT5fbn6voD/fwC8vX4UiT9Zi//APHyAP8ACgUBAPv5APz7BPj2+DIaC2o3E+3o6ywaC5fT6gD6/QD9/QEVf9kD+/dcLQgJA/7v8vqfwOf18wA1IAIEVycAyt//v9XvAPv7APz8LhoIAPz9Ri4OAgwARgx4W/6fVeEAAAAASUVORK5CYII=&quot;}&#39; http://127.0.0.1:41184/notes
-</code></pre></li>
-</ul>
-<h3 id="creating-a-note-with-a-specific-id">Creating a note with a specific ID</h3>
-<p>When a new note is created, it is automatically assigned a new unique ID so <strong>normally you do not need to set the ID</strong>. However, if for some reason you want to set it, you can supply it as the <code>id</code> property. It needs to be a 32 characters long hexadecimal string. <strong>Make sure it is unique</strong>, for example by generating it using whatever GUID function is available in your programming language.</p>
-<pre><code>  curl --data &#39;{ &quot;id&quot;: &quot;00a87474082744c1a8515da6aa5792d2&quot;, &quot;title&quot;: &quot;My note with custom ID&quot;}&#39; http://127.0.0.1:41184/notes
-</code></pre><h2 id="put-notes-id">PUT /notes/:id</h2>
-<p>Sets the properties of the note with ID :id</p>
-<h2 id="delete-notes-id">DELETE /notes/:id</h2>
-<p>Deletes the note with ID :id</p>
-<h1 id="folders">Folders</h1>
-<p>This is actually a notebook. Internally notebooks are called &quot;folders&quot;.</p>
-<h2 id="properties">Properties</h2>
-<table>
-<thead>
-<tr>
-<th>Name</th>
-<th>Type</th>
-<th>Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>id</td>
-<td>text</td>
-<td></td>
-</tr>
-<tr>
-<td>title</td>
-<td>text</td>
-<td>The folder title.</td>
-</tr>
-<tr>
-<td>created_time</td>
-<td>int</td>
-<td>When the folder was created.</td>
-</tr>
-<tr>
-<td>updated_time</td>
-<td>int</td>
-<td>When the folder was last updated.</td>
-</tr>
-<tr>
-<td>user_created_time</td>
-<td>int</td>
-<td>When the folder was created. It may differ from created_time as it can be manually set by the user.</td>
-</tr>
-<tr>
-<td>user_updated_time</td>
-<td>int</td>
-<td>When the folder was last updated. It may differ from updated_time as it can be manually set by the user.</td>
-</tr>
-<tr>
-<td>encryption_cipher_text</td>
-<td>text</td>
-<td></td>
-</tr>
-<tr>
-<td>encryption_applied</td>
-<td>int</td>
-<td></td>
-</tr>
-<tr>
-<td>parent_id</td>
-<td>text</td>
-<td></td>
-</tr>
-</tbody>
-</table>
-<h2 id="get-folders">GET /folders</h2>
-<p>Gets all folders</p>
-<p>The folders are returned as a tree. The sub-notebooks of a notebook, if any, are under the <code>children</code> key.</p>
-<h2 id="get-folders-id">GET /folders/:id</h2>
-<p>Gets folder with ID :id</p>
-<h2 id="get-folders-id-notes">GET /folders/:id/notes</h2>
-<p>Gets all the notes inside this folder.</p>
-<h2 id="post-folders">POST /folders</h2>
-<p>Creates a new folder</p>
-<h2 id="put-folders-id">PUT /folders/:id</h2>
-<p>Sets the properties of the folder with ID :id</p>
-<h2 id="delete-folders-id">DELETE /folders/:id</h2>
-<p>Deletes the folder with ID :id</p>
-<h1 id="resources">Resources</h1>
-<h2 id="properties">Properties</h2>
-<table>
-<thead>
-<tr>
-<th>Name</th>
-<th>Type</th>
-<th>Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>id</td>
-<td>text</td>
-<td></td>
-</tr>
-<tr>
-<td>title</td>
-<td>text</td>
-<td>The resource title.</td>
-</tr>
-<tr>
-<td>mime</td>
-<td>text</td>
-<td></td>
-</tr>
-<tr>
-<td>filename</td>
-<td>text</td>
-<td></td>
-</tr>
-<tr>
-<td>created_time</td>
-<td>int</td>
-<td>When the resource was created.</td>
-</tr>
-<tr>
-<td>updated_time</td>
-<td>int</td>
-<td>When the resource was last updated.</td>
-</tr>
-<tr>
-<td>user_created_time</td>
-<td>int</td>
-<td>When the resource was created. It may differ from created_time as it can be manually set by the user.</td>
-</tr>
-<tr>
-<td>user_updated_time</td>
-<td>int</td>
-<td>When the resource was last updated. It may differ from updated_time as it can be manually set by the user.</td>
-</tr>
-<tr>
-<td>file_extension</td>
-<td>text</td>
-<td></td>
-</tr>
-<tr>
-<td>encryption_cipher_text</td>
-<td>text</td>
-<td></td>
-</tr>
-<tr>
-<td>encryption_applied</td>
-<td>int</td>
-<td></td>
-</tr>
-<tr>
-<td>encryption_blob_encrypted</td>
-<td>int</td>
-<td></td>
-</tr>
-</tbody>
-</table>
-<h2 id="get-resources">GET /resources</h2>
-<p>Gets all resources</p>
-<h2 id="get-resources-id">GET /resources/:id</h2>
-<p>Gets resource with ID :id</p>
-<h2 id="get-resources-id-file">GET /resources/:id/file</h2>
-<p>Gets the actual file associated with this resource.</p>
-<h2 id="post-resources">POST /resources</h2>
-<p>Creates a new resource</p>
-<p>Creating a new resource is special because you also need to upload the file. Unlike other API calls, this one must have the &quot;multipart/form-data&quot; Content-Type. The file data must be passed to the &quot;data&quot; form field, and the other properties to the &quot;props&quot; form field. An example of a valid call with cURL would be:</p>
-<pre><code>curl -F &#39;data=@/path/to/file.jpg&#39; -F &#39;props={&quot;title&quot;:&quot;my resource title&quot;}&#39; http://localhost:41184/resources
-</code></pre><p>The &quot;data&quot; field is required, while the &quot;props&quot; one is not. If not specified, default values will be used.</p>
-<h2 id="put-resources-id">PUT /resources/:id</h2>
-<p>Sets the properties of the resource with ID :id</p>
-<h2 id="delete-resources-id">DELETE /resources/:id</h2>
-<p>Deletes the resource with ID :id</p>
-<h1 id="tags">Tags</h1>
-<h2 id="properties">Properties</h2>
-<table>
-<thead>
-<tr>
-<th>Name</th>
-<th>Type</th>
-<th>Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>id</td>
-<td>text</td>
-<td></td>
-</tr>
-<tr>
-<td>title</td>
-<td>text</td>
-<td>The tag title.</td>
-</tr>
-<tr>
-<td>created_time</td>
-<td>int</td>
-<td>When the tag was created.</td>
-</tr>
-<tr>
-<td>updated_time</td>
-<td>int</td>
-<td>When the tag was last updated.</td>
-</tr>
-<tr>
-<td>user_created_time</td>
-<td>int</td>
-<td>When the tag was created. It may differ from created_time as it can be manually set by the user.</td>
-</tr>
-<tr>
-<td>user_updated_time</td>
-<td>int</td>
-<td>When the tag was last updated. It may differ from updated_time as it can be manually set by the user.</td>
-</tr>
-<tr>
-<td>encryption_cipher_text</td>
-<td>text</td>
-<td></td>
-</tr>
-<tr>
-<td>encryption_applied</td>
-<td>int</td>
-<td></td>
-</tr>
-</tbody>
-</table>
-<h2 id="get-tags">GET /tags</h2>
-<p>Gets all tags</p>
-<h2 id="get-tags-id">GET /tags/:id</h2>
-<p>Gets tag with ID :id</p>
-<h2 id="get-tags-id-notes">GET /tags/:id/notes</h2>
-<p>Gets all the notes with this tag.</p>
-<h2 id="post-tags">POST /tags</h2>
-<p>Creates a new tag</p>
-<h2 id="post-tags-id-notes">POST /tags/:id/notes</h2>
-<p>Post a note to this endpoint to add the tag to the note. The note data must at least contain an ID property (all other properties will be ignored).</p>
-<h2 id="put-tags-id">PUT /tags/:id</h2>
-<p>Sets the properties of the tag with ID :id</p>
-<h2 id="delete-tags-id">DELETE /tags/:id</h2>
-<p>Deletes the tag with ID :id</p>
-<h2 id="delete-tags-id-notes-note_id">DELETE /tags/:id/notes/:note_id</h2>
-<p>Remove the tag from the note.</p>
 
 <script>
 	function stickyHeader() { 
diff --git a/docs/changelog/index.html b/docs/changelog/index.html
index 5aec3cf512..4046937fde 100644
--- a/docs/changelog/index.html
+++ b/docs/changelog/index.html
@@ -5,10 +5,10 @@
 	<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://joplin.cozic.net/css/bootstrap.min.css">
+	<link rel="stylesheet" href="https://joplinapp.org/css/bootstrap.min.css">
 	<link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
-	<link rel="stylesheet" href="https://joplin.cozic.net/css/fontawesome-all.min.css"> 
-	<script src="https://joplin.cozic.net/js/jquery-3.2.1.slim.min.js"></script>
+	<link rel="stylesheet" href="https://joplinapp.org/css/fontawesome-all.min.css"> 
+	<script src="https://joplinapp.org/js/jquery-3.2.1.slim.min.js"></script>
 	<style>
 	body {
 		background-color: #F1F1F1;
@@ -196,22 +196,22 @@
 <div class="container">
 
 <div class="header">
-	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="https://joplin.cozic.net/images/ForkMe.png"/></a>
-	<a href="https://joplin.cozic.net"><h1 id="joplin"><img class="title-icon" src="https://joplin.cozic.net/images/Icon512.png">oplin</h1></a>
+	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="https://joplinapp.org/images/ForkMe.png"/></a>
+	<a href="https://joplinapp.org"><h1 id="joplin"><img class="title-icon" src="https://joplinapp.org/images/Icon512.png">oplin</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;joplin.cozic.net/" title="Home"><i class="fa fa-home"></i></a></li>
+			<li class=""><a href="https:&#x2F;&#x2F;joplinapp.org/" title="Home"><i class="fa fa-home"></i></a></li>
 			<li><a href="https://discourse.joplin.cozic.net" title="Forum">Forum</a></li>
 			<li><a class="help" href="#" title="Menu">Menu</a></li>
 		</ul>
 		<div class="nav-right">
 			<!--
-				<iframe class="share-btn" src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplin.cozic.net&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
-				<iframe class="share-btn" src="https://platform.twitter.com/widgets/tweet_button.html?url=http%3A%2F%2Fjoplin.cozic.net" width="62" height="20" title="Tweet" style="border: 0; overflow: hidden;"></iframe>
+				<iframe class="share-btn" src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplinapp.org&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
+				<iframe class="share-btn" src="https://platform.twitter.com/widgets/tweet_button.html?url=http%3A%2F%2Fjoplinapp.org" width="62" height="20" title="Tweet" style="border: 0; overflow: hidden;"></iframe>
 			-->
 			<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="100px" height="20px"></iframe>
 		</div>
@@ -223,29 +223,29 @@
 <li>
 <p>Applications</p>
 <ul>
-<li><a href="https://joplin.cozic.net/desktop">Desktop application</a></li>
-<li><a href="https://joplin.cozic.net/mobile">Mobile applications</a></li>
-<li><a href="https://joplin.cozic.net/terminal">Terminal application</a></li>
-<li><a href="https://joplin.cozic.net/clipper">Web Clipper</a></li>
+<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.joplin.cozic.net">Joplin Forum</a></li>
-<li><a href="https://joplin.cozic.net/e2ee">How to enable end-to-end encryption</a></li>
-<li><a href="https://joplin.cozic.net/spec">End-to-end encryption spec</a></li>
-<li><a href="https://joplin.cozic.net/debugging">How to enable debug mode</a></li>
-<li><a href="https://joplin.cozic.net/api">API documentation</a></li>
-<li><a href="https://joplin.cozic.net/faq">FAQ</a></li>
+<li><a href="https://joplinapp.org/e2ee">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/spec">End-to-end encryption spec</a></li>
+<li><a href="https://joplinapp.org/debugging">How to enable debug mode</a></li>
+<li><a href="https://joplinapp.org/api">API documentation</a></li>
+<li><a href="https://joplinapp.org/faq">FAQ</a></li>
 </ul>
 </li>
 <li>
 <p>About</p>
 <ul>
-<li><a href="https://joplin.cozic.net/changelog">Changelog</a></li>
-<li><a href="https://joplin.cozic.net/stats">Stats</a></li>
-<li><a href="https://joplin.cozic.net/donate">Donate</a></li>
+<li><a href="https://joplinapp.org/changelog">Changelog</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>
diff --git a/docs/clipper/index.html b/docs/clipper/index.html
index 04cb8f4fe8..c2fdefcf61 100644
--- a/docs/clipper/index.html
+++ b/docs/clipper/index.html
@@ -5,10 +5,10 @@
 	<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://joplin.cozic.net/css/bootstrap.min.css">
+	<link rel="stylesheet" href="https://joplinapp.org/css/bootstrap.min.css">
 	<link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
-	<link rel="stylesheet" href="https://joplin.cozic.net/css/fontawesome-all.min.css"> 
-	<script src="https://joplin.cozic.net/js/jquery-3.2.1.slim.min.js"></script>
+	<link rel="stylesheet" href="https://joplinapp.org/css/fontawesome-all.min.css"> 
+	<script src="https://joplinapp.org/js/jquery-3.2.1.slim.min.js"></script>
 	<style>
 	body {
 		background-color: #F1F1F1;
@@ -196,22 +196,22 @@
 <div class="container">
 
 <div class="header">
-	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="https://joplin.cozic.net/images/ForkMe.png"/></a>
-	<a href="https://joplin.cozic.net"><h1 id="joplin"><img class="title-icon" src="https://joplin.cozic.net/images/Icon512.png">oplin</h1></a>
+	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="https://joplinapp.org/images/ForkMe.png"/></a>
+	<a href="https://joplinapp.org"><h1 id="joplin"><img class="title-icon" src="https://joplinapp.org/images/Icon512.png">oplin</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;joplin.cozic.net/" title="Home"><i class="fa fa-home"></i></a></li>
+			<li class=""><a href="https:&#x2F;&#x2F;joplinapp.org/" title="Home"><i class="fa fa-home"></i></a></li>
 			<li><a href="https://discourse.joplin.cozic.net" title="Forum">Forum</a></li>
 			<li><a class="help" href="#" title="Menu">Menu</a></li>
 		</ul>
 		<div class="nav-right">
 			<!--
-				<iframe class="share-btn" src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplin.cozic.net&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
-				<iframe class="share-btn" src="https://platform.twitter.com/widgets/tweet_button.html?url=http%3A%2F%2Fjoplin.cozic.net" width="62" height="20" title="Tweet" style="border: 0; overflow: hidden;"></iframe>
+				<iframe class="share-btn" src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplinapp.org&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
+				<iframe class="share-btn" src="https://platform.twitter.com/widgets/tweet_button.html?url=http%3A%2F%2Fjoplinapp.org" width="62" height="20" title="Tweet" style="border: 0; overflow: hidden;"></iframe>
 			-->
 			<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="100px" height="20px"></iframe>
 		</div>
@@ -223,36 +223,36 @@
 <li>
 <p>Applications</p>
 <ul>
-<li><a href="https://joplin.cozic.net/desktop">Desktop application</a></li>
-<li><a href="https://joplin.cozic.net/mobile">Mobile applications</a></li>
-<li><a href="https://joplin.cozic.net/terminal">Terminal application</a></li>
-<li><a href="https://joplin.cozic.net/clipper">Web Clipper</a></li>
+<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.joplin.cozic.net">Joplin Forum</a></li>
-<li><a href="https://joplin.cozic.net/e2ee">How to enable end-to-end encryption</a></li>
-<li><a href="https://joplin.cozic.net/spec">End-to-end encryption spec</a></li>
-<li><a href="https://joplin.cozic.net/debugging">How to enable debug mode</a></li>
-<li><a href="https://joplin.cozic.net/api">API documentation</a></li>
-<li><a href="https://joplin.cozic.net/faq">FAQ</a></li>
+<li><a href="https://joplinapp.org/e2ee">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/spec">End-to-end encryption spec</a></li>
+<li><a href="https://joplinapp.org/debugging">How to enable debug mode</a></li>
+<li><a href="https://joplinapp.org/api">API documentation</a></li>
+<li><a href="https://joplinapp.org/faq">FAQ</a></li>
 </ul>
 </li>
 <li>
 <p>About</p>
 <ul>
-<li><a href="https://joplin.cozic.net/changelog">Changelog</a></li>
-<li><a href="https://joplin.cozic.net/stats">Stats</a></li>
-<li><a href="https://joplin.cozic.net/donate">Donate</a></li>
+<li><a href="https://joplinapp.org/changelog">Changelog</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>
 <h1 id="joplin-web-clipper">Joplin Web Clipper</h1>
 <p>The Web Clipper is a browser extension that allows you to save web pages and screenshots from your browser. To start using it, open the Joplin desktop application, go to the <strong>Web Clipper Options</strong> and follow the instructions.</p>
-<p><img src="https://joplin.cozic.net/images/WebExtensionScreenshot.png" style="max-width: 50%; border: 1px solid gray;"></p>
+<p><img src="https://joplinapp.org/images/WebExtensionScreenshot.png" style="max-width: 50%; border: 1px solid gray;"></p>
 <h1 id="troubleshooting-the-web-clipper-service">Troubleshooting the web clipper service</h1>
 <p>The web clipper extension and the Joplin application communicates via a service, which is started by the Joplin desktop app.</p>
 <p>However certain things can interfer with this service and prevent it from being accessible or from starting. If something does not work, check the following:</p>
@@ -282,7 +282,7 @@
 <p>Now use the extension as normal and replicate the bug you&#39;re having.</p>
 <p>Copy and paste the content of both the debugging window and the Firefox console, and post it to the <a href="https://discourse.joplin.cozic.net/">forum</a>.</p>
 <h1 id="using-the-web-clipper-service">Using the Web Clipper service</h1>
-<p>The Web Clipper service can be used to create, modify or delete notes, notebooks, tags, etc. from any other application. It exposes an API with a number of methods to manage Joplin&#39;s data. For more information about this API and how to use it, please check the <a href="https://joplin.cozic.net/api">Joplin API documentation</a>.</p>
+<p>The Web Clipper service can be used to create, modify or delete notes, notebooks, tags, etc. from any other application. It exposes an API with a number of methods to manage Joplin&#39;s data. For more information about this API and how to use it, please check the <a href="https://joplinapp.org/api">Joplin API documentation</a>.</p>
 
 <script>
 	function stickyHeader() { 
diff --git a/docs/debugging/index.html b/docs/debugging/index.html
index ffb271bc48..223e52aaa0 100644
--- a/docs/debugging/index.html
+++ b/docs/debugging/index.html
@@ -5,10 +5,10 @@
 	<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://joplin.cozic.net/css/bootstrap.min.css">
+	<link rel="stylesheet" href="https://joplinapp.org/css/bootstrap.min.css">
 	<link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
-	<link rel="stylesheet" href="https://joplin.cozic.net/css/fontawesome-all.min.css"> 
-	<script src="https://joplin.cozic.net/js/jquery-3.2.1.slim.min.js"></script>
+	<link rel="stylesheet" href="https://joplinapp.org/css/fontawesome-all.min.css"> 
+	<script src="https://joplinapp.org/js/jquery-3.2.1.slim.min.js"></script>
 	<style>
 	body {
 		background-color: #F1F1F1;
@@ -196,22 +196,22 @@
 <div class="container">
 
 <div class="header">
-	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="https://joplin.cozic.net/images/ForkMe.png"/></a>
-	<a href="https://joplin.cozic.net"><h1 id="joplin"><img class="title-icon" src="https://joplin.cozic.net/images/Icon512.png">oplin</h1></a>
+	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="https://joplinapp.org/images/ForkMe.png"/></a>
+	<a href="https://joplinapp.org"><h1 id="joplin"><img class="title-icon" src="https://joplinapp.org/images/Icon512.png">oplin</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;joplin.cozic.net/" title="Home"><i class="fa fa-home"></i></a></li>
+			<li class=""><a href="https:&#x2F;&#x2F;joplinapp.org/" title="Home"><i class="fa fa-home"></i></a></li>
 			<li><a href="https://discourse.joplin.cozic.net" title="Forum">Forum</a></li>
 			<li><a class="help" href="#" title="Menu">Menu</a></li>
 		</ul>
 		<div class="nav-right">
 			<!--
-				<iframe class="share-btn" src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplin.cozic.net&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
-				<iframe class="share-btn" src="https://platform.twitter.com/widgets/tweet_button.html?url=http%3A%2F%2Fjoplin.cozic.net" width="62" height="20" title="Tweet" style="border: 0; overflow: hidden;"></iframe>
+				<iframe class="share-btn" src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplinapp.org&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
+				<iframe class="share-btn" src="https://platform.twitter.com/widgets/tweet_button.html?url=http%3A%2F%2Fjoplinapp.org" width="62" height="20" title="Tweet" style="border: 0; overflow: hidden;"></iframe>
 			-->
 			<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="100px" height="20px"></iframe>
 		</div>
@@ -223,29 +223,29 @@
 <li>
 <p>Applications</p>
 <ul>
-<li><a href="https://joplin.cozic.net/desktop">Desktop application</a></li>
-<li><a href="https://joplin.cozic.net/mobile">Mobile applications</a></li>
-<li><a href="https://joplin.cozic.net/terminal">Terminal application</a></li>
-<li><a href="https://joplin.cozic.net/clipper">Web Clipper</a></li>
+<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.joplin.cozic.net">Joplin Forum</a></li>
-<li><a href="https://joplin.cozic.net/e2ee">How to enable end-to-end encryption</a></li>
-<li><a href="https://joplin.cozic.net/spec">End-to-end encryption spec</a></li>
-<li><a href="https://joplin.cozic.net/debugging">How to enable debug mode</a></li>
-<li><a href="https://joplin.cozic.net/api">API documentation</a></li>
-<li><a href="https://joplin.cozic.net/faq">FAQ</a></li>
+<li><a href="https://joplinapp.org/e2ee">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/spec">End-to-end encryption spec</a></li>
+<li><a href="https://joplinapp.org/debugging">How to enable debug mode</a></li>
+<li><a href="https://joplinapp.org/api">API documentation</a></li>
+<li><a href="https://joplinapp.org/faq">FAQ</a></li>
 </ul>
 </li>
 <li>
 <p>About</p>
 <ul>
-<li><a href="https://joplin.cozic.net/changelog">Changelog</a></li>
-<li><a href="https://joplin.cozic.net/stats">Stats</a></li>
-<li><a href="https://joplin.cozic.net/donate">Donate</a></li>
+<li><a href="https://joplinapp.org/changelog">Changelog</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>
diff --git a/docs/desktop/index.html b/docs/desktop/index.html
index 665a20aee4..595f23fdd9 100644
--- a/docs/desktop/index.html
+++ b/docs/desktop/index.html
@@ -5,10 +5,10 @@
 	<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://joplin.cozic.net/css/bootstrap.min.css">
+	<link rel="stylesheet" href="https://joplinapp.org/css/bootstrap.min.css">
 	<link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
-	<link rel="stylesheet" href="https://joplin.cozic.net/css/fontawesome-all.min.css"> 
-	<script src="https://joplin.cozic.net/js/jquery-3.2.1.slim.min.js"></script>
+	<link rel="stylesheet" href="https://joplinapp.org/css/fontawesome-all.min.css"> 
+	<script src="https://joplinapp.org/js/jquery-3.2.1.slim.min.js"></script>
 	<style>
 	body {
 		background-color: #F1F1F1;
@@ -196,22 +196,22 @@
 <div class="container">
 
 <div class="header">
-	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="https://joplin.cozic.net/images/ForkMe.png"/></a>
-	<a href="https://joplin.cozic.net"><h1 id="joplin"><img class="title-icon" src="https://joplin.cozic.net/images/Icon512.png">oplin</h1></a>
+	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="https://joplinapp.org/images/ForkMe.png"/></a>
+	<a href="https://joplinapp.org"><h1 id="joplin"><img class="title-icon" src="https://joplinapp.org/images/Icon512.png">oplin</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;joplin.cozic.net/" title="Home"><i class="fa fa-home"></i></a></li>
+			<li class=""><a href="https:&#x2F;&#x2F;joplinapp.org/" title="Home"><i class="fa fa-home"></i></a></li>
 			<li><a href="https://discourse.joplin.cozic.net" title="Forum">Forum</a></li>
 			<li><a class="help" href="#" title="Menu">Menu</a></li>
 		</ul>
 		<div class="nav-right">
 			<!--
-				<iframe class="share-btn" src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplin.cozic.net&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
-				<iframe class="share-btn" src="https://platform.twitter.com/widgets/tweet_button.html?url=http%3A%2F%2Fjoplin.cozic.net" width="62" height="20" title="Tweet" style="border: 0; overflow: hidden;"></iframe>
+				<iframe class="share-btn" src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplinapp.org&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
+				<iframe class="share-btn" src="https://platform.twitter.com/widgets/tweet_button.html?url=http%3A%2F%2Fjoplinapp.org" width="62" height="20" title="Tweet" style="border: 0; overflow: hidden;"></iframe>
 			-->
 			<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="100px" height="20px"></iframe>
 		</div>
@@ -223,35 +223,35 @@
 <li>
 <p>Applications</p>
 <ul>
-<li><a href="https://joplin.cozic.net/desktop">Desktop application</a></li>
-<li><a href="https://joplin.cozic.net/mobile">Mobile applications</a></li>
-<li><a href="https://joplin.cozic.net/terminal">Terminal application</a></li>
-<li><a href="https://joplin.cozic.net/clipper">Web Clipper</a></li>
+<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.joplin.cozic.net">Joplin Forum</a></li>
-<li><a href="https://joplin.cozic.net/e2ee">How to enable end-to-end encryption</a></li>
-<li><a href="https://joplin.cozic.net/spec">End-to-end encryption spec</a></li>
-<li><a href="https://joplin.cozic.net/debugging">How to enable debug mode</a></li>
-<li><a href="https://joplin.cozic.net/api">API documentation</a></li>
-<li><a href="https://joplin.cozic.net/faq">FAQ</a></li>
+<li><a href="https://joplinapp.org/e2ee">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/spec">End-to-end encryption spec</a></li>
+<li><a href="https://joplinapp.org/debugging">How to enable debug mode</a></li>
+<li><a href="https://joplinapp.org/api">API documentation</a></li>
+<li><a href="https://joplinapp.org/faq">FAQ</a></li>
 </ul>
 </li>
 <li>
 <p>About</p>
 <ul>
-<li><a href="https://joplin.cozic.net/changelog">Changelog</a></li>
-<li><a href="https://joplin.cozic.net/stats">Stats</a></li>
-<li><a href="https://joplin.cozic.net/donate">Donate</a></li>
+<li><a href="https://joplinapp.org/changelog">Changelog</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>
-<p><img src="https://joplin.cozic.net/images/DemoDesktop.png" style="max-width: 100%"></p>
-<p>For general information relevant to all the applications, see also <a href="https://joplin.cozic.net">Joplin home page</a>.</p>
+<p><img src="https://joplinapp.org/images/DemoDesktop.png" style="max-width: 100%"></p>
+<p>For general information relevant to all the applications, see also <a href="https://joplinapp.org">Joplin home page</a>.</p>
 
 <script>
 	function stickyHeader() { 
diff --git a/docs/donate/index.html b/docs/donate/index.html
index 350593e498..6c088afaf6 100644
--- a/docs/donate/index.html
+++ b/docs/donate/index.html
@@ -5,10 +5,10 @@
 	<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://joplin.cozic.net/css/bootstrap.min.css">
+	<link rel="stylesheet" href="https://joplinapp.org/css/bootstrap.min.css">
 	<link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
-	<link rel="stylesheet" href="https://joplin.cozic.net/css/fontawesome-all.min.css"> 
-	<script src="https://joplin.cozic.net/js/jquery-3.2.1.slim.min.js"></script>
+	<link rel="stylesheet" href="https://joplinapp.org/css/fontawesome-all.min.css"> 
+	<script src="https://joplinapp.org/js/jquery-3.2.1.slim.min.js"></script>
 	<style>
 	body {
 		background-color: #F1F1F1;
@@ -196,22 +196,22 @@
 <div class="container">
 
 <div class="header">
-	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="https://joplin.cozic.net/images/ForkMe.png"/></a>
-	<a href="https://joplin.cozic.net"><h1 id="joplin"><img class="title-icon" src="https://joplin.cozic.net/images/Icon512.png">oplin</h1></a>
+	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="https://joplinapp.org/images/ForkMe.png"/></a>
+	<a href="https://joplinapp.org"><h1 id="joplin"><img class="title-icon" src="https://joplinapp.org/images/Icon512.png">oplin</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;joplin.cozic.net/" title="Home"><i class="fa fa-home"></i></a></li>
+			<li class=""><a href="https:&#x2F;&#x2F;joplinapp.org/" title="Home"><i class="fa fa-home"></i></a></li>
 			<li><a href="https://discourse.joplin.cozic.net" title="Forum">Forum</a></li>
 			<li><a class="help" href="#" title="Menu">Menu</a></li>
 		</ul>
 		<div class="nav-right">
 			<!--
-				<iframe class="share-btn" src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplin.cozic.net&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
-				<iframe class="share-btn" src="https://platform.twitter.com/widgets/tweet_button.html?url=http%3A%2F%2Fjoplin.cozic.net" width="62" height="20" title="Tweet" style="border: 0; overflow: hidden;"></iframe>
+				<iframe class="share-btn" src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplinapp.org&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
+				<iframe class="share-btn" src="https://platform.twitter.com/widgets/tweet_button.html?url=http%3A%2F%2Fjoplinapp.org" width="62" height="20" title="Tweet" style="border: 0; overflow: hidden;"></iframe>
 			-->
 			<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="100px" height="20px"></iframe>
 		</div>
@@ -223,29 +223,29 @@
 <li>
 <p>Applications</p>
 <ul>
-<li><a href="https://joplin.cozic.net/desktop">Desktop application</a></li>
-<li><a href="https://joplin.cozic.net/mobile">Mobile applications</a></li>
-<li><a href="https://joplin.cozic.net/terminal">Terminal application</a></li>
-<li><a href="https://joplin.cozic.net/clipper">Web Clipper</a></li>
+<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.joplin.cozic.net">Joplin Forum</a></li>
-<li><a href="https://joplin.cozic.net/e2ee">How to enable end-to-end encryption</a></li>
-<li><a href="https://joplin.cozic.net/spec">End-to-end encryption spec</a></li>
-<li><a href="https://joplin.cozic.net/debugging">How to enable debug mode</a></li>
-<li><a href="https://joplin.cozic.net/api">API documentation</a></li>
-<li><a href="https://joplin.cozic.net/faq">FAQ</a></li>
+<li><a href="https://joplinapp.org/e2ee">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/spec">End-to-end encryption spec</a></li>
+<li><a href="https://joplinapp.org/debugging">How to enable debug mode</a></li>
+<li><a href="https://joplinapp.org/api">API documentation</a></li>
+<li><a href="https://joplinapp.org/faq">FAQ</a></li>
 </ul>
 </li>
 <li>
 <p>About</p>
 <ul>
-<li><a href="https://joplin.cozic.net/changelog">Changelog</a></li>
-<li><a href="https://joplin.cozic.net/stats">Stats</a></li>
-<li><a href="https://joplin.cozic.net/donate">Donate</a></li>
+<li><a href="https://joplinapp.org/changelog">Changelog</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>
@@ -255,19 +255,19 @@
 <p>There are various ways to send a donation:</p>
 <h2 id="paypal">Paypal</h2>
 <p>To donate via Paypal, please follow this link:</p>
-<p><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=E8JMYD2LQ8MMA&lc=GB&item_name=Joplin+Development&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted"><img src="https://joplin.cozic.net/images/PayPalDonate.png" height="60px"/></a></p>
+<p><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=E8JMYD2LQ8MMA&lc=GB&item_name=Joplin+Development&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted"><img src="https://joplinapp.org/images/PayPalDonate.png" height="60px"/></a></p>
 <h2 id="patreon">Patreon</h2>
 <p>Or you may support the project on Patreon:</p>
-<p><a href="https://www.patreon.com/joplin"><img src="https://joplin.cozic.net/images/badges/Patreon.png"/></a></p>
+<p><a href="https://www.patreon.com/joplin"><img src="https://joplinapp.org/images/badges/Patreon.png"/></a></p>
 <h2 id="bitcoin">Bitcoin</h2>
 <p>Bitcoins are also accepted:</p>
 <p><a href="bitcoin:1AnbeRd5NZT1ssG93jXzaDoHwzgjQAHX3R?message=Joplin%20development">1AnbeRd5NZT1ssG93jXzaDoHwzgjQAHX3R</a></p>
-<p><img src="https://joplin.cozic.net/images/BitcoinQr.png" alt=""></p>
+<p><img src="https://joplinapp.org/images/BitcoinQr.png" alt=""></p>
 <h2 id="other-way-to-support-the-development">Other way to support the development</h2>
 <p>Finally, there are other ways to support the development of Joplin:</p>
 <ul>
 <li>Consider rating the app on <a href="https://play.google.com/store/apps/details?id=net.cozic.joplin&amp;utm_source=GitHub&amp;utm_campaign=README&amp;pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1">Google Play</a> or <a href="https://itunes.apple.com/us/app/joplin/id1315599797">App Store</a>.</li>
-<li><a href="https://joplin.cozic.net/#localisation">Create or update a translation</a>.</li>
+<li><a href="https://joplinapp.org/#localisation">Create or update a translation</a>.</li>
 <li>Help with the <a href="https://github.com/laurent22/joplin">documentation</a>.</li>
 <li>Vote for or review the app on <a href="https://alternativeto.net/software/joplin/">alternativeTo</a></li>
 </ul>
diff --git a/docs/e2ee/index.html b/docs/e2ee/index.html
index cfb6c446fe..81e537b30d 100644
--- a/docs/e2ee/index.html
+++ b/docs/e2ee/index.html
@@ -5,10 +5,10 @@
 	<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://joplin.cozic.net/css/bootstrap.min.css">
+	<link rel="stylesheet" href="https://joplinapp.org/css/bootstrap.min.css">
 	<link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
-	<link rel="stylesheet" href="https://joplin.cozic.net/css/fontawesome-all.min.css"> 
-	<script src="https://joplin.cozic.net/js/jquery-3.2.1.slim.min.js"></script>
+	<link rel="stylesheet" href="https://joplinapp.org/css/fontawesome-all.min.css"> 
+	<script src="https://joplinapp.org/js/jquery-3.2.1.slim.min.js"></script>
 	<style>
 	body {
 		background-color: #F1F1F1;
@@ -196,22 +196,22 @@
 <div class="container">
 
 <div class="header">
-	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="https://joplin.cozic.net/images/ForkMe.png"/></a>
-	<a href="https://joplin.cozic.net"><h1 id="joplin"><img class="title-icon" src="https://joplin.cozic.net/images/Icon512.png">oplin</h1></a>
+	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="https://joplinapp.org/images/ForkMe.png"/></a>
+	<a href="https://joplinapp.org"><h1 id="joplin"><img class="title-icon" src="https://joplinapp.org/images/Icon512.png">oplin</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;joplin.cozic.net/" title="Home"><i class="fa fa-home"></i></a></li>
+			<li class=""><a href="https:&#x2F;&#x2F;joplinapp.org/" title="Home"><i class="fa fa-home"></i></a></li>
 			<li><a href="https://discourse.joplin.cozic.net" title="Forum">Forum</a></li>
 			<li><a class="help" href="#" title="Menu">Menu</a></li>
 		</ul>
 		<div class="nav-right">
 			<!--
-				<iframe class="share-btn" src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplin.cozic.net&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
-				<iframe class="share-btn" src="https://platform.twitter.com/widgets/tweet_button.html?url=http%3A%2F%2Fjoplin.cozic.net" width="62" height="20" title="Tweet" style="border: 0; overflow: hidden;"></iframe>
+				<iframe class="share-btn" src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplinapp.org&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
+				<iframe class="share-btn" src="https://platform.twitter.com/widgets/tweet_button.html?url=http%3A%2F%2Fjoplinapp.org" width="62" height="20" title="Tweet" style="border: 0; overflow: hidden;"></iframe>
 			-->
 			<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="100px" height="20px"></iframe>
 		</div>
@@ -223,29 +223,29 @@
 <li>
 <p>Applications</p>
 <ul>
-<li><a href="https://joplin.cozic.net/desktop">Desktop application</a></li>
-<li><a href="https://joplin.cozic.net/mobile">Mobile applications</a></li>
-<li><a href="https://joplin.cozic.net/terminal">Terminal application</a></li>
-<li><a href="https://joplin.cozic.net/clipper">Web Clipper</a></li>
+<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.joplin.cozic.net">Joplin Forum</a></li>
-<li><a href="https://joplin.cozic.net/e2ee">How to enable end-to-end encryption</a></li>
-<li><a href="https://joplin.cozic.net/spec">End-to-end encryption spec</a></li>
-<li><a href="https://joplin.cozic.net/debugging">How to enable debug mode</a></li>
-<li><a href="https://joplin.cozic.net/api">API documentation</a></li>
-<li><a href="https://joplin.cozic.net/faq">FAQ</a></li>
+<li><a href="https://joplinapp.org/e2ee">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/spec">End-to-end encryption spec</a></li>
+<li><a href="https://joplinapp.org/debugging">How to enable debug mode</a></li>
+<li><a href="https://joplinapp.org/api">API documentation</a></li>
+<li><a href="https://joplinapp.org/faq">FAQ</a></li>
 </ul>
 </li>
 <li>
 <p>About</p>
 <ul>
-<li><a href="https://joplin.cozic.net/changelog">Changelog</a></li>
-<li><a href="https://joplin.cozic.net/stats">Stats</a></li>
-<li><a href="https://joplin.cozic.net/donate">Donate</a></li>
+<li><a href="https://joplinapp.org/changelog">Changelog</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>
@@ -269,7 +269,7 @@
 <h1 id="disabling-e2ee">Disabling E2EE</h1>
 <p>Follow the same procedure as above but instead disable E2EE on each device one by one. Again it might be simpler to do it one device at a time and to wait every time for the synchronisation to complete.</p>
 <h1 id="technical-specification">Technical specification</h1>
-<p>For a more technical description, mostly relevant for development or to review the method being used, please see the <a href="https://joplin.cozic.net/spec">Encryption specification</a>.</p>
+<p>For a more technical description, mostly relevant for development or to review the method being used, please see the <a href="https://joplinapp.org/spec">Encryption specification</a>.</p>
 
 <script>
 	function stickyHeader() { 
diff --git a/docs/faq/index.html b/docs/faq/index.html
index e719b87900..980a1ca865 100644
--- a/docs/faq/index.html
+++ b/docs/faq/index.html
@@ -5,10 +5,10 @@
 	<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://joplin.cozic.net/css/bootstrap.min.css">
+	<link rel="stylesheet" href="https://joplinapp.org/css/bootstrap.min.css">
 	<link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
-	<link rel="stylesheet" href="https://joplin.cozic.net/css/fontawesome-all.min.css"> 
-	<script src="https://joplin.cozic.net/js/jquery-3.2.1.slim.min.js"></script>
+	<link rel="stylesheet" href="https://joplinapp.org/css/fontawesome-all.min.css"> 
+	<script src="https://joplinapp.org/js/jquery-3.2.1.slim.min.js"></script>
 	<style>
 	body {
 		background-color: #F1F1F1;
@@ -196,22 +196,22 @@
 <div class="container">
 
 <div class="header">
-	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="https://joplin.cozic.net/images/ForkMe.png"/></a>
-	<a href="https://joplin.cozic.net"><h1 id="joplin"><img class="title-icon" src="https://joplin.cozic.net/images/Icon512.png">oplin</h1></a>
+	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="https://joplinapp.org/images/ForkMe.png"/></a>
+	<a href="https://joplinapp.org"><h1 id="joplin"><img class="title-icon" src="https://joplinapp.org/images/Icon512.png">oplin</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;joplin.cozic.net/" title="Home"><i class="fa fa-home"></i></a></li>
+			<li class=""><a href="https:&#x2F;&#x2F;joplinapp.org/" title="Home"><i class="fa fa-home"></i></a></li>
 			<li><a href="https://discourse.joplin.cozic.net" title="Forum">Forum</a></li>
 			<li><a class="help" href="#" title="Menu">Menu</a></li>
 		</ul>
 		<div class="nav-right">
 			<!--
-				<iframe class="share-btn" src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplin.cozic.net&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
-				<iframe class="share-btn" src="https://platform.twitter.com/widgets/tweet_button.html?url=http%3A%2F%2Fjoplin.cozic.net" width="62" height="20" title="Tweet" style="border: 0; overflow: hidden;"></iframe>
+				<iframe class="share-btn" src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplinapp.org&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
+				<iframe class="share-btn" src="https://platform.twitter.com/widgets/tweet_button.html?url=http%3A%2F%2Fjoplinapp.org" width="62" height="20" title="Tweet" style="border: 0; overflow: hidden;"></iframe>
 			-->
 			<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="100px" height="20px"></iframe>
 		</div>
@@ -223,29 +223,29 @@
 <li>
 <p>Applications</p>
 <ul>
-<li><a href="https://joplin.cozic.net/desktop">Desktop application</a></li>
-<li><a href="https://joplin.cozic.net/mobile">Mobile applications</a></li>
-<li><a href="https://joplin.cozic.net/terminal">Terminal application</a></li>
-<li><a href="https://joplin.cozic.net/clipper">Web Clipper</a></li>
+<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.joplin.cozic.net">Joplin Forum</a></li>
-<li><a href="https://joplin.cozic.net/e2ee">How to enable end-to-end encryption</a></li>
-<li><a href="https://joplin.cozic.net/spec">End-to-end encryption spec</a></li>
-<li><a href="https://joplin.cozic.net/debugging">How to enable debug mode</a></li>
-<li><a href="https://joplin.cozic.net/api">API documentation</a></li>
-<li><a href="https://joplin.cozic.net/faq">FAQ</a></li>
+<li><a href="https://joplinapp.org/e2ee">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/spec">End-to-end encryption spec</a></li>
+<li><a href="https://joplinapp.org/debugging">How to enable debug mode</a></li>
+<li><a href="https://joplinapp.org/api">API documentation</a></li>
+<li><a href="https://joplinapp.org/faq">FAQ</a></li>
 </ul>
 </li>
 <li>
 <p>About</p>
 <ul>
-<li><a href="https://joplin.cozic.net/changelog">Changelog</a></li>
-<li><a href="https://joplin.cozic.net/stats">Stats</a></li>
-<li><a href="https://joplin.cozic.net/donate">Donate</a></li>
+<li><a href="https://joplinapp.org/changelog">Changelog</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>
diff --git a/docs/index.html b/docs/index.html
index 5a7f28ef9e..a27c6a3b21 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -5,10 +5,10 @@
 	<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://joplin.cozic.net/css/bootstrap.min.css">
+	<link rel="stylesheet" href="https://joplinapp.org/css/bootstrap.min.css">
 	<link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
-	<link rel="stylesheet" href="https://joplin.cozic.net/css/fontawesome-all.min.css"> 
-	<script src="https://joplin.cozic.net/js/jquery-3.2.1.slim.min.js"></script>
+	<link rel="stylesheet" href="https://joplinapp.org/css/fontawesome-all.min.css"> 
+	<script src="https://joplinapp.org/js/jquery-3.2.1.slim.min.js"></script>
 	<style>
 	body {
 		background-color: #F1F1F1;
@@ -196,22 +196,22 @@
 <div class="container">
 
 <div class="header">
-	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="https://joplin.cozic.net/images/ForkMe.png"/></a>
-	<a href="https://joplin.cozic.net"><h1 id="joplin"><img class="title-icon" src="https://joplin.cozic.net/images/Icon512.png">oplin</h1></a>
+	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="https://joplinapp.org/images/ForkMe.png"/></a>
+	<a href="https://joplinapp.org"><h1 id="joplin"><img class="title-icon" src="https://joplinapp.org/images/Icon512.png">oplin</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;joplin.cozic.net/" title="Home"><i class="fa fa-home"></i></a></li>
+			<li class=""><a href="https:&#x2F;&#x2F;joplinapp.org/" title="Home"><i class="fa fa-home"></i></a></li>
 			<li><a href="https://discourse.joplin.cozic.net" title="Forum">Forum</a></li>
 			<li><a class="help" href="#" title="Menu">Menu</a></li>
 		</ul>
 		<div class="nav-right">
 			<!--
-				<iframe class="share-btn" src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplin.cozic.net&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
-				<iframe class="share-btn" src="https://platform.twitter.com/widgets/tweet_button.html?url=http%3A%2F%2Fjoplin.cozic.net" width="62" height="20" title="Tweet" style="border: 0; overflow: hidden;"></iframe>
+				<iframe class="share-btn" src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplinapp.org&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
+				<iframe class="share-btn" src="https://platform.twitter.com/widgets/tweet_button.html?url=http%3A%2F%2Fjoplinapp.org" width="62" height="20" title="Tweet" style="border: 0; overflow: hidden;"></iframe>
 			-->
 			<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="100px" height="20px"></iframe>
 		</div>
@@ -223,39 +223,39 @@
 <li>
 <p>Applications</p>
 <ul>
-<li><a href="https://joplin.cozic.net/desktop">Desktop application</a></li>
-<li><a href="https://joplin.cozic.net/mobile">Mobile applications</a></li>
-<li><a href="https://joplin.cozic.net/terminal">Terminal application</a></li>
-<li><a href="https://joplin.cozic.net/clipper">Web Clipper</a></li>
+<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.joplin.cozic.net">Joplin Forum</a></li>
-<li><a href="https://joplin.cozic.net/e2ee">How to enable end-to-end encryption</a></li>
-<li><a href="https://joplin.cozic.net/spec">End-to-end encryption spec</a></li>
-<li><a href="https://joplin.cozic.net/debugging">How to enable debug mode</a></li>
-<li><a href="https://joplin.cozic.net/api">API documentation</a></li>
-<li><a href="https://joplin.cozic.net/faq">FAQ</a></li>
+<li><a href="https://joplinapp.org/e2ee">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/spec">End-to-end encryption spec</a></li>
+<li><a href="https://joplinapp.org/debugging">How to enable debug mode</a></li>
+<li><a href="https://joplinapp.org/api">API documentation</a></li>
+<li><a href="https://joplinapp.org/faq">FAQ</a></li>
 </ul>
 </li>
 <li>
 <p>About</p>
 <ul>
-<li><a href="https://joplin.cozic.net/changelog">Changelog</a></li>
-<li><a href="https://joplin.cozic.net/stats">Stats</a></li>
-<li><a href="https://joplin.cozic.net/donate">Donate</a></li>
+<li><a href="https://joplinapp.org/changelog">Changelog</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>
-<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://joplin.cozic.net/images/badges/Donate-PayPal-green.svg" alt="Donate"></a> <a href="https://www.patreon.com/joplin"><img src="https://joplin.cozic.net/images/badges/Patreon-Badge.svg" alt="Become a patron"></a> <a href="https://travis-ci.org/laurent22/joplin"><img src="https://travis-ci.org/laurent22/joplin.svg?branch=master" alt="Travis Build Status"></a> <a href="https://ci.appveyor.com/project/laurent22/joplin"><img src="https://ci.appveyor.com/api/projects/status/github/laurent22/joplin?branch=master&amp;passingText=master%20-%20OK&amp;svg=true" alt="Appveyor Build Status"></a></p>
+<p><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=E8JMYD2LQ8MMA&amp;lc=GB&amp;item_name=Joplin+Development&amp;currency_code=EUR&amp;bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted"><img src="https://joplinapp.org/images/badges/Donate-PayPal-green.svg" alt="Donate"></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://travis-ci.org/laurent22/joplin"><img src="https://travis-ci.org/laurent22/joplin.svg?branch=master" alt="Travis Build Status"></a> <a href="https://ci.appveyor.com/project/laurent22/joplin"><img src="https://ci.appveyor.com/api/projects/status/github/laurent22/joplin?branch=master&amp;passingText=master%20-%20OK&amp;svg=true" alt="Appveyor Build Status"></a></p>
 <p>Joplin is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in <a href="#markdown">Markdown format</a>.</p>
 <p>Notes exported from Evernote via .enex files <a href="#importing">can be imported</a> into Joplin, including the formatted content (which is converted to Markdown), resources (images, attachments, etc.) and complete metadata (geolocation, updated time, created time, etc.). Plain Markdown files can also be imported.</p>
 <p>The notes can be <a href="#synchronisation">synchronised</a> with various cloud services including <a href="https://nextcloud.com/">Nextcloud</a>, Dropbox, OneDrive, WebDAV or the file system (for example with a network directory). When synchronising the notes, notebooks, tags and other metadata are saved to plain text files which can be easily inspected, backed up and moved around.</p>
 <p>The application is available for Windows, Linux, macOS, Android and iOS. A <a href="https://github.com/laurent22/joplin/blob/master/readme/clipper.md">Web Clipper</a>, to save web pages and screenshots from your browser, is also available for <a href="https://addons.mozilla.org/en-US/firefox/addon/joplin-web-clipper/">Firefox</a> and <a href="https://chrome.google.com/webstore/detail/joplin-web-clipper/alofnhikmmkdbbbgpnglcpdollgjjfek?hl=en-GB">Chrome</a>.</p>
-<div class="top-screenshot"><img src="https://joplin.cozic.net/images/AllClients.jpg" style="max-width: 100%; max-height: 35em;"></div>
+<div class="top-screenshot"><img src="https://joplinapp.org/images/AllClients.jpg" style="max-width: 100%; max-height: 35em;"></div>
 
 <h1 id="installation">Installation</h1>
 <p>Three types of applications are available: for the <strong>desktop</strong> (Windows, macOS and Linux), for <strong>mobile</strong> (Android and iOS) and for <strong>terminal</strong> (Windows, macOS and Linux). All applications have similar user interfaces and can synchronise with each other.</p>
@@ -271,17 +271,17 @@
 <tbody>
 <tr>
 <td>Windows (32 and 64-bit)</td>
-<td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.142/Joplin-Setup-1.0.142.exe'><img alt='Get it on Windows' height="40px" src='https://joplin.cozic.net/images/BadgeWindows.png'/></a></td>
+<td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.142/Joplin-Setup-1.0.142.exe'><img alt='Get it on Windows' height="40px" src='https://joplinapp.org/images/BadgeWindows.png'/></a></td>
 <td>or Get the <a href='https://github.com/laurent22/joplin/releases/download/v1.0.142/JoplinPortable.exe'>Portable version</a><br>(to run from a USB key, etc.)</td>
 </tr>
 <tr>
 <td>macOS</td>
-<td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.142/Joplin-1.0.142.dmg'><img alt='Get it on macOS' height="40px" src='https://joplin.cozic.net/images/BadgeMacOS.png'/></a></td>
+<td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.142/Joplin-1.0.142.dmg'><img alt='Get it on macOS' height="40px" src='https://joplinapp.org/images/BadgeMacOS.png'/></a></td>
 <td></td>
 </tr>
 <tr>
 <td>Linux</td>
-<td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.142/Joplin-1.0.142-x86_64.AppImage'><img alt='Get it on Linux' height="40px" src='https://joplin.cozic.net/images/BadgeLinux.png'/></a></td>
+<td><a href='https://github.com/laurent22/joplin/releases/download/v1.0.142/Joplin-1.0.142-x86_64.AppImage'><img alt='Get it on Linux' height="40px" src='https://joplinapp.org/images/BadgeLinux.png'/></a></td>
 <td>An Arch Linux package<br><a href="#terminal-application">is also available</a>.</td>
 </tr>
 </tbody>
@@ -302,12 +302,12 @@
 <tbody>
 <tr>
 <td>Android</td>
-<td><a href='https://play.google.com/store/apps/details?id=net.cozic.joplin&utm_source=GitHub&utm_campaign=README&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' height="40px" src='https://joplin.cozic.net/images/BadgeAndroid.png'/></a></td>
+<td><a href='https://play.google.com/store/apps/details?id=net.cozic.joplin&utm_source=GitHub&utm_campaign=README&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' height="40px" src='https://joplinapp.org/images/BadgeAndroid.png'/></a></td>
 <td>or <a href="https://github.com/laurent22/joplin-android/releases/download/android-v1.0.242/joplin-v1.0.242.apk">Download APK File</a></td>
 </tr>
 <tr>
 <td>iOS</td>
-<td><a href='https://itunes.apple.com/us/app/joplin/id1315599797'><img alt='Get it on the App Store' height="40px" src='https://joplin.cozic.net/images/BadgeIOS.png'/></a></td>
+<td><a href='https://itunes.apple.com/us/app/joplin/id1315599797'><img alt='Get it on the App Store' height="40px" src='https://joplinapp.org/images/BadgeIOS.png'/></a></td>
 <td>-</td>
 </tr>
 </tbody>
@@ -336,7 +336,7 @@
 </tbody>
 </table>
 <p>To start it, type <code>joplin</code>.</p>
-<p>For usage information, please refer to the full <a href="https://joplin.cozic.net/terminal">Joplin Terminal Application Documentation</a>.</p>
+<p>For usage information, please refer to the full <a href="https://joplinapp.org/terminal">Joplin Terminal Application Documentation</a>.</p>
 <h2 id="web-clipper">Web Clipper</h2>
 <p>The Web Clipper is a browser extension that allows you to save web pages and screenshots from your browser. For more information on how to install and use it, see the <a href="https://github.com/laurent22/joplin/blob/master/readme/clipper.md">Web Clipper Help Page</a>.</p>
 <h1 id="features">Features</h1>
@@ -369,11 +369,11 @@
 </ul>
 <p>To import Evernote data, first export your Evernote notebooks to ENEX files as described <a href="https://help.evernote.com/hc/en-us/articles/209005557-How-to-back-up-export-and-restore-import-notes-and-notebooks">here</a>. Then follow these steps:</p>
 <p>On the <strong>desktop application</strong>, open File &gt; Import &gt; ENEX and select your file. The notes will be imported into a new separate notebook. If needed they can then be moved to a different notebook, or the notebook can be renamed, etc.</p>
-<p>On the <strong>terminal application</strong>, in <a href="https://joplin.cozic.net/terminal#command-line-mode">command-line mode</a>, type <code>import /path/to/file.enex</code>. This will import the notes into a new notebook named after the filename.</p>
+<p>On the <strong>terminal application</strong>, in <a href="https://joplinapp.org/terminal#command-line-mode">command-line mode</a>, type <code>import /path/to/file.enex</code>. This will import the notes into a new notebook named after the filename.</p>
 <h2 id="importing-from-markdown-files">Importing from Markdown files</h2>
 <p>Joplin can import notes from plain Markdown file. You can either import a complete directory of Markdown files or individual files.</p>
 <p>On the <strong>desktop application</strong>, open File &gt; Import &gt; MD and select your Markdown file or directory.</p>
-<p>On the <strong>terminal application</strong>, in <a href="https://joplin.cozic.net/terminal#command-line-mode">command-line mode</a>, type <code>import --format md /path/to/file.md</code> or <code>import --format md /path/to/directory/</code>.</p>
+<p>On the <strong>terminal application</strong>, in <a href="https://joplinapp.org/terminal#command-line-mode">command-line mode</a>, type <code>import --format md /path/to/file.md</code> or <code>import --format md /path/to/directory/</code>.</p>
 <h2 id="importing-from-other-applications">Importing from other applications</h2>
 <p>In general the way to import notes from any application into Joplin is to convert the notes to ENEX files (Evernote format) and to import these ENEX files into Joplin using the method above. Most note-taking applications support ENEX files so it should be relatively straightforward. For help about specific applications, see below:</p>
 <ul>
@@ -388,7 +388,7 @@
 <p>One of the goals of Joplin was to avoid being tied to any particular company or service, whether it is Evernote, Google or Microsoft. As such the synchronisation is designed without any hard dependency to any particular service. Most of the synchronisation process is done at an abstract level and access to external services, such as Nextcloud or Dropbox, is done via lightweight drivers. It is easy to support new services by creating simple drivers that provide a filesystem-like interface, i.e. the ability to read, write, delete and list items. It is also simple to switch from one service to another or to even sync to multiple services at once. Each note, notebook, tags, as well as the relation between items is transmitted as plain text files during synchronisation, which means the data can also be moved to a different application, can be easily backed up, inspected, etc.</p>
 <p>Currently, synchronisation is possible with Nextcloud, Dropbox (by default), OneDrive or the local filesystem. To setup synchronisation please follow the instructions below. After that, the application will synchronise in the background whenever it is running, or you can click on &quot;Synchronise&quot; to start a synchronisation manually.</p>
 <h2 id="nextcloud-synchronisation">Nextcloud synchronisation</h2>
-<p><img src="https://joplin.cozic.net/images/nextcloud-logo-background.png" width="100" align="left"> <a href="https://nextcloud.com/">Nextcloud</a> is a self-hosted, private cloud solution. It can store documents, images and videos but also calendars, passwords and countless other things and can sync them to your laptop or phone. As you can host your own Nextcloud server, you own both the data on your device and infrastructure used for synchronisation. As such it is a good fit for Joplin. The platform is also well supported and with a strong community, so it is likely to be around for a while - since it&#39;s open source anyway, it is not a service that can be closed, it can exist on a server for as long as one chooses.</p>
+<p><img src="https://joplinapp.org/images/nextcloud-logo-background.png" width="100" align="left"> <a href="https://nextcloud.com/">Nextcloud</a> is a self-hosted, private cloud solution. It can store documents, images and videos but also calendars, passwords and countless other things and can sync them to your laptop or phone. As you can host your own Nextcloud server, you own both the data on your device and infrastructure used for synchronisation. As such it is a good fit for Joplin. The platform is also well supported and with a strong community, so it is likely to be around for a while - since it&#39;s open source anyway, it is not a service that can be closed, it can exist on a server for as long as one chooses.</p>
 <p>On the <strong>desktop application</strong> or <strong>mobile application</strong>, go to the config screen and select Nextcloud as the synchronisation target. Then input the WebDAV URL (to get it, click on Settings in the bottom left corner of the page, in Nextcloud), this is normally <code>https://example.com/nextcloud/remote.php/webdav/Joplin</code> (<strong>make sure to create the &quot;Joplin&quot; directory in Nextcloud</strong>), and set the username and password. If it does not work, please <a href="https://github.com/laurent22/joplin/issues/61#issuecomment-373282608">see this explanation</a> for more details.</p>
 <p>On the <strong>terminal application</strong>, you will need to set the <code>sync.target</code> config variable and all the <code>sync.5.path</code>, <code>sync.5.username</code> and <code>sync.5.password</code> config variables to, respectively the Nextcloud WebDAV URL, your username and your password. This can be done from the command line mode using:</p>
 <pre><code>:config sync.5.path https://example.com/nextcloud/remote.php/webdav/Joplin
@@ -423,8 +423,8 @@
 <p>On the <strong>desktop application</strong> or <strong>mobile application</strong>, select &quot;OneDrive&quot; as the synchronisation target in the config screen. Then, to initiate the synchronisation process, click on the &quot;Synchronise&quot; button in the sidebar and follow the instructions.</p>
 <p>On the <strong>terminal application</strong>, to initiate the synchronisation process, type <code>:sync</code>. You will be asked to follow a link to authorise the application (simply input your Microsoft credentials - you do not need to register with OneDrive).</p>
 <h1 id="encryption">Encryption</h1>
-<p>Joplin supports end-to-end encryption (E2EE) on all the applications. E2EE is a system where only the owner of the notes, notebooks, tags or resources can read them. It prevents potential eavesdroppers - including telecom providers, internet providers, and even the developers of Joplin from being able to access the data. Please see the <a href="https://joplin.cozic.net/e2ee">End-To-End Encryption Tutorial</a> for more information about this feature and how to enable it.</p>
-<p>For a more technical description, mostly relevant for development or to review the method being used, please see the <a href="https://joplin.cozic.net/spec">Encryption specification</a>.</p>
+<p>Joplin supports end-to-end encryption (E2EE) on all the applications. E2EE is a system where only the owner of the notes, notebooks, tags or resources can read them. It prevents potential eavesdroppers - including telecom providers, internet providers, and even the developers of Joplin from being able to access the data. Please see the <a href="https://joplinapp.org/e2ee">End-To-End Encryption Tutorial</a> for more information about this feature and how to enable it.</p>
+<p>For a more technical description, mostly relevant for development or to review the method being used, please see the <a href="https://joplinapp.org/spec">Encryption specification</a>.</p>
 <h1 id="external-text-editor">External text editor</h1>
 <p>Joplin notes can be opened and edited using an external editor of your choice. It can be a simple text editor like Notepad++ or Sublime Text or an actual Markdown editor like Typora. In that case, images will also be displayed within the editor. To open the note in an external editor, click on the icon in the toolbar or press Ctrl+E (or Cmd+E). Your default text editor will be used to open the note. If needed, you can also specify the editor directly in the General Options, under &quot;Text editor command&quot;.</p>
 <h1 id="attachments-resources">Attachments / Resources</h1>
@@ -444,7 +444,7 @@
 <p>If for any reason the notifications do not work, please <a href="https://github.com/laurent22/joplin/issues">open an issue</a>.</p>
 <h1 id="sub-notebooks">Sub-notebooks</h1>
 <p>Sub-notebooks allow organising multiple notebooks into a tree of notebooks. For example it can be used to regroup all the notebooks related to work, to family or to a particular project under a parent notebook.</p>
-<p><img src="https://joplin.cozic.net/images/SubNotebooks.png" alt=""></p>
+<p><img src="https://joplinapp.org/images/SubNotebooks.png" alt=""></p>
 <ul>
 <li>On the <strong>desktop application</strong>, to create a subnotebook, drag and drop it onto another notebook. To move it back to the root, drag and drop it on the &quot;Notebooks&quot; header. Currently only the desktop app can be used to organise the notebooks.</li>
 <li>The <strong>mobile application</strong> supports displaying and collapsing/expanding the tree of notebooks, however it does not currently support moving the subnotebooks to different notebooks.</li>
@@ -548,7 +548,7 @@ f(x) = \int_{-\infty}^\infty
     \,d\xi
 $$
 </code></pre><p>Here is an example with the Markdown and rendered result side by side:</p>
-<p><img src="https://joplin.cozic.net/images/Katex.png" height="400px"></p>
+<p><img src="https://joplinapp.org/images/Katex.png" height="400px"></p>
 <h2 id="checkboxes">Checkboxes</h2>
 <p>Checkboxes can be added like so:</p>
 <pre><code>- [ ] Milk
@@ -601,7 +601,7 @@ $$
 <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 matter how close to each others are the terms. This is a bit experimental so if you notice a search query that returns unexpected results, please report it in the forum, providing as much details as possible to replicate the issue.</p>
 <h1 id="donations">Donations</h1>
 <p>Donations to Joplin support the development of the project. Developing quality applications mostly takes time, but there are also some expenses, such as digital certificates to sign the applications, app store fees, hosting, etc. Most of all, your donation will make it possible to keep up the current development standard.</p>
-<p>Please see the <a href="https://joplin.cozic.net/donate/">donation page</a> for information on how to support the development of Joplin.</p>
+<p>Please see the <a href="https://joplinapp.org/donate/">donation page</a> for information on how to support the development of Joplin.</p>
 <h1 id="community">Community</h1>
 <ul>
 <li>For general discussion about Joplin, user support, software development questions, and to discuss new features, go to the <a href="https://discourse.joplin.cozic.net/">Joplin Forum</a>. It is possible to login with your GitHub account.</li>
@@ -635,175 +635,175 @@ $$
 </thead>
 <tbody>
 <tr>
-<td><img src="https://joplin.cozic.net/images/flags/country-4x3/.png" alt=""></td>
+<td><img src="https://joplinapp.org/images/flags/country-4x3/.png" alt=""></td>
 <td>Arabic</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/ar.po">ar</a></td>
 <td>عبد الناصر سعيد (as@althobaity.com)</td>
 <td>95%</td>
 </tr>
 <tr>
-<td><img src="https://joplin.cozic.net/images/flags/es/basque_country.png" alt=""></td>
+<td><img src="https://joplinapp.org/images/flags/es/basque_country.png" alt=""></td>
 <td>Basque</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/eu.po">eu</a></td>
 <td>juan.abasolo@ehu.eus</td>
 <td>54%</td>
 </tr>
 <tr>
-<td><img src="https://joplin.cozic.net/images/flags/es/catalonia.png" alt=""></td>
+<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/master/CliClient/locales/ca.po">ca</a></td>
 <td>jmontane, 2018</td>
 <td>78%</td>
 </tr>
 <tr>
-<td><img src="https://joplin.cozic.net/images/flags/country-4x3/hr.png" alt=""></td>
+<td><img src="https://joplinapp.org/images/flags/country-4x3/hr.png" alt=""></td>
 <td>Croatian</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/hr_HR.po">hr_HR</a></td>
 <td>Hrvoje Mandić (trbuhom@net.hr)</td>
 <td>44%</td>
 </tr>
 <tr>
-<td><img src="https://joplin.cozic.net/images/flags/country-4x3/cz.png" alt=""></td>
+<td><img src="https://joplinapp.org/images/flags/country-4x3/cz.png" alt=""></td>
 <td>Czech</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/cs_CZ.po">cs_CZ</a></td>
 <td>Lukas Helebrandt (lukas@aiya.cz)</td>
 <td>69%</td>
 </tr>
 <tr>
-<td><img src="https://joplin.cozic.net/images/flags/country-4x3/dk.png" alt=""></td>
+<td><img src="https://joplinapp.org/images/flags/country-4x3/dk.png" alt=""></td>
 <td>Dansk</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/da_DK.po">da_DK</a></td>
 <td>Morten Juhl-Johansen Zölde-Fejér (mjjzf@syntaktisk.</td>
 <td>70%</td>
 </tr>
 <tr>
-<td><img src="https://joplin.cozic.net/images/flags/country-4x3/de.png" alt=""></td>
+<td><img src="https://joplinapp.org/images/flags/country-4x3/de.png" alt=""></td>
 <td>Deutsch</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/de_DE.po">de_DE</a></td>
 <td>Michael Sonntag (ms@editorei.de)</td>
 <td>97%</td>
 </tr>
 <tr>
-<td><img src="https://joplin.cozic.net/images/flags/country-4x3/gb.png" alt=""></td>
+<td><img src="https://joplinapp.org/images/flags/country-4x3/gb.png" alt=""></td>
 <td>English</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/en_GB.po">en_GB</a></td>
 <td></td>
 <td>100%</td>
 </tr>
 <tr>
-<td><img src="https://joplin.cozic.net/images/flags/country-4x3/es.png" alt=""></td>
+<td><img src="https://joplinapp.org/images/flags/country-4x3/es.png" alt=""></td>
 <td>Español</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/es_ES.po">es_ES</a></td>
 <td>Andros Fenollosa (andros@fenollosa.email)</td>
 <td>96%</td>
 </tr>
 <tr>
-<td><img src="https://joplin.cozic.net/images/flags/country-4x3/fr.png" alt=""></td>
+<td><img src="https://joplinapp.org/images/flags/country-4x3/fr.png" alt=""></td>
 <td>Français</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/fr_FR.po">fr_FR</a></td>
 <td>Laurent Cozic</td>
 <td>100%</td>
 </tr>
 <tr>
-<td><img src="https://joplin.cozic.net/images/flags/es/galicia.png" alt=""></td>
+<td><img src="https://joplinapp.org/images/flags/es/galicia.png" alt=""></td>
 <td>Galician</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/gl_ES.po">gl_ES</a></td>
 <td>Marcos Lans (marcoslansgarza@gmail.com)</td>
 <td>69%</td>
 </tr>
 <tr>
-<td><img src="https://joplin.cozic.net/images/flags/country-4x3/it.png" alt=""></td>
+<td><img src="https://joplinapp.org/images/flags/country-4x3/it.png" alt=""></td>
 <td>Italiano</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/it_IT.po">it_IT</a></td>
 <td></td>
 <td>86%</td>
 </tr>
 <tr>
-<td><img src="https://joplin.cozic.net/images/flags/country-4x3/be.png" alt=""></td>
+<td><img src="https://joplinapp.org/images/flags/country-4x3/be.png" alt=""></td>
 <td>Nederlands</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/nl_BE.po">nl_BE</a></td>
 <td></td>
 <td>55%</td>
 </tr>
 <tr>
-<td><img src="https://joplin.cozic.net/images/flags/country-4x3/nl.png" alt=""></td>
+<td><img src="https://joplinapp.org/images/flags/country-4x3/nl.png" alt=""></td>
 <td>Nederlands</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/nl_NL.po">nl_NL</a></td>
 <td>Heimen Stoffels (vistausss@outlook.com)</td>
 <td>83%</td>
 </tr>
 <tr>
-<td><img src="https://joplin.cozic.net/images/flags/country-4x3/no.png" alt=""></td>
+<td><img src="https://joplinapp.org/images/flags/country-4x3/no.png" alt=""></td>
 <td>Norwegian</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/nb_NO.po">nb_NO</a></td>
 <td>Mats Estensen (code@mxe.no)</td>
 <td>97%</td>
 </tr>
 <tr>
-<td><img src="https://joplin.cozic.net/images/flags/country-4x3/br.png" alt=""></td>
+<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/master/CliClient/locales/pt_BR.po">pt_BR</a></td>
 <td>Renato Nunes Bastos (rnbastos@gmail.com)</td>
 <td>90%</td>
 </tr>
 <tr>
-<td><img src="https://joplin.cozic.net/images/flags/country-4x3/ro.png" alt=""></td>
+<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/master/CliClient/locales/ro.po">ro</a></td>
 <td></td>
 <td>54%</td>
 </tr>
 <tr>
-<td><img src="https://joplin.cozic.net/images/flags/country-4x3/si.png" alt=""></td>
+<td><img src="https://joplinapp.org/images/flags/country-4x3/si.png" alt=""></td>
 <td>Slovenian</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/sl_SI.po">sl_SI</a></td>
 <td></td>
 <td>68%</td>
 </tr>
 <tr>
-<td><img src="https://joplin.cozic.net/images/flags/country-4x3/se.png" alt=""></td>
+<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/master/CliClient/locales/sv.po">sv</a></td>
 <td>Jonatan Nyberg (jonatan@autistici.org)</td>
 <td>93%</td>
 </tr>
 <tr>
-<td><img src="https://joplin.cozic.net/images/flags/country-4x3/tr.png" alt=""></td>
+<td><img src="https://joplinapp.org/images/flags/country-4x3/tr.png" alt=""></td>
 <td>Türkçe</td>
 <td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/tr_TR.po">tr_TR</a></td>
 <td>Zorbey Doğangüneş (zorbeyd@gmail.com)</td>
 <td>90%</td>
 </tr>
 <tr>
-<td><img src="https://joplin.cozic.net/images/flags/country-4x3/ru.png" alt=""></td>
+<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/master/CliClient/locales/ru_RU.po">ru_RU</a></td>
 <td>Artyom Karlov (artyom.karlov@gmail.com)</td>
 <td>96%</td>
 </tr>
 <tr>
-<td><img src="https://joplin.cozic.net/images/flags/country-4x3/cn.png" alt=""></td>
+<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/master/CliClient/locales/zh_CN.po">zh_CN</a></td>
 <td></td>
 <td>97%</td>
 </tr>
 <tr>
-<td><img src="https://joplin.cozic.net/images/flags/country-4x3/tw.png" alt=""></td>
+<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/master/CliClient/locales/zh_TW.po">zh_TW</a></td>
 <td>penguinsam (samliu@gmail.com)</td>
 <td>83%</td>
 </tr>
 <tr>
-<td><img src="https://joplin.cozic.net/images/flags/country-4x3/jp.png" alt=""></td>
+<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/master/CliClient/locales/ja_JP.po">ja_JP</a></td>
 <td>AWASHIRO Ikuya (ikunya@gmail.com)</td>
 <td>90%</td>
 </tr>
 <tr>
-<td><img src="https://joplin.cozic.net/images/flags/country-4x3/kr.png" alt=""></td>
+<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/master/CliClient/locales/ko.po">ko</a></td>
 <td></td>
diff --git a/docs/mobile/index.html b/docs/mobile/index.html
index 01a258030e..c82bef5cd1 100644
--- a/docs/mobile/index.html
+++ b/docs/mobile/index.html
@@ -5,10 +5,10 @@
 	<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://joplin.cozic.net/css/bootstrap.min.css">
+	<link rel="stylesheet" href="https://joplinapp.org/css/bootstrap.min.css">
 	<link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
-	<link rel="stylesheet" href="https://joplin.cozic.net/css/fontawesome-all.min.css"> 
-	<script src="https://joplin.cozic.net/js/jquery-3.2.1.slim.min.js"></script>
+	<link rel="stylesheet" href="https://joplinapp.org/css/fontawesome-all.min.css"> 
+	<script src="https://joplinapp.org/js/jquery-3.2.1.slim.min.js"></script>
 	<style>
 	body {
 		background-color: #F1F1F1;
@@ -196,22 +196,22 @@
 <div class="container">
 
 <div class="header">
-	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="https://joplin.cozic.net/images/ForkMe.png"/></a>
-	<a href="https://joplin.cozic.net"><h1 id="joplin"><img class="title-icon" src="https://joplin.cozic.net/images/Icon512.png">oplin</h1></a>
+	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="https://joplinapp.org/images/ForkMe.png"/></a>
+	<a href="https://joplinapp.org"><h1 id="joplin"><img class="title-icon" src="https://joplinapp.org/images/Icon512.png">oplin</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;joplin.cozic.net/" title="Home"><i class="fa fa-home"></i></a></li>
+			<li class=""><a href="https:&#x2F;&#x2F;joplinapp.org/" title="Home"><i class="fa fa-home"></i></a></li>
 			<li><a href="https://discourse.joplin.cozic.net" title="Forum">Forum</a></li>
 			<li><a class="help" href="#" title="Menu">Menu</a></li>
 		</ul>
 		<div class="nav-right">
 			<!--
-				<iframe class="share-btn" src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplin.cozic.net&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
-				<iframe class="share-btn" src="https://platform.twitter.com/widgets/tweet_button.html?url=http%3A%2F%2Fjoplin.cozic.net" width="62" height="20" title="Tweet" style="border: 0; overflow: hidden;"></iframe>
+				<iframe class="share-btn" src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplinapp.org&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
+				<iframe class="share-btn" src="https://platform.twitter.com/widgets/tweet_button.html?url=http%3A%2F%2Fjoplinapp.org" width="62" height="20" title="Tweet" style="border: 0; overflow: hidden;"></iframe>
 			-->
 			<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="100px" height="20px"></iframe>
 		</div>
@@ -223,34 +223,34 @@
 <li>
 <p>Applications</p>
 <ul>
-<li><a href="https://joplin.cozic.net/desktop">Desktop application</a></li>
-<li><a href="https://joplin.cozic.net/mobile">Mobile applications</a></li>
-<li><a href="https://joplin.cozic.net/terminal">Terminal application</a></li>
-<li><a href="https://joplin.cozic.net/clipper">Web Clipper</a></li>
+<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.joplin.cozic.net">Joplin Forum</a></li>
-<li><a href="https://joplin.cozic.net/e2ee">How to enable end-to-end encryption</a></li>
-<li><a href="https://joplin.cozic.net/spec">End-to-end encryption spec</a></li>
-<li><a href="https://joplin.cozic.net/debugging">How to enable debug mode</a></li>
-<li><a href="https://joplin.cozic.net/api">API documentation</a></li>
-<li><a href="https://joplin.cozic.net/faq">FAQ</a></li>
+<li><a href="https://joplinapp.org/e2ee">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/spec">End-to-end encryption spec</a></li>
+<li><a href="https://joplinapp.org/debugging">How to enable debug mode</a></li>
+<li><a href="https://joplinapp.org/api">API documentation</a></li>
+<li><a href="https://joplinapp.org/faq">FAQ</a></li>
 </ul>
 </li>
 <li>
 <p>About</p>
 <ul>
-<li><a href="https://joplin.cozic.net/changelog">Changelog</a></li>
-<li><a href="https://joplin.cozic.net/stats">Stats</a></li>
-<li><a href="https://joplin.cozic.net/donate">Donate</a></li>
+<li><a href="https://joplinapp.org/changelog">Changelog</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>
-<p>An Android and iOS (iPhone/iPad) applications are available from the <a href="https://joplin.cozic.net">Joplin home page</a>.</p>
+<p>An Android and iOS (iPhone/iPad) applications are available from the <a href="https://joplinapp.org">Joplin home page</a>.</p>
 
 <script>
 	function stickyHeader() { 
diff --git a/docs/prereleases/index.html b/docs/prereleases/index.html
index b3f928a788..1a7400b1c4 100644
--- a/docs/prereleases/index.html
+++ b/docs/prereleases/index.html
@@ -5,10 +5,10 @@
 	<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://joplin.cozic.net/css/bootstrap.min.css">
+	<link rel="stylesheet" href="https://joplinapp.org/css/bootstrap.min.css">
 	<link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
-	<link rel="stylesheet" href="https://joplin.cozic.net/css/fontawesome-all.min.css"> 
-	<script src="https://joplin.cozic.net/js/jquery-3.2.1.slim.min.js"></script>
+	<link rel="stylesheet" href="https://joplinapp.org/css/fontawesome-all.min.css"> 
+	<script src="https://joplinapp.org/js/jquery-3.2.1.slim.min.js"></script>
 	<style>
 	body {
 		background-color: #F1F1F1;
@@ -196,22 +196,22 @@
 <div class="container">
 
 <div class="header">
-	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="https://joplin.cozic.net/images/ForkMe.png"/></a>
-	<a href="https://joplin.cozic.net"><h1 id="joplin"><img class="title-icon" src="https://joplin.cozic.net/images/Icon512.png">oplin</h1></a>
+	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="https://joplinapp.org/images/ForkMe.png"/></a>
+	<a href="https://joplinapp.org"><h1 id="joplin"><img class="title-icon" src="https://joplinapp.org/images/Icon512.png">oplin</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;joplin.cozic.net/" title="Home"><i class="fa fa-home"></i></a></li>
+			<li class=""><a href="https:&#x2F;&#x2F;joplinapp.org/" title="Home"><i class="fa fa-home"></i></a></li>
 			<li><a href="https://discourse.joplin.cozic.net" title="Forum">Forum</a></li>
 			<li><a class="help" href="#" title="Menu">Menu</a></li>
 		</ul>
 		<div class="nav-right">
 			<!--
-				<iframe class="share-btn" src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplin.cozic.net&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
-				<iframe class="share-btn" src="https://platform.twitter.com/widgets/tweet_button.html?url=http%3A%2F%2Fjoplin.cozic.net" width="62" height="20" title="Tweet" style="border: 0; overflow: hidden;"></iframe>
+				<iframe class="share-btn" src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplinapp.org&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
+				<iframe class="share-btn" src="https://platform.twitter.com/widgets/tweet_button.html?url=http%3A%2F%2Fjoplinapp.org" width="62" height="20" title="Tweet" style="border: 0; overflow: hidden;"></iframe>
 			-->
 			<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="100px" height="20px"></iframe>
 		</div>
@@ -223,29 +223,29 @@
 <li>
 <p>Applications</p>
 <ul>
-<li><a href="https://joplin.cozic.net/desktop">Desktop application</a></li>
-<li><a href="https://joplin.cozic.net/mobile">Mobile applications</a></li>
-<li><a href="https://joplin.cozic.net/terminal">Terminal application</a></li>
-<li><a href="https://joplin.cozic.net/clipper">Web Clipper</a></li>
+<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.joplin.cozic.net">Joplin Forum</a></li>
-<li><a href="https://joplin.cozic.net/e2ee">How to enable end-to-end encryption</a></li>
-<li><a href="https://joplin.cozic.net/spec">End-to-end encryption spec</a></li>
-<li><a href="https://joplin.cozic.net/debugging">How to enable debug mode</a></li>
-<li><a href="https://joplin.cozic.net/api">API documentation</a></li>
-<li><a href="https://joplin.cozic.net/faq">FAQ</a></li>
+<li><a href="https://joplinapp.org/e2ee">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/spec">End-to-end encryption spec</a></li>
+<li><a href="https://joplinapp.org/debugging">How to enable debug mode</a></li>
+<li><a href="https://joplinapp.org/api">API documentation</a></li>
+<li><a href="https://joplinapp.org/faq">FAQ</a></li>
 </ul>
 </li>
 <li>
 <p>About</p>
 <ul>
-<li><a href="https://joplin.cozic.net/changelog">Changelog</a></li>
-<li><a href="https://joplin.cozic.net/stats">Stats</a></li>
-<li><a href="https://joplin.cozic.net/donate">Donate</a></li>
+<li><a href="https://joplinapp.org/changelog">Changelog</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>
diff --git a/docs/spec/index.html b/docs/spec/index.html
index b3240cc069..07ef7badf5 100644
--- a/docs/spec/index.html
+++ b/docs/spec/index.html
@@ -5,10 +5,10 @@
 	<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://joplin.cozic.net/css/bootstrap.min.css">
+	<link rel="stylesheet" href="https://joplinapp.org/css/bootstrap.min.css">
 	<link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
-	<link rel="stylesheet" href="https://joplin.cozic.net/css/fontawesome-all.min.css"> 
-	<script src="https://joplin.cozic.net/js/jquery-3.2.1.slim.min.js"></script>
+	<link rel="stylesheet" href="https://joplinapp.org/css/fontawesome-all.min.css"> 
+	<script src="https://joplinapp.org/js/jquery-3.2.1.slim.min.js"></script>
 	<style>
 	body {
 		background-color: #F1F1F1;
@@ -196,22 +196,22 @@
 <div class="container">
 
 <div class="header">
-	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="https://joplin.cozic.net/images/ForkMe.png"/></a>
-	<a href="https://joplin.cozic.net"><h1 id="joplin"><img class="title-icon" src="https://joplin.cozic.net/images/Icon512.png">oplin</h1></a>
+	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="https://joplinapp.org/images/ForkMe.png"/></a>
+	<a href="https://joplinapp.org"><h1 id="joplin"><img class="title-icon" src="https://joplinapp.org/images/Icon512.png">oplin</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;joplin.cozic.net/" title="Home"><i class="fa fa-home"></i></a></li>
+			<li class=""><a href="https:&#x2F;&#x2F;joplinapp.org/" title="Home"><i class="fa fa-home"></i></a></li>
 			<li><a href="https://discourse.joplin.cozic.net" title="Forum">Forum</a></li>
 			<li><a class="help" href="#" title="Menu">Menu</a></li>
 		</ul>
 		<div class="nav-right">
 			<!--
-				<iframe class="share-btn" src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplin.cozic.net&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
-				<iframe class="share-btn" src="https://platform.twitter.com/widgets/tweet_button.html?url=http%3A%2F%2Fjoplin.cozic.net" width="62" height="20" title="Tweet" style="border: 0; overflow: hidden;"></iframe>
+				<iframe class="share-btn" src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplinapp.org&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
+				<iframe class="share-btn" src="https://platform.twitter.com/widgets/tweet_button.html?url=http%3A%2F%2Fjoplinapp.org" width="62" height="20" title="Tweet" style="border: 0; overflow: hidden;"></iframe>
 			-->
 			<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="100px" height="20px"></iframe>
 		</div>
@@ -223,29 +223,29 @@
 <li>
 <p>Applications</p>
 <ul>
-<li><a href="https://joplin.cozic.net/desktop">Desktop application</a></li>
-<li><a href="https://joplin.cozic.net/mobile">Mobile applications</a></li>
-<li><a href="https://joplin.cozic.net/terminal">Terminal application</a></li>
-<li><a href="https://joplin.cozic.net/clipper">Web Clipper</a></li>
+<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.joplin.cozic.net">Joplin Forum</a></li>
-<li><a href="https://joplin.cozic.net/e2ee">How to enable end-to-end encryption</a></li>
-<li><a href="https://joplin.cozic.net/spec">End-to-end encryption spec</a></li>
-<li><a href="https://joplin.cozic.net/debugging">How to enable debug mode</a></li>
-<li><a href="https://joplin.cozic.net/api">API documentation</a></li>
-<li><a href="https://joplin.cozic.net/faq">FAQ</a></li>
+<li><a href="https://joplinapp.org/e2ee">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/spec">End-to-end encryption spec</a></li>
+<li><a href="https://joplinapp.org/debugging">How to enable debug mode</a></li>
+<li><a href="https://joplinapp.org/api">API documentation</a></li>
+<li><a href="https://joplinapp.org/faq">FAQ</a></li>
 </ul>
 </li>
 <li>
 <p>About</p>
 <ul>
-<li><a href="https://joplin.cozic.net/changelog">Changelog</a></li>
-<li><a href="https://joplin.cozic.net/stats">Stats</a></li>
-<li><a href="https://joplin.cozic.net/donate">Donate</a></li>
+<li><a href="https://joplinapp.org/changelog">Changelog</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>
diff --git a/docs/stats/index.html b/docs/stats/index.html
index c8f1df7b83..9123217b02 100644
--- a/docs/stats/index.html
+++ b/docs/stats/index.html
@@ -5,10 +5,10 @@
 	<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://joplin.cozic.net/css/bootstrap.min.css">
+	<link rel="stylesheet" href="https://joplinapp.org/css/bootstrap.min.css">
 	<link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
-	<link rel="stylesheet" href="https://joplin.cozic.net/css/fontawesome-all.min.css"> 
-	<script src="https://joplin.cozic.net/js/jquery-3.2.1.slim.min.js"></script>
+	<link rel="stylesheet" href="https://joplinapp.org/css/fontawesome-all.min.css"> 
+	<script src="https://joplinapp.org/js/jquery-3.2.1.slim.min.js"></script>
 	<style>
 	body {
 		background-color: #F1F1F1;
@@ -196,22 +196,22 @@
 <div class="container">
 
 <div class="header">
-	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="https://joplin.cozic.net/images/ForkMe.png"/></a>
-	<a href="https://joplin.cozic.net"><h1 id="joplin"><img class="title-icon" src="https://joplin.cozic.net/images/Icon512.png">oplin</h1></a>
+	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="https://joplinapp.org/images/ForkMe.png"/></a>
+	<a href="https://joplinapp.org"><h1 id="joplin"><img class="title-icon" src="https://joplinapp.org/images/Icon512.png">oplin</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;joplin.cozic.net/" title="Home"><i class="fa fa-home"></i></a></li>
+			<li class=""><a href="https:&#x2F;&#x2F;joplinapp.org/" title="Home"><i class="fa fa-home"></i></a></li>
 			<li><a href="https://discourse.joplin.cozic.net" title="Forum">Forum</a></li>
 			<li><a class="help" href="#" title="Menu">Menu</a></li>
 		</ul>
 		<div class="nav-right">
 			<!--
-				<iframe class="share-btn" src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplin.cozic.net&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
-				<iframe class="share-btn" src="https://platform.twitter.com/widgets/tweet_button.html?url=http%3A%2F%2Fjoplin.cozic.net" width="62" height="20" title="Tweet" style="border: 0; overflow: hidden;"></iframe>
+				<iframe class="share-btn" src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplinapp.org&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
+				<iframe class="share-btn" src="https://platform.twitter.com/widgets/tweet_button.html?url=http%3A%2F%2Fjoplinapp.org" width="62" height="20" title="Tweet" style="border: 0; overflow: hidden;"></iframe>
 			-->
 			<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="100px" height="20px"></iframe>
 		</div>
@@ -223,29 +223,29 @@
 <li>
 <p>Applications</p>
 <ul>
-<li><a href="https://joplin.cozic.net/desktop">Desktop application</a></li>
-<li><a href="https://joplin.cozic.net/mobile">Mobile applications</a></li>
-<li><a href="https://joplin.cozic.net/terminal">Terminal application</a></li>
-<li><a href="https://joplin.cozic.net/clipper">Web Clipper</a></li>
+<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.joplin.cozic.net">Joplin Forum</a></li>
-<li><a href="https://joplin.cozic.net/e2ee">How to enable end-to-end encryption</a></li>
-<li><a href="https://joplin.cozic.net/spec">End-to-end encryption spec</a></li>
-<li><a href="https://joplin.cozic.net/debugging">How to enable debug mode</a></li>
-<li><a href="https://joplin.cozic.net/api">API documentation</a></li>
-<li><a href="https://joplin.cozic.net/faq">FAQ</a></li>
+<li><a href="https://joplinapp.org/e2ee">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/spec">End-to-end encryption spec</a></li>
+<li><a href="https://joplinapp.org/debugging">How to enable debug mode</a></li>
+<li><a href="https://joplinapp.org/api">API documentation</a></li>
+<li><a href="https://joplinapp.org/faq">FAQ</a></li>
 </ul>
 </li>
 <li>
 <p>About</p>
 <ul>
-<li><a href="https://joplin.cozic.net/changelog">Changelog</a></li>
-<li><a href="https://joplin.cozic.net/stats">Stats</a></li>
-<li><a href="https://joplin.cozic.net/donate">Donate</a></li>
+<li><a href="https://joplinapp.org/changelog">Changelog</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>
@@ -261,19 +261,19 @@
 <tbody>
 <tr>
 <td>Total Windows downloads</td>
-<td>210,983</td>
+<td>223,902</td>
 </tr>
 <tr>
 <td>Total macOs downloads</td>
-<td>96,170</td>
+<td>100,238</td>
 </tr>
 <tr>
 <td>Total Linux downloads</td>
-<td>75,423</td>
+<td>79,184</td>
 </tr>
 <tr>
 <td>Windows %</td>
-<td>55%</td>
+<td>56%</td>
 </tr>
 <tr>
 <td>macOS %</td>
@@ -300,58 +300,58 @@
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.142">v1.0.142</a></td>
 <td>2019-04-02T16:44:51Z</td>
-<td>2</td>
-<td>2</td>
-<td>0</td>
-<td>4  </td>
+<td>12,294</td>
+<td>3,930</td>
+<td>3,614</td>
+<td>19,838</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.140">v1.0.140</a></td>
 <td>2019-03-10T20:59:58Z</td>
-<td>12,856</td>
-<td>4,085</td>
-<td>2,949</td>
-<td>19,890</td>
+<td>13,382</td>
+<td>4,106</td>
+<td>2,969</td>
+<td>20,457</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.139">v1.0.139</a></td>
 <td>2019-03-09T10:06:48Z</td>
-<td>80</td>
-<td>15</td>
+<td>81</td>
+<td>16</td>
 <td>21</td>
-<td>116</td>
+<td>118</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.138">v1.0.138</a></td>
 <td>2019-03-03T17:23:00Z</td>
-<td>108</td>
+<td>109</td>
 <td>39</td>
 <td>66</td>
-<td>213</td>
+<td>214</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.137">v1.0.137</a></td>
 <td>2019-03-03T01:12:51Z</td>
 <td>545</td>
 <td>24</td>
-<td>66</td>
-<td>635</td>
+<td>67</td>
+<td>636</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.135">v1.0.135</a></td>
 <td>2019-02-27T23:36:57Z</td>
-<td>12,057</td>
-<td>3,903</td>
-<td>4,037</td>
-<td>19,997</td>
+<td>12,089</td>
+<td>3,911</td>
+<td>4,039</td>
+<td>20,039</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.134">v1.0.134</a></td>
 <td>2019-02-27T10:21:44Z</td>
-<td>1,424</td>
+<td>1,426</td>
 <td>529</td>
 <td>199</td>
-<td>2,152</td>
+<td>2,154</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.132">v1.0.132</a></td>
@@ -364,18 +364,18 @@
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.127">v1.0.127</a></td>
 <td>2019-02-14T23:12:48Z</td>
-<td>9,343</td>
-<td>3,122</td>
-<td>2,899</td>
-<td>15,364</td>
+<td>9,349</td>
+<td>3,123</td>
+<td>2,901</td>
+<td>15,373</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.126">v1.0.126</a></td>
 <td>2019-02-09T19:46:16Z</td>
 <td>911</td>
-<td>49</td>
+<td>50</td>
 <td>106</td>
-<td>1,066</td>
+<td>1,067</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.125">v1.0.125</a></td>
@@ -388,66 +388,66 @@
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.120">v1.0.120</a></td>
 <td>2019-01-10T21:42:53Z</td>
-<td>15,550</td>
-<td>5,162</td>
-<td>6,485</td>
-<td>27,197</td>
+<td>15,552</td>
+<td>5,163</td>
+<td>6,487</td>
+<td>27,202</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.119">v1.0.119</a></td>
 <td>2018-12-18T12:40:22Z</td>
-<td>8,850</td>
-<td>3,199</td>
+<td>8,855</td>
+<td>3,200</td>
 <td>1,991</td>
-<td>14,040</td>
+<td>14,046</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.118">v1.0.118</a></td>
 <td>2019-01-11T08:34:13Z</td>
-<td>674</td>
+<td>676</td>
 <td>215</td>
 <td>75</td>
-<td>964</td>
+<td>966</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.117">v1.0.117</a></td>
 <td>2018-11-24T12:05:24Z</td>
-<td>16,205</td>
-<td>4,844</td>
+<td>16,207</td>
+<td>4,845</td>
 <td>6,356</td>
-<td>27,405</td>
+<td>27,408</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.116">v1.0.116</a></td>
 <td>2018-11-20T19:09:24Z</td>
-<td>3,456</td>
+<td>3,457</td>
 <td>1,087</td>
 <td>704</td>
-<td>5,247</td>
+<td>5,248</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.115">v1.0.115</a></td>
 <td>2018-11-16T16:52:02Z</td>
-<td>3,626</td>
-<td>1,277</td>
-<td>781</td>
-<td>5,684</td>
+<td>3,628</td>
+<td>1,278</td>
+<td>782</td>
+<td>5,688</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.114">v1.0.114</a></td>
 <td>2018-10-24T20:14:10Z</td>
-<td>11,366</td>
+<td>11,369</td>
 <td>3,475</td>
 <td>3,822</td>
-<td>18,663</td>
+<td>18,666</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.111">v1.0.111</a></td>
 <td>2018-09-30T20:15:09Z</td>
-<td>11,856</td>
-<td>3,124</td>
-<td>3,647</td>
-<td>18,627</td>
+<td>11,859</td>
+<td>3,130</td>
+<td>3,648</td>
+<td>18,637</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.110">v1.0.110</a></td>
@@ -476,34 +476,34 @@
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.107">v1.0.107</a></td>
 <td>2018-09-16T19:51:07Z</td>
-<td>7,125</td>
+<td>7,127</td>
 <td>2,115</td>
 <td>1,698</td>
-<td>10,938</td>
+<td>10,940</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.106">v1.0.106</a></td>
 <td>2018-09-08T15:23:40Z</td>
-<td>4,526</td>
+<td>4,529</td>
 <td>1,440</td>
-<td>308</td>
-<td>6,274</td>
+<td>309</td>
+<td>6,278</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.105">v1.0.105</a></td>
 <td>2018-09-05T11:29:36Z</td>
-<td>4,587</td>
+<td>4,591</td>
 <td>1,554</td>
 <td>1,440</td>
-<td>7,581</td>
+<td>7,585</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.104">v1.0.104</a></td>
 <td>2018-06-28T20:25:36Z</td>
-<td>14,987</td>
+<td>14,990</td>
 <td>4,656</td>
-<td>7,042</td>
-<td>26,685</td>
+<td>7,054</td>
+<td>26,700</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.103">v1.0.103</a></td>
@@ -540,18 +540,18 @@
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.97">v1.0.97</a></td>
 <td>2018-06-09T19:23:34Z</td>
-<td>296</td>
+<td>297</td>
 <td>138</td>
 <td>54</td>
-<td>488</td>
+<td>489</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.96">v1.0.96</a></td>
 <td>2018-05-26T16:36:39Z</td>
 <td>2,686</td>
 <td>1,200</td>
-<td>1,228</td>
-<td>5,114</td>
+<td>1,241</td>
+<td>5,127</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.95">v1.0.95</a></td>
@@ -573,9 +573,9 @@
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.93">v1.0.93</a></td>
 <td>2018-05-14T11:36:01Z</td>
 <td>1,770</td>
-<td>908</td>
+<td>913</td>
 <td>742</td>
-<td>3,420</td>
+<td>3,425</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.91">v1.0.91</a></td>
@@ -598,48 +598,48 @@
 <td>2018-05-01T21:08:24Z</td>
 <td>1,641</td>
 <td>934</td>
-<td>613</td>
-<td>3,188</td>
+<td>615</td>
+<td>3,190</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.83">v1.0.83</a></td>
 <td>2018-04-04T19:43:58Z</td>
-<td>4,529</td>
-<td>2,408</td>
-<td>2,628</td>
-<td>9,565</td>
+<td>4,532</td>
+<td>2,417</td>
+<td>2,630</td>
+<td>9,579</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.82">v1.0.82</a></td>
 <td>2018-03-31T19:16:31Z</td>
 <td>684</td>
-<td>384</td>
-<td>96</td>
-<td>1,164</td>
+<td>385</td>
+<td>97</td>
+<td>1,166</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.81">v1.0.81</a></td>
 <td>2018-03-28T08:13:58Z</td>
-<td>984</td>
-<td>566</td>
-<td>744</td>
-<td>2,294</td>
+<td>985</td>
+<td>568</td>
+<td>747</td>
+<td>2,300</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.79">v1.0.79</a></td>
 <td>2018-03-23T18:00:11Z</td>
 <td>919</td>
-<td>510</td>
-<td>353</td>
-<td>1,782</td>
+<td>511</td>
+<td>355</td>
+<td>1,785</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.78">v1.0.78</a></td>
 <td>2018-03-17T15:27:18Z</td>
 <td>1,302</td>
-<td>838</td>
-<td>845</td>
-<td>2,985</td>
+<td>839</td>
+<td>846</td>
+<td>2,987</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.77">v1.0.77</a></td>
@@ -653,25 +653,25 @@
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.72">v1.0.72</a></td>
 <td>2018-03-14T09:44:35Z</td>
 <td>396</td>
-<td>232</td>
-<td>32</td>
-<td>660</td>
+<td>233</td>
+<td>35</td>
+<td>664</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.70">v1.0.70</a></td>
 <td>2018-02-28T20:04:30Z</td>
 <td>1,844</td>
-<td>1,023</td>
-<td>1,222</td>
-<td>4,089</td>
+<td>1,024</td>
+<td>1,224</td>
+<td>4,092</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.67">v1.0.67</a></td>
 <td>2018-02-19T22:51:08Z</td>
 <td>1,805</td>
-<td>580</td>
+<td>581</td>
 <td>0</td>
-<td>2,385</td>
+<td>2,386</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.66">v1.0.66</a></td>
@@ -685,9 +685,9 @@
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.65">v1.0.65</a></td>
 <td>2018-02-17T20:02:25Z</td>
 <td>185</td>
-<td>105</td>
-<td>115</td>
-<td>405</td>
+<td>107</td>
+<td>117</td>
+<td>409</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.64">v1.0.64</a></td>
@@ -709,225 +709,225 @@
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v1.0.62">v1.0.62</a></td>
 <td>2018-02-12T20:19:58Z</td>
 <td>549</td>
-<td>274</td>
-<td>349</td>
-<td>1,172</td>
+<td>275</td>
+<td>350</td>
+<td>1,174</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.61">v0.10.61</a></td>
 <td>2018-02-08T18:27:39Z</td>
 <td>962</td>
-<td>603</td>
-<td>942</td>
-<td>2,507</td>
+<td>604</td>
+<td>943</td>
+<td>2,509</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.60">v0.10.60</a></td>
 <td>2018-02-06T13:09:56Z</td>
 <td>711</td>
-<td>495</td>
-<td>540</td>
-<td>1,746</td>
+<td>497</td>
+<td>541</td>
+<td>1,749</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.54">v0.10.54</a></td>
 <td>2018-01-31T20:21:30Z</td>
 <td>1,811</td>
-<td>1,437</td>
-<td>307</td>
-<td>3,555</td>
+<td>1,440</td>
+<td>308</td>
+<td>3,559</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.52">v0.10.52</a></td>
 <td>2018-01-31T19:25:18Z</td>
 <td>37</td>
-<td>614</td>
+<td>616</td>
 <td>6</td>
-<td>657</td>
+<td>659</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.51">v0.10.51</a></td>
 <td>2018-01-28T18:47:02Z</td>
 <td>1,316</td>
-<td>1,579</td>
+<td>1,581</td>
 <td>318</td>
-<td>3,213</td>
+<td>3,215</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.48">v0.10.48</a></td>
 <td>2018-01-23T11:19:51Z</td>
 <td>1,956</td>
-<td>1,728</td>
-<td>18</td>
-<td>3,702</td>
+<td>1,731</td>
+<td>19</td>
+<td>3,706</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.47">v0.10.47</a></td>
 <td>2018-01-16T17:27:17Z</td>
 <td>1,216</td>
-<td>1,247</td>
+<td>1,249</td>
 <td>59</td>
-<td>2,522</td>
+<td>2,524</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.43">v0.10.43</a></td>
 <td>2018-01-08T10:12:10Z</td>
 <td>3,427</td>
-<td>2,323</td>
-<td>1,196</td>
-<td>6,946</td>
+<td>2,327</td>
+<td>1,197</td>
+<td>6,951</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.41">v0.10.41</a></td>
 <td>2018-01-05T20:38:12Z</td>
 <td>1,029</td>
-<td>1,525</td>
-<td>226</td>
-<td>2,780</td>
+<td>1,528</td>
+<td>227</td>
+<td>2,784</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.40">v0.10.40</a></td>
 <td>2018-01-02T23:16:57Z</td>
 <td>1,586</td>
-<td>1,748</td>
+<td>1,751</td>
 <td>326</td>
-<td>3,660</td>
+<td>3,663</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.39">v0.10.39</a></td>
 <td>2017-12-11T21:19:44Z</td>
-<td>5,458</td>
-<td>3,950</td>
-<td>2,859</td>
-<td>12,267</td>
+<td>5,475</td>
+<td>3,966</td>
+<td>2,873</td>
+<td>12,314</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.38">v0.10.38</a></td>
 <td>2017-12-08T10:12:06Z</td>
 <td>1,041</td>
-<td>1,211</td>
+<td>1,213</td>
 <td>299</td>
-<td>2,551</td>
+<td>2,553</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.37">v0.10.37</a></td>
 <td>2017-12-07T19:38:05Z</td>
 <td>256</td>
-<td>827</td>
+<td>829</td>
 <td>74</td>
-<td>1,157</td>
+<td>1,159</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.36">v0.10.36</a></td>
 <td>2017-12-05T09:34:40Z</td>
 <td>1,008</td>
-<td>1,338</td>
-<td>428</td>
-<td>2,774</td>
+<td>1,340</td>
+<td>429</td>
+<td>2,777</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.35">v0.10.35</a></td>
 <td>2017-12-02T15:56:08Z</td>
 <td>1,570</td>
-<td>1,530</td>
+<td>1,532</td>
 <td>739</td>
-<td>3,839</td>
+<td>3,841</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.34">v0.10.34</a></td>
 <td>2017-12-02T14:50:28Z</td>
 <td>80</td>
-<td>650</td>
+<td>652</td>
 <td>53</td>
-<td>783</td>
+<td>785</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.33">v0.10.33</a></td>
 <td>2017-12-02T13:20:39Z</td>
 <td>52</td>
-<td>639</td>
+<td>641</td>
 <td>13</td>
-<td>704</td>
+<td>706</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.31">v0.10.31</a></td>
 <td>2017-12-01T09:56:44Z</td>
 <td>884</td>
-<td>1,434</td>
+<td>1,436</td>
 <td>400</td>
-<td>2,718</td>
+<td>2,720</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.30">v0.10.30</a></td>
 <td>2017-11-30T20:28:16Z</td>
 <td>711</td>
-<td>1,350</td>
+<td>1,352</td>
 <td>410</td>
-<td>2,471</td>
+<td>2,473</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.28">v0.10.28</a></td>
 <td>2017-11-30T01:07:46Z</td>
-<td>1,269</td>
-<td>1,680</td>
+<td>1,273</td>
+<td>1,682</td>
 <td>864</td>
-<td>3,813</td>
+<td>3,819</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.26">v0.10.26</a></td>
 <td>2017-11-29T16:02:17Z</td>
 <td>180</td>
-<td>683</td>
+<td>685</td>
 <td>255</td>
-<td>1,118</td>
+<td>1,120</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.25">v0.10.25</a></td>
 <td>2017-11-24T14:27:49Z</td>
 <td>136</td>
-<td>674</td>
-<td>5,338</td>
-<td>6,148</td>
+<td>676</td>
+<td>5,389</td>
+<td>6,201</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.23">v0.10.23</a></td>
 <td>2017-11-21T19:38:41Z</td>
 <td>124</td>
-<td>626</td>
+<td>628</td>
 <td>20</td>
-<td>770</td>
+<td>772</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.22">v0.10.22</a></td>
 <td>2017-11-20T21:45:57Z</td>
 <td>76</td>
-<td>625</td>
+<td>627</td>
 <td>11</td>
-<td>712</td>
+<td>714</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.21">v0.10.21</a></td>
 <td>2017-11-18T00:53:15Z</td>
 <td>44</td>
-<td>617</td>
+<td>619</td>
 <td>4</td>
-<td>665</td>
+<td>667</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.20">v0.10.20</a></td>
 <td>2017-11-17T17:18:25Z</td>
 <td>23</td>
-<td>626</td>
+<td>628</td>
 <td>14</td>
-<td>663</td>
+<td>665</td>
 </tr>
 <tr>
 <td><a href="https://github.com/laurent22/joplin/releases/tag/v0.10.19">v0.10.19</a></td>
 <td>2017-11-20T18:59:48Z</td>
-<td>2</td>
-<td>616</td>
-<td>4</td>
-<td>622</td>
+<td>3</td>
+<td>618</td>
+<td>5</td>
+<td>626</td>
 </tr>
 </tbody>
 </table>
diff --git a/docs/terminal/index.html b/docs/terminal/index.html
index 4b6dae5f35..c1d09ee834 100644
--- a/docs/terminal/index.html
+++ b/docs/terminal/index.html
@@ -5,10 +5,10 @@
 	<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://joplin.cozic.net/css/bootstrap.min.css">
+	<link rel="stylesheet" href="https://joplinapp.org/css/bootstrap.min.css">
 	<link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
-	<link rel="stylesheet" href="https://joplin.cozic.net/css/fontawesome-all.min.css"> 
-	<script src="https://joplin.cozic.net/js/jquery-3.2.1.slim.min.js"></script>
+	<link rel="stylesheet" href="https://joplinapp.org/css/fontawesome-all.min.css"> 
+	<script src="https://joplinapp.org/js/jquery-3.2.1.slim.min.js"></script>
 	<style>
 	body {
 		background-color: #F1F1F1;
@@ -196,22 +196,22 @@
 <div class="container">
 
 <div class="header">
-	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="https://joplin.cozic.net/images/ForkMe.png"/></a>
-	<a href="https://joplin.cozic.net"><h1 id="joplin"><img class="title-icon" src="https://joplin.cozic.net/images/Icon512.png">oplin</h1></a>
+	<a class="forkme" href="https://github.com/laurent22/joplin"><img src="https://joplinapp.org/images/ForkMe.png"/></a>
+	<a href="https://joplinapp.org"><h1 id="joplin"><img class="title-icon" src="https://joplinapp.org/images/Icon512.png">oplin</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;joplin.cozic.net/" title="Home"><i class="fa fa-home"></i></a></li>
+			<li class=""><a href="https:&#x2F;&#x2F;joplinapp.org/" title="Home"><i class="fa fa-home"></i></a></li>
 			<li><a href="https://discourse.joplin.cozic.net" title="Forum">Forum</a></li>
 			<li><a class="help" href="#" title="Menu">Menu</a></li>
 		</ul>
 		<div class="nav-right">
 			<!--
-				<iframe class="share-btn" src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplin.cozic.net&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
-				<iframe class="share-btn" src="https://platform.twitter.com/widgets/tweet_button.html?url=http%3A%2F%2Fjoplin.cozic.net" width="62" height="20" title="Tweet" style="border: 0; overflow: hidden;"></iframe>
+				<iframe class="share-btn" src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplinapp.org&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
+				<iframe class="share-btn" src="https://platform.twitter.com/widgets/tweet_button.html?url=http%3A%2F%2Fjoplinapp.org" width="62" height="20" title="Tweet" style="border: 0; overflow: hidden;"></iframe>
 			-->
 			<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="100px" height="20px"></iframe>
 		</div>
@@ -223,37 +223,37 @@
 <li>
 <p>Applications</p>
 <ul>
-<li><a href="https://joplin.cozic.net/desktop">Desktop application</a></li>
-<li><a href="https://joplin.cozic.net/mobile">Mobile applications</a></li>
-<li><a href="https://joplin.cozic.net/terminal">Terminal application</a></li>
-<li><a href="https://joplin.cozic.net/clipper">Web Clipper</a></li>
+<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.joplin.cozic.net">Joplin Forum</a></li>
-<li><a href="https://joplin.cozic.net/e2ee">How to enable end-to-end encryption</a></li>
-<li><a href="https://joplin.cozic.net/spec">End-to-end encryption spec</a></li>
-<li><a href="https://joplin.cozic.net/debugging">How to enable debug mode</a></li>
-<li><a href="https://joplin.cozic.net/api">API documentation</a></li>
-<li><a href="https://joplin.cozic.net/faq">FAQ</a></li>
+<li><a href="https://joplinapp.org/e2ee">How to enable end-to-end encryption</a></li>
+<li><a href="https://joplinapp.org/spec">End-to-end encryption spec</a></li>
+<li><a href="https://joplinapp.org/debugging">How to enable debug mode</a></li>
+<li><a href="https://joplinapp.org/api">API documentation</a></li>
+<li><a href="https://joplinapp.org/faq">FAQ</a></li>
 </ul>
 </li>
 <li>
 <p>About</p>
 <ul>
-<li><a href="https://joplin.cozic.net/changelog">Changelog</a></li>
-<li><a href="https://joplin.cozic.net/stats">Stats</a></li>
-<li><a href="https://joplin.cozic.net/donate">Donate</a></li>
+<li><a href="https://joplinapp.org/changelog">Changelog</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>
 <p>Joplin is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified with your own text editor.</p>
-<p>Notes exported from Evernote via .enex files <a href="https://joplin.cozic.net/#importing">can be imported</a> into Joplin, including the formatted content (which is converted to Markdown), resources (images, attachments, etc.) and complete metadata (geolocation, updated time, created time, etc.). Plain Markdown files can also be imported.</p>
+<p>Notes exported from Evernote via .enex files <a href="https://joplinapp.org/#importing">can be imported</a> into Joplin, including the formatted content (which is converted to Markdown), resources (images, attachments, etc.) and complete metadata (geolocation, updated time, created time, etc.). Plain Markdown files can also be imported.</p>
 <p>The notes can be <a href="#synchronisation">synchronised</a> with various targets including the file system (for example with a network directory), Nextcloud, Dropbox, OneDrive or WebDAV. When synchronising the notes, notebooks, tags and other metadata are saved to plain text files which can be easily inspected, backed up and moved around.</p>
-<p><img src="https://joplin.cozic.net/images/ScreenshotTerminal.png" style="max-width: 60%"></p>
+<p><img src="https://joplinapp.org/images/ScreenshotTerminal.png" style="max-width: 60%"></p>
 <h1 id="installation">Installation</h1>
 <table>
 <thead>
@@ -280,7 +280,7 @@
 <p>To start it, type <code>joplin</code>.</p>
 <h1 id="usage">Usage</h1>
 <p>To start the application type <code>joplin</code>. This will open the user interface, which has three main panes: Notebooks, Notes and the text of the current note. There are also additional panels that can be toggled on and off via <a href="#shortcuts">shortcuts</a>.</p>
-<p><img src="https://joplin.cozic.net/images/ScreenshotTerminalCaptions.png" height="450px"></p>
+<p><img src="https://joplinapp.org/images/ScreenshotTerminalCaptions.png" height="450px"></p>
 <h2 id="input-modes">Input modes</h2>
 <p>Joplin user interface is partly based on the text editor Vim and offers two different modes to interact with the notes and notebooks:</p>
 <h3 id="normal-mode">Normal mode</h3>
@@ -350,7 +350,7 @@
 </tbody>
 </table>
 <p>If the help is not fully visible, press <code>Tab</code> multiple times till the console is in focus and use the arrow keys or page up/down to scroll the text.</p>
-<p>For general information relevant to all the applications, see also <a href="https://joplin.cozic.net">Joplin home page</a>.</p>
+<p>For general information relevant to all the applications, see also <a href="https://joplinapp.org">Joplin home page</a>.</p>
 <h1 id="importing-notes-from-evernote">Importing notes from Evernote</h1>
 <p>To import Evernote data, follow these steps:</p>
 <ul>
@@ -376,10 +376,10 @@
 <pre><code>*/30 * * * * /path/to/joplin sync
 </code></pre><h1 id="urls">URLs</h1>
 <p>When Ctrl+Clicking a URL, most terminals will open that URL in the default browser. However, one issue, especially with long URLs, is that they can end up like this:</p>
-<p><img src="https://joplin.cozic.net/images/UrlCut.png" width="300px"></p>
+<p><img src="https://joplinapp.org/images/UrlCut.png" width="300px"></p>
 <p>Not only it makes the text hard to read, but the link, being cut in two, will also not be clickable.</p>
 <p>As a solution Joplin tries to start a mini-server in the background and, if successful, all the links will be converted to a much shorter URL:</p>
-<p><img src="https://joplin.cozic.net/images/UrlNoCut.png" width="300px"></p>
+<p><img src="https://joplinapp.org/images/UrlNoCut.png" width="300px"></p>
 <p>Since this is still an actual URL, the terminal will still make it clickable. And with shorter URLs, the text is more readable and the links unlikely to be cut. Both resources (files that are attached to notes) and external links are handled in this way.</p>
 <h1 id="attachments-resources">Attachments / Resources</h1>
 <p>In Markdown, links to resources are represented as a simple ID to the resource. In order to give access to these resources, they will be, like links, converted to local URLs. Clicking this link will then open a browser, which will handle the file - i.e. display the image, open the PDF file, etc.</p>
@@ -622,7 +622,7 @@ Possible keys/values:
                              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://joplin.cozic.net/faq/
+                             for more details: https://joplinapp.org/faq/
                              Type: string.
 
     sync.5.username          Nextcloud username.
@@ -635,7 +635,7 @@ Possible keys/values:
                              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://joplin.cozic.net/faq/
+                             for more details: https://joplinapp.org/faq/
                              Type: string.
 
     sync.6.username          WebDAV username.
diff --git a/readme/api.md b/readme/api.md
index bc893a1057..e69de29bb2 100644
--- a/readme/api.md
+++ b/readme/api.md
@@ -1,294 +0,0 @@
-# Joplin API
-
-When the Web Clipper service is enabled, Joplin exposes a [REST API](https://en.wikipedia.org/wiki/Representational_state_transfer) which allows third-party applications to access Joplin's data and to create, modify or delete notes, notebooks, resources or tags.
-
-In order to use it, you'll first need to find on which port the service is running. To do so, open the Web Clipper Options in Joplin and if the service is running it should tell you on which port. Normally it runs on port **41184**. If you want to find it programmatically, you may follow this kind of algorithm:
-
-```javascript
-let port = null;
-for (let portToTest = 41184; portToTest <= 41194; portToTest++) {
-    const result = pingPort(portToTest); // Call GET /ping
-    if (result == 'JoplinClipperServer') {
-        port = portToTest; // Found the port
-        break;
-    }
-}
-```
-
-# Authorisation
-
-To prevent unauthorised applications from accessing the API, the calls must be authentified. To do so, you must provide a token as a query parameter for each API call. You can get this token from the Joplin desktop application, on the Web Clipper Options screen.
-
-This would be an example of valid cURL call using a token:
-
-	curl http://localhost:41184/notes?token=ABCD123ABCD123ABCD123ABCD123ABCD123
-
-In the documentation below, the token will not be specified every time however you will need to include it.
-
-# Using the API
-
-All the calls, unless noted otherwise, receives and send **JSON data**. For example to create a new note:
-
-	curl --data '{ "title": "My note", "body": "Some note in **Markdown**"}' http://localhost:41184/notes
-
-In the documentation below, the calls may include special parameters such as :id or :note_id. You would replace this with the item ID or note ID.
-
-For example, for the endpoint `DELETE /tags/:id/notes/:note_id`, to remove the tag with ID "ABCD1234" from the note with ID "EFGH789", you would run for example:
-
-	curl -X DELETE http://localhost:41184/tags/ABCD1234/notes/EFGH789
-
-The four verbs supported by the API are the following ones:
-
-* **GET**: To retrieve items (notes, notebooks, etc.).
-* **POST**: To create new items. In general most item properties are optional. If you omit any, a default value will be used.
-* **PUT**: To update an item. Note in a REST API, traditionally PUT is used to completely replace an item, however in this API it will only replace the properties that are provided. For example if you PUT {"title": "my new title"}, only the "title" property will be changed. The other properties will be left untouched (they won't be cleared nor changed).
-* **DELETE**: To delete items.
-
-# Filtering data
-
-You can change the fields that will be returned by the API using the `fields=` query parameter, which takes a list of comma separated fields. For example, to get the longitude and latitude of a note, use this:
-
-	curl http://localhost:41184/notes/ABCD123?fields=longitude,latitude
-
-To get the IDs only of all the tags:
-
-	curl http://localhost:41184/tags?fields=id
-
-# Error handling
-
-In case of an error, an HTTP status code >= 400 will be returned along with a JSON object that provides more info about the error. The JSON object is in the format `{ "error": "description of error" }`.
-
-# About the property types
-
-* Text is UTF-8.
-* All date/time are Unix timestamps in milliseconds.
-* Booleans are integer values 0 or 1.
-
-# Testing if the service is available
-
-Call **GET /ping** to check if the service is available. It should return "JoplinClipperServer" if it works.
-
-# Searching
-
-Call **GET /search?query=YOUR_QUERY** to search for notes. This end-point supports the `field` parameter which is recommended to use so that you only get the data that you need. The query syntax is as described in the main documentation: https://joplinapp.org/#searching
-
-# Notes
-
-## Properties
-
-Name | Type | Description
---- | --- | ---
-id  | text |    
-parent_id | text | ID of the notebook that contains this note. Change this ID to move the note to a different notebook.
-title | text | The note title.
-body | text | The note body, in Markdown. May also contain HTML.
-created_time | int | When the note was created.
-updated_time | int | When the note was last updated.
-is_conflict | int | Tells whether the note is a conflict or not.
-latitude | numeric |    
-longitude | numeric |    
-altitude | numeric |    
-author | text |    
-source_url | text | The full URL where the note comes from.
-is_todo | int | Tells whether this note is a todo or not.
-todo_due | int | When the todo is due. An alarm will be triggered on that date.
-todo_completed | int | Tells whether todo is completed or not. This is a timestamp in milliseconds.
-source | text |    
-source_application | text |    
-application_data | text |    
-order | int |    
-user_created_time | int | When the note was created. It may differ from created_time as it can be manually set by the user.
-user_updated_time | int | When the note was last updated. It may differ from updated_time as it can be manually set by the user.
-encryption_cipher_text | text |    
-encryption_applied | int |    
-body_html | text | Note body, in HTML format
-base_url | text | If `body_html` is provided and contains relative URLs, provide the `base_url` parameter too so that all the URLs can be converted to absolute ones. The base URL is basically where the HTML was fetched from, minus the query (everything after the '?'). For example if the original page was `https://stackoverflow.com/search?q=%5Bjava%5D+test`, the base URL is `https://stackoverflow.com/search`.
-image_data_url | text | An image to attach to the note, in [Data URL](https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs) format.
-crop_rect | text | If an image is provided, you can also specify an optional rectangle that will be used to crop the image. In format `{ x: x, y: y, width: width, height: height }`
-
-## GET /notes
-
-Gets all notes
-
-## GET /notes/:id
-
-Gets note with ID :id
-
-## GET /notes/:id/tags
-
-Gets all the tags attached to this note.
-
-## POST /notes
-
-Creates a new note
-
-You can either specify the note body as Markdown by setting the `body` parameter, or in HTML by setting the `body_html`.
-
-Examples:
-
-* Create a note from some Markdown text
-
-      curl --data '{ "title": "My note", "body": "Some note in **Markdown**"}' http://127.0.0.1:41184/notes
-
-* Create a note from some HTML
-
-      curl --data '{ "title": "My note", "body_html": "Some note in <b>HTML</b>"}' http://127.0.0.1:41184/notes
-
-* Create a note and attach an image to it:
-
-      curl --data '{ "title": "Image test", "body": "Here is Joplin icon:", "image_data_url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAIAAABLbSncAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAANZJREFUeNoAyAA3/wFwtO3K6gUB/vz2+Prw9fj/+/r+/wBZKAAExOgF4/MC9ff+MRH6Ui4E+/0Bqc/zutj6AgT+/Pz7+vv7++nu82c4DlMqCvLs8goA/gL8/fz09fb59vXa6vzZ6vjT5fbn6voD/fwC8vX4UiT9Zi//APHyAP8ACgUBAPv5APz7BPj2+DIaC2o3E+3o6ywaC5fT6gD6/QD9/QEVf9kD+/dcLQgJA/7v8vqfwOf18wA1IAIEVycAyt//v9XvAPv7APz8LhoIAPz9Ri4OAgwARgx4W/6fVeEAAAAASUVORK5CYII="}' http://127.0.0.1:41184/notes
-
-### Creating a note with a specific ID
-
-When a new note is created, it is automatically assigned a new unique ID so **normally you do not need to set the ID**. However, if for some reason you want to set it, you can supply it as the `id` property. It needs to be a 32 characters long hexadecimal string. **Make sure it is unique**, for example by generating it using whatever GUID function is available in your programming language.
-
-      curl --data '{ "id": "00a87474082744c1a8515da6aa5792d2", "title": "My note with custom ID"}' http://127.0.0.1:41184/notes
-
-## PUT /notes/:id
-
-Sets the properties of the note with ID :id
-
-## DELETE /notes/:id
-
-Deletes the note with ID :id
-
-# Folders
-
-This is actually a notebook. Internally notebooks are called "folders".
-
-## Properties
-
-Name | Type | Description
---- | --- | ---
-id  | text |    
-title | text | The folder title.
-created_time | int | When the folder was created.
-updated_time | int | When the folder was last updated.
-user_created_time | int | When the folder was created. It may differ from created_time as it can be manually set by the user.
-user_updated_time | int | When the folder was last updated. It may differ from updated_time as it can be manually set by the user.
-encryption_cipher_text | text |    
-encryption_applied | int |    
-parent_id | text |    
-
-## GET /folders
-
-Gets all folders
-
-The folders are returned as a tree. The sub-notebooks of a notebook, if any, are under the `children` key.
-
-## GET /folders/:id
-
-Gets folder with ID :id
-
-## GET /folders/:id/notes
-
-Gets all the notes inside this folder.
-
-## POST /folders
-
-Creates a new folder
-
-## PUT /folders/:id
-
-Sets the properties of the folder with ID :id
-
-## DELETE /folders/:id
-
-Deletes the folder with ID :id
-
-# Resources
-
-## Properties
-
-Name | Type | Description
---- | --- | ---
-id  | text |    
-title | text | The resource title.
-mime | text |    
-filename | text |    
-created_time | int | When the resource was created.
-updated_time | int | When the resource was last updated.
-user_created_time | int | When the resource was created. It may differ from created_time as it can be manually set by the user.
-user_updated_time | int | When the resource was last updated. It may differ from updated_time as it can be manually set by the user.
-file_extension | text |    
-encryption_cipher_text | text |    
-encryption_applied | int |    
-encryption_blob_encrypted | int |    
-
-## GET /resources
-
-Gets all resources
-
-## GET /resources/:id
-
-Gets resource with ID :id
-
-## GET /resources/:id/file
-
-Gets the actual file associated with this resource.
-
-## POST /resources
-
-Creates a new resource
-
-Creating a new resource is special because you also need to upload the file. Unlike other API calls, this one must have the "multipart/form-data" Content-Type. The file data must be passed to the "data" form field, and the other properties to the "props" form field. An example of a valid call with cURL would be:
-
-	curl -F 'data=@/path/to/file.jpg' -F 'props={"title":"my resource title"}' http://localhost:41184/resources
-
-The "data" field is required, while the "props" one is not. If not specified, default values will be used.
-
-## PUT /resources/:id
-
-Sets the properties of the resource with ID :id
-
-## DELETE /resources/:id
-
-Deletes the resource with ID :id
-
-# Tags
-
-## Properties
-
-Name | Type | Description
---- | --- | ---
-id  | text |    
-title | text | The tag title.
-created_time | int | When the tag was created.
-updated_time | int | When the tag was last updated.
-user_created_time | int | When the tag was created. It may differ from created_time as it can be manually set by the user.
-user_updated_time | int | When the tag was last updated. It may differ from updated_time as it can be manually set by the user.
-encryption_cipher_text | text |    
-encryption_applied | int |    
-
-## GET /tags
-
-Gets all tags
-
-## GET /tags/:id
-
-Gets tag with ID :id
-
-## GET /tags/:id/notes
-
-Gets all the notes with this tag.
-
-## POST /tags
-
-Creates a new tag
-
-## POST /tags/:id/notes
-
-Post a note to this endpoint to add the tag to the note. The note data must at least contain an ID property (all other properties will be ignored).
-
-## PUT /tags/:id
-
-Sets the properties of the tag with ID :id
-
-## DELETE /tags/:id
-
-Deletes the tag with ID :id
-
-## DELETE /tags/:id/notes/:note_id
-
-Remove the tag from the note.
-
diff --git a/readme/changelog.md b/readme/changelog.md
index ebb8716dd3..6a8295f116 100644
--- a/readme/changelog.md
+++ b/readme/changelog.md
@@ -177,7 +177,7 @@ This big release aims at improving the overall usability of the application and
 
 Important: This release might be slow on startup due to the need to index all the notes, especially if you have many of them with lots of content. The best is simply to wait for it even if it takes several minutes. This is just a one off and afterwards startup time will be the same as before.
 
-- New: Fast full text search engine. Works with multiple terms, support for prefixes, can restrict search to either note title or body. See https://joplinapp.org/#searching for more info.
+- New: Fast full text search engine. Works with multiple terms, support for prefixes, can restrict search to either note title or body. See https://joplin.cozic.net/#searching for more info.
 - New: Search within current note (Ctrl+F).
 - New: Add separate editor font size option ([#1027](https://github.com/laurent22/joplin/issues/1027))
 - Changed: Changed global search shortcut to F6.
@@ -191,7 +191,7 @@ Important: This release might be slow on startup due to the need to index all th
 
 Important: This release might be slow on startup due to the need to index all the notes, especially if you have many of them with lots of content. The best is simply to wait for it even if it takes several minutes. This is just a one off and afterwards startup time will be the same as before.
 
-- New: Fast full text search engine. Works with multiple terms, support for prefixes, can restrict search to either note title or body. See https://joplinapp.org/#searching for more info.
+- New: Fast full text search engine. Works with multiple terms, support for prefixes, can restrict search to either note title or body. See https://joplin.cozic.net/#searching for more info.
 - New: Search within current note (Ctrl+F).
 - New: Add separate editor font size option ([#1027](https://github.com/laurent22/joplin/issues/1027))
 - Changed: Changed global search shortcut to F6.
@@ -405,7 +405,7 @@ This release is mainly to fix various issues with the recently released Web Clip
 
 ## [v1.0.93](https://github.com/laurent22/joplin/releases/tag/v1.0.93) - 2018-05-14T11:36:01Z
 
-- New: A portable version is now available. To install it simply copy the file "JoplinPortable.exe" to your USB device. See the documentation for more information - https://joplinapp.org/#desktop-applications
+- New: A portable version is now available. To install it simply copy the file "JoplinPortable.exe" to your USB device. See the documentation for more information - https://joplin.cozic.net/#desktop-applications
 - Improved: Made import of ENEX files more robust and accurate
 - Improved: Auto-update process should be more reliable.
 - Fixed: Made sync-after-save interval longer to made synchronisations less frequent.
@@ -423,7 +423,7 @@ Same as v1.0.90 but with a fix for [#510](https://github.com/laurent22/joplin/is
 
 ## [v1.0.89](https://github.com/laurent22/joplin/releases/tag/v1.0.89) - 2018-05-09T13:05:05Z
 
-- New: Resolves [#122](https://github.com/laurent22/joplin/issues/122): Added support for sub-notebooks. Please see doc for more info: https://joplinapp.org/#sub-notebooks
+- New: Resolves [#122](https://github.com/laurent22/joplin/issues/122): Added support for sub-notebooks. Please see doc for more info: https://joplin.cozic.net/#sub-notebooks
 - Improved: Export/Import links to notes
 - Fixes [#480](https://github.com/laurent22/joplin/issues/480): Ignore invalid flag automatically passed by macOS
 - Fixes [#61](https://github.com/laurent22/joplin/issues/61): Handle path that ends with slash for file system sync
diff --git a/readme/stats.md b/readme/stats.md
index bfb6ee9589..374b98c594 100644
--- a/readme/stats.md
+++ b/readme/stats.md
@@ -2,91 +2,91 @@
 
 Name | Value
 --- | ---
-Total Windows downloads | 210,983
-Total macOs downloads | 96,170
-Total Linux downloads | 75,423
-Windows % | 55%
+Total Windows downloads | 223,902
+Total macOs downloads | 100,238
+Total Linux downloads | 79,184
+Windows % | 56%
 macOS % | 25%
 Linux % | 20%
 
 Version | Date | Windows | macOS | Linux | Total
 --- | --- | --- | --- | --- | ---
-[v1.0.142](https://github.com/laurent22/joplin/releases/tag/v1.0.142) | 2019-04-02T16:44:51Z | 2   | 2   | 0   | 4  
-[v1.0.140](https://github.com/laurent22/joplin/releases/tag/v1.0.140) | 2019-03-10T20:59:58Z | 12,856 | 4,085 | 2,949 | 19,890
-[v1.0.139](https://github.com/laurent22/joplin/releases/tag/v1.0.139) | 2019-03-09T10:06:48Z | 80  | 15  | 21  | 116
-[v1.0.138](https://github.com/laurent22/joplin/releases/tag/v1.0.138) | 2019-03-03T17:23:00Z | 108 | 39  | 66  | 213
-[v1.0.137](https://github.com/laurent22/joplin/releases/tag/v1.0.137) | 2019-03-03T01:12:51Z | 545 | 24  | 66  | 635
-[v1.0.135](https://github.com/laurent22/joplin/releases/tag/v1.0.135) | 2019-02-27T23:36:57Z | 12,057 | 3,903 | 4,037 | 19,997
-[v1.0.134](https://github.com/laurent22/joplin/releases/tag/v1.0.134) | 2019-02-27T10:21:44Z | 1,424 | 529 | 199 | 2,152
+[v1.0.142](https://github.com/laurent22/joplin/releases/tag/v1.0.142) | 2019-04-02T16:44:51Z | 12,294 | 3,930 | 3,614 | 19,838
+[v1.0.140](https://github.com/laurent22/joplin/releases/tag/v1.0.140) | 2019-03-10T20:59:58Z | 13,382 | 4,106 | 2,969 | 20,457
+[v1.0.139](https://github.com/laurent22/joplin/releases/tag/v1.0.139) | 2019-03-09T10:06:48Z | 81  | 16  | 21  | 118
+[v1.0.138](https://github.com/laurent22/joplin/releases/tag/v1.0.138) | 2019-03-03T17:23:00Z | 109 | 39  | 66  | 214
+[v1.0.137](https://github.com/laurent22/joplin/releases/tag/v1.0.137) | 2019-03-03T01:12:51Z | 545 | 24  | 67  | 636
+[v1.0.135](https://github.com/laurent22/joplin/releases/tag/v1.0.135) | 2019-02-27T23:36:57Z | 12,089 | 3,911 | 4,039 | 20,039
+[v1.0.134](https://github.com/laurent22/joplin/releases/tag/v1.0.134) | 2019-02-27T10:21:44Z | 1,426 | 529 | 199 | 2,154
 [v1.0.132](https://github.com/laurent22/joplin/releases/tag/v1.0.132) | 2019-02-26T23:02:05Z | 1,043 | 409 | 78  | 1,530
-[v1.0.127](https://github.com/laurent22/joplin/releases/tag/v1.0.127) | 2019-02-14T23:12:48Z | 9,343 | 3,122 | 2,899 | 15,364
-[v1.0.126](https://github.com/laurent22/joplin/releases/tag/v1.0.126) | 2019-02-09T19:46:16Z | 911 | 49  | 106 | 1,066
+[v1.0.127](https://github.com/laurent22/joplin/releases/tag/v1.0.127) | 2019-02-14T23:12:48Z | 9,349 | 3,123 | 2,901 | 15,373
+[v1.0.126](https://github.com/laurent22/joplin/releases/tag/v1.0.126) | 2019-02-09T19:46:16Z | 911 | 50  | 106 | 1,067
 [v1.0.125](https://github.com/laurent22/joplin/releases/tag/v1.0.125) | 2019-01-26T18:14:33Z | 10,229 | 3,518 | 1,689 | 15,436
-[v1.0.120](https://github.com/laurent22/joplin/releases/tag/v1.0.120) | 2019-01-10T21:42:53Z | 15,550 | 5,162 | 6,485 | 27,197
-[v1.0.119](https://github.com/laurent22/joplin/releases/tag/v1.0.119) | 2018-12-18T12:40:22Z | 8,850 | 3,199 | 1,991 | 14,040
-[v1.0.118](https://github.com/laurent22/joplin/releases/tag/v1.0.118) | 2019-01-11T08:34:13Z | 674 | 215 | 75  | 964
-[v1.0.117](https://github.com/laurent22/joplin/releases/tag/v1.0.117) | 2018-11-24T12:05:24Z | 16,205 | 4,844 | 6,356 | 27,405
-[v1.0.116](https://github.com/laurent22/joplin/releases/tag/v1.0.116) | 2018-11-20T19:09:24Z | 3,456 | 1,087 | 704 | 5,247
-[v1.0.115](https://github.com/laurent22/joplin/releases/tag/v1.0.115) | 2018-11-16T16:52:02Z | 3,626 | 1,277 | 781 | 5,684
-[v1.0.114](https://github.com/laurent22/joplin/releases/tag/v1.0.114) | 2018-10-24T20:14:10Z | 11,366 | 3,475 | 3,822 | 18,663
-[v1.0.111](https://github.com/laurent22/joplin/releases/tag/v1.0.111) | 2018-09-30T20:15:09Z | 11,856 | 3,124 | 3,647 | 18,627
+[v1.0.120](https://github.com/laurent22/joplin/releases/tag/v1.0.120) | 2019-01-10T21:42:53Z | 15,552 | 5,163 | 6,487 | 27,202
+[v1.0.119](https://github.com/laurent22/joplin/releases/tag/v1.0.119) | 2018-12-18T12:40:22Z | 8,855 | 3,200 | 1,991 | 14,046
+[v1.0.118](https://github.com/laurent22/joplin/releases/tag/v1.0.118) | 2019-01-11T08:34:13Z | 676 | 215 | 75  | 966
+[v1.0.117](https://github.com/laurent22/joplin/releases/tag/v1.0.117) | 2018-11-24T12:05:24Z | 16,207 | 4,845 | 6,356 | 27,408
+[v1.0.116](https://github.com/laurent22/joplin/releases/tag/v1.0.116) | 2018-11-20T19:09:24Z | 3,457 | 1,087 | 704 | 5,248
+[v1.0.115](https://github.com/laurent22/joplin/releases/tag/v1.0.115) | 2018-11-16T16:52:02Z | 3,628 | 1,278 | 782 | 5,688
+[v1.0.114](https://github.com/laurent22/joplin/releases/tag/v1.0.114) | 2018-10-24T20:14:10Z | 11,369 | 3,475 | 3,822 | 18,666
+[v1.0.111](https://github.com/laurent22/joplin/releases/tag/v1.0.111) | 2018-09-30T20:15:09Z | 11,859 | 3,130 | 3,648 | 18,637
 [v1.0.110](https://github.com/laurent22/joplin/releases/tag/v1.0.110) | 2018-09-29T12:29:21Z | 926 | 376 | 103 | 1,405
 [v1.0.109](https://github.com/laurent22/joplin/releases/tag/v1.0.109) | 2018-09-27T18:01:41Z | 2,074 | 680 | 311 | 3,065
 [v1.0.108](https://github.com/laurent22/joplin/releases/tag/v1.0.108) | 2018-09-29T18:49:29Z | 13  | 6   | 5   | 24 
-[v1.0.107](https://github.com/laurent22/joplin/releases/tag/v1.0.107) | 2018-09-16T19:51:07Z | 7,125 | 2,115 | 1,698 | 10,938
-[v1.0.106](https://github.com/laurent22/joplin/releases/tag/v1.0.106) | 2018-09-08T15:23:40Z | 4,526 | 1,440 | 308 | 6,274
-[v1.0.105](https://github.com/laurent22/joplin/releases/tag/v1.0.105) | 2018-09-05T11:29:36Z | 4,587 | 1,554 | 1,440 | 7,581
-[v1.0.104](https://github.com/laurent22/joplin/releases/tag/v1.0.104) | 2018-06-28T20:25:36Z | 14,987 | 4,656 | 7,042 | 26,685
+[v1.0.107](https://github.com/laurent22/joplin/releases/tag/v1.0.107) | 2018-09-16T19:51:07Z | 7,127 | 2,115 | 1,698 | 10,940
+[v1.0.106](https://github.com/laurent22/joplin/releases/tag/v1.0.106) | 2018-09-08T15:23:40Z | 4,529 | 1,440 | 309 | 6,278
+[v1.0.105](https://github.com/laurent22/joplin/releases/tag/v1.0.105) | 2018-09-05T11:29:36Z | 4,591 | 1,554 | 1,440 | 7,585
+[v1.0.104](https://github.com/laurent22/joplin/releases/tag/v1.0.104) | 2018-06-28T20:25:36Z | 14,990 | 4,656 | 7,054 | 26,700
 [v1.0.103](https://github.com/laurent22/joplin/releases/tag/v1.0.103) | 2018-06-21T19:38:13Z | 2,006 | 858 | 668 | 3,532
 [v1.0.101](https://github.com/laurent22/joplin/releases/tag/v1.0.101) | 2018-06-17T18:35:11Z | 1,290 | 581 | 401 | 2,272
 [v1.0.100](https://github.com/laurent22/joplin/releases/tag/v1.0.100) | 2018-06-14T17:41:43Z | 856 | 410 | 228 | 1,494
 [v1.0.99](https://github.com/laurent22/joplin/releases/tag/v1.0.99) | 2018-06-10T13:18:23Z | 1,237 | 581 | 372 | 2,190
-[v1.0.97](https://github.com/laurent22/joplin/releases/tag/v1.0.97) | 2018-06-09T19:23:34Z | 296 | 138 | 54  | 488
-[v1.0.96](https://github.com/laurent22/joplin/releases/tag/v1.0.96) | 2018-05-26T16:36:39Z | 2,686 | 1,200 | 1,228 | 5,114
+[v1.0.97](https://github.com/laurent22/joplin/releases/tag/v1.0.97) | 2018-06-09T19:23:34Z | 297 | 138 | 54  | 489
+[v1.0.96](https://github.com/laurent22/joplin/releases/tag/v1.0.96) | 2018-05-26T16:36:39Z | 2,686 | 1,200 | 1,241 | 5,127
 [v1.0.95](https://github.com/laurent22/joplin/releases/tag/v1.0.95) | 2018-05-25T13:04:30Z | 387 | 190 | 87  | 664
 [v1.0.94](https://github.com/laurent22/joplin/releases/tag/v1.0.94) | 2018-05-21T20:52:59Z | 1,099 | 557 | 362 | 2,018
-[v1.0.93](https://github.com/laurent22/joplin/releases/tag/v1.0.93) | 2018-05-14T11:36:01Z | 1,770 | 908 | 742 | 3,420
+[v1.0.93](https://github.com/laurent22/joplin/releases/tag/v1.0.93) | 2018-05-14T11:36:01Z | 1,770 | 913 | 742 | 3,425
 [v1.0.91](https://github.com/laurent22/joplin/releases/tag/v1.0.91) | 2018-05-10T14:48:04Z | 814 | 535 | 290 | 1,639
 [v1.0.89](https://github.com/laurent22/joplin/releases/tag/v1.0.89) | 2018-05-09T13:05:05Z | 476 | 212 | 97  | 785
-[v1.0.85](https://github.com/laurent22/joplin/releases/tag/v1.0.85) | 2018-05-01T21:08:24Z | 1,641 | 934 | 613 | 3,188
-[v1.0.83](https://github.com/laurent22/joplin/releases/tag/v1.0.83) | 2018-04-04T19:43:58Z | 4,529 | 2,408 | 2,628 | 9,565
-[v1.0.82](https://github.com/laurent22/joplin/releases/tag/v1.0.82) | 2018-03-31T19:16:31Z | 684 | 384 | 96  | 1,164
-[v1.0.81](https://github.com/laurent22/joplin/releases/tag/v1.0.81) | 2018-03-28T08:13:58Z | 984 | 566 | 744 | 2,294
-[v1.0.79](https://github.com/laurent22/joplin/releases/tag/v1.0.79) | 2018-03-23T18:00:11Z | 919 | 510 | 353 | 1,782
-[v1.0.78](https://github.com/laurent22/joplin/releases/tag/v1.0.78) | 2018-03-17T15:27:18Z | 1,302 | 838 | 845 | 2,985
+[v1.0.85](https://github.com/laurent22/joplin/releases/tag/v1.0.85) | 2018-05-01T21:08:24Z | 1,641 | 934 | 615 | 3,190
+[v1.0.83](https://github.com/laurent22/joplin/releases/tag/v1.0.83) | 2018-04-04T19:43:58Z | 4,532 | 2,417 | 2,630 | 9,579
+[v1.0.82](https://github.com/laurent22/joplin/releases/tag/v1.0.82) | 2018-03-31T19:16:31Z | 684 | 385 | 97  | 1,166
+[v1.0.81](https://github.com/laurent22/joplin/releases/tag/v1.0.81) | 2018-03-28T08:13:58Z | 985 | 568 | 747 | 2,300
+[v1.0.79](https://github.com/laurent22/joplin/releases/tag/v1.0.79) | 2018-03-23T18:00:11Z | 919 | 511 | 355 | 1,785
+[v1.0.78](https://github.com/laurent22/joplin/releases/tag/v1.0.78) | 2018-03-17T15:27:18Z | 1,302 | 839 | 846 | 2,987
 [v1.0.77](https://github.com/laurent22/joplin/releases/tag/v1.0.77) | 2018-03-16T15:12:35Z | 165 | 87  | 25  | 277
-[v1.0.72](https://github.com/laurent22/joplin/releases/tag/v1.0.72) | 2018-03-14T09:44:35Z | 396 | 232 | 32  | 660
-[v1.0.70](https://github.com/laurent22/joplin/releases/tag/v1.0.70) | 2018-02-28T20:04:30Z | 1,844 | 1,023 | 1,222 | 4,089
-[v1.0.67](https://github.com/laurent22/joplin/releases/tag/v1.0.67) | 2018-02-19T22:51:08Z | 1,805 | 580 | 0   | 2,385
+[v1.0.72](https://github.com/laurent22/joplin/releases/tag/v1.0.72) | 2018-03-14T09:44:35Z | 396 | 233 | 35  | 664
+[v1.0.70](https://github.com/laurent22/joplin/releases/tag/v1.0.70) | 2018-02-28T20:04:30Z | 1,844 | 1,024 | 1,224 | 4,092
+[v1.0.67](https://github.com/laurent22/joplin/releases/tag/v1.0.67) | 2018-02-19T22:51:08Z | 1,805 | 581 | 0   | 2,386
 [v1.0.66](https://github.com/laurent22/joplin/releases/tag/v1.0.66) | 2018-02-18T23:09:09Z | 314 | 107 | 72  | 493
-[v1.0.65](https://github.com/laurent22/joplin/releases/tag/v1.0.65) | 2018-02-17T20:02:25Z | 185 | 105 | 115 | 405
+[v1.0.65](https://github.com/laurent22/joplin/releases/tag/v1.0.65) | 2018-02-17T20:02:25Z | 185 | 107 | 117 | 409
 [v1.0.64](https://github.com/laurent22/joplin/releases/tag/v1.0.64) | 2018-02-16T00:58:20Z | 1,074 | 529 | 1,116 | 2,719
 [v1.0.63](https://github.com/laurent22/joplin/releases/tag/v1.0.63) | 2018-02-14T19:40:36Z | 291 | 143 | 83  | 517
-[v1.0.62](https://github.com/laurent22/joplin/releases/tag/v1.0.62) | 2018-02-12T20:19:58Z | 549 | 274 | 349 | 1,172
-[v0.10.61](https://github.com/laurent22/joplin/releases/tag/v0.10.61) | 2018-02-08T18:27:39Z | 962 | 603 | 942 | 2,507
-[v0.10.60](https://github.com/laurent22/joplin/releases/tag/v0.10.60) | 2018-02-06T13:09:56Z | 711 | 495 | 540 | 1,746
-[v0.10.54](https://github.com/laurent22/joplin/releases/tag/v0.10.54) | 2018-01-31T20:21:30Z | 1,811 | 1,437 | 307 | 3,555
-[v0.10.52](https://github.com/laurent22/joplin/releases/tag/v0.10.52) | 2018-01-31T19:25:18Z | 37  | 614 | 6   | 657
-[v0.10.51](https://github.com/laurent22/joplin/releases/tag/v0.10.51) | 2018-01-28T18:47:02Z | 1,316 | 1,579 | 318 | 3,213
-[v0.10.48](https://github.com/laurent22/joplin/releases/tag/v0.10.48) | 2018-01-23T11:19:51Z | 1,956 | 1,728 | 18  | 3,702
-[v0.10.47](https://github.com/laurent22/joplin/releases/tag/v0.10.47) | 2018-01-16T17:27:17Z | 1,216 | 1,247 | 59  | 2,522
-[v0.10.43](https://github.com/laurent22/joplin/releases/tag/v0.10.43) | 2018-01-08T10:12:10Z | 3,427 | 2,323 | 1,196 | 6,946
-[v0.10.41](https://github.com/laurent22/joplin/releases/tag/v0.10.41) | 2018-01-05T20:38:12Z | 1,029 | 1,525 | 226 | 2,780
-[v0.10.40](https://github.com/laurent22/joplin/releases/tag/v0.10.40) | 2018-01-02T23:16:57Z | 1,586 | 1,748 | 326 | 3,660
-[v0.10.39](https://github.com/laurent22/joplin/releases/tag/v0.10.39) | 2017-12-11T21:19:44Z | 5,458 | 3,950 | 2,859 | 12,267
-[v0.10.38](https://github.com/laurent22/joplin/releases/tag/v0.10.38) | 2017-12-08T10:12:06Z | 1,041 | 1,211 | 299 | 2,551
-[v0.10.37](https://github.com/laurent22/joplin/releases/tag/v0.10.37) | 2017-12-07T19:38:05Z | 256 | 827 | 74  | 1,157
-[v0.10.36](https://github.com/laurent22/joplin/releases/tag/v0.10.36) | 2017-12-05T09:34:40Z | 1,008 | 1,338 | 428 | 2,774
-[v0.10.35](https://github.com/laurent22/joplin/releases/tag/v0.10.35) | 2017-12-02T15:56:08Z | 1,570 | 1,530 | 739 | 3,839
-[v0.10.34](https://github.com/laurent22/joplin/releases/tag/v0.10.34) | 2017-12-02T14:50:28Z | 80  | 650 | 53  | 783
-[v0.10.33](https://github.com/laurent22/joplin/releases/tag/v0.10.33) | 2017-12-02T13:20:39Z | 52  | 639 | 13  | 704
-[v0.10.31](https://github.com/laurent22/joplin/releases/tag/v0.10.31) | 2017-12-01T09:56:44Z | 884 | 1,434 | 400 | 2,718
-[v0.10.30](https://github.com/laurent22/joplin/releases/tag/v0.10.30) | 2017-11-30T20:28:16Z | 711 | 1,350 | 410 | 2,471
-[v0.10.28](https://github.com/laurent22/joplin/releases/tag/v0.10.28) | 2017-11-30T01:07:46Z | 1,269 | 1,680 | 864 | 3,813
-[v0.10.26](https://github.com/laurent22/joplin/releases/tag/v0.10.26) | 2017-11-29T16:02:17Z | 180 | 683 | 255 | 1,118
-[v0.10.25](https://github.com/laurent22/joplin/releases/tag/v0.10.25) | 2017-11-24T14:27:49Z | 136 | 674 | 5,338 | 6,148
-[v0.10.23](https://github.com/laurent22/joplin/releases/tag/v0.10.23) | 2017-11-21T19:38:41Z | 124 | 626 | 20  | 770
-[v0.10.22](https://github.com/laurent22/joplin/releases/tag/v0.10.22) | 2017-11-20T21:45:57Z | 76  | 625 | 11  | 712
-[v0.10.21](https://github.com/laurent22/joplin/releases/tag/v0.10.21) | 2017-11-18T00:53:15Z | 44  | 617 | 4   | 665
-[v0.10.20](https://github.com/laurent22/joplin/releases/tag/v0.10.20) | 2017-11-17T17:18:25Z | 23  | 626 | 14  | 663
-[v0.10.19](https://github.com/laurent22/joplin/releases/tag/v0.10.19) | 2017-11-20T18:59:48Z | 2   | 616 | 4   | 622
\ No newline at end of file
+[v1.0.62](https://github.com/laurent22/joplin/releases/tag/v1.0.62) | 2018-02-12T20:19:58Z | 549 | 275 | 350 | 1,174
+[v0.10.61](https://github.com/laurent22/joplin/releases/tag/v0.10.61) | 2018-02-08T18:27:39Z | 962 | 604 | 943 | 2,509
+[v0.10.60](https://github.com/laurent22/joplin/releases/tag/v0.10.60) | 2018-02-06T13:09:56Z | 711 | 497 | 541 | 1,749
+[v0.10.54](https://github.com/laurent22/joplin/releases/tag/v0.10.54) | 2018-01-31T20:21:30Z | 1,811 | 1,440 | 308 | 3,559
+[v0.10.52](https://github.com/laurent22/joplin/releases/tag/v0.10.52) | 2018-01-31T19:25:18Z | 37  | 616 | 6   | 659
+[v0.10.51](https://github.com/laurent22/joplin/releases/tag/v0.10.51) | 2018-01-28T18:47:02Z | 1,316 | 1,581 | 318 | 3,215
+[v0.10.48](https://github.com/laurent22/joplin/releases/tag/v0.10.48) | 2018-01-23T11:19:51Z | 1,956 | 1,731 | 19  | 3,706
+[v0.10.47](https://github.com/laurent22/joplin/releases/tag/v0.10.47) | 2018-01-16T17:27:17Z | 1,216 | 1,249 | 59  | 2,524
+[v0.10.43](https://github.com/laurent22/joplin/releases/tag/v0.10.43) | 2018-01-08T10:12:10Z | 3,427 | 2,327 | 1,197 | 6,951
+[v0.10.41](https://github.com/laurent22/joplin/releases/tag/v0.10.41) | 2018-01-05T20:38:12Z | 1,029 | 1,528 | 227 | 2,784
+[v0.10.40](https://github.com/laurent22/joplin/releases/tag/v0.10.40) | 2018-01-02T23:16:57Z | 1,586 | 1,751 | 326 | 3,663
+[v0.10.39](https://github.com/laurent22/joplin/releases/tag/v0.10.39) | 2017-12-11T21:19:44Z | 5,475 | 3,966 | 2,873 | 12,314
+[v0.10.38](https://github.com/laurent22/joplin/releases/tag/v0.10.38) | 2017-12-08T10:12:06Z | 1,041 | 1,213 | 299 | 2,553
+[v0.10.37](https://github.com/laurent22/joplin/releases/tag/v0.10.37) | 2017-12-07T19:38:05Z | 256 | 829 | 74  | 1,159
+[v0.10.36](https://github.com/laurent22/joplin/releases/tag/v0.10.36) | 2017-12-05T09:34:40Z | 1,008 | 1,340 | 429 | 2,777
+[v0.10.35](https://github.com/laurent22/joplin/releases/tag/v0.10.35) | 2017-12-02T15:56:08Z | 1,570 | 1,532 | 739 | 3,841
+[v0.10.34](https://github.com/laurent22/joplin/releases/tag/v0.10.34) | 2017-12-02T14:50:28Z | 80  | 652 | 53  | 785
+[v0.10.33](https://github.com/laurent22/joplin/releases/tag/v0.10.33) | 2017-12-02T13:20:39Z | 52  | 641 | 13  | 706
+[v0.10.31](https://github.com/laurent22/joplin/releases/tag/v0.10.31) | 2017-12-01T09:56:44Z | 884 | 1,436 | 400 | 2,720
+[v0.10.30](https://github.com/laurent22/joplin/releases/tag/v0.10.30) | 2017-11-30T20:28:16Z | 711 | 1,352 | 410 | 2,473
+[v0.10.28](https://github.com/laurent22/joplin/releases/tag/v0.10.28) | 2017-11-30T01:07:46Z | 1,273 | 1,682 | 864 | 3,819
+[v0.10.26](https://github.com/laurent22/joplin/releases/tag/v0.10.26) | 2017-11-29T16:02:17Z | 180 | 685 | 255 | 1,120
+[v0.10.25](https://github.com/laurent22/joplin/releases/tag/v0.10.25) | 2017-11-24T14:27:49Z | 136 | 676 | 5,389 | 6,201
+[v0.10.23](https://github.com/laurent22/joplin/releases/tag/v0.10.23) | 2017-11-21T19:38:41Z | 124 | 628 | 20  | 772
+[v0.10.22](https://github.com/laurent22/joplin/releases/tag/v0.10.22) | 2017-11-20T21:45:57Z | 76  | 627 | 11  | 714
+[v0.10.21](https://github.com/laurent22/joplin/releases/tag/v0.10.21) | 2017-11-18T00:53:15Z | 44  | 619 | 4   | 667
+[v0.10.20](https://github.com/laurent22/joplin/releases/tag/v0.10.20) | 2017-11-17T17:18:25Z | 23  | 628 | 14  | 665
+[v0.10.19](https://github.com/laurent22/joplin/releases/tag/v0.10.19) | 2017-11-20T18:59:48Z | 3   | 618 | 5   | 626
\ No newline at end of file