diff --git a/ccm-auth-http/web/WEB-INF/web.ccm-auth-http.xml b/ccm-auth-http/web/WEB-INF/web.ccm-auth-http.xml
index 30eec55e3..845f3e757 100644
--- a/ccm-auth-http/web/WEB-INF/web.ccm-auth-http.xml
+++ b/ccm-auth-http/web/WEB-INF/web.ccm-auth-http.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" 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" version="2.4">
+<web-app        xmlns="http://java.sun.com/xml/ns/j2ee" 
+            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" 
+              version="2.4">
 
   <!-- module ccm-auth-http  -  servlet definitions BEGIN  -->
   <servlet>
diff --git a/ccm-formbuilder-pdf/web/WEB-INF/web.ccm-formbuilder-pdf.xml b/ccm-formbuilder-pdf/web/WEB-INF/web.ccm-formbuilder-pdf.xml
index beae23b67..2485b96d4 100644
--- a/ccm-formbuilder-pdf/web/WEB-INF/web.ccm-formbuilder-pdf.xml
+++ b/ccm-formbuilder-pdf/web/WEB-INF/web.ccm-formbuilder-pdf.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" 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" version="2.4">
+<web-app         xmlns="http://java.sun.com/xml/ns/j2ee" 
+             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" 
+               version="2.4">
 
   <!-- module ccm-formbuilder-pdf  -  servlet definitions BEGIN  -->
   <servlet>
diff --git a/ccm-gen-aplaws/bundles/handbook/cfg/integration.properties b/ccm-gen-aplaws/bundles/handbook/cfg/integration.properties
index ea14a439c..640347229 100755
--- a/ccm-gen-aplaws/bundles/handbook/cfg/integration.properties
+++ b/ccm-gen-aplaws/bundles/handbook/cfg/integration.properties
@@ -3,7 +3,6 @@ waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
 waf.bebop.dhtml_editor=FCKeditor
 
 waf.categorization.show_internal_name=true
-waf.categorization.supported_languages=en
 
 waf.dispatcher.default_expiry=3600
 ;
@@ -11,6 +10,7 @@ waf.dispatcher.default_expiry=3600
 waf.kernel.primary_user_identifier=email
 ; if you activate screen_name, forum loader doesn't work.
 ; waf.kernel.primary_user_identifier=screen_name
+waf.kernel.supported_languages=en
 
 ; security.properties:
 waf.auto_registration_on=false
diff --git a/ccm-gen-aplaws/web/WEB-INF/web.xml-aplaws b/ccm-gen-aplaws/web/WEB-INF/web.xml-aplaws
index 4a55dc1c1..56db465b9 100755
--- a/ccm-gen-aplaws/web/WEB-INF/web.xml-aplaws
+++ b/ccm-gen-aplaws/web/WEB-INF/web.xml-aplaws
@@ -1,8 +1,8 @@
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-        "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
-
-<web-app>
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app         xmlns="http://java.sun.com/xml/ns/j2ee"
+             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"
+               version="2.4">
 
   <display-name>CCM ZeS</display-name>
   <description>Content and Collaboration Management</description>
diff --git a/ccm-iaw-aplaws/web/WEB-INF/web.xml-aplaws b/ccm-iaw-aplaws/web/WEB-INF/web.xml-aplaws
index 4a55dc1c1..ea9463bcf 100644
--- a/ccm-iaw-aplaws/web/WEB-INF/web.xml-aplaws
+++ b/ccm-iaw-aplaws/web/WEB-INF/web.xml-aplaws
@@ -1,10 +1,11 @@
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-        "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app         xmlns="http://java.sun.com/xml/ns/j2ee"
+             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"
+               version="2.4">
 
-<web-app>
 
-  <display-name>CCM ZeS</display-name>
+  <display-name>CCM IAW</display-name>
   <description>Content and Collaboration Management</description>
 
   <!-- path and filename of the log4j user accessible config file
diff --git a/ccm-ldn-rss/web/WEB-INF/web.ccm-ldn-rss.xml b/ccm-ldn-rss/web/WEB-INF/web.ccm-ldn-rss.xml
index a111daa20..6e35abb50 100644
--- a/ccm-ldn-rss/web/WEB-INF/web.ccm-ldn-rss.xml
+++ b/ccm-ldn-rss/web/WEB-INF/web.ccm-ldn-rss.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" 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" version="2.4">
+<web-app         xmlns="http://java.sun.com/xml/ns/j2ee" 
+             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" 
+               version="2.4">
 
     <!-- module ccm-ldn-rss  -  servlet definitions   -->
     <servlet>
diff --git a/ccm-zes-aplaws/web/WEB-INF/web.xml-aplaws b/ccm-zes-aplaws/web/WEB-INF/web.xml-aplaws
index 4a55dc1c1..42860c51d 100644
--- a/ccm-zes-aplaws/web/WEB-INF/web.xml-aplaws
+++ b/ccm-zes-aplaws/web/WEB-INF/web.xml-aplaws
@@ -1,8 +1,9 @@
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-        "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app         xmlns="http://java.sun.com/xml/ns/j2ee"
+             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"
+               version="2.4">
 
-<web-app>
 
   <display-name>CCM ZeS</display-name>
   <description>Content and Collaboration Management</description>