diff --git a/archiva-web/archiva-webapp/src/main/resources/freemarker.properties b/archiva-web/archiva-webapp/src/main/resources/freemarker.properties
new file mode 100644
index 000000000..e2c1805e7
--- /dev/null
+++ b/archiva-web/archiva-webapp/src/main/resources/freemarker.properties
@@ -0,0 +1,20 @@
+#
+# 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.
+#
+# 1 hour
+template_update_delay=3600000
\ No newline at end of file
diff --git a/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/a-close.ftl b/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/a-close.ftl
new file mode 100644
index 000000000..706f1f49f
--- /dev/null
+++ b/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/a-close.ftl
@@ -0,0 +1 @@
+</a><#rt/>
\ No newline at end of file
diff --git a/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/a.ftl b/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/a.ftl
new file mode 100644
index 000000000..1b41b312f
--- /dev/null
+++ b/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/a.ftl
@@ -0,0 +1,22 @@
+<a<#rt/>
+<#if parameters.id?if_exists != "">
+ id="${parameters.id?html}"<#rt/>
+</#if>
+<#if parameters.href?if_exists != "">
+ href="${parameters.href}"<#rt/>
+</#if>
+<#if parameters.tabindex?exists>
+ tabindex="${parameters.tabindex?html}"<#rt/>
+</#if>
+<#if parameters.cssClass?exists>
+ class="${parameters.cssClass?html}"<#rt/>
+</#if>
+<#if parameters.cssStyle?exists>
+ style="${parameters.cssStyle?html}"<#rt/>
+</#if>
+<#if parameters.title?exists>
+ title="${parameters.title?html}"<#rt/>
+</#if>
+<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
+<#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
+><#rt/>
diff --git a/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/actionerror.ftl b/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/actionerror.ftl
new file mode 100644
index 000000000..74c313652
--- /dev/null
+++ b/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/actionerror.ftl
@@ -0,0 +1,7 @@
+<#if (actionErrors?exists && actionErrors?size > 0)>
+	<ul>
+	<#list actionErrors as error>
+		<li><span class="errorMessage">${error}</span></li>
+	</#list>
+	</ul>
+</#if>
diff --git a/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/actionmessage.ftl b/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/actionmessage.ftl
new file mode 100644
index 000000000..384b75558
--- /dev/null
+++ b/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/actionmessage.ftl
@@ -0,0 +1,7 @@
+<#if (actionMessages?exists && actionMessages?size > 0)>
+	<ul>
+		<#list actionMessages as message>
+			<li><span class="actionMessage">${message}</span></li>
+		</#list>
+	</ul>
+</#if>
diff --git a/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/hidden.ftl b/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/hidden.ftl
new file mode 100644
index 000000000..c97423fe9
--- /dev/null
+++ b/archiva-web/archiva-webapp/src/main/webapp/template/xhtml/hidden.ftl
@@ -0,0 +1,15 @@
+<input type="hidden"<#rt/>
+ name="${parameters.name?default("")?html}"<#rt/>
+<#if parameters.nameValue?exists>
+ value="<@ww.property value="parameters.nameValue"/>"<#rt/>
+</#if>
+<#if parameters.id?exists>
+ id="${parameters.id?html}"<#rt/>
+</#if>
+<#if parameters.cssClass?exists>
+ class="${parameters.cssClass?html}"<#rt/>
+</#if>
+<#if parameters.cssStyle?exists>
+ style="${parameters.cssStyle?html}"<#rt/>
+</#if>
+/>