47 files changed, 73 insertions, 197 deletions
diff --git a/doc/3rd-party-libraries.html b/doc/3rd-party-libraries.html
index 0da63f22..f6ff4763 100644
--- a/doc/3rd-party-libraries.html
+++ b/doc/3rd-party-libraries.html
@@ -23,10 +23,9 @@
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
diff --git a/doc/Backup,-restore,-import-and-export.html b/doc/Backup,-restore,-import-and-export.html
index f5414efb..4d72728e 100644
--- a/doc/Backup,-restore,-import-and-export.html
+++ b/doc/Backup,-restore,-import-and-export.html
@@ -60,10 +60,9 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
diff --git a/doc/Browsing-and-searching.html b/doc/Browsing-and-searching.html
index a0887850..39806128 100644
--- a/doc/Browsing-and-searching.html
+++ b/doc/Browsing-and-searching.html
@@ -23,10 +23,9 @@
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
diff --git a/doc/Coding-guidelines.html b/doc/Coding-guidelines.html
index 8dbf3bce..add69631 100644
--- a/doc/Coding-guidelines.html
+++ b/doc/Coding-guidelines.html
@@ -23,10 +23,9 @@
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
diff --git a/doc/Community-&-Related-software.html b/doc/Community-&-Related-software.html
index 8dd0e430..77b9793f 100644
--- a/doc/Community-&-Related-software.html
+++ b/doc/Community-&-Related-software.html
@@ -23,10 +23,9 @@
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
@@ -79,11 +78,14 @@
 <li><a href="http://sebsauvage.net/wiki/doku.php?id=php:shaarli:discussion">Original discussion page</a> (fr)<a href=".html"></a></li>
 <li><a href="http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history">Original revisions history</a><a href=".html"></a></li>
 <li><a href="https://www.shaarli.fr/my.php">Shaarli.fr/my</a> - Unofficial, unsupported (old fork) hosted Shaarlis provider, courtesy of <a href="https://github.com/DMeloni">DMeloni</a><a href=".html"></a></li>
-<li><a href="http://shaarferme.etudiant-libre.fr.nf/index.php">Shaarli Community</a> - Unknown Shaarli hoster (unsupported, old fork)<a href=".html"></a></li>
 </ul>
 <h3 id="third-party-plugins">Third party plugins</h3>
 <ul>
-<li><a href="https://github.com/kalvn/shaarli-plugin-autosave">autosave</a> - periodically saves contents of the <em>Edit link/Save link</em> dialog to your browser's LocalStorage to avoid data loss when typing a long entry.<a href=".html"></a></li>
+<li><a href="https://github.com/kalvn/shaarli-plugin-autosave">autosave</a> by <a href="https://github.com/kalvn">@kalvn</a>: Automatically saves data when editing a link to avoid any loss in case of crash or unexpected shutdown.<a href=".html"></a></li>
+<li><a href="https://github.com/ArthurHoaro/code-coloration">Code Coloration</a> by <a href="https://github.com/ArthurHoaro">@ArthurHoaro</a>: client side code syntax highlighter.<a href=".html"></a></li>
+<li><a href="https://github.com/alexisju/social">social</a> by <a href="https://github.com/alexisju">@alexisju</a>: share links to social networks.<a href=".html"></a></li>
+<li><a href="https://github.com/NerosTie/emojione">emojione</a> by <a href="https://github.com/NerosTie/emojione">@NerosTie</a>: Add colorful emojis to your Shaarli.<a href=".html"></a></li>
+<li><a href="https://github.com/ArthurHoaro/launch-plugin">launch</a> - Launch Plugin is a plugin designed to enhance and customize Launch Theme for Shaarli.<a href=".html"></a></li>
 </ul>
 <h3 id="themes">Themes</h3>
 <p>See <a href="Theming.html">Theming</a> for the list of community-contributed themes, and an installation guide.</p>
diff --git a/doc/Community-&-Related-software.md b/doc/Community-&-Related-software.md
index 27da45d8..03a3dea9 100644
--- a/doc/Community-&-Related-software.md
+++ b/doc/Community-&-Related-software.md
@@ -13,11 +13,17 @@ _TODO: contact repos owners to see if they'd like to standardize their work with
 - [Original discussion page](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:discussion) (fr)[](.html)
 - [Original revisions history](http://sebsauvage.net/wiki/doku.php?id=php:shaarli:history)[](.html)
 - [Shaarli.fr/my](https://www.shaarli.fr/my.php) - Unofficial, unsupported (old fork) hosted Shaarlis provider, courtesy of [DMeloni](https://github.com/DMeloni)[](.html)
- [Shaarli Community](http://shaarferme.etudiant-libre.fr.nf/index.php) - Unknown Shaarli hoster (unsupported, old fork)[](.html)
 ### Third party plugins
- * [autosave](https://github.com/kalvn/shaarli-plugin-autosave) - periodically saves contents of the _Edit link/Save link_ dialog to your browser's LocalStorage to avoid data loss when typing a long entry.[](.html)
+  * [autosave](https://github.com/kalvn/shaarli-plugin-autosave) by [@kalvn](https://github.com/kalvn): Automatically saves data when editing a link to avoid any loss in case of crash or unexpected shutdown.[](.html)
+  * [Code Coloration](https://github.com/ArthurHoaro/code-coloration) by [@ArthurHoaro](https://github.com/ArthurHoaro): client side code syntax highlighter.[](.html)
+  * [social](https://github.com/alexisju/social) by [@alexisju](https://github.com/alexisju): share links to social networks.[](.html)
+  * [emojione](https://github.com/NerosTie/emojione) by [@NerosTie](https://github.com/NerosTie/emojione): Add colorful emojis to your Shaarli.[](.html)
+  * [launch](https://github.com/ArthurHoaro/launch-plugin) - Launch Plugin is a plugin designed to enhance and customize Launch Theme for Shaarli.[](.html)
 ### Themes
 See [Theming](Theming.html) for the list of community-contributed themes, and an installation guide.
diff --git a/doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.html b/doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.html
index 067c6828..edb1555f 100644
--- a/doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.html
+++ b/doc/Copy-an-existing-installation-over-SSH-and-serve-it-locally.html
@@ -60,10 +60,9 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
diff --git a/doc/Create-and-serve-multiple-Shaarlis-(farm).html b/doc/Create-and-serve-multiple-Shaarlis-(farm).html
index d3da1a2e..933144e4 100644
--- a/doc/Create-and-serve-multiple-Shaarlis-(farm).html
+++ b/doc/Create-and-serve-multiple-Shaarlis-(farm).html
@@ -60,10 +60,9 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
diff --git a/doc/Datastore-hacks.html b/doc/Datastore-hacks.html
index 6273fae0..88639402 100644
--- a/doc/Datastore-hacks.html
+++ b/doc/Datastore-hacks.html
@@ -60,10 +60,9 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
diff --git a/doc/Development.html b/doc/Development.html
index f7ada07f..2eacff94 100644
--- a/doc/Development.html
+++ b/doc/Development.html
@@ -23,10 +23,9 @@
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
diff --git a/doc/Directory-structure.html b/doc/Directory-structure.html
index 2369950a..003d4d94 100644
--- a/doc/Directory-structure.html
+++ b/doc/Directory-structure.html
@@ -60,10 +60,9 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
diff --git a/doc/Docker.html b/doc/Docker.html
index ab95da39..a443d100 100644
--- a/doc/Docker.html
+++ b/doc/Docker.html
@@ -60,10 +60,9 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
diff --git a/doc/Download-CSS-styles-from-an-OPML-list.html b/doc/Download-CSS-styles-from-an-OPML-list.html
index aaafbfeb..22771502 100644
--- a/doc/Download-CSS-styles-from-an-OPML-list.html
+++ b/doc/Download-CSS-styles-from-an-OPML-list.html
@@ -60,10 +60,9 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
diff --git a/doc/Download.html b/doc/Download.html
index 6d668e8e..9f9f5117 100644
--- a/doc/Download.html
+++ b/doc/Download.html
@@ -60,10 +60,9 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
diff --git a/doc/Example-patch---add-new-via-field-for-links.html b/doc/Example-patch---add-new-via-field-for-links.html
index d6f9a92e..7db43107 100644
--- a/doc/Example-patch---add-new-via-field-for-links.html
+++ b/doc/Example-patch---add-new-via-field-for-links.html
@@ -23,10 +23,9 @@
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
diff --git a/doc/FAQ.html b/doc/FAQ.html
index 72343b3f..3b6b956d 100644
--- a/doc/FAQ.html
+++ b/doc/FAQ.html
@@ -23,10 +23,9 @@
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
diff --git a/doc/Firefox-share.html b/doc/Firefox-share.html
index 0ae70605..add6d4e8 100644
--- a/doc/Firefox-share.html
+++ b/doc/Firefox-share.html
@@ -23,10 +23,9 @@
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
diff --git a/doc/GnuPG-signature.html b/doc/GnuPG-signature.html
index c187c996..c431f9ad 100644
--- a/doc/GnuPG-signature.html
+++ b/doc/GnuPG-signature.html
@@ -60,10 +60,9 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
diff --git a/doc/Home.html b/doc/Home.html
index 827d256f..442503c5 100644
--- a/doc/Home.html
+++ b/doc/Home.html
@@ -23,10 +23,9 @@
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
diff --git a/doc/Plugin-System.html b/doc/Plugin-System.html
index 2a660c49..37b26152 100644
--- a/doc/Plugin-System.html
+++ b/doc/Plugin-System.html
@@ -60,10 +60,9 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
@@ -279,6 +278,7 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
 <p>List of placeholders:</p>
 <ul>
 <li><code>text</code>: called after the end of the footer text.</li>
+<li><code>endofpage</code>: called at the end of the page.</li>
 </ul>
 <p><img src="http://i.imgur.com/L5S2YEH.png" alt="text_example" /><a href=".html"></a></p>
 <ul>
diff --git a/doc/Plugin-System.md b/doc/Plugin-System.md
index 8281e61d..623627dd 100644
--- a/doc/Plugin-System.md
+++ b/doc/Plugin-System.md
@@ -195,6 +195,7 @@ Items can be displayed in templates by adding an entry in `$data['<placeholder>'
 List of placeholders:
  * `text`: called after the end of the footer text.
+  * `endofpage`: called at the end of the page.
 ![text_example](http://i.imgur.com/L5S2YEH.png)[](.html)
diff --git a/doc/Plugin-list.html b/doc/Plugin-list.html
deleted file mode 100644
index 16eca046..00000000
--- a/doc/Plugin-list.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-  <meta name="generator" content="pandoc">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
-  <title>Shaarli – Plugin list</title>
-  <style type="text/css">code{white-space: pre;}</style>
-  <link rel="stylesheet" href="github-markdown.css">
-  <!--[if lt IE 9]>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
-  <![endif]-->
-</head>
-<body>
-<div id="local-sidebar">
-<ul>
-<li><a href="Home.html">Home</a></li>
-<li>Installation
-<ul>
-<li><a href="Download.html">Download</a></li>
-<li><a href="Server-requirements.html">Server requirements</a></li>
-<li><a href="Server-configuration.html">Server configuration</a></li>
-<li><a href="Server-security.html">Server security</a></li>
-<li><a href="Shaarli-installation.html">Shaarli installation</a></li>
-<li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
-</ul></li>
-<li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
-<li><a href="Usage.html">Usage</a>
-<ul>
-<li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
-<li><a href="Browsing-and-Searching.html">Browsing and Searching</a></li>
-<li><a href="Firefox-share.html">Firefox share</a></li>
-<li><a href="RSS-feeds.html">RSS feeds</a></li>
-</ul></li>
-<li>How To
-<ul>
-<li><a href="Backup,-restore,-import-and-export.html">Backup, restore, import and export</a></li>
-<li><a href="Upgrade-from-original-sebsauvage/Shaarli.html">Upgrade from original sebsauvage/Shaarli</a></li>
-<li><a href="Copy-an-existing-installation-over-SSH-and-serve-it-locally.html">Copy an existing installation over SSH and serve it locally</a></li>
-<li><a href="Create-and-serve-multiple-Shaarlis-(farm).html">Create and serve multiple Shaarlis (farm)</a></li>
-<li><a href="Download-CSS-styles-from-an-OPML-list.html">Download CSS styles from an OPML list</a></li>
-<li><a href="Datastore-hacks.html">Datastore hacks</a></li>
-</ul></li>
-<li><a href="Troubleshooting.html">Troubleshooting</a></li>
-<li><a href="Development.html">Development</a>
-<ul>
-<li><a href="GnuPG-signature.html">GnuPG signature</a></li>
-<li><a href="Coding-guidelines.html">Coding guidelines</a></li>
-<li><a href="Directory-structure.html">Directory structure</a></li>
-<li><a href="3rd-party-libraries.html">3rd party libraries</a></li>
-<li><a href="Plugin-System.html">Plugin System</a></li>
-<li><a href="Release-Shaarli.html">Release Shaarli</a></li>
-<li><a href="Security.html">Security</a></li>
-<li><a href="Static-analysis.html">Static analysis</a></li>
-<li><a href="Theming.html">Theming</a></li>
-<li><a href="Unit-tests.html">Unit tests</a></li>
-</ul></li>
-<li>About
-<ul>
-<li><a href="FAQ.html">FAQ</a></li>
-<li><a href="Community-&amp;-Related-software.html">Community &amp; Related software</a></li>
-<li><a href="TODO.html">TODO</a></li>
-</ul></li>
-</ul>
-</div>
-<h1 id="plugin-list">Plugin list</h1>
-<h2 id="community-plugins">Community plugins</h2>
-<p>These plugins are maintained by the community:</p>
-<ul>
-<li>Archive.org - add a clickable icon to every link to archive.org.</li>
-<li>Addlink in toolbar - add a field to paste new links URL in toolbar.</li>
-<li>Markdown - write and display Shaare in Markdown.</li>
-<li>Play videos - popup to play all videos displayed in linklist.</li>
-<li>QRCode - add a clickable icon generating a QRCode for every link.</li>
-<li>ReadItYourself - add a clickable icon for ReadItYourself.</li>
-<li>Wallabag - add a clickable icon for Wallabag.</li>
-</ul>
-<h2 id="third-party-plugins">Third party plugins</h2>
-<ul>
-<li><a href="https://github.com/kalvn/shaarli-plugin-autosave">autosave</a> by <a href="https://github.com/kalvn">@kalvn</a>: Automatically saves data when editing a link to avoid any loss in case of crash or unexpected shutdown.<a href=".html"></a></li>
-<li><a href="https://github.com/ArthurHoaro/code-coloration">Code Coloration</a> by <a href="https://github.com/ArthurHoaro">@ArthurHoaro</a>: client side code syntax highlighter.<a href=".html"></a></li>
-<li><a href="https://github.com/alexisju/social">social</a> by <a href="https://github.com/alexisju">@alexisju</a>: share links to social networks.<a href=".html"></a></li>
-</ul>
-</body>
-</html>
diff --git a/doc/Plugin-list.md b/doc/Plugin-list.md
deleted file mode 100644
index bb4f553b..00000000
--- a/doc/Plugin-list.md
+++ /dev/null
@@ -1,18 +0,0 @@
-#Plugin list
-## Community plugins
-These plugins are maintained by the community:
-  * Archive.org - add a clickable icon to every link to archive.org.
-  * Addlink in toolbar - add a field to paste new links URL in toolbar.
-  * Markdown - write and display Shaare in Markdown.
-  * Play videos - popup to play all videos displayed in linklist.
-  * QRCode - add a clickable icon generating a QRCode for every link.
-  * ReadItYourself - add a clickable icon for ReadItYourself.
-  * Wallabag - add a clickable icon for Wallabag.
-## Third party plugins
-  * [autosave](https://github.com/kalvn/shaarli-plugin-autosave) by [@kalvn](https://github.com/kalvn): Automatically saves data when editing a link to avoid any loss in case of crash or unexpected shutdown.[](.html)
-  * [Code Coloration](https://github.com/ArthurHoaro/code-coloration) by [@ArthurHoaro](https://github.com/ArthurHoaro): client side code syntax highlighter.[](.html)
-  * [social](https://github.com/alexisju/social) by [@alexisju](https://github.com/alexisju): share links to social networks.[](.html)
diff --git a/doc/Plugin-installation-&-configuration.html b/doc/Plugins.html
index 3d2f9704..e7df6aed 100644
--- a/doc/Plugin-installation-&-configuration.html
+++ b/doc/Plugins.html
@@ -4,7 +4,7 @@
  <meta charset="utf-8">
  <meta name="generator" content="pandoc">
  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
-  <title>Shaarli – Plugin installation & configuration</title>
+  <title>Shaarli – Plugins</title>
  <style type="text/css">code{white-space: pre;}</style>
  <style type="text/css">
 div.sourceCode { overflow-x: auto; }
@@ -60,10 +60,9 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
@@ -102,7 +101,7 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
 </ul></li>
 </ul>
 </div>
-<h1 id="plugin-installation-configuration">Plugin installation &amp; configuration</h1>
+<h1 id="plugins">Plugins</h1>
 <h2 id="plugin-installation">Plugin installation</h2>
 <p>There is a bunch of plugins shipped with Shaarli, where there is nothing to do to install them.</p>
 <p>If you want to install a third party plugin:</p>
@@ -140,6 +139,7 @@ Example:</p>
    <span class="st">&#39;markdown&#39;</span><span class="ot">,</span>
 <span class="ot">);</span></code></pre></div>
 <h3 id="plugin-usage">Plugin usage</h3>
+<h4 id="official-plugins">Official plugins</h4>
 <p>Usage of each plugin is documented in it's README file:</p>
 <ul>
 <li><code>addlink-toolbar</code>: Adds the addlink input on the linklist page</li>
@@ -150,5 +150,7 @@ Example:</p>
 <li><code>readityourself</code>: For each link, add a ReadItYourself icon to save the shaared URL</li>
 <li><a href="https://github.com/shaarli/Shaarli/blob/master/plugins/wallabag/README.md"><code>wallabag</code></a>: For each link, add a Wallabag icon to save it in your instance.<a href=".html"></a></li>
 </ul>
+<h4 id="third-party-plugins">Third party plugins</h4>
+<p>See <a href="https://github.com/shaarli/Shaarli/wiki/Community-%26-Related-software#third-party-plugins">Community &amp; related software</a><a href=".html"></a></p>
 </body>
 </html>
diff --git a/doc/Plugin-installation-&-configuration.md b/doc/Plugins.md
index c260aa1a..81167fcf 100644
--- a/doc/Plugin-installation-&-configuration.md
+++ b/doc/Plugins.md
@@ -1,4 +1,4 @@
-#Plugin installation & configuration
+#Plugins
 ## Plugin installation
 There is a bunch of plugins shipped with Shaarli, where there is nothing to do to install them.
@@ -58,6 +58,8 @@ $GLOBALS['config'['ENABLED_PLUGINS'] = array(]('ENABLED_PLUGINS']-=-array(.html)
 ### Plugin usage
+#### Official plugins
 Usage of each plugin is documented in it's README file:
 * `addlink-toolbar`: Adds the addlink input on the linklist page
@@ -67,3 +69,9 @@ Usage of each plugin is documented in it's README file:
 * `qrcode`: For each link, add a QRCode icon.
 * `readityourself`: For each link, add a ReadItYourself icon to save the shaared URL
 * [`wallabag`](https://github.com/shaarli/Shaarli/blob/master/plugins/wallabag/README.md):  For each link, add a Wallabag icon to save it in your instance.[](.html)
+#### Third party plugins
+See [Community & related software](https://github.com/shaarli/Shaarli/wiki/Community-%26-Related-software#third-party-plugins)[](.html)
diff --git a/doc/RSS-feeds.html b/doc/RSS-feeds.html
index 9b1447ac..1b38e4e8 100644
--- a/doc/RSS-feeds.html
+++ b/doc/RSS-feeds.html
@@ -23,10 +23,9 @@
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
diff --git a/doc/Release-Shaarli.html b/doc/Release-Shaarli.html
index 69b49478..cfaa663b 100644
--- a/doc/Release-Shaarli.html
+++ b/doc/Release-Shaarli.html
@@ -60,10 +60,9 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
diff --git a/doc/Security.html b/doc/Security.html
index 87a4ee4b..b1969a4c 100644
--- a/doc/Security.html
+++ b/doc/Security.html
@@ -60,10 +60,9 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
diff --git a/doc/Server-configuration.html b/doc/Server-configuration.html
index e1edf557..1d2276df 100644
--- a/doc/Server-configuration.html
+++ b/doc/Server-configuration.html
@@ -60,10 +60,9 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
diff --git a/doc/Server-requirements.html b/doc/Server-requirements.html
index ff0ad9cd..8e4deeb8 100644
--- a/doc/Server-requirements.html
+++ b/doc/Server-requirements.html
@@ -23,10 +23,9 @@
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
diff --git a/doc/Server-security.html b/doc/Server-security.html
index 97f93780..6b44a133 100644
--- a/doc/Server-security.html
+++ b/doc/Server-security.html
@@ -60,10 +60,9 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
diff --git a/doc/Shaarli-configuration.html b/doc/Shaarli-configuration.html
index f53289fe..74947578 100644
--- a/doc/Shaarli-configuration.html
+++ b/doc/Shaarli-configuration.html
@@ -60,10 +60,9 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
diff --git a/doc/Shaarli-installation.html b/doc/Shaarli-installation.html
index ae40b3a3..487ec1db 100644
--- a/doc/Shaarli-installation.html
+++ b/doc/Shaarli-installation.html
@@ -23,10 +23,9 @@
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
diff --git a/doc/Sharing-button.html b/doc/Sharing-button.html
index 6dfdd564..3770d8ad 100644
--- a/doc/Sharing-button.html
+++ b/doc/Sharing-button.html
@@ -23,10 +23,9 @@
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
diff --git a/doc/Static-analysis.html b/doc/Static-analysis.html
index 6d1695cb..86cb4696 100644
--- a/doc/Static-analysis.html
+++ b/doc/Static-analysis.html
@@ -23,10 +23,9 @@
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
diff --git a/doc/TODO.html b/doc/TODO.html
index e7ce4f04..04224dbf 100644
--- a/doc/TODO.html
+++ b/doc/TODO.html
@@ -23,10 +23,9 @@
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
diff --git a/doc/Theming.html b/doc/Theming.html
index 1eda52e4..27c5d863 100644
--- a/doc/Theming.html
+++ b/doc/Theming.html
@@ -60,10 +60,9 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
diff --git a/doc/Troubleshooting.html b/doc/Troubleshooting.html
index 0d58f321..3de8ad1e 100644
--- a/doc/Troubleshooting.html
+++ b/doc/Troubleshooting.html
@@ -60,10 +60,9 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
diff --git a/doc/Unit-tests.html b/doc/Unit-tests.html
index b933bc7c..7934e346 100644
--- a/doc/Unit-tests.html
+++ b/doc/Unit-tests.html
@@ -60,10 +60,9 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
diff --git a/doc/Upgrade-from-original-sebsauvage-Shaarli.html b/doc/Upgrade-from-original-sebsauvage-Shaarli.html
index 5297c8bb..db69a0ed 100644
--- a/doc/Upgrade-from-original-sebsauvage-Shaarli.html
+++ b/doc/Upgrade-from-original-sebsauvage-Shaarli.html
@@ -23,10 +23,9 @@
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
diff --git a/doc/Usage.html b/doc/Usage.html
index 5b4b8a5f..2befaa02 100644
--- a/doc/Usage.html
+++ b/doc/Usage.html
@@ -23,10 +23,9 @@
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
diff --git a/doc/_Footer.html b/doc/_Footer.html
index 8cc166ac..a054cc53 100644
--- a/doc/_Footer.html
+++ b/doc/_Footer.html
@@ -23,10 +23,9 @@
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
diff --git a/doc/_Sidebar.html b/doc/_Sidebar.html
index 2c7d2837..89c2cf8a 100644
--- a/doc/_Sidebar.html
+++ b/doc/_Sidebar.html
@@ -23,10 +23,9 @@
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
@@ -76,10 +75,9 @@
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
diff --git a/doc/_Sidebar.md b/doc/_Sidebar.md
index 4522c254..7c71f462 100644
--- a/doc/_Sidebar.md
+++ b/doc/_Sidebar.md
@@ -7,9 +7,8 @@
    - [Server security](Server-security.html)
    - [Shaarli installation](Shaarli-installation.html)
    - [Shaarli configuration](Shaarli-configuration.html)
-    - [Plugin installation & configuration](Plugin-installation-&-configuration.html)
+    - [Plugins](Plugins.html)
 - [Docker](Docker.html)
- [Plugin list](Plugin-list.html)
 - [Usage](Usage.html)
    - [Sharing button](Sharing-button.html) (bookmarklet)
    - [Browsing and Searching](Browsing-and-Searching.html)
diff --git a/doc/sidebar.html b/doc/sidebar.html
index 8603ecac..62844581 100644
--- a/doc/sidebar.html
+++ b/doc/sidebar.html
@@ -9,10 +9,9 @@
 <li><a href="Server-security.html">Server security</a></li>
 <li><a href="Shaarli-installation.html">Shaarli installation</a></li>
 <li><a href="Shaarli-configuration.html">Shaarli configuration</a></li>
-<li><a href="Plugin-installation-&amp;-configuration.html">Plugin installation &amp; configuration</a></li>
+<li><a href="Plugins.html">Plugins</a></li>
 </ul></li>
 <li><a href="Docker.html">Docker</a></li>
-<li><a href="Plugin-list.html">Plugin list</a></li>
 <li><a href="Usage.html">Usage</a>
 <ul>
 <li><a href="Sharing-button.html">Sharing button</a> (bookmarklet)</li>
diff --git a/index.php b/index.php
index 5b8384ba..7465c41f 100644
--- a/index.php
+++ b/index.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Shaarli v0.6.5 - Shaare your links...
+ * Shaarli v0.7.0 - Shaare your links...
 *
 * The personal, minimalist, super-fast, no-database Delicious clone.
 *
@@ -126,7 +126,7 @@ $GLOBALS['config']['PUBSUBHUB_URL'] = '';
 /*
 * PHP configuration
 */
-define('shaarli_version', '0.6.5');
+define('shaarli_version', '0.7.0');
 // http://server.com/x/shaarli --> /shaarli/
 define('WEB_PATH', substr($_SERVER["REQUEST_URI"], 0, 1+strrpos($_SERVER["REQUEST_URI"], '/', 0)));
diff --git a/shaarli_version.php b/shaarli_version.php
index 5e293321..184e5220 100644
--- a/shaarli_version.php
+++ b/shaarli_version.php
@@ -1 +1 @@
-<?php /* 0.6.5 */ ?>
+<?php /* 0.7.0 */