diff --git a/ccm-ldn-aplaws/doc/docs-stuff/src/com/redhat/ccm/documentation/Splitter.java b/ccm-ldn-aplaws/doc/docs-stuff/src/com/redhat/ccm/documentation/Splitter.java
index 2013cf643..ea4032a88 100755
--- a/ccm-ldn-aplaws/doc/docs-stuff/src/com/redhat/ccm/documentation/Splitter.java
+++ b/ccm-ldn-aplaws/doc/docs-stuff/src/com/redhat/ccm/documentation/Splitter.java
@@ -7,13 +7,11 @@ import java.util.*;
  * Splitter
  *
  * @author Rafael H. Schloming <rhs@mit.edu>
- * @version $Revision: #1 $ $Date: 2003/09/18 $
+ * @version $Id: Splitter.java 287 2005-02-22 00:29:02Z sskracic $
  **/
 
 public class Splitter {
 
-    public final static String versionId = "$Id: Splitter.java 287 2005-02-22 00:29:02Z sskracic $ by $Author: sskracic $, $DateTime: 2003/09/18 15:50:41 $";
-
     private static final String BEGIN = "@rhdoc.begin";
     private static final String END = "@rhdoc.end";
 
diff --git a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Aplaws.java b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Aplaws.java
index 4f6d74d7e..dfcbd62b9 100755
--- a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Aplaws.java
+++ b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Aplaws.java
@@ -20,9 +20,11 @@ package com.arsdigita.aplaws;
 
 import org.apache.log4j.Logger;
 
+/**
+ *
+ * @version "$Id: Aplaws.java 1297 2006-08-25 18:17:50Z apevec $
+ */
 public class Aplaws {
-    public static final String versionId =
-        "$Id: Aplaws.java 1297 2006-08-25 18:17:50Z apevec $";
 
     private static final Logger LOG = Logger.getLogger(Aplaws.class);
 
diff --git a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AplawsConfig.java b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AplawsConfig.java
index 779effcc3..e56ee5ee6 100755
--- a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AplawsConfig.java
+++ b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/AplawsConfig.java
@@ -27,12 +27,11 @@ import com.arsdigita.util.parameter.StringParameter;
  * AplawsConfig
  *
  * @version $Revision: 1.2 $ $Date: 2005/01/07 19:01:40 $
+ * @version $Id: AplawsConfig.java 1565 2007-04-18 16:46:14Z apevec $
  */
 
 public class AplawsConfig extends AbstractConfig {
 
-    public final static String versionId = "$Id: AplawsConfig.java 1565 2007-04-18 16:46:14Z apevec $";
-
     private final Parameter m_overrideAnavFromLGCLMappings = new BooleanParameter
         ("com.arsdigita.aplaws.override_anav_from_lgcl_mappings", Parameter.OPTIONAL, new Boolean(false));
     private final Parameter m_autocatServiceURL = new StringParameter("com.arsdigita.aplaws.autocat_url", Parameter.OPTIONAL, "http://demo.masprovider.com/searchLightWS/services/textMiner");
diff --git a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Initializer.java b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Initializer.java
index 933b9d905..b58cb59e8 100755
--- a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Initializer.java
+++ b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Initializer.java
@@ -32,7 +32,7 @@ import com.arsdigita.templating.PatternStylesheetResolver;
 /**
  * The APLAWS initializer.
  *
- * @version $Id: Initializer.java 1232 2006-06-22 12:01:30Z sskracic $
+ * @version $Id: Initializer.java 2070 2010-01-28 08:47:41Z pboy $
  */
 public class Initializer extends CompoundInitializer {
 
diff --git a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java
index 2eeae7281..18165d477 100755
--- a/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java
+++ b/ccm-ldn-aplaws/src/com/arsdigita/aplaws/Loader.java
@@ -61,10 +61,6 @@ import org.apache.log4j.Logger;
  * @version $Id: Loader.java 755 2005-09-02 13:42:47Z sskracic $
  */
 public class Loader extends PackageLoader {
-    public final static String versionId =
-        "$Id: Loader.java 755 2005-09-02 13:42:47Z sskracic $" +
-        "$Author: sskracic $" +
-        "$DateTime: 2004/03/25 09:34:39 $";
 
     private static final Logger s_log = Logger.getLogger(Loader.class);
 
diff --git a/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/consultations-index.xsl b/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/consultations-index.xsl
index 40ca23cd0..b6b7b96f3 100755
--- a/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/consultations-index.xsl
+++ b/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/consultations-index.xsl
@@ -8,7 +8,7 @@
   xmlns:nav="http://ccm.redhat.com/london/navigation"
   version="1.0">
 
-  <xsl:import href="../../../../ROOT/__ccm__/themes/aplaws/navigation-index.xsl"/>
+  <xsl:import href="../../themes/aplaws/navigation-index.xsl"/>
   
   <xsl:template name="pageContent">
     <a class="intLink" name="top" />
diff --git a/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/forum-example/categorised-forum/forum-categories.xsl b/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/forum-example/categorised-forum/forum-categories.xsl
index a77f999ce..c53df6013 100644
--- a/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/forum-example/categorised-forum/forum-categories.xsl
+++ b/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/forum-example/categorised-forum/forum-categories.xsl
@@ -1,7 +1,7 @@
 <xsl:stylesheet xmlns:forum="http://www.arsdigita.com/forum/1.0"
-		xmlns:bebop="http://www.arsdigita.com/bebop/1.0" 
-		  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-		  xmlns:nav="http://ccm.redhat.com/london/navigation" 
+				xmlns:bebop="http://www.arsdigita.com/bebop/1.0" 
+				xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+				xmlns:nav="http://ccm.redhat.com/london/navigation" 
 				xmlns:search="http://rhea.redhat.com/search/1.0" 
 				xmlns:portal="http://www.uk.arsdigita.com/portal/1.0" 				
 				xmlns:cms="http://www.arsdigita.com/cms/1.0" 	
@@ -9,8 +9,8 @@
 				version="1.0">
 
   <!-- IMPORT DEFINITIONS ccm-forum installed as separate web application
-  <xsl:import href="../../../../ROOT/__ccm__/themes/aplaws/category-step.xsl"/>
-  <xsl:import href="../../../../ROOT/__ccm__/static/cms/admin/category-step/category-step.xsl"/>	
+	<xsl:import href="../../../../ROOT/__ccm__/themes/aplaws/category-step.xsl"/>
+  	<xsl:import href="../../../../ROOT/__ccm__/static/cms/admin/category-step/category-step.xsl"/>	
   -->
   <!-- IMPORT DEFINITIONS ccm-forum installed into the main CCM webapp
   -->
diff --git a/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/forum-example/categorised-forum/forum-index.xsl b/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/forum-example/categorised-forum/forum-index.xsl
index 8562e9ee6..909942baa 100644
--- a/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/forum-example/categorised-forum/forum-index.xsl
+++ b/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/forum-example/categorised-forum/forum-index.xsl
@@ -1,40 +1,44 @@
-<xsl:stylesheet xmlns:forum="http://www.arsdigita.com/forum/1.0"
-				xmlns:bebop="http://www.arsdigita.com/bebop/1.0" 
-				xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-				xmlns:nav="http://ccm.redhat.com/london/navigation" 
-				xmlns:search="http://rhea.redhat.com/search/1.0" 
-				xmlns:portal="http://www.uk.arsdigita.com/portal/1.0" 				
-				xmlns:cms="http://www.arsdigita.com/cms/1.0" 	
-				exclude-result-prefixes="xsl bebop nav search portal forum cms" 
-				version="1.0">
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet
+	xmlns:forum="http://www.arsdigita.com/forum/1.0"
+	xmlns:bebop="http://www.arsdigita.com/bebop/1.0" 
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+	xmlns:nav="http://ccm.redhat.com/london/navigation" 
+	xmlns:search="http://rhea.redhat.com/search/1.0" 
+	xmlns:portal="http://www.uk.arsdigita.com/portal/1.0" 				
+	xmlns:cms="http://www.arsdigita.com/cms/1.0" 	
+	exclude-result-prefixes="xsl bebop nav search portal forum cms" 
+	version="1.0">
 
   <!-- IMPORT DEFINITIONS ccm-forum  installed as separate web application
-  <xsl:import href="../../../../ROOT/packages/bebop/xsl/bebop.xsl" />
-  <xsl:import href="../../../../ROOT/packages/ui/xsl/ui.xsl" />
-  <xsl:import href="../../../../ROOT/packages/bebop/xsl/bebop.xsl" />
+	<xsl:import href="../../../../ROOT/packages/bebop/xsl/bebop.xsl" />
+	<xsl:import href="../../../../ROOT/packages/ui/xsl/ui.xsl" />
+	<xsl:import href="../../../../ROOT/packages/bebop/xsl/bebop.xsl" />
   -->
   <!-- IMPORT DEFINITIONS ccm-forum installed into the main CCM webapp
   -->
-  <xsl:import href="../../../packages/bebop/xsl/bebop.xsl" />
-  <xsl:import href="../../../packages/ui/xsl/ui.xsl" />
-  <xsl:import href="../../../packages/bebop/xsl/bebop.xsl" />
+    <xsl:import href="../../../packages/bebop/xsl/bebop.xsl" />
+    <xsl:import href="../../../packages/ui/xsl/ui.xsl" />
+    <xsl:import href="../../../packages/bebop/xsl/bebop.xsl" />
 
-  <xsl:import href="lib/header.xsl" />
-  <xsl:import href="lib/lib.xsl" />
-  <xsl:import href="lib/leftNav.xsl" />
-  <xsl:import href="forum-categories.xsl"/>
+	<xsl:import href="lib/header.xsl" />
+	<xsl:import href="lib/lib.xsl" />
+	<xsl:import href="lib/leftNav.xsl" />
+	<xsl:import href="forum-categories.xsl"/>
   <!-- IMPORT DEFINITIONS ccm-forum  installed as separate web application
-  <xsl:import href="../../../../ROOT/packages/bebop/xsl/dcp.xsl"/>
+	<xsl:import href="../../../../ROOT/packages/bebop/xsl/dcp.xsl"/>
   -->
   <!-- IMPORT DEFINITIONS ccm-forum installed into the main CCM webapp
   -->
-  <xsl:import href="../../../packages/bebop/xsl/dcp.xsl"/>
-  
-  <xsl:param name="theme-prefix" />
-  <xsl:param name="context-prefix" />
-  <xsl:param name="dispatcher-prefix" />
+    <xsl:import href="../../../packages/bebop/xsl/dcp.xsl"/>
 
-  <xsl:output method="html" doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" doctype-system="http://www.w3.org/TR/html4/loose.dtd" indent="yes" />
+
+	<xsl:param name="theme-prefix" />
+	<xsl:param name="context-prefix" />
+	<xsl:param name="dispatcher-prefix" />
+
+	<xsl:output method="html" doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" 
+		    doctype-system="http://www.w3.org/TR/html4/loose.dtd" indent="yes" />
 
 <!-- ********************* MAIN PAGE LAYOUT TEMPLATES ********************* -->
 
diff --git a/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/forum-example/forum-index.xsl b/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/forum-example/forum-index.xsl
index 95c94f2cf..0c6275af2 100644
--- a/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/forum-example/forum-index.xsl
+++ b/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/forum-example/forum-index.xsl
@@ -1,35 +1,36 @@
-<xsl:stylesheet xmlns:forum="http://www.arsdigita.com/forum/1.0"
-		xmlns:bebop="http://www.arsdigita.com/bebop/1.0" 
-		  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-    	  	  xmlns:nav="http://ccm.redhat.com/london/navigation" 
-	       xmlns:search="http://rhea.redhat.com/search/1.0" 
-	       xmlns:portal="http://www.uk.arsdigita.com/portal/1.0" 				
-		  xmlns:cms="http://www.arsdigita.com/cms/1.0" 	
-    exclude-result-prefixes="xsl bebop nav search portal forum cms" 
-	  	    version="1.0">
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet
+	xmlns:forum="http://www.arsdigita.com/forum/1.0"
+	xmlns:bebop="http://www.arsdigita.com/bebop/1.0" 
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+	xmlns:nav="http://ccm.redhat.com/london/navigation" 
+	xmlns:search="http://rhea.redhat.com/search/1.0" 
+	xmlns:portal="http://www.uk.arsdigita.com/portal/1.0" 				
+	xmlns:cms="http://www.arsdigita.com/cms/1.0" 	
+	exclude-result-prefixes="xsl bebop nav search portal forum cms" 
+	version="1.0">
 
-        <!-- IMPORT DEFINITIONS ccm-forum  installed as separate web application
+  <!-- IMPORT DEFINITIONS ccm-forum  installed as separate web application
 	<xsl:import href="../../../../ROOT/packages/bebop/xsl/bebop.xsl" />
 	<xsl:import href="../../../../ROOT/packages/ui/xsl/ui.xsl" />
 	<xsl:import href="../../../../ROOT/packages/bebop/xsl/bebop.xsl" />
-	-->
- 	<!-- IMPORT DEFINITIONS ccm-forum installed into the main CCM webapp
-	-->
-	<xsl:import href="../../../packages/bebop/xsl/bebop.xsl" />
-	<xsl:import href="../../../packages/ui/xsl/ui.xsl" />
-	<xsl:import href="../../../packages/bebop/xsl/bebop.xsl" />
+  -->
+  <!-- IMPORT DEFINITIONS ccm-forum installed into the main CCM webapp
+  -->
+    <xsl:import href="../../../packages/bebop/xsl/bebop.xsl" />
+    <xsl:import href="../../../packages/ui/xsl/ui.xsl" />
+    <xsl:import href="../../../packages/bebop/xsl/bebop.xsl" />
 
 	<xsl:import href="lib/header.xsl" />
 	<xsl:import href="lib/lib.xsl" />
 	<xsl:import href="lib/leftNav.xsl" />
-        <!-- IMPORT DEFINITIONS ccm-forum  installed as separate web application
-	<xsl:import href="../../../../ROOT/packages/bebop/xsl/dcp.xsl"/>
-	-->
- 	<!-- IMPORT DEFINITIONS ccm-forum installed into the main CCM webapp
-	-->
-	<xsl:import href="../../../packages/bebop/xsl/dcp.xsl"/>
-  
 
+  <!-- IMPORT DEFINITIONS ccm-forum  installed as separate web application
+	<xsl:import href="../../../../ROOT/packages/bebop/xsl/dcp.xsl"/>
+  -->
+  <!-- IMPORT DEFINITIONS ccm-forum installed into the main CCM webapp
+  -->
+    <xsl:import href="../../../packages/bebop/xsl/dcp.xsl"/>
 
 
 	<xsl:param name="theme-prefix" />
@@ -44,6 +45,7 @@
 	<xsl:template match="bebop:page[@class='simplePage']">
 		<html lang="en">
 			<head>
+
 				<title>
 					Forum
 				</title>
@@ -54,6 +56,11 @@
 			</head>
 
 			<body>
+
+
+
+
+
  				<a name="Ptop"></a>
 				<a class="navHide" href="#startcontent" title="Go directly to main content" accesskey="S">Skip over navigation</a>
 				<span class="hide">|</span>
@@ -159,12 +166,12 @@
 				 	<xsl:if test="$preview = 'false'">
 						<div class="actions">
 							<xsl:if test="@approveURL">
-							  <a href="{@approveURL}">
-								<img alt="Approve" border="0" src="{$theme-prefix}/images/forum/reward-16x16.gif" />
-							  </a>
-						 	  <!--<xsl:text>&#160;</xsl:text>
+								<a href="{@approveURL}">
+									<img alt="Approve" border="0" src="{$theme-prefix}/images/forum/reward-16x16.gif" />
+								</a>
+								<!--<xsl:text>&#160;</xsl:text>
 								<a href="{@approveURL}">Approve</a>-->
-							  <xsl:text>&#160;</xsl:text>
+								<xsl:text>&#160;</xsl:text>
 	
 							</xsl:if>
 							<xsl:if test="@rejectURL">
diff --git a/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/portal/portlets.xsl b/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/portal/portlets.xsl
index d0ef2a49e..7af695964 100755
--- a/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/portal/portlets.xsl
+++ b/ccm-ldn-aplaws/web/__ccm__/themes/aplaws/portal/portlets.xsl
@@ -11,14 +11,14 @@
   
 	
 	<xsl:import href="login-portlet.xsl"/>
-  <xsl:import href="directory-portlet.xsl"/>
-  <xsl:import href="content-sections-portlet.xsl"/>
-  <xsl:import href="time-of-day-portlet.xsl"/>
-  <xsl:import href="freeform-html-portlet.xsl"/>
-  <xsl:import href="rss-feed-portlet.xsl"/>
-  <xsl:import href="tasklist-portlet.xsl"/>
-  <xsl:import href="application-directory-portlet.xsl"/>
-  <xsl:import href="workspace-directory-portlet.xsl"/>
+        <xsl:import href="directory-portlet.xsl"/>
+        <xsl:import href="content-sections-portlet.xsl"/>
+        <xsl:import href="time-of-day-portlet.xsl"/>
+        <xsl:import href="freeform-html-portlet.xsl"/>
+        <xsl:import href="rss-feed-portlet.xsl"/>
+        <xsl:import href="tasklist-portlet.xsl"/>
+        <xsl:import href="application-directory-portlet.xsl"/>
+        <xsl:import href="workspace-directory-portlet.xsl"/>
 	<xsl:import href="content-item-portlet.xsl"/>