diff --git a/docs/contribute.md b/docs/contribute.md
index 8b0d9408b..da3bcd2a7 100644
--- a/docs/contribute.md
+++ b/docs/contribute.md
@@ -4,6 +4,9 @@ title: Contributing to LibreTime
blurb: LibreTime is a community project, maintained by an awesome group of volunteers. Being a "free as in freedom" project, we need the help of our users to keep the project going. You don't have to know how to write code in order to help. Check out some of ways you can give back to the LibreTime project below.
---
+> LibreTime is a fork of AirTime due to stalled development of the FLOSS version. For background on this,
+see this [open letter to the Airtime community](https://gist.github.com/hairmare/8c03b69c9accc90cfe31fd7e77c3b07d).
+
## Bug reporting
If you think you've found a bug, please report it on our [Github issues page](https://github.com/LibreTime/libretime/issues/new/choose).
diff --git a/docs/faq.md b/docs/faq.md
deleted file mode 100644
index 867d570b0..000000000
--- a/docs/faq.md
+++ /dev/null
@@ -1,37 +0,0 @@
----
-layout: post
-title: Frequently Asked Questions
-date: May 22, 2020
-author: LibreTime Community
-blurb: You've got questions, we've got answers
----
-
-
-**What is LibreTime?**
-
-LibreTime is a community managed fork of the AirTime project.
-
-It is managed by a friendly inclusive community of stations
-from around the globe that use, document and improve LibreTime.
-
-**Can I upgrade to LibreTime?**
-
-In theory you can update any pre 3.0 version of AirTime to
-LibreTime 3.0.0 and above. More information on [Upgrading](upgrading)
-is in the docs.
-
-LibreTime is complex software, as such it is close to impossible
-to guarantee that every upgrade path works as intended. This
-means you should trial the update on a parallel test
-infrastructure to minimize possible downtime.
-
-Please let the community know if you encounter issues with the
-update process.
-
-**Why are Cue-In/Out points wrong in some tracks? / What's with silan?**
-
-The silan silence detection is currently outdated on almost all distributions. The older versions report clearly wrong information and may segfault at the worst. Versions starting with 0.3.3 (and some patched 0.3.2 builds) are much better but still need thorough testing. Please see the [release notes](https://github.com/LibreTime/libretime/releases) for up to date mitigation scenarios and details on the issues.
-
-**Why did you fork AirTime?**
-
-See this [open letter to the Airtime community](https://gist.github.com/hairmare/8c03b69c9accc90cfe31fd7e77c3b07d).
diff --git a/docs/features.md b/docs/features.md
index 666c22abd..ed138e19d 100644
--- a/docs/features.md
+++ b/docs/features.md
@@ -1,16 +1,26 @@
---
layout: page
title: Features
+blurb:
---
-# What is LibreTime?
+
-[LibreTime](http://libretime.org/ "LibreTime homepage") is the open broadcast
-software for scheduling and remote station management. Web browser access to
-the station's media library, multi-file upload and automatic metadata import
-features are coupled with a collaborative online scheduling calendar and
-playlist management. The scheduling calendar is managed through an easy-to-use
-interface and triggers playout with sub-second precision.
+Some of LibreTime's greatest hits:
+
+* *Web-based remote station management* - authorized personnel can add
+ programme material, create playlists or smart blocks, and stream in live,
+ all via a web interface.
+* *Automation* - LibreTime has a scheduler function that enables users to
+ create shows with content for playback at the exact date and time specified.
+ Playlists, smart blocks and remote stream URLs can be used multiple times.
+* *Solid playout* - LibreTime uses the open source Liquidsoap streaming language
+ for reliable and precise playback to multiple outputs.
+* *Open source* - run LibreTime royalty-free, make changes to the code, and contribute to the project as you see fit, under the GNU AGPLv3 license.
+* *Multilingual* - supports over 15 languages both in the interface and inside file metadata
+* *Low system requirements*
+ * For servers: 1Ghz processor, 2 GB RAM, and a wired ethernet connection with a static IP address
+ * For end-users: a modern version of Firefox, Chrome, or Safari, and a screen resolution of at least 1280x768
@@ -79,3 +89,44 @@ can enable remote studios to stream in to Liquidsoap at authorised times.
Optionally, the outgoing Icecast stream can be relayed to a transmitter.
+
+
+
+
+
+
+
Frequently Asked Questions
+
+
+
+
+
+
+
+
"What is LibreTime?"
+
LibreTime is a community managed fork of the AirTime project. It is managed by a friendly inclusive community of stations from around the globe that use, document and improve LibreTime.
+
+
+
+
+
"Can I upgrade to LibreTime?"
+
In theory you can update any pre 3.0 version of AirTime to LibreTime 3.0.0 and above. More information is here.
+
+
+
+
+
"Why are Cue-In/Out points wrong in some tracks?"
+
The silan silence detection is currently outdated on almost all distributions. The older versions report clearly wrong information and may segfault at the worst. Versions starting with 0.3.3 (and some patched 0.3.2 builds) are much better but still need thorough testing.
+
+
+
+
+
+
\ No newline at end of file
diff --git a/docs/img/Screenshot493-APC_host_stats.png b/docs/img/Screenshot493-APC_host_stats.png
deleted file mode 100644
index 45dc72932..000000000
Binary files a/docs/img/Screenshot493-APC_host_stats.png and /dev/null differ
diff --git a/docs/index2.md b/docs/index2.md
deleted file mode 100644
index 76630099f..000000000
--- a/docs/index2.md
+++ /dev/null
@@ -1,39 +0,0 @@
----
-layout: default
-title: Home
-sidebar: main
----
-
-
-Welcome to LibreTime
-====================
-
-LibreTime makes it easy to run your own online or terrestrial radio station.
-Don't believe us? Check out our [Quick Install](quickstart) page to see just how easy it is to install and use LibreTime!
-
-Some of LibreTime's main features include:
-
-* *Web-based remote station management* - authorized personnel can add
- programme material, create playlists or smart blocks, and stream in live,
- all via a web interface.
-* *Automation* - LibreTime has a scheduler function that enables users to
- create shows with content for playback at the exact date and time specified.
- Playlists, smart blocks and remote stream URLs can be used multiple times.
-* *Solid playout* - LibreTime uses the open source Liquidsoap streaming language
- for reliable and precise playback to multiple outputs.
-* *Open source* - run LibreTime royalty-free, make changes to the code, and contribute to the project as you see fit, under the GNU AGPLv3 license.
-* *Multilingual* - supports over 15 languages both in the interface and inside file metadata
-* *Low system requirements*
- * For servers: 1Ghz processor, 2 GB RAM, and a wired ethernet connection with a static IP address
- * For end-users: a modern version of Firefox, Chrome, or Safari, and a screen resolution of at least 1280x768
-
-LibreTime is a fork of AirTime due to stalled development of the FLOSS version. For background on this, see this [open letter to the Airtime community](https://gist.github.com/hairmare/8c03b69c9accc90cfe31fd7e77c3b07d).
-
-We have a number of [how-to guides](tutorials) that contain step-by-step instructions for various common tasks for both end users and administrators.
-
-There are currently no companies offering turn-key LibreTime hosting so if you are interested in running it you will need to have some familiarity with running a Linux server.
-You can always reach out to help from the community at our [forum](http://discourse.libretime.org). You can also join our [Mattermost instance](https://chat.libretime.org/) and talk with other developers and users.
-
-### Proud Users
-
-   