diff --git a/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConfig.java b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConfig.java
index 8f0fdb1b7..d1cb14268 100755
--- a/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConfig.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConfig.java
@@ -130,7 +130,6 @@ public class ThemeDirectorConfig extends AbstractConfig {
     public ThemeDirectorConfig() {
 
         register(m_defaultThemePath);
-//      register(m_defaultThemeContext);
         register(m_defaultThemeManifest);
         register(m_fileExtParam);
         
diff --git a/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConfig_parameter.properties b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConfig_parameter.properties
index 186a4c238..17b04867a 100755
--- a/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConfig_parameter.properties
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConfig_parameter.properties
@@ -3,11 +3,6 @@ themedirector.default_theme_path.purpose=This is the directory that all of the d
 themedirector.default_theme_path.example=[themes/default/]
 themedirector.default_theme_path.format=[string]
 
-themedirector.default_theme_context.title=The servlet context containing the theme
-themedirector.default_theme_context.purpose=This is the servlet context path containing the theme. It should start and end with a /
-themedirector.default_theme_context.example=[/ccm-themedirector/]
-themedirector.default_theme_context.format=[string]
-
 themedirector.default_theme_manifest.title=The manifest file containing the default themes directory (Themes Application)
 themedirector.default_theme_manifest.purpose=This is the manifest file containing the default themes directory.  This is used in conjuntion with com.arsdigita.london.theme.default_directory_filter to dictate the final default directoroy.
 themedirector.default_theme_manifest.example=[ccm-themedirectory.web.mf]
diff --git a/ccm-themedirector/web/themes/master/aREADME.master b/ccm-themedirector/web/themes/master/aREADME.master
new file mode 100644
index 000000000..c5397e31d
--- /dev/null
+++ b/ccm-themedirector/web/themes/master/aREADME.master
@@ -0,0 +1,11 @@
+This is the theme-director directory containing the theme used as source for
+downloading a skeleton to create a new custom specific theme. Usually it is
+used as default unmanaged theme as well (used as long as there is no managed 
+theme (managed by theme-director) configured. 
+It is specified and used to filter out files listed in the manifest 
+file chosen, specified by the 
+   com.arsdigita.themedirector.default_theme_manifest 
+attribute.  
+
+If my be overwritten by a bundle-specific default.
+
diff --git a/ccm-themedirector/web/themes/static/default/admin-index.xsl b/ccm-themedirector/web/themes/static/default/admin-index.xsl
deleted file mode 100644
index 7aea67457..000000000
--- a/ccm-themedirector/web/themes/static/default/admin-index.xsl
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-
-<xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-  version="1.0" >
-  
-  <xsl:import href="../../heirloom/apps/admin/xsl/index.xsl"/>
-
-</xsl:stylesheet>
diff --git a/ccm-themedirector/web/themes/static/default/atoz-index.xsl b/ccm-themedirector/web/themes/static/default/atoz-index.xsl
deleted file mode 100644
index 816d7d020..000000000
--- a/ccm-themedirector/web/themes/static/default/atoz-index.xsl
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-
-  <xsl:import href="../../../themes/heirloom/apps/atoz/xsl/index.xsl"/> 
-
-</xsl:stylesheet>
diff --git a/ccm-themedirector/web/themes/static/default/content-center-index.xsl b/ccm-themedirector/web/themes/static/default/content-center-index.xsl
deleted file mode 100644
index 16ce5c26d..000000000
--- a/ccm-themedirector/web/themes/static/default/content-center-index.xsl
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-
-<xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-  version="1.0" >
-  
-  <xsl:import href="../../heirloom/apps/content-center/xsl/index.xsl"/> 
-
-</xsl:stylesheet>
diff --git a/ccm-themedirector/web/themes/static/default/content-section-admin.xsl b/ccm-themedirector/web/themes/static/default/content-section-admin.xsl
deleted file mode 100644
index 89cce7430..000000000
--- a/ccm-themedirector/web/themes/static/default/content-section-admin.xsl
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-
-<xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-  version="1.0" >
-  
-  <xsl:import href="../../heirloom/apps/content-section/xsl/admin.xsl"/>
-
-</xsl:stylesheet>
diff --git a/ccm-themedirector/web/themes/static/default/content-section-index.xsl b/ccm-themedirector/web/themes/static/default/content-section-index.xsl
deleted file mode 100644
index d3154e098..000000000
--- a/ccm-themedirector/web/themes/static/default/content-section-index.xsl
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-
-<xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-  version="1.0" >
-  
-  <xsl:import href="../../heirloom/apps/content-section/xsl/index.xsl"/>
-
-</xsl:stylesheet>
diff --git a/ccm-themedirector/web/themes/static/default/forum-index.xsl b/ccm-themedirector/web/themes/static/default/forum-index.xsl
deleted file mode 100644
index c27a4894b..000000000
--- a/ccm-themedirector/web/themes/static/default/forum-index.xsl
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-
-<xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-  version="1.0" >
-  
-  <xsl:import href="../../heirloom/apps/forum/xsl/index.xsl"/> 
-
-</xsl:stylesheet>
diff --git a/ccm-themedirector/web/themes/static/default/navigation-admin.xsl b/ccm-themedirector/web/themes/static/default/navigation-admin.xsl
deleted file mode 100644
index 6d28265eb..000000000
--- a/ccm-themedirector/web/themes/static/default/navigation-admin.xsl
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-
-<xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-  version="1.0" >
-  
-  <xsl:import href="../../heirloom/apps/navigation/xsl/admin.xsl"/> 
-
-</xsl:stylesheet>
diff --git a/ccm-themedirector/web/themes/static/default/navigation-index.xsl b/ccm-themedirector/web/themes/static/default/navigation-index.xsl
deleted file mode 100644
index 08be52a37..000000000
--- a/ccm-themedirector/web/themes/static/default/navigation-index.xsl
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-
-<xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-  version="1.0" >
-  
-  <xsl:import href="../../heirloom/apps/navigation/xsl/index.xsl"/> 
-</xsl:stylesheet>
diff --git a/ccm-themedirector/web/themes/static/default/rss-index.xsl b/ccm-themedirector/web/themes/static/default/rss-index.xsl
deleted file mode 100644
index bc1a4a077..000000000
--- a/ccm-themedirector/web/themes/static/default/rss-index.xsl
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-  version="1.0" >
-
-  <xsl:import href="../../heirloom/apps/rss/xsl/index.xsl"/> 
-
-</xsl:stylesheet>
diff --git a/ccm-themedirector/web/themes/static/default/search-index.xsl b/ccm-themedirector/web/themes/static/default/search-index.xsl
deleted file mode 100644
index 41e99798d..000000000
--- a/ccm-themedirector/web/themes/static/default/search-index.xsl
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-
-<xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-  version="1.0" >
-  
-  <xsl:import href="../../heirloom/apps/search/xsl/index.xsl"/>
-  
-</xsl:stylesheet>
diff --git a/ccm-themedirector/web/themes/static/default/shortcuts-index.xsl b/ccm-themedirector/web/themes/static/default/shortcuts-index.xsl
deleted file mode 100644
index 877272c99..000000000
--- a/ccm-themedirector/web/themes/static/default/shortcuts-index.xsl
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-  version="1.0" >
-
-  <xsl:import href="../../heirloom/apps/shortcuts/xsl/index.xsl"/> 
-
-</xsl:stylesheet>
diff --git a/ccm-themedirector/web/themes/static/default/simplesurvey-index.xsl b/ccm-themedirector/web/themes/static/default/simplesurvey-index.xsl
deleted file mode 100644
index c142ff32b..000000000
--- a/ccm-themedirector/web/themes/static/default/simplesurvey-index.xsl
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-  version="1.0" >
-    
-  <xsl:import href="../../heirloom/apps/simplesurvey/xsl/index.xsl"/>
-
-</xsl:stylesheet>
diff --git a/ccm-themedirector/web/themes/static/default/sitemap-index.xsl b/ccm-themedirector/web/themes/static/default/sitemap-index.xsl
deleted file mode 100644
index ae067f6e0..000000000
--- a/ccm-themedirector/web/themes/static/default/sitemap-index.xsl
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-  version="1.0">
-  
-  <xsl:import href="../../heirloom/apps/sitemap/xsl/index.xsl"/> 
-
-</xsl:stylesheet>
diff --git a/ccm-themedirector/web/themes/static/default/subsite-index.xsl b/ccm-themedirector/web/themes/static/default/subsite-index.xsl
deleted file mode 100644
index c1c407af3..000000000
--- a/ccm-themedirector/web/themes/static/default/subsite-index.xsl
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-  version="1.0" >
-  
-  <xsl:import href="../../heirloom/apps/subsite/xsl/index.xsl"/> 
-
-</xsl:stylesheet>
diff --git a/ccm-themedirector/web/themes/static/default/webdev-support-index.xsl b/ccm-themedirector/web/themes/static/default/webdev-support-index.xsl
deleted file mode 100644
index a3dc1fbf1..000000000
--- a/ccm-themedirector/web/themes/static/default/webdev-support-index.xsl
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-  version="1.0" >
- 
-  <xsl:import href="../../heirloom/apps/webdev-support/xsl/index.xsl"/>
-
-</xsl:stylesheet>
diff --git a/ccm-themedirector/web/themes/static/default/workspace-admin.xsl b/ccm-themedirector/web/themes/static/default/workspace-admin.xsl
deleted file mode 100644
index ae4665084..000000000
--- a/ccm-themedirector/web/themes/static/default/workspace-admin.xsl
+++ /dev/null
@@ -1,7 +0,0 @@
-<xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-  version="1.0">
-
-  <xsl:import href="../../heirloom/apps/workspace/xsl/admin.xsl"/> 
-
-</xsl:stylesheet>
diff --git a/ccm-themedirector/web/themes/static/default/workspace-edit.xsl b/ccm-themedirector/web/themes/static/default/workspace-edit.xsl
deleted file mode 100644
index b168809fd..000000000
--- a/ccm-themedirector/web/themes/static/default/workspace-edit.xsl
+++ /dev/null
@@ -1,7 +0,0 @@
-<xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-  version="1.0">
-
-  <xsl:import href="../../heirloom/apps/workspace/xsl/edit.xsl"/> 
-
-</xsl:stylesheet>
diff --git a/ccm-themedirector/web/themes/static/default/workspace-index.xsl b/ccm-themedirector/web/themes/static/default/workspace-index.xsl
deleted file mode 100644
index 1067f8dc5..000000000
--- a/ccm-themedirector/web/themes/static/default/workspace-index.xsl
+++ /dev/null
@@ -1,7 +0,0 @@
-<xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-  version="1.0">
-
-  <xsl:import href="../../heirloom/apps/workspace/xsl/index.xsl"/>
-  
-</xsl:stylesheet>