diff --git a/index/conf.py b/index/conf.py
index 644b55ae5..dc29849e5 100644
--- a/index/conf.py
+++ b/index/conf.py
@@ -64,7 +64,7 @@
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ['_build']
+exclude_patterns = ['_build', 'index_com.rst']
 
 # The reST default role (used for this markup: `text`) to use for all documents.
 #default_role = None
@@ -162,5 +162,4 @@
 #html_use_opensearch = ''
 
 # This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
-
+#html_file_suffix = None
\ No newline at end of file
diff --git a/index/index.rst b/index/index.rst
index 22277590a..c37d5510b 100644
--- a/index/index.rst
+++ b/index/index.rst
@@ -1,50 +1,38 @@
-======================
-Documentation Overview
-======================
-
-------------------
-ownCloud Resources
-------------------
-
-* `Howtos, demos, news, and Webinars 
-  <https://doc.owncloud.org/server/8.0/admin_manual/videos/index.html>`_ for both the 
-  Server and Enterprise versions of ownCloud.
-* `ownCloud FAQ <https://owncloud.org/eight>`_ with answers around the ownCloud community, technology and more.
-* `Where to get help <https://owncloud.org/faq/#channels>`_ when the documentation is not enough.
-
---------------------
-ownCloud Server 8.0
---------------------
-
-This documents the *latest* version of ownCloud, suitable for production use.
+===============================
+ownCloud Documentation Overview
+===============================
+
+-----------------------------
+Additional ownCloud Resources
+-----------------------------
+
+* `Howto, demo, news, and Webinar videos
+  <https://doc.owncloud.org/server/8.0/admin_manual/videos/index.html>`_ 
+* `ownCloud FAQ 
+  <https://owncloud.org/eight>`_ Video introduction to ownCloud 8.
+* `Where to get help 
+  <https://owncloud.org/faq/>`_ when the documentation is not enough.
+   
+------------
+ownCloud 8.0
+------------
+
+This documents *all* editions of the *latest* version of ownCloud, Server and 
+Enterprise Subscription, suitable for production use.
 
 * `User Manual <https://doc.owncloud.org/server/8.0/user_manual/>`_ (`Download 
   PDF <https://doc.owncloud.org/server/8.0/ownCloudUserManual.pdf>`_)
-* `Administrator Manual <https://doc.owncloud.org/server/8.0/admin_manual/>`_
+* `Administration Manual <https://doc.owncloud.org/server/8.0/admin_manual/>`_
   (`Download PDF   
   <https://doc.owncloud.org/server/8.0/ownCloudServerAdminManual.pdf>`_)
 * `Developer Manual <https://doc.owncloud.org/server/8.0/developer_manual/>`_ 
   (`Download PDF 
   <https://doc.owncloud.org/server/8.0/ownCloudDeveloperManual.pdf>`_)
-  
-------------------------------------
-ownCloud Enterprise Subscription 8.0
-------------------------------------
 
-This documents the *latest* version of ownCloud Enterprise Subscription, 
-suitable for production use.
 
-* `User Manual <https://doc.owncloud.com/server/8.0/user_manual/>`_ 
-  (`Download PDF 
-  <https://doc.owncloud.com/server/8.0/ownCloudUserManual.pdf>`_)
-* `Administrator Manual 
-  <https://doc.owncloud.com/server/8.0/admin_manual/>`_ 
-  (`Download PDF 
-  <https://doc.owncloud.com/server/8.0/ownCloudServerAdminManual.pdf>`_) 
-
--------------------
-ownCloud Server 7.0
--------------------
+------------------------------
+ownCloud Community Edition 7.0
+------------------------------
 
 This documents the *previous* ownCloud release, suitable for production use.
 
@@ -56,77 +44,11 @@ This documents the *previous* ownCloud release, suitable for production use.
 * `Developer Manual <https://doc.owncloud.org/server/7.0/developer_manual/>`_ 
   (`Download PDF 
   <https://doc.owncloud.org/server/7.0/ownCloudDeveloperManual.pdf>`_)
-
-------------------------------
-ownCloud Enterprise Server 7.0
-------------------------------
-
-This documents the *previous* ownCloud release, suitable for production use.
-
-* `User Manual <https://doc.owncloud.com/server/7.0EE/user_manual/>`_ 
-  (`Download   PDF 
-  <https://doc.owncloud.com/server/7.0EE/ownCloudEEUserManual.pdf>`_)
-
-* `Administrator Manual <https://doc.owncloud.com/server/7.0EE/admin_manual/>`_
-  (`Download PDF 
-  <https://doc.owncloud.com/server/7.0EE/ownCloudEEAdminManual.pdf>`_)
-
--------------------
-ownCloud Server 6.0
--------------------
-
-This documents the *older* ownCloud release. ownCloud 6 receives security 
-fixes, and users are encouraged to upgrade to the latest production release.
-
-* `User Manual <https://doc.owncloud.org/server/6.0/user_manual/>`_ (`Download 
-  PDF <https://doc.owncloud.org/server/6.0/ownCloudUserManual.pdf>`_) 
-* `Administrator Manual <https://doc.owncloud.org/server/6.0/admin_manual/>`_ 
-  (`Download PDF 
-  <https://doc.owncloud.org/server/6.0/ownCloudAdminManual.pdf>`_)
   
-------------------------------
-ownCloud Enterprise Server 6.0
-------------------------------
-
-This documents the *older* ownCloud release. ownCloud 6 receives security 
-fixes, and users are encouraged to upgrade to the latest production release.
-
-* `User Manual <https://doc.owncloud.com/server/6.0EE/user_manual/>`_ 
-  (`Download 
-  PDF <https://doc.owncloud.com/server/6.0EE/ownCloudEEUserManual.pdf>`_) 
-* `Administrator Manual 
-  <https://doc.owncloud.com/server/6.0EE/admin_manual/>`_
-  (`Download PDF 
-  <https://doc.owncloud.com/server/6.0EE/ownCloudEEAdminManual.pdf>`_)
+==============================
+Desktop Client and Mobile Apps
+==============================  
   
--------------------
-ownCloud Server 5.0
--------------------
-
-This documents the *deprecated* ownCloud release. Users are encouraged to 
-upgrade to the latest production release.
-
-* `User Manual <https://doc.owncloud.org/server/5.0/user_manual/>`_ (`Download 
-  PDF <https://doc.owncloud.org/server/6.0/ownCloudUserManual.pdf>`_)
-* `Administrator Manual <https://doc.owncloud.org/server/5.0/admin_manual/>`_ 
-  (`Download PDF 
-  <https://doc.owncloud.org/server/5.0/ownCloudAdminManual.pdf>`_)
-
-------------------------------
-ownCloud Enterprise Server 5.0
-------------------------------
-
-This documents the *deprecated* ownCloud release. Users are encouraged to 
-upgrade to the latest production release.
-
-* `User Manual <https://doc.owncloud.com/server/5.0EE/user_manual/>`_ 
-  (`Download 
-  PDF <https://doc.owncloud.com/server/5.0EE/ownCloudUserManual.pdf>`_) 
-
-* `Administrator Manual <https://doc.owncloud.com/server/5.0EE/admin_manual/>`_ 
-  (`Download PDF 
-  <https://doc.owncloud.com/server/5.0EE/ownCloudAdminManual.pdf>`_)
-
 ---------------------------
 ownCloud Desktop Client 1.8
 ---------------------------
@@ -159,4 +81,42 @@ ownCloud iOS App
 ----------------
 
 * `ownCloud iOS App Manual <https://doc.owncloud.org/ios/>`_ (`Download PDF 
-  <https://doc.owncloud.org/ios/ownCloudiOSAppManual.pdf>`_)
+  <https://doc.owncloud.org/ios/ownCloudiOSAppManual.pdf>`_)  
+
+=======================
+Older ownCloud Releases
+=======================
+
+------------------------------
+ownCloud Community Edition 6.0
+------------------------------
+
+This documents the *older* ownCloud release. ownCloud 6 receives security 
+fixes, and users are encouraged to upgrade to the latest production release.
+
+* `User Manual <https://doc.owncloud.org/server/6.0/user_manual/>`_ (`Download 
+  PDF <https://doc.owncloud.org/server/6.0/ownCloudUserManual.pdf>`_) 
+* `Administrator Manual <https://doc.owncloud.org/server/6.0/admin_manual/>`_ 
+  (`Download PDF 
+  <https://doc.owncloud.org/server/6.0/ownCloudAdminManual.pdf>`_)
+ 
+------------------------------
+ownCloud Community Edition 5.0
+------------------------------
+
+This documents the *deprecated* ownCloud release. Users are encouraged to 
+upgrade to the latest production release.
+
+* `User Manual <https://doc.owncloud.org/server/5.0/user_manual/>`_ (`Download 
+  PDF <https://doc.owncloud.org/server/6.0/ownCloudUserManual.pdf>`_)
+* `Administrator Manual <https://doc.owncloud.org/server/5.0/admin_manual/>`_ 
+  (`Download PDF 
+  <https://doc.owncloud.org/server/5.0/ownCloudAdminManual.pdf>`_)
+  
+-------------------------------------
+Previous ownCloud Enterprise Editions
+-------------------------------------
+
+You'll find all admin and user manuals for older ownCloud Enterprise editions 
+(7.0, 6.0, and 5.0) at the ownCloud Documentation Overview on 
+`doc.owncloud.com <http://doc.owncloud.com/>`_.
\ No newline at end of file