diff --git a/doc/EN/app_pleroma.org b/doc/EN/app_pleroma.org
new file mode 100644
index 00000000..5bdfcb04
--- /dev/null
+++ b/doc/EN/app_pleroma.org
@@ -0,0 +1,39 @@
+#+TITLE:
+#+AUTHOR: Bob Mottram
+#+EMAIL: bob@freedombone.net
+#+KEYWORDS: freedombone, pleroma
+#+DESCRIPTION: How to use Pleroma
+#+OPTIONS: ^:nil toc:nil
+#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="freedombone.css" />
+
+#+BEGIN_CENTER
+[[file:images/logo.png]]
+#+END_CENTER
+
+#+BEGIN_EXPORT html
+<center>
+<h1>Pleroma</h1>
+</center>
+#+END_EXPORT
+
+Pleroma is an OStatus-compatible social networking server, compatible with GNU Social, PostActiv and Mastodon. It is high-performance and so is especially well suited for running on low power single board computers without much RAM.
+
+#+BEGIN_CENTER
+[[file:images/pleroma.jpg]]
+#+END_CENTER
+
+* Installation
+Log into your system with:
+
+#+begin_src bash
+ssh myusername@mydomain -p 2222
+#+end_src
+
+Using cursor keys, space bar and Enter key select *Administrator controls* and type in your password.
+
+Select *Add/Remove Apps* then *pleroma*. You will then be asked for a domain name and if you are using FreeDNS also the code for the domain which can be found under *Dynamic DNS* on the FreeDNS site (the random string from "/quick cron example/" which appears after /update.php?/ and before />>/). For more details on obtaining a domain and making it accessible via dynamic DNS see the [[./faq.html][FAQ]]. Typically the domain name you use will be a subdomain, such as /pleroma.mydomainname.net/. It will need to be a domain which you have bought somewhere and own and not one of the FreeDNS subdomains, otherwise you won't be able to get a SSL/TLS certificate for it.
+
+* Initial setup
+The first thing you'll need to do is register a new account. You can set your profile details and profile image by selecting the small settings icon to the right of your name.
+
+Once you have done that then you can disable further registrations from the *Administrator control panel* by going to *App Settings* then *pleroma* then *Disable new account registrations*. This may take a while because the app gets recompiled afterwards.
diff --git a/doc/EN/apps.org b/doc/EN/apps.org
index d46d7daf..326a3cac 100644
--- a/doc/EN/apps.org
+++ b/doc/EN/apps.org
@@ -53,7 +53,7 @@ Modern looking blogging system.
 
 [[./app_ghost.html][How to use it]]
 * GNU Social
-Federated social network. You can "/remote follow/" other users within the GNU Social federation.
+Federated social network based on the OStatus protocol. You can "/remote follow/" other users within the GNU Social federation.
 
 [[./app_gnusocial.html][How to use it]]
 * Gogs
@@ -115,10 +115,14 @@ Store files on your server and sync them with laptops or mobile devices. Include
 The black hole for web adverts. Block adverts at the domain name level within your local network. It can significantly reduce bandwidth, speed up page load times and protect your systems from being tracked by spyware.
 
 [[./app_pihole.html][How to use it]]
-* PostActiv
-An alternative federated social networking system compatible with GNU Social. It includes some optimisations and fixes currently not available within the main GNU Social project.
+* Pleroma
+Pleroma is an OStatus-compatible social networking server, compatible with GNU Social, PostActiv and Mastodon. It is high-performance and so is especially well suited for running on low power single board computers without much RAM.
 
-[[./app_postactiv.html][How to use it]]
+[[./app_pleroma.html][How to use it]]
+* PostActiv
+An alternative federated social networking system compatible with GNU Social, Pleroma and Mastodon. It includes some optimisations and fixes currently not available within the main GNU Social project.
+
+[[./app_postactiv.html][How to use it]
 * Profanity
 A shell based XMPP client which you can run on the Freedombone server via ssh.
 
diff --git a/img/pleroma.jpg b/img/pleroma.jpg
new file mode 100644
index 00000000..b6bd9416
Binary files /dev/null and b/img/pleroma.jpg differ
diff --git a/src/freedombone-app-pleroma b/src/freedombone-app-pleroma
index fef6e695..31db299f 100755
--- a/src/freedombone-app-pleroma
+++ b/src/freedombone-app-pleroma
@@ -232,8 +232,17 @@ function pleroma_create_database {
     sed -i "/Pleroma.Web.Endpoint/a pubsub: [name: Pleroma.Web.PubSub, adapter: Phoenix.PubSub.PG2]," $pleroma_secret
     sed -i 's|pubsub: |  pubsub: |g' $pleroma_secret
     sed -i 's|watchers: []|watchers: [],|g' $pleroma_secret
-    sed -i "/watchers: []/a url: [host: \"$PLEROMA_DOMAIN_NAME\", scheme: \"https\", port: 443]" $pleroma_secret
+    if [[ $ONION_ONLY == 'no' ]]; then
+        sed -i "/watchers: []/a url: [host: \"$PLEROMA_DOMAIN_NAME\", scheme: \"https\", port: 443]" $pleroma_secret
+    else
+        sed -i "/watchers: []/a url: [host: \"$PLEROMA_ONION_HOSTNAME\", scheme: \"http\", port: 80]" $pleroma_secret
+    fi
     sed -i 's|url: |  url: |g' $pleroma_secret
+    if ! grep -q "pbkdf2_rounds" $pleroma_secret; then
+        sed -i '/config :logger/a config :comeonin, :pbkdf2_rounds, 1' $pleroma_secret
+    else
+        sed -i 's|pbkdf2_rounds.*|pbkdf2_rounds, 1|g' $pleroma_secret
+    fi
 
     cd $PLEROMA_DIR
     chown -R pleroma:pleroma *
@@ -450,6 +459,7 @@ function restore_local_pleroma {
         temp_restore_dir=/root/temppleroma
         pleroma_dir=$PLEROMA_DIR
 
+        PLEROMA_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_pleroma/hostname)
         function_check pleroma_create_database
         pleroma_create_database
 
@@ -501,6 +511,7 @@ function restore_remote_pleroma {
         temp_restore_dir=/root/temppleroma
         pleroma_dir=$PLEROMA_DIR
 
+        PLEROMA_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_pleroma/hostname)
         function_check pleroma_create_database
         pleroma_create_database
 
diff --git a/website/EN/app_pleroma.html b/website/EN/app_pleroma.html
new file mode 100644
index 00000000..dc4f59fb
--- /dev/null
+++ b/website/EN/app_pleroma.html
@@ -0,0 +1,323 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+<!-- 2017-11-08 Wed 14:34 -->
+<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
+<title>&lrm;</title>
+<meta name="generator" content="Org mode" />
+<meta name="author" content="Bob Mottram" />
+<meta name="description" content="How to use Pleroma"
+ />
+<meta name="keywords" content="freedombone, pleroma" />
+<style type="text/css">
+ <!--/*--><![CDATA[/*><!--*/
+  .title  { text-align: center;
+             margin-bottom: .2em; }
+  .subtitle { text-align: center;
+              font-size: medium;
+              font-weight: bold;
+              margin-top:0; }
+  .todo   { font-family: monospace; color: red; }
+  .done   { font-family: monospace; color: green; }
+  .priority { font-family: monospace; color: orange; }
+  .tag    { background-color: #eee; font-family: monospace;
+            padding: 2px; font-size: 80%; font-weight: normal; }
+  .timestamp { color: #bebebe; }
+  .timestamp-kwd { color: #5f9ea0; }
+  .org-right  { margin-left: auto; margin-right: 0px;  text-align: right; }
+  .org-left   { margin-left: 0px;  margin-right: auto; text-align: left; }
+  .org-center { margin-left: auto; margin-right: auto; text-align: center; }
+  .underline { text-decoration: underline; }
+  #postamble p, #preamble p { font-size: 90%; margin: .2em; }
+  p.verse { margin-left: 3%; }
+  pre {
+    border: 1px solid #ccc;
+    box-shadow: 3px 3px 3px #eee;
+    padding: 8pt;
+    font-family: monospace;
+    overflow: auto;
+    margin: 1.2em;
+  }
+  pre.src {
+    position: relative;
+    overflow: visible;
+    padding-top: 1.2em;
+  }
+  pre.src:before {
+    display: none;
+    position: absolute;
+    background-color: white;
+    top: -10px;
+    right: 10px;
+    padding: 3px;
+    border: 1px solid black;
+  }
+  pre.src:hover:before { display: inline;}
+  /* Languages per Org manual */
+  pre.src-asymptote:before { content: 'Asymptote'; }
+  pre.src-awk:before { content: 'Awk'; }
+  pre.src-C:before { content: 'C'; }
+  /* pre.src-C++ doesn't work in CSS */
+  pre.src-clojure:before { content: 'Clojure'; }
+  pre.src-css:before { content: 'CSS'; }
+  pre.src-D:before { content: 'D'; }
+  pre.src-ditaa:before { content: 'ditaa'; }
+  pre.src-dot:before { content: 'Graphviz'; }
+  pre.src-calc:before { content: 'Emacs Calc'; }
+  pre.src-emacs-lisp:before { content: 'Emacs Lisp'; }
+  pre.src-fortran:before { content: 'Fortran'; }
+  pre.src-gnuplot:before { content: 'gnuplot'; }
+  pre.src-haskell:before { content: 'Haskell'; }
+  pre.src-hledger:before { content: 'hledger'; }
+  pre.src-java:before { content: 'Java'; }
+  pre.src-js:before { content: 'Javascript'; }
+  pre.src-latex:before { content: 'LaTeX'; }
+  pre.src-ledger:before { content: 'Ledger'; }
+  pre.src-lisp:before { content: 'Lisp'; }
+  pre.src-lilypond:before { content: 'Lilypond'; }
+  pre.src-lua:before { content: 'Lua'; }
+  pre.src-matlab:before { content: 'MATLAB'; }
+  pre.src-mscgen:before { content: 'Mscgen'; }
+  pre.src-ocaml:before { content: 'Objective Caml'; }
+  pre.src-octave:before { content: 'Octave'; }
+  pre.src-org:before { content: 'Org mode'; }
+  pre.src-oz:before { content: 'OZ'; }
+  pre.src-plantuml:before { content: 'Plantuml'; }
+  pre.src-processing:before { content: 'Processing.js'; }
+  pre.src-python:before { content: 'Python'; }
+  pre.src-R:before { content: 'R'; }
+  pre.src-ruby:before { content: 'Ruby'; }
+  pre.src-sass:before { content: 'Sass'; }
+  pre.src-scheme:before { content: 'Scheme'; }
+  pre.src-screen:before { content: 'Gnu Screen'; }
+  pre.src-sed:before { content: 'Sed'; }
+  pre.src-sh:before { content: 'shell'; }
+  pre.src-sql:before { content: 'SQL'; }
+  pre.src-sqlite:before { content: 'SQLite'; }
+  /* additional languages in org.el's org-babel-load-languages alist */
+  pre.src-forth:before { content: 'Forth'; }
+  pre.src-io:before { content: 'IO'; }
+  pre.src-J:before { content: 'J'; }
+  pre.src-makefile:before { content: 'Makefile'; }
+  pre.src-maxima:before { content: 'Maxima'; }
+  pre.src-perl:before { content: 'Perl'; }
+  pre.src-picolisp:before { content: 'Pico Lisp'; }
+  pre.src-scala:before { content: 'Scala'; }
+  pre.src-shell:before { content: 'Shell Script'; }
+  pre.src-ebnf2ps:before { content: 'ebfn2ps'; }
+  /* additional language identifiers per "defun org-babel-execute"
+       in ob-*.el */
+  pre.src-cpp:before  { content: 'C++'; }
+  pre.src-abc:before  { content: 'ABC'; }
+  pre.src-coq:before  { content: 'Coq'; }
+  pre.src-groovy:before  { content: 'Groovy'; }
+  /* additional language identifiers from org-babel-shell-names in
+     ob-shell.el: ob-shell is the only babel language using a lambda to put
+     the execution function name together. */
+  pre.src-bash:before  { content: 'bash'; }
+  pre.src-csh:before  { content: 'csh'; }
+  pre.src-ash:before  { content: 'ash'; }
+  pre.src-dash:before  { content: 'dash'; }
+  pre.src-ksh:before  { content: 'ksh'; }
+  pre.src-mksh:before  { content: 'mksh'; }
+  pre.src-posh:before  { content: 'posh'; }
+  /* Additional Emacs modes also supported by the LaTeX listings package */
+  pre.src-ada:before { content: 'Ada'; }
+  pre.src-asm:before { content: 'Assembler'; }
+  pre.src-caml:before { content: 'Caml'; }
+  pre.src-delphi:before { content: 'Delphi'; }
+  pre.src-html:before { content: 'HTML'; }
+  pre.src-idl:before { content: 'IDL'; }
+  pre.src-mercury:before { content: 'Mercury'; }
+  pre.src-metapost:before { content: 'MetaPost'; }
+  pre.src-modula-2:before { content: 'Modula-2'; }
+  pre.src-pascal:before { content: 'Pascal'; }
+  pre.src-ps:before { content: 'PostScript'; }
+  pre.src-prolog:before { content: 'Prolog'; }
+  pre.src-simula:before { content: 'Simula'; }
+  pre.src-tcl:before { content: 'tcl'; }
+  pre.src-tex:before { content: 'TeX'; }
+  pre.src-plain-tex:before { content: 'Plain TeX'; }
+  pre.src-verilog:before { content: 'Verilog'; }
+  pre.src-vhdl:before { content: 'VHDL'; }
+  pre.src-xml:before { content: 'XML'; }
+  pre.src-nxml:before { content: 'XML'; }
+  /* add a generic configuration mode; LaTeX export needs an additional
+     (add-to-list 'org-latex-listings-langs '(conf " ")) in .emacs */
+  pre.src-conf:before { content: 'Configuration File'; }
+
+  table { border-collapse:collapse; }
+  caption.t-above { caption-side: top; }
+  caption.t-bottom { caption-side: bottom; }
+  td, th { vertical-align:top;  }
+  th.org-right  { text-align: center;  }
+  th.org-left   { text-align: center;   }
+  th.org-center { text-align: center; }
+  td.org-right  { text-align: right;  }
+  td.org-left   { text-align: left;   }
+  td.org-center { text-align: center; }
+  dt { font-weight: bold; }
+  .footpara { display: inline; }
+  .footdef  { margin-bottom: 1em; }
+  .figure { padding: 1em; }
+  .figure p { text-align: center; }
+  .inlinetask {
+    padding: 10px;
+    border: 2px solid gray;
+    margin: 10px;
+    background: #ffffcc;
+  }
+  #org-div-home-and-up
+   { text-align: right; font-size: 70%; white-space: nowrap; }
+  textarea { overflow-x: auto; }
+  .linenr { font-size: smaller }
+  .code-highlighted { background-color: #ffff00; }
+  .org-info-js_info-navigation { border-style: none; }
+  #org-info-js_console-label
+    { font-size: 10px; font-weight: bold; white-space: nowrap; }
+  .org-info-js_search-highlight
+    { background-color: #ffff00; color: #000000; font-weight: bold; }
+  .org-svg { width: 90%; }
+  /*]]>*/-->
+</style>
+<link rel="stylesheet" type="text/css" href="freedombone.css" />
+<script type="text/javascript">
+/*
+@licstart  The following is the entire license notice for the
+JavaScript code in this tag.
+
+Copyright (C) 2012-2017 Free Software Foundation, Inc.
+
+The JavaScript code in this tag is free software: you can
+redistribute it and/or modify it under the terms of the GNU
+General Public License (GNU GPL) as published by the Free Software
+Foundation, either version 3 of the License, or (at your option)
+any later version.  The code is distributed WITHOUT ANY WARRANTY;
+without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE.  See the GNU GPL for more details.
+
+As additional permission under GNU GPL version 3 section 7, you
+may distribute non-source (e.g., minimized or compacted) forms of
+that code without the copy of the GNU GPL normally required by
+section 4, provided you include this license notice and a URL
+through which recipients can access the Corresponding Source.
+
+
+@licend  The above is the entire license notice
+for the JavaScript code in this tag.
+*/
+<!--/*--><![CDATA[/*><!--*/
+ function CodeHighlightOn(elem, id)
+ {
+   var target = document.getElementById(id);
+   if(null != target) {
+     elem.cacheClassElem = elem.className;
+     elem.cacheClassTarget = target.className;
+     target.className = "code-highlighted";
+     elem.className   = "code-highlighted";
+   }
+ }
+ function CodeHighlightOff(elem, id)
+ {
+   var target = document.getElementById(id);
+   if(elem.cacheClassElem)
+     elem.className = elem.cacheClassElem;
+   if(elem.cacheClassTarget)
+     target.className = elem.cacheClassTarget;
+ }
+/*]]>*///-->
+</script>
+</head>
+<body>
+<div id="preamble" class="status">
+<a name="top" id="top"></a>
+</div>
+<div id="content">
+<div class="org-center">
+
+<div class="figure">
+<p><img src="images/logo.png" alt="logo.png" />
+</p>
+</div>
+</div>
+
+<center>
+<h1>Pleroma</h1>
+</center>
+
+<p>
+Pleroma is an OStatus-compatible social networking server, compatible with GNU Social, PostActiv and Mastodon. It is high-performance and so is especially well suited for running on low power single board computers without much RAM.
+</p>
+
+<div class="org-center">
+
+<div class="figure">
+<p><img src="images/pleroma.jpg" alt="pleroma.jpg" />
+</p>
+</div>
+</div>
+
+<div id="outline-container-org7600aa0" class="outline-2">
+<h2 id="org7600aa0">Installation</h2>
+<div class="outline-text-2" id="text-org7600aa0">
+<p>
+Log into your system with:
+</p>
+
+<div class="org-src-container">
+<pre class="src src-bash">ssh myusername@mydomain -p 2222
+</pre>
+</div>
+
+<p>
+Using cursor keys, space bar and Enter key select <b>Administrator controls</b> and type in your password.
+</p>
+
+<p>
+Select <b>Add/Remove Apps</b> then <b>pleroma</b>. You will then be asked for a domain name and if you are using FreeDNS also the code for the domain which can be found under <b>Dynamic DNS</b> on the FreeDNS site (the random string from "<i>quick cron example</i>" which appears after <i>update.php?</i> and before <i>&gt;&gt;</i>). For more details on obtaining a domain and making it accessible via dynamic DNS see the <a href="./faq.html">FAQ</a>. Typically the domain name you use will be a subdomain, such as <i>pleroma.mydomainname.net</i>. It will need to be a domain which you have bought somewhere and own and not one of the FreeDNS subdomains, otherwise you won't be able to get a SSL/TLS certificate for it.
+</p>
+</div>
+</div>
+
+<div id="outline-container-orgf115794" class="outline-2">
+<h2 id="orgf115794">Initial setup</h2>
+<div class="outline-text-2" id="text-orgf115794">
+<p>
+The first thing you'll need to do is register a new account. You can set your profile details and profile image by selecting the small settings icon to the right of your name.
+</p>
+
+<p>
+Once you have done that then you can disable further registrations from the <b>Administrator control panel</b> by going to <b>App Settings</b> then <b>pleroma</b> then <b>Disable new account registrations</b>. This may take a while because the app gets recompiled afterwards.
+</p>
+</div>
+</div>
+</div>
+<div id="postamble" class="status">
+
+<style type="text/css">
+.back-to-top {
+    position: fixed;
+    bottom: 2em;
+    right: 0px;
+    text-decoration: none;
+    color: #000000;
+    background-color: rgba(235, 235, 235, 0.80);
+    font-size: 12px;
+    padding: 1em;
+    display: none;
+}
+
+.back-to-top:hover {
+    background-color: rgba(135, 135, 135, 0.50);
+}
+</style>
+
+<div class="back-to-top">
+<a href="#top">Back to top</a> | <a href="mailto:bob@freedombone.net">E-mail me</a>
+</div>
+</div>
+</body>
+</html>
diff --git a/website/EN/apps.html b/website/EN/apps.html
index 843c3e34..0f1ef236 100644
--- a/website/EN/apps.html
+++ b/website/EN/apps.html
@@ -3,7 +3,7 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<!-- 2017-09-27 Wed 17:45 -->
+<!-- 2017-11-08 Wed 14:34 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>&lrm;</title>
@@ -264,9 +264,9 @@ The base install of the system just contains an email server and Mutt client, bu
 </div>
 </div>
 
-<div id="outline-container-orge12e0d4" class="outline-2">
-<h2 id="orge12e0d4">CryptPad</h2>
-<div class="outline-text-2" id="text-orge12e0d4">
+<div id="outline-container-orge2d5b23" class="outline-2">
+<h2 id="orge2d5b23">CryptPad</h2>
+<div class="outline-text-2" id="text-orge2d5b23">
 <p>
 Collaborate on editing documents, presentations and source code, or vote on things. All with a good level of security.
 </p>
@@ -276,9 +276,9 @@ Collaborate on editing documents, presentations and source code, or vote on thin
 </p>
 </div>
 </div>
-<div id="outline-container-orgaaead32" class="outline-2">
-<h2 id="orgaaead32">DLNA</h2>
-<div class="outline-text-2" id="text-orgaaead32">
+<div id="outline-container-org535af0a" class="outline-2">
+<h2 id="org535af0a">DLNA</h2>
+<div class="outline-text-2" id="text-org535af0a">
 <p>
 Enables you to use the system as a music server which any DLNA compatible devices can connect to within your home network.
 </p>
@@ -288,9 +288,9 @@ Enables you to use the system as a music server which any DLNA compatible device
 </p>
 </div>
 </div>
-<div id="outline-container-orga0c144d" class="outline-2">
-<h2 id="orga0c144d">Dokuwiki</h2>
-<div class="outline-text-2" id="text-orga0c144d">
+<div id="outline-container-org61623e3" class="outline-2">
+<h2 id="org61623e3">Dokuwiki</h2>
+<div class="outline-text-2" id="text-org61623e3">
 <p>
 A databaseless wiki system.
 </p>
@@ -300,9 +300,9 @@ A databaseless wiki system.
 </p>
 </div>
 </div>
-<div id="outline-container-orgad65042" class="outline-2">
-<h2 id="orgad65042">Emacs</h2>
-<div class="outline-text-2" id="text-orgad65042">
+<div id="outline-container-orge0257ac" class="outline-2">
+<h2 id="orge0257ac">Emacs</h2>
+<div class="outline-text-2" id="text-orge0257ac">
 <p>
 If you use the Mutt client to read your email then this will set it up to use emacs for composing new mail.
 </p>
@@ -312,9 +312,9 @@ If you use the Mutt client to read your email then this will set it up to use em
 </p>
 </div>
 </div>
-<div id="outline-container-org7ba525b" class="outline-2">
-<h2 id="org7ba525b">Etherpad</h2>
-<div class="outline-text-2" id="text-org7ba525b">
+<div id="outline-container-orgb24d6db" class="outline-2">
+<h2 id="orgb24d6db">Etherpad</h2>
+<div class="outline-text-2" id="text-orgb24d6db">
 <p>
 Collaborate on creating documents in real time. Maybe you're planning a holiday with other family members or creating documentation for a Free Software project along with other volunteers. Etherpad is hard to beat for simplicity and speed. Only users of the system will be able to access it.
 </p>
@@ -324,9 +324,9 @@ Collaborate on creating documents in real time. Maybe you're planning a holiday
 </p>
 </div>
 </div>
-<div id="outline-container-orgb7656a4" class="outline-2">
-<h2 id="orgb7656a4">Friendica</h2>
-<div class="outline-text-2" id="text-orgb7656a4">
+<div id="outline-container-orgb3d24df" class="outline-2">
+<h2 id="orgb3d24df">Friendica</h2>
+<div class="outline-text-2" id="text-orgb3d24df">
 <p>
 Federated social network system.
 </p>
@@ -336,9 +336,9 @@ Federated social network system.
 </p>
 </div>
 </div>
-<div id="outline-container-org9b12dc6" class="outline-2">
-<h2 id="org9b12dc6">Ghost</h2>
-<div class="outline-text-2" id="text-org9b12dc6">
+<div id="outline-container-org80e709f" class="outline-2">
+<h2 id="org80e709f">Ghost</h2>
+<div class="outline-text-2" id="text-org80e709f">
 <p>
 Modern looking blogging system.
 </p>
@@ -348,11 +348,11 @@ Modern looking blogging system.
 </p>
 </div>
 </div>
-<div id="outline-container-org507ecb0" class="outline-2">
-<h2 id="org507ecb0">GNU Social</h2>
-<div class="outline-text-2" id="text-org507ecb0">
+<div id="outline-container-orge6cfb69" class="outline-2">
+<h2 id="orge6cfb69">GNU Social</h2>
+<div class="outline-text-2" id="text-orge6cfb69">
 <p>
-Federated social network. You can "<i>remote follow</i>" other users within the GNU Social federation.
+Federated social network based on the OStatus protocol. You can "<i>remote follow</i>" other users within the GNU Social federation.
 </p>
 
 <p>
@@ -360,9 +360,9 @@ Federated social network. You can "<i>remote follow</i>" other users within the
 </p>
 </div>
 </div>
-<div id="outline-container-org8309404" class="outline-2">
-<h2 id="org8309404">Gogs</h2>
-<div class="outline-text-2" id="text-org8309404">
+<div id="outline-container-org41197ed" class="outline-2">
+<h2 id="org41197ed">Gogs</h2>
+<div class="outline-text-2" id="text-org41197ed">
 <p>
 Lightweight git project hosting system. You can mirror projects from Github, or if Github turns evil then just host your own projects while retaining the familiar <i>fork-and-pull</i> workflow. If you can use Github then you can also use Gogs.
 </p>
@@ -372,9 +372,9 @@ Lightweight git project hosting system. You can mirror projects from Github, or
 </p>
 </div>
 </div>
-<div id="outline-container-orgc12018c" class="outline-2">
-<h2 id="orgc12018c">HTMLy</h2>
-<div class="outline-text-2" id="text-orgc12018c">
+<div id="outline-container-orgca785f7" class="outline-2">
+<h2 id="orgca785f7">HTMLy</h2>
+<div class="outline-text-2" id="text-orgca785f7">
 <p>
 Databaseless blogging system. Quite simple and with a markdown-like format.
 </p>
@@ -384,9 +384,9 @@ Databaseless blogging system. Quite simple and with a markdown-like format.
 </p>
 </div>
 </div>
-<div id="outline-container-org7c97a23" class="outline-2">
-<h2 id="org7c97a23">Hubzilla</h2>
-<div class="outline-text-2" id="text-org7c97a23">
+<div id="outline-container-org86037c8" class="outline-2">
+<h2 id="org86037c8">Hubzilla</h2>
+<div class="outline-text-2" id="text-org86037c8">
 <p>
 Web publishing platform with social network like features and good privacy controls so that it's possible to specify who can see which content. Includes photo albums, calendar, wiki and file storage.
 </p>
@@ -396,9 +396,9 @@ Web publishing platform with social network like features and good privacy contr
 </p>
 </div>
 </div>
-<div id="outline-container-org15dcaac" class="outline-2">
-<h2 id="org15dcaac">IRC Server (ngirc)</h2>
-<div class="outline-text-2" id="text-org15dcaac">
+<div id="outline-container-org8a61ba6" class="outline-2">
+<h2 id="org8a61ba6">IRC Server (ngirc)</h2>
+<div class="outline-text-2" id="text-org8a61ba6">
 <p>
 Run your own IRC chat channel which can be secured with a password and accessible via an onion address. A bouncer is included so that you can receive messages sent while you were offline. Works with Hexchat and other popular clients.
 </p>
@@ -408,18 +408,18 @@ Run your own IRC chat channel which can be secured with a password and accessibl
 </p>
 </div>
 </div>
-<div id="outline-container-orga195719" class="outline-2">
-<h2 id="orga195719">Jitsi Meet</h2>
-<div class="outline-text-2" id="text-orga195719">
+<div id="outline-container-org5fb058b" class="outline-2">
+<h2 id="org5fb058b">Jitsi Meet</h2>
+<div class="outline-text-2" id="text-org5fb058b">
 <p>
 Experimental WebRTC video conferencing system, similar to Google Hangouts. This may not be fully functional, but is hoped to be in the near future.
 </p>
 </div>
 </div>
 
-<div id="outline-container-org67269ac" class="outline-2">
-<h2 id="org67269ac">KanBoard</h2>
-<div class="outline-text-2" id="text-org67269ac">
+<div id="outline-container-org34dd27a" class="outline-2">
+<h2 id="org34dd27a">KanBoard</h2>
+<div class="outline-text-2" id="text-org34dd27a">
 <p>
 A simple kanban system for managing projects or TODO lists.
 </p>
@@ -429,9 +429,9 @@ A simple kanban system for managing projects or TODO lists.
 </p>
 </div>
 </div>
-<div id="outline-container-org5db580b" class="outline-2">
-<h2 id="org5db580b">Key Server</h2>
-<div class="outline-text-2" id="text-org5db580b">
+<div id="outline-container-orgd752c61" class="outline-2">
+<h2 id="orgd752c61">Key Server</h2>
+<div class="outline-text-2" id="text-orgd752c61">
 <p>
 An OpenPGP key server for storing and retrieving GPG public keys.
 </p>
@@ -441,9 +441,9 @@ An OpenPGP key server for storing and retrieving GPG public keys.
 </p>
 </div>
 </div>
-<div id="outline-container-org6675f8f" class="outline-2">
-<h2 id="org6675f8f">Koel</h2>
-<div class="outline-text-2" id="text-org6675f8f">
+<div id="outline-container-orgd209174" class="outline-2">
+<h2 id="orgd209174">Koel</h2>
+<div class="outline-text-2" id="text-orgd209174">
 <p>
 Access your music collection from any internet connected device.
 </p>
@@ -453,9 +453,9 @@ Access your music collection from any internet connected device.
 </p>
 </div>
 </div>
-<div id="outline-container-orgdfd8572" class="outline-2">
-<h2 id="orgdfd8572">Lychee</h2>
-<div class="outline-text-2" id="text-orgdfd8572">
+<div id="outline-container-orgfa62348" class="outline-2">
+<h2 id="orgfa62348">Lychee</h2>
+<div class="outline-text-2" id="text-orgfa62348">
 <p>
 Make your photo albums available on the web.
 </p>
@@ -465,9 +465,9 @@ Make your photo albums available on the web.
 </p>
 </div>
 </div>
-<div id="outline-container-org5f70509" class="outline-2">
-<h2 id="org5f70509">Mailpile</h2>
-<div class="outline-text-2" id="text-org5f70509">
+<div id="outline-container-org05fc470" class="outline-2">
+<h2 id="org05fc470">Mailpile</h2>
+<div class="outline-text-2" id="text-org05fc470">
 <p>
 Modern email client which supports GPG encryption.
 </p>
@@ -477,9 +477,9 @@ Modern email client which supports GPG encryption.
 </p>
 </div>
 </div>
-<div id="outline-container-orgacaf2b5" class="outline-2">
-<h2 id="orgacaf2b5">Matrix</h2>
-<div class="outline-text-2" id="text-orgacaf2b5">
+<div id="outline-container-orga3887ed" class="outline-2">
+<h2 id="orga3887ed">Matrix</h2>
+<div class="outline-text-2" id="text-orga3887ed">
 <p>
 Multi-user chat with some security and moderation controls.
 </p>
@@ -489,9 +489,9 @@ Multi-user chat with some security and moderation controls.
 </p>
 </div>
 </div>
-<div id="outline-container-org4c6673d" class="outline-2">
-<h2 id="org4c6673d">Mediagoblin</h2>
-<div class="outline-text-2" id="text-org4c6673d">
+<div id="outline-container-org98a5590" class="outline-2">
+<h2 id="org98a5590">Mediagoblin</h2>
+<div class="outline-text-2" id="text-org98a5590">
 <p>
 Publicly host video and audio files so that you don't need to use YouTube/Vimeo/etc.
 </p>
@@ -501,9 +501,9 @@ Publicly host video and audio files so that you don't need to use YouTube/Vimeo/
 </p>
 </div>
 </div>
-<div id="outline-container-org5778590" class="outline-2">
-<h2 id="org5778590">Mumble</h2>
-<div class="outline-text-2" id="text-org5778590">
+<div id="outline-container-orgf91b078" class="outline-2">
+<h2 id="orgf91b078">Mumble</h2>
+<div class="outline-text-2" id="text-orgf91b078">
 <p>
 The popular VoIP and text chat system. Say goodbye to old-fashioned telephony conferences with silly dial codes. Also works well on mobile.
 </p>
@@ -513,9 +513,9 @@ The popular VoIP and text chat system. Say goodbye to old-fashioned telephony co
 </p>
 </div>
 </div>
-<div id="outline-container-orgbecac51" class="outline-2">
-<h2 id="orgbecac51">NextCloud</h2>
-<div class="outline-text-2" id="text-orgbecac51">
+<div id="outline-container-orga31496f" class="outline-2">
+<h2 id="orga31496f">NextCloud</h2>
+<div class="outline-text-2" id="text-orga31496f">
 <p>
 Store files on your server and sync them with laptops or mobile devices. Includes many plugins including videoconferencing and collaborative document editing.
 </p>
@@ -525,9 +525,9 @@ Store files on your server and sync them with laptops or mobile devices. Include
 </p>
 </div>
 </div>
-<div id="outline-container-org4e52617" class="outline-2">
-<h2 id="org4e52617">PI-Hole</h2>
-<div class="outline-text-2" id="text-org4e52617">
+<div id="outline-container-org4565812" class="outline-2">
+<h2 id="org4565812">PI-Hole</h2>
+<div class="outline-text-2" id="text-org4565812">
 <p>
 The black hole for web adverts. Block adverts at the domain name level within your local network. It can significantly reduce bandwidth, speed up page load times and protect your systems from being tracked by spyware.
 </p>
@@ -537,21 +537,33 @@ The black hole for web adverts. Block adverts at the domain name level within yo
 </p>
 </div>
 </div>
-<div id="outline-container-org77c5c76" class="outline-2">
-<h2 id="org77c5c76">PostActiv</h2>
-<div class="outline-text-2" id="text-org77c5c76">
+<div id="outline-container-orgdb572b6" class="outline-2">
+<h2 id="orgdb572b6">Pleroma</h2>
+<div class="outline-text-2" id="text-orgdb572b6">
 <p>
-An alternative federated social networking system compatible with GNU Social. It includes some optimisations and fixes currently not available within the main GNU Social project.
+Pleroma is an OStatus-compatible social networking server, compatible with GNU Social, PostActiv and Mastodon. It is high-performance and so is especially well suited for running on low power single board computers without much RAM.
 </p>
 
 <p>
-<a href="./app_postactiv.html">How to use it</a>
+<a href="./app_pleroma.html">How to use it</a>
 </p>
 </div>
 </div>
-<div id="outline-container-org0bf6985" class="outline-2">
-<h2 id="org0bf6985">Profanity</h2>
-<div class="outline-text-2" id="text-org0bf6985">
+<div id="outline-container-org5d51ff5" class="outline-2">
+<h2 id="org5d51ff5">PostActiv</h2>
+<div class="outline-text-2" id="text-org5d51ff5">
+<p>
+An alternative federated social networking system compatible with GNU Social, Pleroma and Mastodon. It includes some optimisations and fixes currently not available within the main GNU Social project.
+</p>
+
+<p>
+[[./app_postactiv.html][How to use it]
+</p>
+</div>
+</div>
+<div id="outline-container-org6e223d1" class="outline-2">
+<h2 id="org6e223d1">Profanity</h2>
+<div class="outline-text-2" id="text-org6e223d1">
 <p>
 A shell based XMPP client which you can run on the Freedombone server via ssh.
 </p>
@@ -561,9 +573,9 @@ A shell based XMPP client which you can run on the Freedombone server via ssh.
 </p>
 </div>
 </div>
-<div id="outline-container-org3a8644d" class="outline-2">
-<h2 id="org3a8644d">Riot Web</h2>
-<div class="outline-text-2" id="text-org3a8644d">
+<div id="outline-container-orga15f077" class="outline-2">
+<h2 id="orga15f077">Riot Web</h2>
+<div class="outline-text-2" id="text-orga15f077">
 <p>
 A browser based user interface for the Matrix federated communications system, including WebRTC audio and video chat.
 </p>
@@ -573,9 +585,9 @@ A browser based user interface for the Matrix federated communications system, i
 </p>
 </div>
 </div>
-<div id="outline-container-org072b2ee" class="outline-2">
-<h2 id="org072b2ee">SearX</h2>
-<div class="outline-text-2" id="text-org072b2ee">
+<div id="outline-container-org1d66f8e" class="outline-2">
+<h2 id="org1d66f8e">SearX</h2>
+<div class="outline-text-2" id="text-org1d66f8e">
 <p>
 A metasearch engine for customised and private web searches.
 </p>
@@ -585,9 +597,9 @@ A metasearch engine for customised and private web searches.
 </p>
 </div>
 </div>
-<div id="outline-container-orge6d7a97" class="outline-2">
-<h2 id="orge6d7a97">tt-rss</h2>
-<div class="outline-text-2" id="text-orge6d7a97">
+<div id="outline-container-org255b78b" class="outline-2">
+<h2 id="org255b78b">tt-rss</h2>
+<div class="outline-text-2" id="text-org255b78b">
 <p>
 Private RSS reader. Pulls in RSS/Atom feeds via Tor and is only accessible via an onion address. Have "<i>the right to read</i>" without the Surveillance State knowing what you're reading. Also available with a user interface suitable for viewing on mobile devices via a browser such as OrFox.
 </p>
@@ -597,9 +609,9 @@ Private RSS reader. Pulls in RSS/Atom feeds via Tor and is only accessible via a
 </p>
 </div>
 </div>
-<div id="outline-container-orgb533fa3" class="outline-2">
-<h2 id="orgb533fa3">Syncthing</h2>
-<div class="outline-text-2" id="text-orgb533fa3">
+<div id="outline-container-orgf2f850c" class="outline-2">
+<h2 id="orgf2f850c">Syncthing</h2>
+<div class="outline-text-2" id="text-orgf2f850c">
 <p>
 Possibly the best way to synchronise files across all of your devices. Once it has been set up it "just works" with no user intervention needed.
 </p>
@@ -609,9 +621,9 @@ Possibly the best way to synchronise files across all of your devices. Once it h
 </p>
 </div>
 </div>
-<div id="outline-container-orgae3276a" class="outline-2">
-<h2 id="orgae3276a">Tahoe-LAFS</h2>
-<div class="outline-text-2" id="text-orgae3276a">
+<div id="outline-container-org05328a6" class="outline-2">
+<h2 id="org05328a6">Tahoe-LAFS</h2>
+<div class="outline-text-2" id="text-org05328a6">
 <p>
 Robust and encrypted storage of files on one or more server.
 </p>
@@ -621,9 +633,9 @@ Robust and encrypted storage of files on one or more server.
 </p>
 </div>
 </div>
-<div id="outline-container-orga445624" class="outline-2">
-<h2 id="orga445624">Tox</h2>
-<div class="outline-text-2" id="text-orga445624">
+<div id="outline-container-orgf736869" class="outline-2">
+<h2 id="orgf736869">Tox</h2>
+<div class="outline-text-2" id="text-orgf736869">
 <p>
 Client and bootstrap node for the Tox chat/VoIP system.
 </p>
@@ -633,9 +645,9 @@ Client and bootstrap node for the Tox chat/VoIP system.
 </p>
 </div>
 </div>
-<div id="outline-container-org176644c" class="outline-2">
-<h2 id="org176644c">Turtl</h2>
-<div class="outline-text-2" id="text-org176644c">
+<div id="outline-container-orga2e1cdb" class="outline-2">
+<h2 id="orga2e1cdb">Turtl</h2>
+<div class="outline-text-2" id="text-orga2e1cdb">
 <p>
 A system for privately creating and sharing notes and images, similar to Evernote but without the spying.
 </p>
@@ -645,18 +657,18 @@ A system for privately creating and sharing notes and images, similar to Evernot
 </p>
 </div>
 </div>
-<div id="outline-container-org8d3d9ed" class="outline-2">
-<h2 id="org8d3d9ed">Vim</h2>
-<div class="outline-text-2" id="text-org8d3d9ed">
+<div id="outline-container-org0fd91b2" class="outline-2">
+<h2 id="org0fd91b2">Vim</h2>
+<div class="outline-text-2" id="text-org0fd91b2">
 <p>
 If you use the Mutt client to read your email then this will set it up to use vim for composing new mail.
 </p>
 </div>
 </div>
 
-<div id="outline-container-orgbab78c1" class="outline-2">
-<h2 id="orgbab78c1">Virtual Private Network (VPN)</h2>
-<div class="outline-text-2" id="text-orgbab78c1">
+<div id="outline-container-org378fc24" class="outline-2">
+<h2 id="org378fc24">Virtual Private Network (VPN)</h2>
+<div class="outline-text-2" id="text-org378fc24">
 <p>
 Set up a VPN on your server so that you can bypass local internet censorship.
 </p>
@@ -666,9 +678,9 @@ Set up a VPN on your server so that you can bypass local internet censorship.
 </p>
 </div>
 </div>
-<div id="outline-container-org76fcabc" class="outline-2">
-<h2 id="org76fcabc">XMPP</h2>
-<div class="outline-text-2" id="text-org76fcabc">
+<div id="outline-container-orgf7ad415" class="outline-2">
+<h2 id="orgf7ad415">XMPP</h2>
+<div class="outline-text-2" id="text-orgf7ad415">
 <p>
 Chat server which can be used together with client such as Gajim or Conversations to provide end-to-end content security and also onion routed metadata security. Includes advanced features such as <i>client state notification</i> to save battery power on your mobile devices, support for seamless roaming between networks and <i>message carbons</i> so that you can receive the same messages while being simultaneously logged in to your account on more than one device.
 </p>