diff --git a/doc/EN/index.org b/doc/EN/index.org
index 4f8a56c7..5782a3fb 100644
--- a/doc/EN/index.org
+++ b/doc/EN/index.org
@@ -73,8 +73,9 @@ You can bypass all of these dilemmas and take back ownership of your internet co
Freedombone is an example of the internet as it was supposed to be: a network of peers, rather than a small number of gigantic server farms with everyone connecting to them. Even if they're well run, centralised server farms become a conspicuous target for /all kinds of nefariousness/ and in any future wars they're bound to be amongst the first facilities to receive the "/shock and awe/" treatment. Also consider just what is being "farmed". If a robust information society is desirable then excessive centralisation of control over information should be avoided.
-An emphasis of the Freedombone project is the protection of private communications from indiscriminate mass surveillance, otherwise known as "/bulk intercept/" or "/warrantless wiretapping/". With only a few exceptions data entering and leaving the system is encrypted using settings recommended by [[https://bettercrypto.org][bettercrypto.org]]. Stored emails are encrypted such that only someone knowing your GPG password can read them and a GPG key is created automatically if you don't already have one. The system is firewalled with only the necessary ports being opened. Exclusively [[http://en.wikipedia.org/wiki/Free_software][free software]] is used so that all of it can potentially be security audited and proprietary repositories are disabled by default. There are still numerous security problems with the internet in general and software always contains bugs, but a best attempt has been made to ensure that the Freedombone is at least more secure than average. A limitation is that this system will not protect you from metadata analysis, although it is hoped that new types of email system may be able to do that in future.[fn:1][fn:2]
+An emphasis of the Freedombone project is the protection of private communications from indiscriminate mass surveillance, otherwise known as "/bulk intercept/" or "/warrantless wiretapping/". With only a few exceptions data entering and leaving the system is encrypted using settings recommended by [[https://bettercrypto.org][bettercrypto.org]]. Stored emails are encrypted such that only someone knowing your GPG password can read them and a GPG key is created automatically if you don't already have one. The system is firewalled with only the necessary ports being opened. Exclusively [[http://en.wikipedia.org/wiki/Free_software][free software]] is used so that all of it can potentially be security audited and proprietary repositories are disabled by default. There are still numerous security problems with the internet in general and software always contains bugs, but a best attempt has been made to ensure that the Freedombone is at least more secure than average. A limitation is that this system will not protect you from metadata analysis, although it is hoped that new types of email system may be able to do that in future.[fn:1][fn:2][fn:3]
[fn:1] Title photo by [[https://twitter.com/GrungyBerns][@GrungyBerns]]
-[fn:2] Icons by [[https://www.iconfinder.com/tmthymllr][Timothy Miller]] Creative Commons (Attribution-Share Alike 3.0 Unported)
+[fn:2] Above icons by [[https://www.iconfinder.com/tmthymllr][Timothy Miller]] Creative Commons (Attribution-Share Alike 3.0 Unported)
+[fn:3] Variant icons are [[https://github.com/google/material-design-icons][Google material design]] 1.0.0, Creative Commons Attribution-ShareAlike 4.0
diff --git a/doc/EN/variants.org b/doc/EN/variants.org
index 594b9bfc..5fc10556 100644
--- a/doc/EN/variants.org
+++ b/doc/EN/variants.org
@@ -4,13 +4,19 @@
#+KEYWORDS: freedombox, debian, beaglebone, red matrix, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber
#+DESCRIPTION: Turn the Beaglebone Black into a personal communications server
#+OPTIONS: ^:nil toc:nil
-#+BEGIN_CENTER
-[[./images/logo.png]]
-#+END_CENTER
-| [[file:index.html][Home]] |
+#+BEGIN_HTML
+
+
+
+
+#+END_HTML
-Freedombone may be installed either in its entirety or as different variants with a more specialised purpose. So for example if you just want to run a blog but don't care about any other services then you can do that. The following variants are available:[fn:1]
+#+BEGIN_HTML
+.
+#+END_HTML
+
+Freedombone may be installed either in its entirety or as different variants with a more specialised purpose. So for example if you just want to run a blog but don't care about any other services then you can do that. The following variants are available:
#+BEGIN_HTML
@@ -50,5 +56,3 @@ Freedombone may be installed either in its entirety or as different variants wit
#+END_HTML
-
-[fn:1] Icons are [[https://github.com/google/material-design-icons][Google material design]] 1.0.0, Creative Commons Attribution-ShareAlike 4.0
diff --git a/website/EN/index.html b/website/EN/index.html
index 7529633a..8c8785b4 100644
--- a/website/EN/index.html
+++ b/website/EN/index.html
@@ -4,7 +4,7 @@
-
+
@@ -239,7 +239,7 @@ Freedombone is an example of the internet as it was supposed to be: a network of
-An emphasis of the Freedombone project is the protection of private communications from indiscriminate mass surveillance, otherwise known as "bulk intercept" or "warrantless wiretapping". With only a few exceptions data entering and leaving the system is encrypted using settings recommended by bettercrypto.org. Stored emails are encrypted such that only someone knowing your GPG password can read them and a GPG key is created automatically if you don't already have one. The system is firewalled with only the necessary ports being opened. Exclusively free software is used so that all of it can potentially be security audited and proprietary repositories are disabled by default. There are still numerous security problems with the internet in general and software always contains bugs, but a best attempt has been made to ensure that the Freedombone is at least more secure than average. A limitation is that this system will not protect you from metadata analysis, although it is hoped that new types of email system may be able to do that in future.,
+An emphasis of the Freedombone project is the protection of private communications from indiscriminate mass surveillance, otherwise known as "bulk intercept" or "warrantless wiretapping". With only a few exceptions data entering and leaving the system is encrypted using settings recommended by bettercrypto.org. Stored emails are encrypted such that only someone knowing your GPG password can read them and a GPG key is created automatically if you don't already have one. The system is firewalled with only the necessary ports being opened. Exclusively free software is used so that all of it can potentially be security audited and proprietary repositories are disabled by default. There are still numerous security problems with the internet in general and software always contains bugs, but a best attempt has been made to ensure that the Freedombone is at least more secure than average. A limitation is that this system will not protect you from metadata analysis, although it is hoped that new types of email system may be able to do that in future., ,
+
+
diff --git a/website/EN/variants.html b/website/EN/variants.html
index c9f004ec..cbaef2bc 100644
--- a/website/EN/variants.html
+++ b/website/EN/variants.html
@@ -4,7 +4,7 @@
-
+
@@ -154,29 +154,15 @@ for the JavaScript code in this tag.
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-Home |
-
-
-
+
.
-Freedombone may be installed either in its entirety or as different variants with a more specialised purpose. So for example if you just want to run a blog but don't care about any other services then you can do that. The following variants are available:
+Freedombone may be installed either in its entirety or as different variants with a more specialised purpose. So for example if you just want to run a blog but don't care about any other services then you can do that. The following variants are available:
@@ -215,17 +201,7 @@ Freedombone may be installed either in its entirety or as different variants wit
-