diff --git a/doc/EN/index.org b/doc/EN/index.org
deleted file mode 100644
index db51dce695e3af72cb205e99ce0c1d387ffce7d4..0000000000000000000000000000000000000000
--- a/doc/EN/index.org
+++ /dev/null
@@ -1,23 +0,0 @@
-#+TITLE: Freedombone
-#+AUTHOR: Bob Mottram
-#+EMAIL: bob@freedombone.net
-#+KEYWORDS: freedombone
-#+DESCRIPTION: Freedombone project
-#+OPTIONS: ^:nil toc:nil
-#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="freedombone.css" />
-
-#+attr_html: :width 80% :height 10% :align center
-[[file:images/logo.png]]
-#+attr_html: :align center :border 0 :cellpadding 15%
-| [[./downloads/images.txt][Downloads]] | [[./apps.html][Apps]] | [[./faq.html][FAQ]] | [[./devguide.html][Developers]] | [[https://code.freedombone.net/bashrc/freedombone][Repo]] |
-| [[./backups.html][Backups]] | [[https://blog.freedombone.net/tag/freedombone][Blog]] | [[./support.html][Contact]] | [[./release31.html][Release]] | [[./mesh.html][Mesh]] |
-
-So you want to run your own internet services? Email, chat, VoIP, web sites, file synchronisation, wikis, blogs, social networks, media hosting, backups, VPN. Freedombone is a home server system which enables you to self-host all of these things. You can run Freedombone on an old laptop, a single board computer, or use it to [[./mesh.html][set up a mesh network]] in your local area.
-
-#+BEGIN_HTML
-<form action="install.html">
-<center>
-<input type="submit" value="Begin Install" />
-</center>
-</form>
-#+END_HTML
diff --git a/img/icon_apps.png b/img/icon_apps.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a97c1b484e47de076bd60922d53486899a2e5c2
Binary files /dev/null and b/img/icon_apps.png differ
diff --git a/img/icon_blog2.png b/img/icon_blog2.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f5f651537581e540b8d11934a6c4d9fda121b31
Binary files /dev/null and b/img/icon_blog2.png differ
diff --git a/img/icon_faq.png b/img/icon_faq.png
index 0561fd95cac0762a951a79bd174223764653ac5a..9bc659a929caf6e934b9fa3b290af1e3000b2a8c 100644
Binary files a/img/icon_faq.png and b/img/icon_faq.png differ
diff --git a/img/icon_shell.png b/img/icon_shell.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4b42a9cd9315158bb5d2a3582c2b0c37d225213
Binary files /dev/null and b/img/icon_shell.png differ
diff --git a/website/EN/index.html b/website/EN/index.html
index be55ad3122c222ed5f0d9a27a1c3e46d6b093826..0f8c9a34a595dd12df930d17a10d329fdef7a532 100644
--- a/website/EN/index.html
+++ b/website/EN/index.html
@@ -1,221 +1,179 @@
-<?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>
-<title>Freedombone</title>
-<!-- 2018-09-02 Sun 18:46 -->
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<meta name="generator" content="Org-mode" />
-<meta name="author" content="Bob Mottram" />
-<meta name="description" content="Freedombone project"
- />
-<meta name="keywords" content="freedombone" />
-<style type="text/css">
- <!--/*--><![CDATA[/*><!--*/
- .title { text-align: center; }
- .todo { font-family: monospace; color: red; }
- .done { color: green; }
- .tag { background-color: #eee; font-family: monospace;
- padding: 2px; font-size: 80%; font-weight: normal; }
- .timestamp { color: #bebebe; }
- .timestamp-kwd { color: #5f9ea0; }
- .right { margin-left: auto; margin-right: 0px; text-align: right; }
- .left { margin-left: 0px; margin-right: auto; text-align: left; }
- .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;}
- pre.src-sh:before { content: 'sh'; }
- pre.src-bash:before { content: 'sh'; }
- pre.src-emacs-lisp:before { content: 'Emacs Lisp'; }
- pre.src-R:before { content: 'R'; }
- pre.src-perl:before { content: 'Perl'; }
- pre.src-java:before { content: 'Java'; }
- pre.src-sql:before { content: 'SQL'; }
-
- table { border-collapse:collapse; }
- caption.t-above { caption-side: top; }
- caption.t-bottom { caption-side: bottom; }
- td, th { vertical-align:top; }
- th.right { text-align: center; }
- th.left { text-align: center; }
- th.center { text-align: center; }
- td.right { text-align: right; }
- td.left { text-align: left; }
- td.center { text-align: center; }
- dt { font-weight: bold; }
- .footpara:nth-child(2) { display: inline; }
- .footpara { display: block; }
- .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; }
- /*]]>*/-->
-</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-2013 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">
-<h1 class="title">Freedombone</h1>
-
-<div class="figure">
-<p><img src="images/logo.png" alt="logo.png" width="80%" height="10%" align="center" />
-</p>
-</div>
-<table border="0" cellspacing="0" cellpadding="15%" rules="groups" frame="hsides" align="center">
-
-
-<colgroup>
-<col class="left" />
-
-<col class="left" />
-
-<col class="left" />
-
-<col class="left" />
-
-<col class="left" />
-</colgroup>
-<tbody>
-<tr>
-<td class="left"><a href="./downloads/images.txt">Downloads</a></td>
-<td class="left"><a href="./apps.html">Apps</a></td>
-<td class="left"><a href="./faq.html">FAQ</a></td>
-<td class="left"><a href="./devguide.html">Developers</a></td>
-<td class="left"><a href="https://code.freedombone.net/bashrc/freedombone">Repo</a></td>
-</tr>
-
-<tr>
-<td class="left"><a href="./backups.html">Backups</a></td>
-<td class="left"><a href="https://blog.freedombone.net/tag/freedombone">Blog</a></td>
-<td class="left"><a href="./support.html">Contact</a></td>
-<td class="left"><a href="./release31.html">Release</a></td>
-<td class="left"><a href="./mesh.html">Mesh</a></td>
-</tr>
-</tbody>
-</table>
-
-<p>
-So you want to run your own internet services? Email, chat, VoIP, web sites, file synchronisation, wikis, blogs, social networks, media hosting, backups, VPN. Freedombone is a home server system which enables you to self-host all of these things. You can run Freedombone on an old laptop, a single board computer, or use it to <a href="./mesh.html">set up a mesh network</a> in your local area.
-</p>
-
-<form action="install.html">
-<center>
-<input type="submit" value="Begin Install" />
-</center>
-</form>
-</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>
+<!DOCTYPE html>
+<html>
+ <style>
+ * {
+ box-sizing: border-box;
+ }
+
+ a, u {
+ text-decoration: none;
+ color: #72a7cf;
+ font-weight: bold;
+ }
+
+ a:visited{
+ color: #72a7cf;
+ font-weight: bold;
+ }
+
+ #headerpic {
+ width: 60%;
+ height: auto;
+ margin-right : auto;
+ margin-left : auto;
+ min-width : 220px;
+ }
+
+ body {
+ margin-left: 8%;
+ margin-right: 8%;
+ font-family: Arial;
+ }
+
+ .header {
+ text-align: center;
+ padding: 32px;
+ }
+
+ .headertext {
+ color: #72a7cf;
+ text-align: center;
+ font-size: 120%;
+ font-weight: bold;
+ }
+
+ .doctext {
+ text-align: left;
+ font-size: 100%;
+ }
+
+ .row {
+ display: -ms-flexbox;
+ display: flex;
+ -ms-flex-wrap: wrap;
+ flex-wrap: wrap;
+ padding: 0 4px;
+ }
+
+ .column {
+ -ms-flex: 25%;
+ flex: 25%;
+ max-width: 25%;
+ padding: 0 4px;
+ }
+ .columnempty {
+ -ms-flex: 25%;
+ flex: 25%;
+ max-width: 25%;
+ padding: 0 4px;
+ }
+
+ .column img {
+ margin-top: 8px;
+ vertical-align: middle;
+ }
+
+ @media screen and (max-width: 600px) {
+ .column {
+ -ms-flex: 50%;
+ flex: 25%;
+ max-width: 50%;
+ }
+ .columnempty {
+ -ms-flex: 0%;
+ flex: 0%;
+ max-width: 0%;
+ }
+ }
+
+ @media screen and (max-width: 200px) {
+ .column {
+ -ms-flex: 25%;
+ flex: 25%;
+ max-width: 25%;
+ }
+ }
+ </style>
+ <body>
+
+ <div class="header">
+ <img id="headerpic" class="img-responsive" src="images/logo.png">
+
+ <p class="headertext">Software for an internet of people</p>
+
+ <p class="doctext">
+ So you want to run your own internet services? Email, chat, VoIP, web sites, file synchronisation, wikis, blogs, social networks, media hosting, backups, VPN. Freedombone is a home server system which enables you to self-host all of these things. You can run Freedombone on an old laptop, a single board computer, or use it to <a href="mesh.html">set up a mesh network</a> in your local area.
+ </p>
+
+ <p class="headertext">Install</p>
+
+ <div class="row">
+ <div class="columnempty">
+ <div>
+ </div>
+ </div>
+ <div class="column">
+ <div>
+ <a href="install_desktop.html">
+ <img src="images/icon_desktop.png" style="width:100%">
+ <center>Desktop/Laptop</center>
+ </a>
+ </div>
+ </div>
+ <div class="column">
+ <div>
+ <a href="install_sbc.html">
+ <img src="images/icon_sbc.png" style="width:100%">
+ <center>Single Board Computer</center>
+ </a>
+ </div>
+ </div>
+ <div class="columnempty">
+ <div>
+ </div>
+ </div>
+ </div>
+
+ <br>
+
+ <p class="headertext">Explore</p>
+
+ <div class="row">
+ <div class="column">
+ <div>
+ <a href="apps.html">
+ <img src="images/icon_apps.png" style="width:100%">
+ <center>Apps</center>
+ </a>
+ </div>
+ </div>
+ <div class="column">
+ <div>
+ <a href="devguide.html">
+ <img src="images/icon_shell.png" style="width:100%">
+ <center>Developer Guide</center>
+ </a>
+ </div>
+ </div>
+ <div class="column">
+ <div>
+ <a href="faq.html">
+ <img src="images/icon_faq.png" style="width:100%">
+ <center>FAQ</center>
+ </a>
+ </div>
+ </div>
+ <div class="column">
+ <div>
+ <a href="https://blog.freedombone.net/tag/freedombone">
+ <img src="images/icon_blog2.png" style="width:100%">
+ <center>Blog</center>
+ </a>
+ </div>
+ </div>
+ </div>
+
+ </div>
+
+ </body>
</html>