diff --git a/archiva-reports-standard/pom.xml b/archiva-reports-standard/pom.xml
index f6d85a9ba..64df5f2d6 100755
--- a/archiva-reports-standard/pom.xml
+++ b/archiva-reports-standard/pom.xml
@@ -53,10 +53,6 @@
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-provider-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact-manager</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven.archiva</groupId>
       <artifactId>archiva-utils</artifactId>
diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxiedRepository.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxiedRepository.jsp
index b064b5678..8deb1468d 100644
--- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxiedRepository.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteProxiedRepository.jsp
@@ -19,7 +19,7 @@
 <html>
 <head>
   <title>Configuration</title>
-  <ww:head />
+  <ww:head/>
 </head>
 
 <body>
@@ -35,12 +35,12 @@
   </blockquote>
 
   <ww:form method="post" action="deleteProxiedRepository" namespace="/admin" validate="true">
-    <ww:hidden name="repoId" />
+    <ww:hidden name="repoId"/>
     <ww:radio list="#@java.util.LinkedHashMap@{
     'delete-contents' : 'Remove the repository and delete its contents from managed repositories',
     'delete-entry' : 'Remove the repository from the available list, but leave the contents in the managed repositories',
-    'unmodified' : 'Leave the repository unmodified'}" name="operation" theme="repository-manager" />
-    <ww:submit value="Go" />
+    'unmodified' : 'Leave the repository unmodified'}" name="operation" theme="archiva"/>
+    <ww:submit value="Go"/>
   </ww:form>
 </div>
 
diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp
index cb2245256..4e4b84cea 100644
--- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteRepository.jsp
@@ -19,7 +19,7 @@
 <html>
 <head>
   <title>Configuration</title>
-  <ww:head />
+  <ww:head/>
 </head>
 
 <body>
@@ -35,11 +35,11 @@
   </blockquote>
 
   <ww:form method="post" action="deleteRepository" namespace="/admin" validate="true">
-    <ww:hidden name="repoId" />
+    <ww:hidden name="repoId"/>
     <ww:radio list="#@java.util.LinkedHashMap@{'delete-contents' : 'Remove the repository and delete its contents from disk',
     'delete-entry' : 'Remove the repository from the management list, but leave the contents unmodified',
-    'unmodified' : 'Leave the repository unmodified'}" name="operation" theme="repository-manager" />
-    <ww:submit value="Go" />
+    'unmodified' : 'Leave the repository unmodified'}" name="operation" theme="archiva"/>
+    <ww:submit value="Go"/>
   </ww:form>
 </div>
 
diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteSyncedRepository.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteSyncedRepository.jsp
index 7db55d5c7..d940999af 100644
--- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteSyncedRepository.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/deleteSyncedRepository.jsp
@@ -19,7 +19,7 @@
 <html>
 <head>
   <title>Configuration</title>
-  <ww:head />
+  <ww:head/>
 </head>
 
 <body>
@@ -35,12 +35,12 @@
   </blockquote>
 
   <ww:form method="post" action="deleteSyncedRepository" namespace="/admin" validate="true">
-    <ww:hidden name="repoId" />
+    <ww:hidden name="repoId"/>
     <ww:radio list="#@java.util.LinkedHashMap@{
     'delete-contents' : 'Remove the repository and delete its contents from managed repositories',
     'delete-entry' : 'Remove the repository from the available list, but leave the contents in the managed repositories',
-    'unmodified' : 'Leave the repository unmodified'}" name="operation" theme="repository-manager" />
-    <ww:submit value="Go" />
+    'unmodified' : 'Leave the repository unmodified'}" name="operation" theme="archiva"/>
+    <ww:submit value="Go"/>
   </ww:form>
 </div>
 
diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
index 76f7b3402..9df80b159 100644
--- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
+++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
@@ -20,8 +20,8 @@
 <%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
 <html>
 <head>
-  <title>Maven Repository Manager ::
-    <decorator:title default="Maven Repository Manager" />
+  <title>Maven Archiva ::
+    <decorator:title default="Maven Archiva"/>
   </title>
 
   <style type="text/css" media="all">
@@ -29,15 +29,15 @@
     @import url( "<%= request.getContextPath() %>/css/maven-theme.css" );
     @import url( "<%= request.getContextPath() %>/css/site.css" );
   </style>
-  <link rel="stylesheet" href="<%= request.getContextPath() %>/css/print.css" type="text/css" media="print" />
-  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+  <link rel="stylesheet" href="<%= request.getContextPath() %>/css/print.css" type="text/css" media="print"/>
+  <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
 </head>
 
 <body onload="<decorator:getProperty property="body.onload" />" class="composite">
 <div id="banner">
   <span id="bannerLeft">
-    <a href="http://maven.apache.org/repository-manager/">
-      <img src="http://maven.apache.org/images/maven.jpg" alt="" width="267" height="70" />
+    <a href="http://maven.apache.org/archiva/">
+      <img src="http://maven.apache.org/images/maven.jpg" alt="" width="267" height="70"/>
       <%-- TODO: logo instead
             <img src="http://ci.codehaus.org/continuum_logo_75.gif" alt="" width="188" height="89" />
       --%>
@@ -52,7 +52,7 @@
   </span>
 
   <div class="clear">
-    <hr />
+    <hr/>
   </div>
 </div>
 
@@ -62,13 +62,13 @@
   </div>
 
   <div class="xright">
-    <a href="http://maven.apache.org/repository-manager">Repository Manager</a> |
+    <a href="http://maven.apache.org/archiva">Archiva</a> |
     <a href="http://maven.apache.org/">Maven</a> |
     <a href="http://www.apache.org/">Apache</a>
   </div>
 
   <div class="clear">
-    <hr />
+    <hr/>
   </div>
 </div>
 
@@ -117,18 +117,18 @@
       </li>
     </ul>
 
-    <br />
+    <br/>
   </div>
 </div>
 
 <div id="bodyColumn">
   <div id="contentBox">
-    <decorator:body />
+    <decorator:body/>
   </div>
 </div>
 
 <div class="clear">
-  <hr />
+  <hr/>
 </div>
 
 <div id="footer">
@@ -137,7 +137,7 @@
   </div>
 
   <div class="clear">
-    <hr />
+    <hr/>
 
   </div>
 </div>
diff --git a/archiva-webapp/src/main/webapp/WEB-INF/web.xml b/archiva-webapp/src/main/webapp/WEB-INF/web.xml
index 49da01f29..6242bf7be 100644
--- a/archiva-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/archiva-webapp/src/main/webapp/WEB-INF/web.xml
@@ -15,10 +15,10 @@
   -->
 
 <web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
 
-  <display-name>Maven Repository Manager</display-name>
+  <display-name>Maven Archiva</display-name>
 
   <filter>
     <filter-name>webwork-cleanup</filter-name>
diff --git a/design/white-site/pom.xml b/design/white-site/pom.xml
index 5139e8210..20365a8c0 100644
--- a/design/white-site/pom.xml
+++ b/design/white-site/pom.xml
@@ -2,9 +2,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.archiva</groupId>
-  <artifactId>maven-repository-manager-white-site</artifactId>
+  <artifactId>archiva-white-site</artifactId>
   <version>1.0-SNAPSHOT</version>
-  <name>Maven Repository Manager White Site</name>
+  <name>Archiva White Site</name>
   <inceptionYear>2005</inceptionYear>
   <reporting>
     <excludeDefaults>true</excludeDefaults>
diff --git a/design/white-site/src/site/site.xml b/design/white-site/src/site/site.xml
index b41e3b260..ced960459 100644
--- a/design/white-site/src/site/site.xml
+++ b/design/white-site/src/site/site.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="Maven Repository Manager">
+<project name="Archiva">
   <bannerLeft>
     <src>http://www.apache.org/images/asf_logo_wide.gif</src>
   </bannerLeft>
diff --git a/design/white-site/src/site/xdoc/admin/add-proxied-repository.xml b/design/white-site/src/site/xdoc/admin/add-proxied-repository.xml
index cb76eb5e7..9ae3b3c4c 100644
--- a/design/white-site/src/site/xdoc/admin/add-proxied-repository.xml
+++ b/design/white-site/src/site/xdoc/admin/add-proxied-repository.xml
@@ -16,7 +16,7 @@
 
 <document>
   <properties>
-    <title>Maven Repository Manager</title>
+    <title>Archiva</title>
   </properties>
   <body>
     <h1>Administration</h1>
diff --git a/design/white-site/src/site/xdoc/admin/add-repository.xml b/design/white-site/src/site/xdoc/admin/add-repository.xml
index 946921c19..85f69e51f 100644
--- a/design/white-site/src/site/xdoc/admin/add-repository.xml
+++ b/design/white-site/src/site/xdoc/admin/add-repository.xml
@@ -16,7 +16,7 @@
 
 <document>
   <properties>
-    <title>Maven Repository Manager</title>
+    <title>Archiva</title>
   </properties>
   <body>
     <h1>Administration</h1>
diff --git a/design/white-site/src/site/xdoc/admin/add-sync-repository.xml b/design/white-site/src/site/xdoc/admin/add-sync-repository.xml
index e2a07bd4c..3e80cb237 100644
--- a/design/white-site/src/site/xdoc/admin/add-sync-repository.xml
+++ b/design/white-site/src/site/xdoc/admin/add-sync-repository.xml
@@ -16,7 +16,7 @@
 
 <document>
   <properties>
-    <title>Maven Repository Manager</title>
+    <title>Archiva</title>
   </properties>
   <body>
     <h1>Administration</h1>
diff --git a/design/white-site/src/site/xdoc/admin/config.xml b/design/white-site/src/site/xdoc/admin/config.xml
index 8e5dede20..ffe8a294a 100644
--- a/design/white-site/src/site/xdoc/admin/config.xml
+++ b/design/white-site/src/site/xdoc/admin/config.xml
@@ -1,6 +1,6 @@
 <document>
   <properties>
-    <title>Maven Repository Manager</title>
+    <title>Archiva</title>
   </properties>
   <body>
     <h1>Configuration</h1>
diff --git a/design/white-site/src/site/xdoc/admin/delete-proxied-repository.xml b/design/white-site/src/site/xdoc/admin/delete-proxied-repository.xml
index d1feacb17..6dfe91fee 100644
--- a/design/white-site/src/site/xdoc/admin/delete-proxied-repository.xml
+++ b/design/white-site/src/site/xdoc/admin/delete-proxied-repository.xml
@@ -1,6 +1,6 @@
 <document>
   <properties>
-    <title>Maven Repository Manager</title>
+    <title>Archiva</title>
   </properties>
   <body>
     <h1>Administration</h1>
@@ -9,15 +9,24 @@
       <h2>Delete Remote Repository</h2>
 
       <blockquote>
-        <strong><span class="statusFailed">WARNING:</span> This operation can not be undone.</strong>
+        <strong>
+          <span class="statusFailed">WARNING:</span>
+          This operation can not be undone.
+        </strong>
       </blockquote>
 
       <form action="proxies.html">
-        <input type="radio"/> Remove the repository and delete its contents from managed repositories<br/>
-        <input type="radio" /> Remove the repository from the available list, but leave the contents in the managed
-        repositories<br/>
-        <input type="radio" checked="checked" /> Leave the repository unmodified<br/>
-        <input type="submit" />
+        <input type="radio"/>
+        Remove the repository and delete its contents from managed repositories
+        <br/>
+        <input type="radio"/>
+        Remove the repository from the available list, but leave the contents in the managed
+        repositories
+        <br/>
+        <input type="radio" checked="checked"/>
+        Leave the repository unmodified
+        <br/>
+        <input type="submit"/>
       </form>
     </div>
   </body>
diff --git a/design/white-site/src/site/xdoc/admin/delete-repository.xml b/design/white-site/src/site/xdoc/admin/delete-repository.xml
index 5c00abe82..0bef5c1f5 100644
--- a/design/white-site/src/site/xdoc/admin/delete-repository.xml
+++ b/design/white-site/src/site/xdoc/admin/delete-repository.xml
@@ -1,6 +1,6 @@
 <document>
   <properties>
-    <title>Maven Repository Manager</title>
+    <title>Archiva</title>
   </properties>
   <body>
     <h1>Administration</h1>
@@ -9,14 +9,23 @@
       <h2>Delete Managed Repository</h2>
 
       <blockquote>
-        <strong><span class="statusFailed">WARNING:</span> This operation can not be undone.</strong>
+        <strong>
+          <span class="statusFailed">WARNING:</span>
+          This operation can not be undone.
+        </strong>
       </blockquote>
 
       <form action="sync.html">
-        <input type="radio"/> Remove the repository and delete its contents from disk<br/>
-        <input type="radio" /> Remove the repository from the management list, but leave the contents unmodified<br/>
-        <input type="radio" checked="checked" /> Leave the repository unmodified<br/>
-        <input type="submit" />
+        <input type="radio"/>
+        Remove the repository and delete its contents from disk
+        <br/>
+        <input type="radio"/>
+        Remove the repository from the management list, but leave the contents unmodified
+        <br/>
+        <input type="radio" checked="checked"/>
+        Leave the repository unmodified
+        <br/>
+        <input type="submit"/>
       </form>
     </div>
   </body>
diff --git a/design/white-site/src/site/xdoc/admin/delete-sync-repository.xml b/design/white-site/src/site/xdoc/admin/delete-sync-repository.xml
index cc5549822..4cfce5656 100644
--- a/design/white-site/src/site/xdoc/admin/delete-sync-repository.xml
+++ b/design/white-site/src/site/xdoc/admin/delete-sync-repository.xml
@@ -1,6 +1,6 @@
 <document>
   <properties>
-    <title>Maven Repository Manager</title>
+    <title>Archiva</title>
   </properties>
   <body>
     <h1>Administration</h1>
@@ -9,15 +9,24 @@
       <h2>Delete Remote Repository</h2>
 
       <blockquote>
-        <strong><span class="statusFailed">WARNING:</span> This operation can not be undone.</strong>
+        <strong>
+          <span class="statusFailed">WARNING:</span>
+          This operation can not be undone.
+        </strong>
       </blockquote>
 
       <form action="sync.html">
-        <input type="radio"/> Remove the repository and delete its contents from managed repositories<br/>
-        <input type="radio" /> Remove the repository from the available list, but leave the contents in the managed
-        repositories<br/>
-        <input type="radio" checked="checked" /> Leave the repository unmodified<br/>
-        <input type="submit" />
+        <input type="radio"/>
+        Remove the repository and delete its contents from managed repositories
+        <br/>
+        <input type="radio"/>
+        Remove the repository from the available list, but leave the contents in the managed
+        repositories
+        <br/>
+        <input type="radio" checked="checked"/>
+        Leave the repository unmodified
+        <br/>
+        <input type="submit"/>
       </form>
     </div>
   </body>
diff --git a/design/white-site/src/site/xdoc/admin/edit-cvs-sync-repository.xml b/design/white-site/src/site/xdoc/admin/edit-cvs-sync-repository.xml
index ac998abe4..fb3516f75 100644
--- a/design/white-site/src/site/xdoc/admin/edit-cvs-sync-repository.xml
+++ b/design/white-site/src/site/xdoc/admin/edit-cvs-sync-repository.xml
@@ -16,7 +16,7 @@
 
 <document>
   <properties>
-    <title>Maven Repository Manager</title>
+    <title>Archiva</title>
   </properties>
   <body>
     <h1>Administration</h1>
diff --git a/design/white-site/src/site/xdoc/admin/edit-file-sync-repository.xml b/design/white-site/src/site/xdoc/admin/edit-file-sync-repository.xml
index a4d5ae448..47e83966b 100644
--- a/design/white-site/src/site/xdoc/admin/edit-file-sync-repository.xml
+++ b/design/white-site/src/site/xdoc/admin/edit-file-sync-repository.xml
@@ -16,7 +16,7 @@
 
 <document>
   <properties>
-    <title>Maven Repository Manager</title>
+    <title>Archiva</title>
   </properties>
   <body>
     <h1>Administration</h1>
diff --git a/design/white-site/src/site/xdoc/admin/edit-rsync-sync-repository.xml b/design/white-site/src/site/xdoc/admin/edit-rsync-sync-repository.xml
index d16ea270f..d76994d3a 100644
--- a/design/white-site/src/site/xdoc/admin/edit-rsync-sync-repository.xml
+++ b/design/white-site/src/site/xdoc/admin/edit-rsync-sync-repository.xml
@@ -16,7 +16,7 @@
 
 <document>
   <properties>
-    <title>Maven Repository Manager</title>
+    <title>Archiva</title>
   </properties>
   <body>
     <h1>Administration</h1>
diff --git a/design/white-site/src/site/xdoc/admin/edit-svn-sync-repository.xml b/design/white-site/src/site/xdoc/admin/edit-svn-sync-repository.xml
index 7f9a3d3c4..f02dfa1d8 100644
--- a/design/white-site/src/site/xdoc/admin/edit-svn-sync-repository.xml
+++ b/design/white-site/src/site/xdoc/admin/edit-svn-sync-repository.xml
@@ -16,7 +16,7 @@
 
 <document>
   <properties>
-    <title>Maven Repository Manager</title>
+    <title>Archiva</title>
   </properties>
   <body>
     <h1>Administration</h1>
diff --git a/design/white-site/src/site/xdoc/admin/index.xml b/design/white-site/src/site/xdoc/admin/index.xml
index ab32e35d1..a634ee484 100644
--- a/design/white-site/src/site/xdoc/admin/index.xml
+++ b/design/white-site/src/site/xdoc/admin/index.xml
@@ -1,6 +1,6 @@
 <document>
   <properties>
-    <title>Maven Repository Manager</title>
+    <title>Archiva</title>
   </properties>
   <body>
     <h1>Administration</h1>
diff --git a/design/white-site/src/site/xdoc/admin/proxies.xml b/design/white-site/src/site/xdoc/admin/proxies.xml
index ea6a6e94d..9ee0d8195 100644
--- a/design/white-site/src/site/xdoc/admin/proxies.xml
+++ b/design/white-site/src/site/xdoc/admin/proxies.xml
@@ -16,7 +16,7 @@
 
 <document>
   <properties>
-    <title>Maven Repository Manager</title>
+    <title>Archiva</title>
   </properties>
   <body>
     <h1>Administration</h1>
diff --git a/design/white-site/src/site/xdoc/admin/sync.xml b/design/white-site/src/site/xdoc/admin/sync.xml
index 4c7bab30e..e5cfd9f40 100644
--- a/design/white-site/src/site/xdoc/admin/sync.xml
+++ b/design/white-site/src/site/xdoc/admin/sync.xml
@@ -16,7 +16,7 @@
 
 <document>
   <properties>
-    <title>Maven Repository Manager</title>
+    <title>Archiva</title>
   </properties>
   <body>
     <h1>Administration</h1>
diff --git a/design/white-site/src/site/xdoc/artifact.xml b/design/white-site/src/site/xdoc/artifact.xml
index dd3f21ec2..2aece3a87 100644
--- a/design/white-site/src/site/xdoc/artifact.xml
+++ b/design/white-site/src/site/xdoc/artifact.xml
@@ -1,6 +1,6 @@
 <document>
   <properties>
-    <title>Maven Repository Manager</title>
+    <title>Archiva</title>
   </properties>
   <body>
     <div id="sidebar">
@@ -98,7 +98,9 @@
           <tr>
             <th>URL</th>
             <td>
-              <a href="http://maven.apache.org/ref/current/maven-model">http://maven.apache.org/ref/current/maven-model</a>
+              <a href="http://maven.apache.org/ref/current/maven-model">
+                http://maven.apache.org/ref/current/maven-model
+              </a>
             </td>
           </tr>
           <tr>
diff --git a/design/white-site/src/site/xdoc/browse.xml b/design/white-site/src/site/xdoc/browse.xml
index d7755a2f6..2e3196ace 100644
--- a/design/white-site/src/site/xdoc/browse.xml
+++ b/design/white-site/src/site/xdoc/browse.xml
@@ -1,6 +1,6 @@
 <document>
   <properties>
-    <title>Maven Repository Manager</title>
+    <title>Archiva</title>
   </properties>
   <body>
     <div id="sidebar">
diff --git a/design/white-site/src/site/xdoc/browse2.xml b/design/white-site/src/site/xdoc/browse2.xml
index 63961b4e6..48d3b4009 100644
--- a/design/white-site/src/site/xdoc/browse2.xml
+++ b/design/white-site/src/site/xdoc/browse2.xml
@@ -1,6 +1,6 @@
 <document>
   <properties>
-    <title>Maven Repository Manager</title>
+    <title>Archiva</title>
   </properties>
   <body>
     <div id="sidebar">
@@ -12,7 +12,8 @@
     <div id="contentArea">
       <div id="nameColumn">
         <p>
-          <a href="#">org</a> /
+          <a href="#">org</a>
+          /
           <strong>apache</strong>
         </p>
         <h2>Groups</h2>
diff --git a/design/white-site/src/site/xdoc/browse3.xml b/design/white-site/src/site/xdoc/browse3.xml
index 91cc2ccf4..a734daf7e 100644
--- a/design/white-site/src/site/xdoc/browse3.xml
+++ b/design/white-site/src/site/xdoc/browse3.xml
@@ -1,6 +1,6 @@
 <document>
   <properties>
-    <title>Maven Repository Manager</title>
+    <title>Archiva</title>
   </properties>
   <body>
     <div id="sidebar">
diff --git a/design/white-site/src/site/xdoc/dependedon.xml b/design/white-site/src/site/xdoc/dependedon.xml
index 0af3677ba..3613ec05b 100644
--- a/design/white-site/src/site/xdoc/dependedon.xml
+++ b/design/white-site/src/site/xdoc/dependedon.xml
@@ -17,7 +17,7 @@
 
 <document>
   <properties>
-    <title>Maven Repository Manager</title>
+    <title>Archiva</title>
   </properties>
   <body>
     <div id="sidebar">
@@ -51,8 +51,10 @@
             <strong>Artifact ID:</strong>
             <a href="browse3.html">maven-artifact</a>
             <strong>Version(s):</strong>
-            <a href="artifact.html">2.0</a>,
-            <a href="artifact.html">2.0.1</a>,
+            <a href="artifact.html">2.0</a>
+            ,
+            <a href="artifact.html">2.0.1</a>
+            ,
             <a href="artifact.html">2.0.4</a>
           </span>
         </p>
@@ -70,8 +72,10 @@
             <strong>Artifact ID:</strong>
             <a href="browse3.html">maven-project</a>
             <strong>Version(s):</strong>
-            <a href="artifact.html">2.0</a>,
-            <a href="artifact.html">2.0.1</a>,
+            <a href="artifact.html">2.0</a>
+            ,
+            <a href="artifact.html">2.0.1</a>
+            ,
             <a href="artifact.html">2.0.4</a>
           </span>
         </p>
diff --git a/design/white-site/src/site/xdoc/dependencies.xml b/design/white-site/src/site/xdoc/dependencies.xml
index 5e02328cf..20a1b1a1d 100644
--- a/design/white-site/src/site/xdoc/dependencies.xml
+++ b/design/white-site/src/site/xdoc/dependencies.xml
@@ -17,7 +17,7 @@
 
 <document>
   <properties>
-    <title>Maven Repository Manager</title>
+    <title>Archiva</title>
   </properties>
   <body>
     <div id="sidebar">
diff --git a/design/white-site/src/site/xdoc/find-artifact.xml b/design/white-site/src/site/xdoc/find-artifact.xml
index 1b73d7d0e..08c06d730 100644
--- a/design/white-site/src/site/xdoc/find-artifact.xml
+++ b/design/white-site/src/site/xdoc/find-artifact.xml
@@ -1,6 +1,6 @@
 <document>
   <properties>
-    <title>Maven Repository Manager</title>
+    <title>Archiva</title>
   </properties>
   <body>
     <h1>Find Artifact</h1>
diff --git a/design/white-site/src/site/xdoc/index.xml b/design/white-site/src/site/xdoc/index.xml
index b05b83d97..899e60111 100644
--- a/design/white-site/src/site/xdoc/index.xml
+++ b/design/white-site/src/site/xdoc/index.xml
@@ -1,6 +1,6 @@
 <document>
   <properties>
-    <title>Maven Repository Manager</title>
+    <title>Archiva</title>
   </properties>
   <body>
     <div id="sidebar">
diff --git a/design/white-site/src/site/xdoc/mail-lists.xml b/design/white-site/src/site/xdoc/mail-lists.xml
index 2a36a8a27..d5557c7a0 100644
--- a/design/white-site/src/site/xdoc/mail-lists.xml
+++ b/design/white-site/src/site/xdoc/mail-lists.xml
@@ -17,7 +17,7 @@
 
 <document>
   <properties>
-    <title>Maven Repository Manager</title>
+    <title>Archiva</title>
   </properties>
   <body>
     <div id="sidebar">
diff --git a/design/white-site/src/site/xdoc/reports.xml b/design/white-site/src/site/xdoc/reports.xml
index effa0e465..d13f82fc9 100644
--- a/design/white-site/src/site/xdoc/reports.xml
+++ b/design/white-site/src/site/xdoc/reports.xml
@@ -1,6 +1,6 @@
 <document>
   <properties>
-    <title>Maven Repository Manager</title>
+    <title>Archiva</title>
   </properties>
   <body>
     <h1>Repository Health</h1>
diff --git a/design/white-site/src/site/xdoc/results.xml b/design/white-site/src/site/xdoc/results.xml
index 3ff69c577..81ff9507b 100644
--- a/design/white-site/src/site/xdoc/results.xml
+++ b/design/white-site/src/site/xdoc/results.xml
@@ -1,6 +1,6 @@
 <document>
   <properties>
-    <title>Maven Repository Manager</title>
+    <title>Archiva</title>
   </properties>
   <body>
     <div id="sidebar">
@@ -13,13 +13,13 @@
         <div id="feed">
           <p>
             <a href="">
-              <img src="images/feed-icon32x32.png" width="28" height="28" />
+              <img src="images/feed-icon32x32.png" width="28" height="28"/>
             </a>
           </p>
         </div>
         <form action="results.html">
           <p>
-            <input type="text" size="50" value="maven" />
+            <input type="text" size="50" value="maven"/>
             <input type="submit" name="Go!"/>
           </p>
           <p>
@@ -30,20 +30,37 @@
         <div id="resultsBox">
           <p>
             <span style="font-size: x-small; background-color: silver; display: block; text-align: right">
-              <b>Page: </b>
-              <b>1</b> |
-              <a href="#">2</a> |
-              <a href="#">3</a> |
-              <a href="#">Next &gt;&gt;</a> 
+              <b>Page:</b>
+              <b>1</b>
+              |
+              <a href="#">2</a>
+              |
+              <a href="#">3</a>
+              |
+              <a href="#">Next &gt;&gt;</a>
             </span>
           </p>
           <h3>
-            <a href="artifact.html">Maven Site Plugin</a> <span style="font-size: x-small">(98%)</span>
+            <a href="artifact.html">Maven Site Plugin</a>
+            <span style="font-size: x-small">(98%)</span>
           </h3>
           <ul>
-            <li><b>Packaging:</b> <i>maven</i>-plugin</li>
-            <li><b>Artifact ID:</b> <i>maven</i>-site-plugin</li>
-            <li><b>Group ID:</b> org.apache.<i>maven</i>.plugins</li>
+            <li>
+              <b>Packaging:</b>
+              <i>maven</i>
+              -plugin
+            </li>
+            <li>
+              <b>Artifact ID:</b>
+              <i>maven</i>
+              -site-plugin
+            </li>
+            <li>
+              <b>Group ID:</b>
+              org.apache.
+              <i>maven</i>
+              .plugins
+            </li>
           </ul>
           <p>
             <span style="font-size: x-small">
@@ -60,11 +77,21 @@
             </span>
           </p>
           <h3>
-            <a href="artifact.html">Maven Project</a> <span style="font-size: x-small">(85%)</span>
+            <a href="artifact.html">Maven Project</a>
+            <span style="font-size: x-small">(85%)</span>
           </h3>
           <ul>
-            <li><b>Package:</b> org.apache.<i>maven</i>.project</li>
-            <li><b>Class:</b> <i>Maven</i>ProjectBuilder</li>
+            <li>
+              <b>Package:</b>
+              org.apache.
+              <i>maven</i>
+              .project
+            </li>
+            <li>
+              <b>Class:</b>
+              <i>Maven</i>
+              ProjectBuilder
+            </li>
           </ul>
           <p>
             <span style="font-size: x-small">
@@ -80,13 +107,16 @@
               <a href="artifact.html">2.0</a>
             </span>
           </p>
-          <h2> ... more results ... </h2>
+          <h2>... more results ...</h2>
           <p>
             <span style="font-size: x-small; background-color: silver; display: block; text-align: right">
-              <b>Page: </b>
-              <b>1</b> |
-              <a href="#">2</a> |
-              <a href="#">3</a> |
+              <b>Page:</b>
+              <b>1</b>
+              |
+              <a href="#">2</a>
+              |
+              <a href="#">3</a>
+              |
               <a href="#">Next &gt;&gt;</a>
             </span>
           </p>
diff --git a/design/white-site/src/site/xdoc/sync.xml b/design/white-site/src/site/xdoc/sync.xml
index 46d4f38c8..883576128 100644
--- a/design/white-site/src/site/xdoc/sync.xml
+++ b/design/white-site/src/site/xdoc/sync.xml
@@ -1,6 +1,6 @@
 <document>
   <properties>
-    <title>Maven Repository Manager</title>
+    <title>Archiva</title>
   </properties>
   <body>
     <h1>Synchronisation</h1>
@@ -10,7 +10,10 @@
       <table>
         <tr>
           <th>Last Sync completed</th>
-          <td>1 February 13:01:04 (<a href="#">View Report</a>)</td>
+          <td>1 February 13:01:04 (
+            <a href="#">View Report</a>
+            )
+          </td>
         </tr>
         <tr>
           <th>Next sync</th>
@@ -18,7 +21,9 @@
         </tr>
         <tr>
           <th>Status</th>
-          <td><span class="statusOk">Success</span></td>
+          <td>
+            <span class="statusOk">Success</span>
+          </td>
         </tr>
       </table>
       <p>
@@ -28,7 +33,10 @@
       <table>
         <tr>
           <th>Last Sync completed</th>
-          <td>1 February 13:05:04 (<a href="#">View Report</a>)</td>
+          <td>1 February 13:05:04 (
+            <a href="#">View Report</a>
+            )
+          </td>
         </tr>
         <tr>
           <th>Next sync</th>
@@ -36,7 +44,10 @@
         </tr>
         <tr>
           <th>Status</th>
-          <td><span class="statusFailed">FAILED</span>: confluence wouldn't share CPU cycles with me</td>
+          <td>
+            <span class="statusFailed">FAILED</span>
+            : confluence wouldn't share CPU cycles with me
+          </td>
         </tr>
       </table>
       <p>
@@ -46,7 +57,10 @@
       <table>
         <tr>
           <th>Last Sync completed</th>
-          <td>1 February 13:11:04 (<a href="#">View Report</a>)</td>
+          <td>1 February 13:11:04 (
+            <a href="#">View Report</a>
+            )
+          </td>
         </tr>
         <tr>
           <th>Next sync</th>
@@ -54,7 +68,10 @@
         </tr>
         <tr>
           <th>Status</th>
-          <td><span class="statusWarn">WARNING</span>: some warnings occurred during the conversion</td>
+          <td>
+            <span class="statusWarn">WARNING</span>
+            : some warnings occurred during the conversion
+          </td>
         </tr>
       </table>
       <p>
