diff --git a/archiva-site/src/site/apt/index.apt b/archiva-site/src/site/apt/index.apt
new file mode 100644
index 000000000..d5fbd1f7e
--- /dev/null
+++ b/archiva-site/src/site/apt/index.apt
@@ -0,0 +1,25 @@
+ -----
+ Welcome to Maven Archiva
+ -----
+ -----
+ -----
+
+  Archiva is a build artifact repository manager for use with
+  build tools such as {{{http://maven.apache.org} Maven}}, {{{http://maven.apache.org/continuum/} Continuum}}, and {{{http://ant.apache.org/} ANT}}.
+
+  With Archiva, you can share artifacts with other developers and manage the associated
+  security required, aggregate (proxy) content from remote artifact repositories, visualise
+  your artifact utilisation with search, browse and reporting, and perform routine
+  maintenance on your repositories.
+
+  ~~TODO: improve appearance of links
+
+  To get started with Archiva, read the following documentation:
+   
+    * {{{/quick-start.html} A Quick Getting Started Guide}}
+
+    * {{{/userguide/index.html} User's Guide}}
+
+    * {{{/adminguide/index.html} Administrator's Guide}}
+
+    []
diff --git a/archiva-site/src/site/xdoc/index.xml b/archiva-site/src/site/xdoc/index.xml
deleted file mode 100644
index fe3075abf..000000000
--- a/archiva-site/src/site/xdoc/index.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<document>
-  <properties>
-    <title>Welcome to Maven Archiva</title>
-  </properties>
-  <body>
-    <section name="Welcome to Maven Archiva">
-<!-- TODO: convert back to APT -->
-      <p>
-         Archiva is a build artifact repository manager for use with
-         build tools such as <a href="http://maven.apache.org">Maven</a>,
-         <a href="http://maven.apache.org/continuum/">Continuum</a>,
-         and <a href="http://ant.apache.org/">ANT</a>.
-      </p>
-
-      <p>
-        With Archiva, you can share artifacts with other developers and manage the associated
-        security required, aggregate (proxy) content from remote artifact repositories, visualise
-        your artifact utilisation with search, browse and reporting, and perform routine
-        maintenance on your repositories.
-      </p>
-
-<!-- TODO: improve appearance of these links -->
-<p>
-  To get started with Archiva, read the following documentation:
-</p>
-<ul>
-<li><a href="/quick-start.html">A Quick Getting Started Guide</a></li>
-<li><a href="/userguide/index.html">User's Guide</a></li>
-<li><a href="/adminguide/index.html">Administrator's Guide</a></li>
-</ul>
-
-<!-- TODO: move to the feature tour
-      <ul>
-        <li>A place for like-minded developers to share artifacts
-            that are private in nature, such as found in proprietary
-            development shops.</li>
-        <li>The ability to act as a nearby (proxy) cache of popular global
-            repositories for better build performance.</li>
-        <li>Secure your repositories!  by user, by role, by repository,
-            read vs write access controls.</li>
-        <li>A tool to browse the repository information, and present it
-            in a user friendly way.</li>
-        <li>Maximize code reuse via a search / research tool to help
-            find artifacts that might be of the most use for your
-            immediate problem.</li>
-        <li>Implement controls on the artifacts that the developers
-            in your organization use.</li>
-        <li>Identify unknown artifacts based on large database of
-            known checksums for known artifacts.</li>
-        <li>Reporting on artifact usage, to help identify those
-            projects that are using your code.</li>
-        <li>Reporting tools.</li>
-        <li>Maintenance tools.</li>
-      </ul>
--->
-    </section>
-
-<!-- TODO: move
-    <section name="Need Help?">
-      <p>Join the conversation!</p>
-      <ul>
-        <li>Try the Documentation: (see the navigation menu on the left)</li>
-        <li><a href="http://www.nabble.com/archiva-users-f16426.html">Archiva
-             Users</a> <a href="mail-lists.html">Mailing List</a>:
-            <a href="mailto:archiva-users-subscribe@maven.apache.org">archiva-users@maven.apache.org</a></li>
-        <li>Archiva IRC Channel:
-           <a href="irc://irc.codehaus.org/#archiva">#archiva</a> on
-           <a href="http://irc.codehaus.org/">irc.codehaus.org</a></li>
-      </ul>
-    </section>
-
-    <section name="Contributing">
-      <div class="p">
-         We welcome developers to the Maven community who are interested
-         in contributing. If you'd like to discuss Archiva, subscribe and
-         post to <a href="mail-lists.html">the development mailing list</a>
-         <code>archiva-dev@maven.apache.org</code>.
-      </div>
-
-      <div class="p">
-         Read the <a href="hacking/">Hacking Archiva</a> document.
-      </div>
-
-      <div class="p">
-         If you'd like to obtain the code, you can get it from Subversion.
-         See <a href="source-repository.html">SCM details</a> for more
-         information.
-      </div>
-
-      <div class="p">
-         Bugs, issues and new ideas should be reported in the issue tracker -
-         see <a href="issue-tracking.html">this page</a>.
-      </div>
-
-      <div class="p">
-         A user managed wiki of alternative documentation is available a
-         <a href="http://docs.codehaus.org/display/MAVENUSER/Archiva">the
-         Archiva wiki</a>.
-      </div>
-    </section>
--->
-  </body>
-</document>
diff --git a/archiva-site/src/site/xdoc/tour/admin.xml b/archiva-site/src/site/xdoc/tour/admin.xml
index 2089b4dc4..478eb483f 100644
--- a/archiva-site/src/site/xdoc/tour/admin.xml
+++ b/archiva-site/src/site/xdoc/tour/admin.xml
@@ -12,6 +12,7 @@
         <img src="../images/tour/admin.png" width="640" height="401" alt="" />
         <p>
           ...
+          <!-- TODO! -->
         </p>
         <p>
           <a href="proxy.html">Previous: Remote Proxying Cache</a> |
diff --git a/archiva-site/src/site/xdoc/tour/project.xml b/archiva-site/src/site/xdoc/tour/project.xml
index 0629cf05d..c0d0fad63 100644
--- a/archiva-site/src/site/xdoc/tour/project.xml
+++ b/archiva-site/src/site/xdoc/tour/project.xml
@@ -11,7 +11,8 @@
       <div style="text-align: center">
         <img src="../images/tour/project.png" width="640" height="401" alt="" />
         <p>
-          ...
+          Reporting on artifact usage, to help identify those projects that are using your code.
+          <!-- TODO! -->
         </p>
         <p>
           <a href="index.html">Previous: Feature Tour</a> |
diff --git a/archiva-site/src/site/xdoc/tour/proxy.xml b/archiva-site/src/site/xdoc/tour/proxy.xml
index 4d9d3969c..2bd350c30 100644
--- a/archiva-site/src/site/xdoc/tour/proxy.xml
+++ b/archiva-site/src/site/xdoc/tour/proxy.xml
@@ -11,7 +11,8 @@
       <div style="text-align: center">
         <img src="../images/tour/proxy.png" width="640" height="401" alt="" />
         <p>
-          ...
+          The ability to act as a nearby (proxy) cache of popular global repositories for better build performance.
+          <!-- TODO: improve description -->
         </p>
         <p>
           <a href="search.html">Previous: Artifact Search</a> |
diff --git a/archiva-site/src/site/xdoc/tour/reports.xml b/archiva-site/src/site/xdoc/tour/reports.xml
index 9c8ca1433..88f44ed12 100644
--- a/archiva-site/src/site/xdoc/tour/reports.xml
+++ b/archiva-site/src/site/xdoc/tour/reports.xml
@@ -12,6 +12,7 @@
         <img src="../images/tour/reports.png" width="640" height="401" alt="" />
         <p>
           ...
+          <!-- TODO! -->
         </p>
         <p>
           <a href="security.html">Previous: Role-based Security</a> |
diff --git a/archiva-site/src/site/xdoc/tour/search.xml b/archiva-site/src/site/xdoc/tour/search.xml
index 05bd4a30f..ccb25299b 100644
--- a/archiva-site/src/site/xdoc/tour/search.xml
+++ b/archiva-site/src/site/xdoc/tour/search.xml
@@ -11,7 +11,10 @@
       <div style="text-align: center">
         <img src="../images/tour/search.png" width="640" height="401" alt="" />
         <p>
-          ...
+          Browse the repository information, and present it in a user friendly way.
+          Maximize code reuse via a search / research tool to help find artifacts that might be of the most use for your immediate problem.
+          Identify unknown artifacts based on large database of known checksums for known artifacts.
+          <!-- TODO: improve -->
         </p>
         <p>
           <a href="project.html">Previous: Project Information</a> |
diff --git a/archiva-site/src/site/xdoc/tour/security.xml b/archiva-site/src/site/xdoc/tour/security.xml
index a74f454a1..0e372a9f5 100644
--- a/archiva-site/src/site/xdoc/tour/security.xml
+++ b/archiva-site/src/site/xdoc/tour/security.xml
@@ -11,7 +11,8 @@
       <div style="text-align: center">
         <img src="../images/tour/security.png" width="640" height="401" alt="" />
         <p>
-          ...
+          Secure your repositories by user, by role, by repository, read vs write access controls.
+          <!-- TODO: improve -->
         </p>
         <p>
           <a href="admin.html">Previous: Graphical Administration</a> |
