diff --git a/ccm-shp-aplaws/bundles/devel/cfg/integration.properties b/ccm-shp-aplaws/bundles/devel/cfg/integration.properties
index a464ae431..0d63a0778 100755
--- a/ccm-shp-aplaws/bundles/devel/cfg/integration.properties
+++ b/ccm-shp-aplaws/bundles/devel/cfg/integration.properties
@@ -71,7 +71,7 @@ com.arsdigita.london.search.show_sponsored_links=true
 
 com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
-com.arsdigita.london.theme.default_theme_path=__ccm__/themes/aplaws
+com.arsdigita.london.theme.default_theme_path=__ccm__/themes/aplaws-generic
 com.arsdigita.london.theme.default_theme_context=
 com.arsdigita.london.theme.default_theme_manifest=ccm-ldn-theme.web.mf
 com.arsdigita.london.theme.file_extensions=jpeg jpg gif xsl css js png bmp xml
@@ -84,7 +84,7 @@ waf.mail.default_from=webmaster@schaedel-hirnpatienten.de
 
 waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/shp?user\=shp&password\=shp48web
 waf.runtime.jdbc_pool_size=80
-waf.web.server=localhost\:9000
+waf.web.server=localhost\:8080
 
 waf.admin.email=webmaster@schaedel-hirnpatienten.de
 waf.admin.name.given=SHP 
diff --git a/ccm-shp-aplaws/bundles/openccm-devel/cfg/integration.properties b/ccm-shp-aplaws/bundles/openccm-devel/cfg/integration.properties
index 9d4b070cd..05353c3a3 100755
--- a/ccm-shp-aplaws/bundles/openccm-devel/cfg/integration.properties
+++ b/ccm-shp-aplaws/bundles/openccm-devel/cfg/integration.properties
@@ -71,7 +71,7 @@ com.arsdigita.london.search.show_sponsored_links=true
 
 com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
-com.arsdigita.london.theme.default_theme_path=__ccm__/themes/aplaws
+com.arsdigita.london.theme.default_theme_path=__ccm__/themes/aplaws-generic
 com.arsdigita.london.theme.default_theme_context=
 com.arsdigita.london.theme.default_theme_manifest=ccm-ldn-theme.web.mf
 com.arsdigita.london.theme.file_extensions=jpeg jpg gif xsl css js png bmp xml
@@ -84,7 +84,7 @@ waf.mail.default_from=webmaster@schaedel-hirnpatienten.de
 
 waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm?user\=ccm&password\=ccm
 waf.runtime.jdbc_pool_size=80
-waf.web.server=localhost\:9000
+waf.web.server=localhost\:8080
 
 waf.admin.email=webmaster@ccm.barkhof.uni-bremen.de
 waf.admin.name.given=CCM 
diff --git a/ccm-shp-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt b/ccm-shp-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt
index c5df4d3de..73c1cb5bf 100755
--- a/ccm-shp-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt
+++ b/ccm-shp-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt
@@ -22,12 +22,12 @@ http://::host::/resource/::webapp::/__ccm__/::themedir::/::theme::/::application
 http://::host::/resource/::webapp::/__ccm__/::themedir::/::theme::/::application::-::url::-::locale::.xsl
 http://::host::/resource/::webapp::/__ccm__/::themedir::/::theme::/::application::-::url::.xsl
 
-# APLAWS default, with locale and prefix
+# APLAWS generic default, with locale and prefix
 # XXX change ROOT -> ccm-ldn-aplaws
 http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::prefix::-::locale::.xsl
 http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::prefix::.xsl
 
-# APLAWS default, with locale
+# APLAWS generic default, with locale
 # XXX change ROOT -> ccm-ldn-aplaws
 http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::locale::.xsl
 http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::.xsl
diff --git a/ccm-zes-aplaws/bundles/devel/cfg/integration.properties b/ccm-zes-aplaws/bundles/devel/cfg/integration.properties
index f6ebdbfdb..e279a3f11 100644
--- a/ccm-zes-aplaws/bundles/devel/cfg/integration.properties
+++ b/ccm-zes-aplaws/bundles/devel/cfg/integration.properties
@@ -93,7 +93,7 @@ com.arsdigita.london.theme.file_extensions=bmp gif jpeg jpg png css js png xsl x
 waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/zes?user\=zes&password\=zes47web
 waf.runtime.jdbc_pool_size=80
 
-waf.web.server=localhost\:9000
+waf.web.server=localhost\:8080
 
 waf.admin.email=webmaster@zes.uni-bremen.de
 waf.admin.name.given=ZeS 
diff --git a/ccm-zes-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt b/ccm-zes-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt
index c5df4d3de..73c1cb5bf 100644
--- a/ccm-zes-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt
+++ b/ccm-zes-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt
@@ -22,12 +22,12 @@ http://::host::/resource/::webapp::/__ccm__/::themedir::/::theme::/::application
 http://::host::/resource/::webapp::/__ccm__/::themedir::/::theme::/::application::-::url::-::locale::.xsl
 http://::host::/resource/::webapp::/__ccm__/::themedir::/::theme::/::application::-::url::.xsl
 
-# APLAWS default, with locale and prefix
+# APLAWS generic default, with locale and prefix
 # XXX change ROOT -> ccm-ldn-aplaws
 http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::prefix::-::locale::.xsl
 http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::prefix::.xsl
 
-# APLAWS default, with locale
+# APLAWS generic default, with locale
 # XXX change ROOT -> ccm-ldn-aplaws
 http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::locale::.xsl
 http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::.xsl