From eaaf561d73418f7a2fd468a70eab83a763bbf52b Mon Sep 17 00:00:00 2001
From: pb <pb@8810af33-2d31-482b-a856-94f89814c4df>
Date: Sun, 27 Mar 2011 11:27:05 +0000
Subject: [PATCH] Umbenennen von ccm-ldn-theme in ccm-themedirector.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Gleichzeitig Einführen einer neuen Infrastruktur für themes:
Es gibt nun ein Verzeichnis ~/themes/ in das alle theme bezogene Daten
migriert werden sollen. Das sollte im ersten Schritt mit den Applicationen
erfolgen, die ihre Dateien in ~/__ccm__/apps ablegen. ccm-themedirector nutzt
bereits diese Infrastruktur.  Die alte Infrastruktur mit ~/packages und
~/templates und ~/static bleibt übergangsweise in core und cms  erhalten.

Das gibt uns die Möglichkeit, Mandalay als neues / alternatives Standard Theme
in die Standard Distribution einzubauen.

Update Script erforderlich:
ccm-themedirector from-version=6.6.0 to-version=6.6.1


git-svn-id: https://svn.libreccm.org/ccm/trunk@800 8810af33-2d31-482b-a856-94f89814c4df
---
 .../upgrade/postgres-6.6.0-6.6.1.sql          |   2 +-
 .../image-lib}/bebop/dhtmleditor/Bold24.gif   | Bin
 .../bebop/dhtmleditor/Bookmarks24.gif         | Bin
 .../image-lib}/bebop/dhtmleditor/Copy24.gif   | Bin
 .../image-lib}/bebop/dhtmleditor/Cut24.gif    | Bin
 .../image-lib}/bebop/dhtmleditor/Indent24.gif | Bin
 .../image-lib}/bebop/dhtmleditor/Italic24.gif | Bin
 .../bebop/dhtmleditor/OrderedList24.gif       | Bin
 .../bebop/dhtmleditor/Outdent24.gif           | Bin
 .../image-lib}/bebop/dhtmleditor/Paste24.gif  | Bin
 .../bebop/dhtmleditor/Underline24.gif         | Bin
 .../bebop/dhtmleditor/UnorderedList24.gif     | Bin
 .../image-lib}/bebop/dhtmleditor/blank.gif    | Bin
 .../image-lib}/bebop/dhtmleditor/edit.js      |   0
 .../com/arsdigita/bebop/form/DHTMLEditor.java |   9 +-
 ccm-core/web/packages/categorization/README   |   1 +
 .../heirloom/apps/acs-subsite/xsl/index.xsl   |   9 +
 .../themes/heirloom/apps/admin/xsl/index.xsl  |   9 +
 .../themes/heirloom/apps/bebop/xsl/index.xsl  |   9 +
 .../heirloom/apps/permissions/xsl/index.xsl   |   9 +
 .../heirloom/apps/sitemap/xsl/index.xsl       |   9 +
 .../apps/webdev-support/xsl/index.xsl         | 151 ++++++++
 .../themes/heirloom/packages/acs-admin/README |   6 +
 .../heirloom/packages/acs-admin/xsl/admin.xsl |  65 ++++
 .../packages/acs-admin/xsl/admin_en.xsl       | 126 +++++++
 .../packages/acs-admin/xsl/sitemap_en.xsl     |  10 +
 .../packages/acs-admin/xsl/split-panel.xsl    | 177 ++++++++++
 .../web/themes/heirloom/packages/bebop/README |   1 +
 .../packages/bebop/demo}/xsl/bebop-demo-2.xsl |   0
 .../packages/bebop/demo}/xsl/bebop-demo.xsl   |   0
 .../heirloom/packages/bebop/xsl/BoxPanel.xsl  |  64 ++++
 .../packages/bebop/xsl/CheckBoxGroup.xsl      |  37 ++
 .../packages/bebop/xsl/ColumnPanel.xsl        |  62 ++++
 .../packages/bebop/xsl/DHTMLEditor.xsl        | 156 +++++++++
 .../heirloom/packages/bebop/xsl/DataTable.xsl |  90 +++++
 .../heirloom/packages/bebop/xsl/DateTime.xsl  |  24 ++
 .../packages/bebop/xsl/DimensionalNavbar.xsl  |  69 ++++
 .../heirloom/packages/bebop/xsl/FCKEditor.xsl |  72 ++++
 .../heirloom/packages/bebop/xsl/Form.xsl      |  33 ++
 .../packages/bebop/xsl/FormWidget.xsl         |  35 ++
 .../heirloom/packages/bebop/xsl/GridPanel.xsl |  18 +
 .../heirloom/packages/bebop/xsl/Image.xsl     |  23 ++
 .../heirloom/packages/bebop/xsl/Label.xsl     | 172 +++++++++
 .../heirloom/packages/bebop/xsl/Link.xsl      | 210 +++++++++++
 .../heirloom/packages/bebop/xsl/List.xsl      |  40 +++
 .../heirloom/packages/bebop/xsl/ListPanel.xsl |  25 ++
 .../packages/bebop/xsl/MultipleSelect.xsl     |  18 +
 .../heirloom/packages/bebop/xsl/Page.xsl      |  58 ++++
 .../packages/bebop/xsl/PageErrorDisplay.xsl   |  26 ++
 .../heirloom/packages/bebop/xsl/PageState.xsl |  20 ++
 .../packages/bebop/xsl/RadioGroup.xsl         |  44 +++
 .../packages/bebop/xsl/SegmentedPanel.xsl     |  65 ++++
 .../heirloom/packages/bebop/xsl/Select.xsl    |  59 ++++
 .../packages/bebop/xsl/SplitPanel.xsl         |  26 ++
 .../packages/bebop/xsl/TabbedPane.xsl         | 118 +++++++
 .../heirloom/packages/bebop/xsl/Table.xsl     |  64 ++++
 .../heirloom/packages/bebop/xsl/TextArea.xsl  |  21 ++
 .../heirloom/packages/bebop/xsl/Tree.xsl      |  59 ++++
 .../heirloom/packages/bebop/xsl/Widget.xsl    |  44 +++
 .../packages/bebop/xsl/XinhaEditor.xsl        |  68 ++++
 .../heirloom/packages/bebop/xsl/bebop.xsl     |  56 +++
 .../heirloom/packages/bebop/xsl/dcp.xsl       |  70 ++++
 .../heirloom/packages/bebop/xsl/plain.xsl     |  25 ++
 .../heirloom/packages/formbuilder/README      |   5 +
 .../formbuilder/xsl/OptionWidgets.xsl         | 122 +++++++
 .../formbuilder/xsl/PersistentDate.xsl        |  81 +++++
 .../formbuilder/xsl/PersistentSubmit.xsl      |  28 ++
 .../packages/formbuilder/xsl/TextWidgets.xsl  | 111 ++++++
 .../packages/formbuilder/xsl/formbuilder.xsl  | 148 ++++++++
 .../heirloom/packages/login/xsl/login_en.xsl  | 173 ++++++++++
 .../heirloom/packages/lucene/xsl/search.xsl   |  59 ++++
 .../packages/permissions/xsl/permissions.xsl  | 103 ++++++
 .../themes/heirloom/packages/placeholder.info |   5 +
 .../heirloom/packages/search/xsl/search.xsl   | 182 ++++++++++
 .../toolbox/xsl/AbstractCollectionTable.xsl   |  50 +++
 .../packages/toolbox/xsl/ControlBar.xsl       |  36 ++
 .../heirloom/packages/ui/xsl/debug-panel.xsl  | 326 ++++++++++++++++++
 .../heirloom/packages/ui/xsl/simple-page.xsl  | 160 +++++++++
 .../heirloom/packages/ui/xsl/site-banner.xsl  |  23 ++
 .../themes/heirloom/packages/ui/xsl/ui.xsl    |  20 ++
 .../heirloom/packages/ui/xsl/url-encoding.xsl |  66 ++++
 .../heirloom/packages/ui/xsl/user-banner.xsl  | 115 ++++++
 .../heirloom/packages/versioning/footer.jspf  |   4 +
 .../heirloom/packages/versioning/graph.jsp    |  25 ++
 .../heirloom/packages/versioning/header.jspf  |   6 +
 .../heirloom/packages/versioning/main.jsp     |  56 +++
 .../heirloom/packages/versioning/rollback.jsp |  31 ++
 .../heirloom/packages/versioning/txns.jsp     |  50 +++
 .../heirloom/packages/versioning/vlog.css     |  60 ++++
 ccm-core/web/themes/heirloom/placeholder.info |   5 +
 ccm-core/web/themes/placeholder.info          |   5 +
 .../bundles/nsh/cfg/applications.cfg          |   4 +-
 .../bundles/nsh/cfg/integration.properties    |   8 +-
 .../bundles/staatsschiff/cfg/applications.cfg |   3 +
 .../resources/aplaws-stylesheet-paths.txt     |   4 +
 .../upgrade/oracle-se-1.0.0-1.0.1.sql         |   1 -
 .../upgrade/oracle-se-6.3.0-6.3.1.sql         |   1 -
 .../upgrade/postgres-1.0.0-1.0.1.sql          |   3 -
 .../upgrade/postgres-1.0.1-1.0.2.sql          |   1 -
 .../upgrade/postgres-6.3.0-6.3.1.sql          |   5 -
 ccm-ldn-theme/src/ccm-ldn-theme.config        |   5 -
 .../theme/ThemeConfig_parameter.properties    |  44 ---
 .../.classpath                                |   0
 {ccm-ldn-theme => ccm-themedirector}/.project |   0
 .../.settings/org.eclipse.jdt.core.prefs      |   0
 .../.settings/org.eclipse.jdt.ui.prefs        |   0
 .../.svnignore                                |   0
 {ccm-ldn-theme => ccm-themedirector}/TODO     |   0
 .../application.xml                           |   8 +-
 .../doc/theme-standalone/README               |   4 +
 .../doc/theme-standalone/bebop-define.tld     |   0
 .../doc/theme-standalone/bebop-show.tld       |   0
 .../doc/theme-standalone/web.xml              |   0
 .../com/arsdigita/themedirector}/Theme.pdl    |  10 +-
 .../arsdigita/themedirector}/ThemeFile.pdl    |   2 +-
 .../default/theme-files-unique-constraint.sql |   0
 .../ccm-themedirector}/oracle-se-create.sql   |   0
 .../ccm-themedirector}/postgres-create.sql    |   0
 .../default/1.0.0-1.0.1}/default-theme.sql    |   0
 .../upgrade/oracle-se-1.0.0-1.0.1.sql         |   1 +
 .../upgrade/oracle-se-1.0.1-1.0.2.sql         |   0
 .../upgrade/oracle-se-6.3.0-6.3.1.sql         |   1 +
 .../upgrade/oracle-se-6.6.0-6.6.1.sql         |  22 ++
 .../oracle-se}/6.3.0-6.3.1/add-is_deleted.sql |   0
 .../upgrade/postgres-1.0.0-1.0.1.sql          |   3 +
 .../upgrade/postgres-1.0.1-1.0.2.sql          |   1 +
 .../upgrade/postgres-6.3.0-6.3.1.sql          |   5 +
 .../upgrade/postgres-6.6.0-6.6.1.sql          |  27 ++
 .../1.0.1-1.0.2/date-to-timestamptz.sql       |   0
 .../postgres}/6.3.0-6.3.1/add-is_deleted.sql  |   0
 .../src/ccm-themedirector.config              |   5 +
 .../src/ccm-themedirector.load                |   6 +-
 .../src/ccm-themedirector.upgrade             |   3 +
 .../arsdigita/themedirector}/Initializer.java |  31 +-
 .../com/arsdigita/themedirector}/Loader.java  |  24 +-
 .../com/arsdigita/themedirector}/Theme.java   |  27 +-
 .../themedirector}/ThemeCollection.java       |   5 +-
 .../themedirector/ThemeDirector.java          |  26 +-
 .../themedirector/ThemeDirectorConfig.java    | 142 +++++---
 .../ThemeDirectorConfig_parameter.properties  |  45 +++
 .../themedirector/ThemeDirectorConstants.java |  20 +-
 .../ThemeDirectorResources.properties         |   0
 .../ThemeDirectorResources_de.properties      |   8 +-
 .../ThemeDirectorResources_en.properties      |   0
 .../ThemeDirectorResources_fr.properties      |   0
 .../ThemeDirectoryPatternGenerator.java       |   7 +-
 .../arsdigita/themedirector}/ThemeFile.java   |  52 ++-
 .../themedirector}/ThemeFileCollection.java   |   3 +-
 .../themedirector}/ThemeObserver.java         |  31 +-
 .../themedirector}/ThemePatternGenerator.java |  16 +-
 .../ThemeTransactionListener.java             |  21 +-
 .../InternalThemePrefixerServlet.java         |  12 +-
 .../dispatcher/ThemeDownloadServlet.java      |  39 ++-
 .../themedirector}/ui/ThemeContainer.java     |  33 +-
 .../themedirector}/ui/ThemeControlPanel.java  |  18 +-
 .../themedirector}/ui/ThemeFilesList.java     |  18 +-
 .../themedirector}/ui/ThemeForm.java          |  22 +-
 .../ui/ThemeListModelBuilder.java             |   4 +-
 .../themedirector}/ui/ThemeProperties.java    |   6 +-
 .../ui/ThemeSelectionModel.java               |   4 +-
 .../ui/ThemeValidationPanel.java              |  14 +-
 .../ui/ThemeXSLParameterGenerator.java        |  18 +-
 .../listeners/ApproveThemeActionListener.java |  18 +-
 .../ui/listeners/CancelListener.java          |   2 +-
 .../listeners/FileRemovalRequestListener.java |   8 +-
 .../ui/listeners/LoggingErrorListener.java    |   4 +-
 .../util/GlobalizationUtil.java               |   9 +-
 .../themedirector}/util/ManifestReader.java   |  10 +-
 .../util/ThemeDevelopmentFileManager.java     |   8 +-
 .../themedirector}/util/ThemeFileManager.java |  16 +-
 .../themedirector}/util/ThemeFileUtil.java    |   8 +-
 .../util/ThemePublishedFileManager.java       |   6 +-
 .../util/TransformerExceptionContainer.java   |   2 +-
 .../util/WhiteListFilenameFilter.java         |   6 +-
 .../web/WEB-INF/web.ccm-themedirector.xml     |  14 +-
 .../web/__ccm__/themes-dev/placeholder.txt    |   0
 .../web/__ccm__/themes-prod/placeholder.txt   |   0
 .../themes/default/acs-subsite-index.xsl      |   0
 .../__ccm__/themes/default/admin-index.xsl    |   0
 .../web/__ccm__/themes/default/atoz-index.xsl |   0
 .../themes/default/content-center-index.xsl   |   0
 .../themes/default/content-section-admin.xsl  |   0
 .../themes/default/content-section-index.xsl  |   0
 .../__ccm__/themes/default/forum-index.xsl    |   0
 .../themes/default/navigation-admin.xsl       |   0
 .../themes/default/navigation-index.xsl       |   0
 .../web/__ccm__/themes/default/rss-index.xsl  |   0
 .../__ccm__/themes/default/search-index.xsl   |   0
 .../themes/default/shortcuts-index.xsl        |   0
 .../themes/default/simplesurvey-index.xsl     |   0
 .../__ccm__/themes/default/sitemap-index.xsl  |   0
 .../__ccm__/themes/default/subsite-index.xsl  |   0
 .../themes/default/webdev-support-index.xsl   |   0
 .../themes/default/workspace-admin.xsl        |   0
 .../__ccm__/themes/default/workspace-edit.xsl |   0
 .../themes/default/workspace-index.xsl        |   0
 .../templates/ccm-themedirector}/index.jsp    |   2 +-
 .../ccm-themedirector}/sync-theme.jsp         |  27 +-
 .../ccm-themedirector}/undoTheme-login.jsp    |   4 +-
 .../ccm-themedirector}/undoTheme.jsp          |   4 +-
 .../web/themes/devel-themedir/placeholder.txt |   2 +
 .../apps/themedirector}/xsl/action-group.xsl  |  10 +-
 .../apps/themedirector}/xsl/index.xsl         |   6 +-
 .../apps/themedirector}/xsl/layout-panel.xsl  |   4 +-
 .../apps/themedirector}/xsl/section.xsl       |   4 +-
 .../themes/published-themedir/placeholder.txt |   2 +
 .../static/default/acs-subsite-index.xsl      |  11 +
 .../web/themes/static/default/admin-index.xsl |   9 +
 .../web/themes/static/default/atoz-index.xsl  |   7 +
 .../static/default/content-center-index.xsl   |   9 +
 .../static/default/content-section-admin.xsl  |   9 +
 .../static/default/content-section-index.xsl  |   9 +
 .../web/themes/static/default/forum-index.xsl |   9 +
 .../static/default/navigation-admin.xsl       |   9 +
 .../static/default/navigation-index.xsl       |   8 +
 .../web/themes/static/default/rss-index.xsl   |   8 +
 .../themes/static/default/search-index.xsl    |   9 +
 .../themes/static/default/shortcuts-index.xsl |   8 +
 .../static/default/simplesurvey-index.xsl     |   8 +
 .../themes/static/default/sitemap-index.xsl   |   8 +
 .../themes/static/default/subsite-index.xsl   |   8 +
 .../static/default/webdev-support-index.xsl   |   8 +
 .../themes/static/default/workspace-admin.xsl |   7 +
 .../themes/static/default/workspace-edit.xsl  |   7 +
 .../themes/static/default/workspace-index.xsl |   7 +
 environment/project.xml.nsh                   |  21 +-
 environment/project.xml.staatsschiff          |   5 +-
 227 files changed, 5406 insertions(+), 396 deletions(-)
 rename ccm-core/{web/STATIC => doc/image-lib}/bebop/dhtmleditor/Bold24.gif (100%)
 rename ccm-core/{web/STATIC => doc/image-lib}/bebop/dhtmleditor/Bookmarks24.gif (100%)
 rename ccm-core/{web/STATIC => doc/image-lib}/bebop/dhtmleditor/Copy24.gif (100%)
 rename ccm-core/{web/STATIC => doc/image-lib}/bebop/dhtmleditor/Cut24.gif (100%)
 rename ccm-core/{web/STATIC => doc/image-lib}/bebop/dhtmleditor/Indent24.gif (100%)
 rename ccm-core/{web/STATIC => doc/image-lib}/bebop/dhtmleditor/Italic24.gif (100%)
 rename ccm-core/{web/STATIC => doc/image-lib}/bebop/dhtmleditor/OrderedList24.gif (100%)
 rename ccm-core/{web/STATIC => doc/image-lib}/bebop/dhtmleditor/Outdent24.gif (100%)
 rename ccm-core/{web/STATIC => doc/image-lib}/bebop/dhtmleditor/Paste24.gif (100%)
 rename ccm-core/{web/STATIC => doc/image-lib}/bebop/dhtmleditor/Underline24.gif (100%)
 rename ccm-core/{web/STATIC => doc/image-lib}/bebop/dhtmleditor/UnorderedList24.gif (100%)
 rename ccm-core/{web/STATIC => doc/image-lib}/bebop/dhtmleditor/blank.gif (100%)
 rename ccm-core/{web/STATIC => doc/image-lib}/bebop/dhtmleditor/edit.js (100%)
 create mode 100644 ccm-core/web/packages/categorization/README
 create mode 100644 ccm-core/web/themes/heirloom/apps/acs-subsite/xsl/index.xsl
 create mode 100644 ccm-core/web/themes/heirloom/apps/admin/xsl/index.xsl
 create mode 100644 ccm-core/web/themes/heirloom/apps/bebop/xsl/index.xsl
 create mode 100644 ccm-core/web/themes/heirloom/apps/permissions/xsl/index.xsl
 create mode 100644 ccm-core/web/themes/heirloom/apps/sitemap/xsl/index.xsl
 create mode 100644 ccm-core/web/themes/heirloom/apps/webdev-support/xsl/index.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/acs-admin/README
 create mode 100644 ccm-core/web/themes/heirloom/packages/acs-admin/xsl/admin.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/acs-admin/xsl/admin_en.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/acs-admin/xsl/sitemap_en.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/acs-admin/xsl/split-panel.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/bebop/README
 rename ccm-core/web/{packages/bebop-demo => themes/heirloom/packages/bebop/demo}/xsl/bebop-demo-2.xsl (100%)
 mode change 100755 => 100644
 rename ccm-core/web/{packages/bebop-demo => themes/heirloom/packages/bebop/demo}/xsl/bebop-demo.xsl (100%)
 mode change 100755 => 100644
 create mode 100644 ccm-core/web/themes/heirloom/packages/bebop/xsl/BoxPanel.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/bebop/xsl/CheckBoxGroup.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/bebop/xsl/ColumnPanel.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/bebop/xsl/DHTMLEditor.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/bebop/xsl/DataTable.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/bebop/xsl/DateTime.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/bebop/xsl/DimensionalNavbar.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/bebop/xsl/FCKEditor.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/bebop/xsl/Form.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/bebop/xsl/FormWidget.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/bebop/xsl/GridPanel.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/bebop/xsl/Image.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/bebop/xsl/Label.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/bebop/xsl/Link.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/bebop/xsl/List.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/bebop/xsl/ListPanel.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/bebop/xsl/MultipleSelect.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/bebop/xsl/Page.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/bebop/xsl/PageErrorDisplay.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/bebop/xsl/PageState.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/bebop/xsl/RadioGroup.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/bebop/xsl/SegmentedPanel.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/bebop/xsl/Select.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/bebop/xsl/SplitPanel.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/bebop/xsl/TabbedPane.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/bebop/xsl/Table.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/bebop/xsl/TextArea.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/bebop/xsl/Tree.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/bebop/xsl/Widget.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/bebop/xsl/XinhaEditor.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/bebop/xsl/bebop.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/bebop/xsl/dcp.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/bebop/xsl/plain.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/formbuilder/README
 create mode 100644 ccm-core/web/themes/heirloom/packages/formbuilder/xsl/OptionWidgets.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/formbuilder/xsl/PersistentDate.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/formbuilder/xsl/PersistentSubmit.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/formbuilder/xsl/TextWidgets.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/formbuilder/xsl/formbuilder.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/login/xsl/login_en.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/lucene/xsl/search.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/permissions/xsl/permissions.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/placeholder.info
 create mode 100644 ccm-core/web/themes/heirloom/packages/search/xsl/search.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/toolbox/xsl/AbstractCollectionTable.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/toolbox/xsl/ControlBar.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/ui/xsl/debug-panel.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/ui/xsl/simple-page.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/ui/xsl/site-banner.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/ui/xsl/ui.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/ui/xsl/url-encoding.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/ui/xsl/user-banner.xsl
 create mode 100644 ccm-core/web/themes/heirloom/packages/versioning/footer.jspf
 create mode 100644 ccm-core/web/themes/heirloom/packages/versioning/graph.jsp
 create mode 100644 ccm-core/web/themes/heirloom/packages/versioning/header.jspf
 create mode 100644 ccm-core/web/themes/heirloom/packages/versioning/main.jsp
 create mode 100644 ccm-core/web/themes/heirloom/packages/versioning/rollback.jsp
 create mode 100644 ccm-core/web/themes/heirloom/packages/versioning/txns.jsp
 create mode 100644 ccm-core/web/themes/heirloom/packages/versioning/vlog.css
 create mode 100644 ccm-core/web/themes/heirloom/placeholder.info
 create mode 100644 ccm-core/web/themes/placeholder.info
 delete mode 100755 ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/oracle-se-1.0.0-1.0.1.sql
 delete mode 100755 ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/oracle-se-6.3.0-6.3.1.sql
 delete mode 100755 ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/postgres-1.0.0-1.0.1.sql
 delete mode 100755 ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/postgres-1.0.1-1.0.2.sql
 delete mode 100755 ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/postgres-6.3.0-6.3.1.sql
 delete mode 100755 ccm-ldn-theme/src/ccm-ldn-theme.config
 delete mode 100755 ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeConfig_parameter.properties
 rename {ccm-ldn-theme => ccm-themedirector}/.classpath (100%)
 rename {ccm-ldn-theme => ccm-themedirector}/.project (100%)
 rename {ccm-ldn-theme => ccm-themedirector}/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {ccm-ldn-theme => ccm-themedirector}/.settings/org.eclipse.jdt.ui.prefs (100%)
 rename {ccm-ldn-theme => ccm-themedirector}/.svnignore (100%)
 rename {ccm-ldn-theme => ccm-themedirector}/TODO (100%)
 rename {ccm-ldn-theme => ccm-themedirector}/application.xml (81%)
 rename {ccm-ldn-theme => ccm-themedirector}/doc/theme-standalone/README (84%)
 rename {ccm-ldn-theme => ccm-themedirector}/doc/theme-standalone/bebop-define.tld (100%)
 rename {ccm-ldn-theme => ccm-themedirector}/doc/theme-standalone/bebop-show.tld (100%)
 rename {ccm-ldn-theme => ccm-themedirector}/doc/theme-standalone/web.xml (100%)
 rename {ccm-ldn-theme/pdl/com/arsdigita/london/themes => ccm-themedirector/pdl/com/arsdigita/themedirector}/Theme.pdl (87%)
 rename {ccm-ldn-theme/pdl/com/arsdigita/london/themes => ccm-themedirector/pdl/com/arsdigita/themedirector}/ThemeFile.pdl (98%)
 rename {ccm-ldn-theme/sql/ccm-ldn-theme => ccm-themedirector/sql/ccm-themedirector}/default/theme-files-unique-constraint.sql (100%)
 rename {ccm-ldn-theme/sql/ccm-ldn-theme => ccm-themedirector/sql/ccm-themedirector}/oracle-se-create.sql (100%)
 rename {ccm-ldn-theme/sql/ccm-ldn-theme => ccm-themedirector/sql/ccm-themedirector}/postgres-create.sql (100%)
 rename {ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/default => ccm-themedirector/sql/ccm-themedirector/upgrade/default/1.0.0-1.0.1}/default-theme.sql (100%)
 create mode 100755 ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se-1.0.0-1.0.1.sql
 rename {ccm-ldn-theme/sql/ccm-ldn-theme => ccm-themedirector/sql/ccm-themedirector}/upgrade/oracle-se-1.0.1-1.0.2.sql (100%)
 create mode 100755 ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se-6.3.0-6.3.1.sql
 create mode 100644 ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se-6.6.0-6.6.1.sql
 rename {ccm-ldn-theme/sql/ccm-ldn-theme/oracle-se/upgrade => ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se}/6.3.0-6.3.1/add-is_deleted.sql (100%)
 create mode 100755 ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-1.0.0-1.0.1.sql
 create mode 100755 ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-1.0.1-1.0.2.sql
 create mode 100755 ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-6.3.0-6.3.1.sql
 create mode 100644 ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-6.6.0-6.6.1.sql
 rename {ccm-ldn-theme/sql/ccm-ldn-theme/postgres/upgrade => ccm-themedirector/sql/ccm-themedirector/upgrade/postgres}/1.0.1-1.0.2/date-to-timestamptz.sql (100%)
 rename {ccm-ldn-theme/sql/ccm-ldn-theme/postgres/upgrade => ccm-themedirector/sql/ccm-themedirector/upgrade/postgres}/6.3.0-6.3.1/add-is_deleted.sql (100%)
 create mode 100755 ccm-themedirector/src/ccm-themedirector.config
 rename ccm-ldn-theme/src/ccm-ldn-theme.load => ccm-themedirector/src/ccm-themedirector.load (65%)
 rename ccm-ldn-theme/src/ccm-ldn-theme.upgrade => ccm-themedirector/src/ccm-themedirector.upgrade (75%)
 rename {ccm-ldn-theme/src/com/arsdigita/london/theme => ccm-themedirector/src/com/arsdigita/themedirector}/Initializer.java (84%)
 rename {ccm-ldn-theme/src/com/arsdigita/london/theme => ccm-themedirector/src/com/arsdigita/themedirector}/Loader.java (78%)
 rename {ccm-ldn-theme/src/com/arsdigita/london/theme => ccm-themedirector/src/com/arsdigita/themedirector}/Theme.java (92%)
 rename {ccm-ldn-theme/src/com/arsdigita/london/theme => ccm-themedirector/src/com/arsdigita/themedirector}/ThemeCollection.java (96%)
 rename ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeApplication.java => ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirector.java (85%)
 rename ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeConfig.java => ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConfig.java (60%)
 create mode 100755 ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConfig_parameter.properties
 rename ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeConstants.java => ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConstants.java (78%)
 rename ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeResources.properties => ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorResources.properties (100%)
 rename ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeResources_fr.properties => ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorResources_de.properties (91%)
 rename ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeResources_de.properties => ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorResources_en.properties (100%)
 rename ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeResources_en.properties => ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorResources_fr.properties (100%)
 rename {ccm-ldn-theme/src/com/arsdigita/london/theme => ccm-themedirector/src/com/arsdigita/themedirector}/ThemeDirectoryPatternGenerator.java (93%)
 rename {ccm-ldn-theme/src/com/arsdigita/london/theme => ccm-themedirector/src/com/arsdigita/themedirector}/ThemeFile.java (86%)
 rename {ccm-ldn-theme/src/com/arsdigita/london/theme => ccm-themedirector/src/com/arsdigita/themedirector}/ThemeFileCollection.java (98%)
 rename {ccm-ldn-theme/src/com/arsdigita/london/theme => ccm-themedirector/src/com/arsdigita/themedirector}/ThemeObserver.java (87%)
 rename {ccm-ldn-theme/src/com/arsdigita/london/theme => ccm-themedirector/src/com/arsdigita/themedirector}/ThemePatternGenerator.java (91%)
 rename {ccm-ldn-theme/src/com/arsdigita/london/theme => ccm-themedirector/src/com/arsdigita/themedirector}/ThemeTransactionListener.java (92%)
 rename {ccm-ldn-theme/src/com/arsdigita/london/theme => ccm-themedirector/src/com/arsdigita/themedirector}/dispatcher/InternalThemePrefixerServlet.java (97%)
 rename {ccm-ldn-theme/src/com/arsdigita/london/theme => ccm-themedirector/src/com/arsdigita/themedirector}/dispatcher/ThemeDownloadServlet.java (95%)
 rename {ccm-ldn-theme/src/com/arsdigita/london/theme => ccm-themedirector/src/com/arsdigita/themedirector}/ui/ThemeContainer.java (93%)
 rename {ccm-ldn-theme/src/com/arsdigita/london/theme => ccm-themedirector/src/com/arsdigita/themedirector}/ui/ThemeControlPanel.java (93%)
 rename {ccm-ldn-theme/src/com/arsdigita/london/theme => ccm-themedirector/src/com/arsdigita/themedirector}/ui/ThemeFilesList.java (91%)
 rename {ccm-ldn-theme/src/com/arsdigita/london/theme => ccm-themedirector/src/com/arsdigita/themedirector}/ui/ThemeForm.java (96%)
 rename {ccm-ldn-theme/src/com/arsdigita/london/theme => ccm-themedirector/src/com/arsdigita/themedirector}/ui/ThemeListModelBuilder.java (96%)
 rename {ccm-ldn-theme/src/com/arsdigita/london/theme => ccm-themedirector/src/com/arsdigita/themedirector}/ui/ThemeProperties.java (97%)
 rename {ccm-ldn-theme/src/com/arsdigita/london/theme => ccm-themedirector/src/com/arsdigita/themedirector}/ui/ThemeSelectionModel.java (94%)
 rename {ccm-ldn-theme/src/com/arsdigita/london/theme => ccm-themedirector/src/com/arsdigita/themedirector}/ui/ThemeValidationPanel.java (96%)
 rename {ccm-ldn-theme/src/com/arsdigita/london/theme => ccm-themedirector/src/com/arsdigita/themedirector}/ui/ThemeXSLParameterGenerator.java (84%)
 rename {ccm-ldn-theme/src/com/arsdigita/london/theme => ccm-themedirector/src/com/arsdigita/themedirector}/ui/listeners/ApproveThemeActionListener.java (92%)
 rename {ccm-ldn-theme/src/com/arsdigita/london/theme => ccm-themedirector/src/com/arsdigita/themedirector}/ui/listeners/CancelListener.java (97%)
 rename {ccm-ldn-theme/src/com/arsdigita/london/theme => ccm-themedirector/src/com/arsdigita/themedirector}/ui/listeners/FileRemovalRequestListener.java (88%)
 rename {ccm-ldn-theme/src/com/arsdigita/london/theme => ccm-themedirector/src/com/arsdigita/themedirector}/ui/listeners/LoggingErrorListener.java (96%)
 rename {ccm-ldn-theme/src/com/arsdigita/london/theme => ccm-themedirector/src/com/arsdigita/themedirector}/util/GlobalizationUtil.java (89%)
 rename {ccm-ldn-theme/src/com/arsdigita/london/theme => ccm-themedirector/src/com/arsdigita/themedirector}/util/ManifestReader.java (97%)
 rename {ccm-ldn-theme/src/com/arsdigita/london/theme => ccm-themedirector/src/com/arsdigita/themedirector}/util/ThemeDevelopmentFileManager.java (96%)
 rename {ccm-ldn-theme/src/com/arsdigita/london/theme => ccm-themedirector/src/com/arsdigita/themedirector}/util/ThemeFileManager.java (96%)
 rename {ccm-ldn-theme/src/com/arsdigita/london/theme => ccm-themedirector/src/com/arsdigita/themedirector}/util/ThemeFileUtil.java (97%)
 rename {ccm-ldn-theme/src/com/arsdigita/london/theme => ccm-themedirector/src/com/arsdigita/themedirector}/util/ThemePublishedFileManager.java (97%)
 rename {ccm-ldn-theme/src/com/arsdigita/london/theme => ccm-themedirector/src/com/arsdigita/themedirector}/util/TransformerExceptionContainer.java (99%)
 rename {ccm-ldn-theme/src/com/arsdigita/london/theme => ccm-themedirector/src/com/arsdigita/themedirector}/util/WhiteListFilenameFilter.java (90%)
 rename ccm-ldn-theme/web/WEB-INF/web.ccm-ldn-theme.xml => ccm-themedirector/web/WEB-INF/web.ccm-themedirector.xml (73%)
 rename {ccm-ldn-theme => ccm-themedirector}/web/__ccm__/themes-dev/placeholder.txt (100%)
 rename {ccm-ldn-theme => ccm-themedirector}/web/__ccm__/themes-prod/placeholder.txt (100%)
 rename {ccm-ldn-theme => ccm-themedirector}/web/__ccm__/themes/default/acs-subsite-index.xsl (100%)
 rename {ccm-ldn-theme => ccm-themedirector}/web/__ccm__/themes/default/admin-index.xsl (100%)
 rename {ccm-ldn-theme => ccm-themedirector}/web/__ccm__/themes/default/atoz-index.xsl (100%)
 rename {ccm-ldn-theme => ccm-themedirector}/web/__ccm__/themes/default/content-center-index.xsl (100%)
 rename {ccm-ldn-theme => ccm-themedirector}/web/__ccm__/themes/default/content-section-admin.xsl (100%)
 rename {ccm-ldn-theme => ccm-themedirector}/web/__ccm__/themes/default/content-section-index.xsl (100%)
 rename {ccm-ldn-theme => ccm-themedirector}/web/__ccm__/themes/default/forum-index.xsl (100%)
 rename {ccm-ldn-theme => ccm-themedirector}/web/__ccm__/themes/default/navigation-admin.xsl (100%)
 rename {ccm-ldn-theme => ccm-themedirector}/web/__ccm__/themes/default/navigation-index.xsl (100%)
 rename {ccm-ldn-theme => ccm-themedirector}/web/__ccm__/themes/default/rss-index.xsl (100%)
 rename {ccm-ldn-theme => ccm-themedirector}/web/__ccm__/themes/default/search-index.xsl (100%)
 rename {ccm-ldn-theme => ccm-themedirector}/web/__ccm__/themes/default/shortcuts-index.xsl (100%)
 rename {ccm-ldn-theme => ccm-themedirector}/web/__ccm__/themes/default/simplesurvey-index.xsl (100%)
 rename {ccm-ldn-theme => ccm-themedirector}/web/__ccm__/themes/default/sitemap-index.xsl (100%)
 rename {ccm-ldn-theme => ccm-themedirector}/web/__ccm__/themes/default/subsite-index.xsl (100%)
 rename {ccm-ldn-theme => ccm-themedirector}/web/__ccm__/themes/default/webdev-support-index.xsl (100%)
 rename {ccm-ldn-theme => ccm-themedirector}/web/__ccm__/themes/default/workspace-admin.xsl (100%)
 rename {ccm-ldn-theme => ccm-themedirector}/web/__ccm__/themes/default/workspace-edit.xsl (100%)
 rename {ccm-ldn-theme => ccm-themedirector}/web/__ccm__/themes/default/workspace-index.xsl (100%)
 rename {ccm-ldn-theme/web/templates/ccm-ldn-theme => ccm-themedirector/web/templates/ccm-themedirector}/index.jsp (90%)
 rename {ccm-ldn-theme/web/templates/ccm-ldn-theme => ccm-themedirector/web/templates/ccm-themedirector}/sync-theme.jsp (66%)
 rename {ccm-ldn-theme/web/templates/ccm-ldn-theme => ccm-themedirector/web/templates/ccm-themedirector}/undoTheme-login.jsp (97%)
 rename {ccm-ldn-theme/web/templates/ccm-ldn-theme => ccm-themedirector/web/templates/ccm-themedirector}/undoTheme.jsp (98%)
 create mode 100644 ccm-themedirector/web/themes/devel-themedir/placeholder.txt
 rename {ccm-ldn-theme/web/__ccm__/apps/theme => ccm-themedirector/web/themes/heirloom/apps/themedirector}/xsl/action-group.xsl (76%)
 rename {ccm-ldn-theme/web/__ccm__/apps/theme => ccm-themedirector/web/themes/heirloom/apps/themedirector}/xsl/index.xsl (93%)
 rename {ccm-ldn-theme/web/__ccm__/apps/theme => ccm-themedirector/web/themes/heirloom/apps/themedirector}/xsl/layout-panel.xsl (92%)
 rename {ccm-ldn-theme/web/__ccm__/apps/theme => ccm-themedirector/web/themes/heirloom/apps/themedirector}/xsl/section.xsl (73%)
 create mode 100644 ccm-themedirector/web/themes/published-themedir/placeholder.txt
 create mode 100644 ccm-themedirector/web/themes/static/default/acs-subsite-index.xsl
 create mode 100644 ccm-themedirector/web/themes/static/default/admin-index.xsl
 create mode 100644 ccm-themedirector/web/themes/static/default/atoz-index.xsl
 create mode 100644 ccm-themedirector/web/themes/static/default/content-center-index.xsl
 create mode 100644 ccm-themedirector/web/themes/static/default/content-section-admin.xsl
 create mode 100644 ccm-themedirector/web/themes/static/default/content-section-index.xsl
 create mode 100644 ccm-themedirector/web/themes/static/default/forum-index.xsl
 create mode 100644 ccm-themedirector/web/themes/static/default/navigation-admin.xsl
 create mode 100644 ccm-themedirector/web/themes/static/default/navigation-index.xsl
 create mode 100644 ccm-themedirector/web/themes/static/default/rss-index.xsl
 create mode 100644 ccm-themedirector/web/themes/static/default/search-index.xsl
 create mode 100644 ccm-themedirector/web/themes/static/default/shortcuts-index.xsl
 create mode 100644 ccm-themedirector/web/themes/static/default/simplesurvey-index.xsl
 create mode 100644 ccm-themedirector/web/themes/static/default/sitemap-index.xsl
 create mode 100644 ccm-themedirector/web/themes/static/default/subsite-index.xsl
 create mode 100644 ccm-themedirector/web/themes/static/default/webdev-support-index.xsl
 create mode 100644 ccm-themedirector/web/themes/static/default/workspace-admin.xsl
 create mode 100644 ccm-themedirector/web/themes/static/default/workspace-edit.xsl
 create mode 100644 ccm-themedirector/web/themes/static/default/workspace-index.xsl

diff --git a/ccm-cms-types-simpleaddress/sql/ccm-cms-types-simpleaddress/upgrade/postgres-6.6.0-6.6.1.sql b/ccm-cms-types-simpleaddress/sql/ccm-cms-types-simpleaddress/upgrade/postgres-6.6.0-6.6.1.sql
index 6d80c7b99..6fb906965 100644
--- a/ccm-cms-types-simpleaddress/sql/ccm-cms-types-simpleaddress/upgrade/postgres-6.6.0-6.6.1.sql
+++ b/ccm-cms-types-simpleaddress/sql/ccm-cms-types-simpleaddress/upgrade/postgres-6.6.0-6.6.1.sql
@@ -1,5 +1,5 @@
 --
--- Copyright (C) 2008 Peter Boy All Rights Reserved.
+-- Copyright (C) 2011 Peter Boy All Rights Reserved.
 --
 -- This library is free software; you can redistribute it and/or
 -- modify it under the terms of the GNU Lesser General Public License
diff --git a/ccm-core/web/STATIC/bebop/dhtmleditor/Bold24.gif b/ccm-core/doc/image-lib/bebop/dhtmleditor/Bold24.gif
similarity index 100%
rename from ccm-core/web/STATIC/bebop/dhtmleditor/Bold24.gif
rename to ccm-core/doc/image-lib/bebop/dhtmleditor/Bold24.gif
diff --git a/ccm-core/web/STATIC/bebop/dhtmleditor/Bookmarks24.gif b/ccm-core/doc/image-lib/bebop/dhtmleditor/Bookmarks24.gif
similarity index 100%
rename from ccm-core/web/STATIC/bebop/dhtmleditor/Bookmarks24.gif
rename to ccm-core/doc/image-lib/bebop/dhtmleditor/Bookmarks24.gif
diff --git a/ccm-core/web/STATIC/bebop/dhtmleditor/Copy24.gif b/ccm-core/doc/image-lib/bebop/dhtmleditor/Copy24.gif
similarity index 100%
rename from ccm-core/web/STATIC/bebop/dhtmleditor/Copy24.gif
rename to ccm-core/doc/image-lib/bebop/dhtmleditor/Copy24.gif
diff --git a/ccm-core/web/STATIC/bebop/dhtmleditor/Cut24.gif b/ccm-core/doc/image-lib/bebop/dhtmleditor/Cut24.gif
similarity index 100%
rename from ccm-core/web/STATIC/bebop/dhtmleditor/Cut24.gif
rename to ccm-core/doc/image-lib/bebop/dhtmleditor/Cut24.gif
diff --git a/ccm-core/web/STATIC/bebop/dhtmleditor/Indent24.gif b/ccm-core/doc/image-lib/bebop/dhtmleditor/Indent24.gif
similarity index 100%
rename from ccm-core/web/STATIC/bebop/dhtmleditor/Indent24.gif
rename to ccm-core/doc/image-lib/bebop/dhtmleditor/Indent24.gif
diff --git a/ccm-core/web/STATIC/bebop/dhtmleditor/Italic24.gif b/ccm-core/doc/image-lib/bebop/dhtmleditor/Italic24.gif
similarity index 100%
rename from ccm-core/web/STATIC/bebop/dhtmleditor/Italic24.gif
rename to ccm-core/doc/image-lib/bebop/dhtmleditor/Italic24.gif
diff --git a/ccm-core/web/STATIC/bebop/dhtmleditor/OrderedList24.gif b/ccm-core/doc/image-lib/bebop/dhtmleditor/OrderedList24.gif
similarity index 100%
rename from ccm-core/web/STATIC/bebop/dhtmleditor/OrderedList24.gif
rename to ccm-core/doc/image-lib/bebop/dhtmleditor/OrderedList24.gif
diff --git a/ccm-core/web/STATIC/bebop/dhtmleditor/Outdent24.gif b/ccm-core/doc/image-lib/bebop/dhtmleditor/Outdent24.gif
similarity index 100%
rename from ccm-core/web/STATIC/bebop/dhtmleditor/Outdent24.gif
rename to ccm-core/doc/image-lib/bebop/dhtmleditor/Outdent24.gif
diff --git a/ccm-core/web/STATIC/bebop/dhtmleditor/Paste24.gif b/ccm-core/doc/image-lib/bebop/dhtmleditor/Paste24.gif
similarity index 100%
rename from ccm-core/web/STATIC/bebop/dhtmleditor/Paste24.gif
rename to ccm-core/doc/image-lib/bebop/dhtmleditor/Paste24.gif
diff --git a/ccm-core/web/STATIC/bebop/dhtmleditor/Underline24.gif b/ccm-core/doc/image-lib/bebop/dhtmleditor/Underline24.gif
similarity index 100%
rename from ccm-core/web/STATIC/bebop/dhtmleditor/Underline24.gif
rename to ccm-core/doc/image-lib/bebop/dhtmleditor/Underline24.gif
diff --git a/ccm-core/web/STATIC/bebop/dhtmleditor/UnorderedList24.gif b/ccm-core/doc/image-lib/bebop/dhtmleditor/UnorderedList24.gif
similarity index 100%
rename from ccm-core/web/STATIC/bebop/dhtmleditor/UnorderedList24.gif
rename to ccm-core/doc/image-lib/bebop/dhtmleditor/UnorderedList24.gif
diff --git a/ccm-core/web/STATIC/bebop/dhtmleditor/blank.gif b/ccm-core/doc/image-lib/bebop/dhtmleditor/blank.gif
similarity index 100%
rename from ccm-core/web/STATIC/bebop/dhtmleditor/blank.gif
rename to ccm-core/doc/image-lib/bebop/dhtmleditor/blank.gif
diff --git a/ccm-core/web/STATIC/bebop/dhtmleditor/edit.js b/ccm-core/doc/image-lib/bebop/dhtmleditor/edit.js
similarity index 100%
rename from ccm-core/web/STATIC/bebop/dhtmleditor/edit.js
rename to ccm-core/doc/image-lib/bebop/dhtmleditor/edit.js
diff --git a/ccm-core/src/com/arsdigita/bebop/form/DHTMLEditor.java b/ccm-core/src/com/arsdigita/bebop/form/DHTMLEditor.java
index 5d2fa8fbf..aac021304 100755
--- a/ccm-core/src/com/arsdigita/bebop/form/DHTMLEditor.java
+++ b/ccm-core/src/com/arsdigita/bebop/form/DHTMLEditor.java
@@ -33,11 +33,11 @@ import com.arsdigita.xml.Element;
  * Displays and manages a WYSIWYG HTML editor that takes advantage of
  * DHTML scripting features.
  * This class can use:
- * - <a href="http://www.xonha.org>Xinha</a>
+ * - <a href="http://www.xinha.org>Xinha</a>
  * - <a href="http://www.fckeditor.net">FCKeditor</a>
  * - HTMLarea for backwards compatibility, development discontinued
  * Editor is choosen based on the config parameter waf.bebop.dhtml_editor,
- * default is "Xinha", which is the successor of HTNLarea
+ * default is "Xinha", which is the successor of HTMLarea
  *
  * @author Jim Parsons
  * @author Richard Li
@@ -218,6 +218,7 @@ public class DHTMLEditor extends TextArea {
     /**
      *      Sets the <tt>ROWS</tt> attribute for the <tt>TEXTAREA</tt> tag.
      */
+    @Override
     public void setRows(int rows) {
         setAttribute("rows", String.valueOf(rows));
     }
@@ -225,6 +226,7 @@ public class DHTMLEditor extends TextArea {
     /**
      *      Sets the <tt>COLS</tt> attribute for the <tt>TEXTAREA</tt> tag.
      */
+    @Override
     public void setCols(int cols) {
         setAttribute("cols", String.valueOf(cols));
     }
@@ -232,6 +234,7 @@ public class DHTMLEditor extends TextArea {
     /**
      *      Sets the <tt>COLS</tt> attribute for the <tt>TEXTAREA</tt> tag.
      */
+    @Override
     public void setWrap(int wrap) {
         String wrapString = null;
 
@@ -258,6 +261,7 @@ public class DHTMLEditor extends TextArea {
      * @return The tag to be used for the top level DOM element
      * generated for this type of Widget.
      */
+    @Override
     protected String getElementTag() {
         return Bebop.getConfig().getDHTMLEditor();
     }
@@ -268,6 +272,7 @@ public class DHTMLEditor extends TextArea {
      * <p><code>&lt;bebop:dhtmleditor name=... value=... [onXXX=...]/>
      *  </code>
      */
+    @Override
     public void generateWidget( PageState state, Element parent ) {
         String value = getParameterData(state).marshal();
         Element editor = parent.newChildElement(getElementTag(), BEBOP_XML_NS);
diff --git a/ccm-core/web/packages/categorization/README b/ccm-core/web/packages/categorization/README
new file mode 100644
index 000000000..c61c22c8a
--- /dev/null
+++ b/ccm-core/web/packages/categorization/README
@@ -0,0 +1 @@
+Seems not to be used by any package
diff --git a/ccm-core/web/themes/heirloom/apps/acs-subsite/xsl/index.xsl b/ccm-core/web/themes/heirloom/apps/acs-subsite/xsl/index.xsl
new file mode 100644
index 000000000..207c7b3ea
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/apps/acs-subsite/xsl/index.xsl
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<xsl:stylesheet 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+  version="1.0">
+  
+  <xsl:import href="../../../../packages/login/xsl/login_en.xsl"/> 
+  
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/apps/admin/xsl/index.xsl b/ccm-core/web/themes/heirloom/apps/admin/xsl/index.xsl
new file mode 100644
index 000000000..f22d44b69
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/apps/admin/xsl/index.xsl
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<xsl:stylesheet 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+  version="1.0">
+  
+  <xsl:import href="../../../../packages/acs-admin/xsl/admin_en.xsl"/> 
+  
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/apps/bebop/xsl/index.xsl b/ccm-core/web/themes/heirloom/apps/bebop/xsl/index.xsl
new file mode 100644
index 000000000..b3b20f96e
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/apps/bebop/xsl/index.xsl
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<xsl:stylesheet 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+  version="1.0">
+  
+  <xsl:import href="../../../../packages/bebop/xsl/bebop.xsl"/> 
+  
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/apps/permissions/xsl/index.xsl b/ccm-core/web/themes/heirloom/apps/permissions/xsl/index.xsl
new file mode 100644
index 000000000..ce89c4b9b
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/apps/permissions/xsl/index.xsl
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<xsl:stylesheet 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+  version="1.0">
+  
+  <xsl:import href="../../../../packages/permissions/xsl/permissions.xsl"/> 
+  
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/apps/sitemap/xsl/index.xsl b/ccm-core/web/themes/heirloom/apps/sitemap/xsl/index.xsl
new file mode 100644
index 000000000..461568ab5
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/apps/sitemap/xsl/index.xsl
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<xsl:stylesheet 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+  version="1.0">
+  
+  <xsl:import href="../../../../packages/acs-admin/xsl/sitemap_en.xsl"/> 
+  
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/apps/webdev-support/xsl/index.xsl b/ccm-core/web/themes/heirloom/apps/webdev-support/xsl/index.xsl
new file mode 100644
index 000000000..2837a13f0
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/apps/webdev-support/xsl/index.xsl
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<xsl:stylesheet 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+  xmlns:devsup="http://xmlns.redhat.com/waf/webdevsupport/1.0"
+  version="1.0">
+  
+  <xsl:import href="../../../../packages/login/xsl/login_en.xsl"/> 
+  
+  <xsl:template match="devsup:configList">
+    <script language="JavaScript1.2">
+      <![CDATA[
+        
+        <!-- begin hiding
+
+
+        function toggle(id) {
+        var elTab = document.getElementById(id);
+
+        if (elTab.style.display != "block") {
+             elTab.style.display = "block";
+        } else {
+             elTab.style.display = "none";
+        }
+        return false;
+        }
+        // -->
+
+        ]]>
+    </script>
+      
+    <style type="text/css">
+        table.config thead tr {
+          background: rgb(168,168,168);
+          padding: 5px;
+        }
+        table.config tr.even td {
+          background: rgb(212,212,212);
+        }
+        table.config {
+          margin: 0px;
+          padding: 0px;
+        }
+        table.config tr {
+          margin: 0px;
+          padding: 0px;
+        }
+        table.config tr td {
+          margin: 0px;
+          padding: 3px;
+        }
+        table.config tr td table.details {
+          border: 1px solid black;
+          margin-left: 2em;
+        }
+        table.config tr td table.details tr th {
+          text-align: right;
+        }
+    </style>
+      
+
+    <xsl:for-each select="application">
+
+      <h2><xsl:value-of select="@key"/></h2>
+
+      <xsl:variable name="appid">
+        <xsl:value-of select="position()"/>
+      </xsl:variable>
+        
+
+      <xsl:for-each select="context">
+        <xsl:sort select="@class"/>
+
+        <h3><xsl:value-of select="@class"/></h3>
+
+        <xsl:variable name="ctxid">
+          <xsl:value-of select="position()"/>
+        </xsl:variable>
+        
+
+        <table class="config" cellpadding="0" cellspacing="0">
+          <thead>
+            <tr>
+              <th>Name</th>
+              <th>Value</th>
+              <th>&#160;</th>
+            </tr>
+          </thead>
+          <tbody>
+            <xsl:for-each select="param">
+              <xsl:sort select="@name"/>
+
+              <xsl:variable name="id">
+                <xsl:value-of select="concat('p',$appid, '_', $ctxid,'_', position())"/>
+              </xsl:variable>
+              
+              <xsl:variable name="class">
+                <xsl:choose>
+                  <xsl:when test="(position() mod 2) = 0">
+                    <xsl:text>odd</xsl:text>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <xsl:text>even</xsl:text>
+                  </xsl:otherwise>
+                </xsl:choose>
+              </xsl:variable>
+
+              <tr class="{$class}">
+                <td><xsl:value-of select="@name"/></td>
+                <td><xsl:value-of select="@value"/></td>
+                <td><a href="#" onClick="return toggle('{$id}')">Toggle details &gt;&gt;&gt;</a></td>
+              </tr>
+              <tr class="{$class}">
+                <td colspan="3">
+                  <div id="{$id}" style="display: none">
+                    <table class="details">
+                      <tr>
+                        <th>Class</th><td><xsl:value-of select="@class"/></td>
+                      </tr>
+                      <tr>
+                        <th>Is Required</th><td><xsl:value-of select="@isRequired"/></td>
+                      </tr>
+                      <tr>
+                        <th>Title</th><td><xsl:value-of select="@title"/></td>
+                      </tr>
+                      <tr>
+                        <th>Purpose</th><td><xsl:value-of select="@purpose"/></td>
+                      </tr>
+                      <tr>
+                        <th>Format</th><td><xsl:value-of select="@format"/></td>
+                      </tr>
+                      <tr>
+                        <th>Example</th><td><xsl:value-of select="@example"/></td>
+                      </tr>
+                    </table>
+                  </div>
+                </td>
+              </tr>
+            </xsl:for-each>
+          </tbody>
+        </table>
+      </xsl:for-each>
+      <xsl:if test="count(context) = 0">
+        <div>
+          This application has no config records
+        </div>
+      </xsl:if>
+    </xsl:for-each>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/acs-admin/README b/ccm-core/web/themes/heirloom/packages/acs-admin/README
new file mode 100644
index 000000000..68a55ed5a
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/acs-admin/README
@@ -0,0 +1,6 @@
+Used by
+
+[pb@shuttle ROOT]$ grep  -R  acs-admin/xsl/ *
+__ccm__/apps/sitemap/xsl/index.xsl:  <xsl:import href="../../../../packages/acs-admin/xsl/sitemap_en.xsl"/>
+__ccm__/apps/admin/xsl/index.xsl:  <xsl:import href="../../../../packages/acs-admin/xsl/admin_en.xsl"/>
+packages/content-section/xsl/cms-admin.xsl:<xsl:import href="../../acs-admin/xsl/split-panel.xsl"/>
diff --git a/ccm-core/web/themes/heirloom/packages/acs-admin/xsl/admin.xsl b/ccm-core/web/themes/heirloom/packages/acs-admin/xsl/admin.xsl
new file mode 100644
index 000000000..50e4e612a
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/acs-admin/xsl/admin.xsl
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:admin="http://www.arsdigita.com/admin-ui/1.0"
+                xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+                exclude-result-prefixes="admin">
+
+<xsl:import href="../../bebop/xsl/bebop.xsl"/>
+<xsl:import href="../../bebop/xsl/DimensionalNavbar.xsl"/>
+<xsl:import href="../../bebop/xsl/TabbedPane.xsl"/>
+<xsl:import href="../../bebop/xsl/DataTable.xsl"/>
+<xsl:import href="../../ui/xsl/ui.xsl"/>
+<xsl:import href="split-panel.xsl"/>
+
+
+<!-- ContextBar formatting -->
+<xsl:template match="bebop:boxPanel[@class='ContextBar']">
+  <xsl:apply-imports/>
+  <hr />
+</xsl:template>
+
+<!-- Table with alternate color for each column. -->
+ <xsl:template match="bebop:table[@class='AlternateTable']"
+               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+   <table>
+     <xsl:for-each select="@*">
+       <xsl:attribute name="{name()}">
+         <xsl:value-of select="."/>
+       </xsl:attribute>
+     </xsl:for-each>
+     <xsl:apply-templates select="bebop:thead"/>
+     <xsl:for-each select="bebop:tbody">
+         <xsl:call-template name="AlternateTableBody"/>
+     </xsl:for-each>
+   </table>
+ </xsl:template>
+
+ <xsl:template name="AlternateTableBody"
+               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+   <tbody>
+     <xsl:for-each select="bebop:trow">
+       <tr>
+         <xsl:attribute name="bgcolor">
+            <xsl:choose>
+               <xsl:when test="position() mod 2">#e1d5b0</xsl:when>
+               <xsl:otherwise>#ffffff</xsl:otherwise>
+            </xsl:choose>
+         </xsl:attribute>
+         <xsl:for-each select="bebop:cell">
+           <td>
+             <xsl:for-each select="@align|@valign|@colspan|@width">
+               <xsl:attribute name="{local-name()}">
+                <xsl:value-of select="."/>
+               </xsl:attribute>
+             </xsl:for-each>
+             <xsl:apply-templates/>
+           </td>
+         </xsl:for-each>
+       </tr>
+     </xsl:for-each>
+   </tbody>
+ </xsl:template>
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/acs-admin/xsl/admin_en.xsl b/ccm-core/web/themes/heirloom/packages/acs-admin/xsl/admin_en.xsl
new file mode 100644
index 000000000..4c4557ab9
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/acs-admin/xsl/admin_en.xsl
@@ -0,0 +1,126 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:admin="http://www.arsdigita.com/admin-ui/1.0"
+  xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+  exclude-result-prefixes="admin">
+
+<xsl:import href="admin.xsl"/>
+ 
+  <!-- this rule matches one user -->
+  <xsl:template match="admin:userInfo">
+    
+    <!-- Feature #166221 capitalize form labels -->
+    <ul>
+      <li> Name: <xsl:value-of select="@name"/> </li>
+      <li> Email: 
+	<table>
+	  <xsl:apply-templates select="admin:email" />
+	</table>
+      </li>
+      <li> Screen Name:  <xsl:value-of select="@screenName"/> </li>
+      <li> URL: <a href="{@URI}"><xsl:value-of select="@URI"/> </a> </li>
+      <li> User ID:  <xsl:value-of select="@id"/> </li>
+      <li> Member State: <xsl:value-of select="@memberState"/> 
+      </li>
+    </ul>
+    
+  </xsl:template>
+  
+  <!-- used to format the list of actions available for one user -->
+  <xsl:template match="admin:userActions">
+    
+    <h3>Adminstrative Actions</h3>
+    
+    <ul>
+      <li><a href="password-update?user_id={@id}">Update password</a></li>
+      <li><a href="login?user_id={@id}">Become this user</a></li>
+    </ul>
+    
+  </xsl:template>
+  
+  <!-- used to format the header of the password update page -->
+  <xsl:template match="bebop:label[@class='UserPasswordHeader']">
+    For <xsl:value-of select="text()"/>
+    <hr />
+  </xsl:template>
+  
+  <!-- usage note displayed on the password-update page -->
+  <xsl:template match="admin:PasswordNote">
+    <h4>Note</h4>
+    <p>If this user does not currently have an authentication record,
+      one will be created when you submit this form and the account
+      will be enabled for login to the system.</p>
+  </xsl:template>
+
+  <!-- used to format primary email for display -->
+  <xsl:template match="admin:email[@primary='t']">
+    <tr>
+      <td>
+        <a href="mailto:{@address}"><xsl:value-of select="@address"/></a>
+      </td>
+      <td>
+        (primary)
+      </td>
+    </tr>
+  </xsl:template>
+  
+  <!-- used to format non-primary email for display -->
+  <xsl:template match="admin:email">
+    <tr>
+      <td>
+        <a href="mailto:{@address}"><xsl:value-of select="@address"/></a>
+      </td>
+      <td>
+      </td>
+    </tr>
+  </xsl:template>
+
+
+<!-- Access Denied Page -->
+<xsl:template match="bebop:label[@class='AccessDenied']">
+  <hr />
+  <p>You don't have permission to perform the requested action.</p>
+  <hr />
+</xsl:template>
+
+<!-- Display search error message -->
+<xsl:template match="bebop:list[@class='SearchResultList'][count(bebop:cell)=0]">
+   <p><font color="red">Your search returned no results.</font></p>
+</xsl:template>
+
+<!-- Display search error message -->
+<xsl:template match="bebop:list[@class='SearchResultList'][count(bebop:cell)>0]">
+    <p>Results matching your query:</p>
+    <ul>
+      <xsl:for-each select="bebop:cell">
+        <li><xsl:apply-templates/></li>
+      </xsl:for-each>
+    </ul>
+</xsl:template>
+
+<!-- used to format the basic information and actions available for one group -->
+<xsl:template match="admin:groupInfo">
+
+<ul>
+  <li> Group Name: <xsl:value-of select="@name"/> </li>
+  <li> Primary Email: <xsl:value-of select="@email"/> </li>
+</ul>
+
+</xsl:template>
+
+<xsl:template match="bebop:list[@class='UserGroupsResultList'][count(bebop:cell)=0]">
+   <p><font color="red">None</font></p>
+</xsl:template>
+  
+<xsl:template match="bebop:link[@class='deleteLink']">
+  <xsl:text>&#160;</xsl:text>
+  (<a href="{@href}" onclick="{@onclick}" class="action_link">
+    <xsl:apply-templates/>
+  </a>)
+</xsl:template>
+
+</xsl:stylesheet>
+
+
diff --git a/ccm-core/web/themes/heirloom/packages/acs-admin/xsl/sitemap_en.xsl b/ccm-core/web/themes/heirloom/packages/acs-admin/xsl/sitemap_en.xsl
new file mode 100644
index 000000000..c72b2b5d6
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/acs-admin/xsl/sitemap_en.xsl
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:admin="http://www.arsdigita.com/admin-ui/1.0"
+                exclude-result-prefixes="admin">
+
+<xsl:import href="admin.xsl"/>
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/acs-admin/xsl/split-panel.xsl b/ccm-core/web/themes/heirloom/packages/acs-admin/xsl/split-panel.xsl
new file mode 100644
index 000000000..db59d6010
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/acs-admin/xsl/split-panel.xsl
@@ -0,0 +1,177 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+                xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+
+<!-- Sidebar Nav Panel -->
+<xsl:template match="*[@class='sidebarNavPanel']">
+  <xsl:call-template name="sidebarNavPanel">
+    <xsl:with-param name="heading" select="//*[@class='heading']"/>
+    <xsl:with-param name="navbar" select="//*[@class='navbar']"/>
+    <xsl:with-param name="main" select="//*[@class='main']"/>
+    <xsl:with-param name="navbar-title" select="@navbar-title"/>
+  </xsl:call-template>
+</xsl:template>
+
+<!-- sidebarNavPanel: This is the outer framing for spli-panels.
+     The heading param is actually the heading for the first section on 
+     the right side -->
+<xsl:template name="sidebarNavPanel">
+  <xsl:param name="heading">The Heading Goes Here</xsl:param>
+  <xsl:param name="navbar">This is the Navbar</xsl:param>
+  <xsl:param name="main">This is the Main Display Panel</xsl:param>
+  <xsl:param name="navbar-title">Title</xsl:param>
+  
+  <table border="0" cellpadding="0" cellspacing="0" width="100%">
+    <tr>
+      <td class="split_pane_left_background" valign="top" width="20%">
+        <!-- Left Panel -->
+
+        <table border="0" cellpadding="0" cellspacing="0" width="100%">
+          <tr>
+            <td>
+              <table border="0" cellpadding="2" cellspacing="0" width="100%">
+                <tr>
+                  <th class="split_pane_header">
+                    <xsl:value-of select="$navbar-title"/>
+                  </th>
+                </tr>
+              </table>
+            </td>
+          </tr>
+          <tr>
+            <td bgcolor="#ffffff">
+              <table border="0" cellpadding="0" cellspacing="0">
+                <tr>
+                  <td height="1"/>
+                </tr>
+              </table>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              <!-- Left Panel: Navigation, list of objects -->
+              <xsl:apply-templates select="$navbar"/>
+            </td>
+          </tr>
+        </table>
+      </td>
+      <td width="1"/>
+      <td valign="top">
+        <!-- Right Panel: Where the contents go -->
+        <xsl:apply-templates select="$main"/>
+      </td>
+    </tr>
+  </table>
+</xsl:template>
+
+
+<!-- Split-panel: This wraps the navigation in the left panel -->
+<xsl:template match="bebop:boxPanel[@class='navbar']">
+<table border="0" cellpadding="0" cellspacing="0" width="100%">
+<tr>
+<td>
+ <table border="0" cellpadding="1" cellspacing="0" width="100%">
+   <tr>
+     <td height="8">
+       <table border="0" cellpadding="0" cellspacing="0">
+	 <tr>
+	   <td height="8"/>
+	 </tr>
+       </table>
+     </td>
+   </tr>
+   <xsl:apply-templates select=".//bebop:list[@class='sidebarNavList']"/>
+   <xsl:apply-templates select=".//bebop:tree"/>
+   <tr>
+     <td height="8">
+       <table border="0" cellpadding="0" cellspacing="0">
+	 <tr>
+	   <td height="8"/>
+	 </tr>
+       </table>
+     </td>
+   </tr>
+   <xsl:for-each select="bebop:cell/bebop:link">
+     <tr>
+       <td class="split_pane_left_item">
+	 <xsl:apply-templates select="."/>
+       </td>
+     </tr>
+   </xsl:for-each>
+ </table>
+</td>
+</tr>
+</table>
+</xsl:template>
+
+
+
+<!-- Split-panel: The list of objects in the left navigational panel -->
+<xsl:template match="bebop:list[@class='sidebarNavList']">
+  <xsl:for-each select="bebop:cell"> 
+    <xsl:choose>
+      <xsl:when test="@selected='selected'">  
+      <tr>
+        <td class="split_pane_left_item_selected" nowrap="1">
+          <xsl:apply-templates/><xsl:text>&#160;</xsl:text><img border="0" height="9" width="5">
+            <xsl:attribute name="src">
+              <xsl:value-of select="//@assets"/>/assets/images/arrow-right.gif</xsl:attribute>
+            </img>
+          </td>
+        </tr>
+      </xsl:when>
+      <xsl:otherwise>
+        <tr>
+          <td class="split_pane_left_item" nowrap="1">
+            <xsl:apply-templates/>
+          </td>
+        </tr>
+      </xsl:otherwise>
+    </xsl:choose>
+    <tr>
+      <td>
+        <table border="0" cellpadding="0" cellspacing="0">
+          <tr>
+            <td height="4"/>
+          </tr>
+        </table>
+      </td>
+    </tr>
+  </xsl:for-each>
+</xsl:template>
+
+
+<!-- Split-panel: The individual objects in the left navigational panel -->
+<xsl:template match="bebop:list[@class='sidebarNavList']/bebop:cell/bebop:link">
+<a class="split_pane_left_item" href="{@href}">
+<xsl:apply-templates/>
+</a>
+</xsl:template>
+
+
+
+<!-- Format the nav bar when the contents is a tree -->
+<xsl:template match="bebop:boxPanel[@class='navbar']//bebop:tree">
+<xsl:for-each select="bebop:t_node">
+<xsl:call-template name="write-node">
+<xsl:with-param name="node" select="."/>
+</xsl:call-template>
+</xsl:for-each>
+</xsl:template>
+
+<!-- pads the label of the submit buttons -->
+<xsl:template match="bebop:formWidget[@type='submit']">
+  <input value="&#160;&#160;&#160;{@value}&#160;&#160;&#160;">
+    <xsl:if test="boolean(@onclick) = false()">
+      <xsl:attribute name="onclick">
+        <xsl:value-of select="'dcp_hide(this);'"/>
+      </xsl:attribute>
+    </xsl:if>
+    <xsl:for-each select="@*[name() != 'value']">
+      <xsl:attribute name="{name()}">
+        <xsl:value-of select="."/>
+      </xsl:attribute>
+    </xsl:for-each>
+  </input>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/bebop/README b/ccm-core/web/themes/heirloom/packages/bebop/README
new file mode 100644
index 000000000..ef4cfff8d
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/bebop/README
@@ -0,0 +1 @@
+Used by various packages!
diff --git a/ccm-core/web/packages/bebop-demo/xsl/bebop-demo-2.xsl b/ccm-core/web/themes/heirloom/packages/bebop/demo/xsl/bebop-demo-2.xsl
old mode 100755
new mode 100644
similarity index 100%
rename from ccm-core/web/packages/bebop-demo/xsl/bebop-demo-2.xsl
rename to ccm-core/web/themes/heirloom/packages/bebop/demo/xsl/bebop-demo-2.xsl
diff --git a/ccm-core/web/packages/bebop-demo/xsl/bebop-demo.xsl b/ccm-core/web/themes/heirloom/packages/bebop/demo/xsl/bebop-demo.xsl
old mode 100755
new mode 100644
similarity index 100%
rename from ccm-core/web/packages/bebop-demo/xsl/bebop-demo.xsl
rename to ccm-core/web/themes/heirloom/packages/bebop/demo/xsl/bebop-demo.xsl
diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/BoxPanel.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/BoxPanel.xsl
new file mode 100644
index 000000000..4057e853e
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/BoxPanel.xsl
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+    xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+
+ <xsl:output method="html" indent="yes"/>
+
+ <xsl:template match="bebop:boxPanel[@axis='1']"
+               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+   <table>
+     <xsl:if test="string-length(@width)>0">
+       <xsl:attribute name="width">
+         <xsl:value-of select="@width"/>
+       </xsl:attribute>
+     </xsl:if>
+     <xsl:if test="string-length(@border)>0">
+       <xsl:attribute name="border">
+         <xsl:value-of select="@border"/>
+       </xsl:attribute>
+     </xsl:if>
+     <tr>
+       <xsl:for-each select="bebop:cell">
+         <td>
+           <xsl:for-each select="*/@class|*/@style">
+             <xsl:attribute name="{name()}">
+               <xsl:value-of select="." />
+             </xsl:attribute>
+           </xsl:for-each>
+           <xsl:apply-templates/>
+         </td>
+       </xsl:for-each>
+     </tr>
+   </table>  
+ </xsl:template>
+
+ <xsl:template match="bebop:boxPanel[@axis='2']"
+               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+   <table>
+     <xsl:if test="string-length(@width)>0">
+       <xsl:attribute name="width">
+         <xsl:value-of select="@width"/>
+       </xsl:attribute>
+     </xsl:if>
+     <xsl:if test="string-length(@border)>0">
+       <xsl:attribute name="border">
+         <xsl:value-of select="@border"/>
+       </xsl:attribute>
+     </xsl:if>
+     <xsl:for-each select="bebop:cell">
+       <tr>
+         <td>
+           <xsl:for-each select="*/@class|*/@style">
+             <xsl:attribute name="{name()}">
+               <xsl:value-of select="." />
+             </xsl:attribute>
+           </xsl:for-each>
+           <xsl:apply-templates/>
+         </td>
+       </tr>
+     </xsl:for-each>
+   </table>  
+ </xsl:template>
+
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/CheckBoxGroup.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/CheckBoxGroup.xsl
new file mode 100644
index 000000000..1c1625271
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/CheckBoxGroup.xsl
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<xsl:stylesheet version="1.0"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+>
+  <xsl:output method="html" indent="yes"/>
+
+  <xsl:template match="bebop:checkboxGroup">
+    <xsl:apply-templates select="bebop:checkbox"/>
+  </xsl:template>
+
+  <xsl:template match="bebop:checkbox">
+    <input id="{@name}:{@value}" type="checkbox">
+      <xsl:copy-of select="@*"/>
+
+      <xsl:if test="../@readonly">
+        <xsl:attribute name="readonly">readonly</xsl:attribute>
+      </xsl:if>
+
+      <xsl:if test="../@disabled">
+        <xsl:attribute name="disabled">disabled</xsl:attribute>
+      </xsl:if>
+      <xsl:if test="../@title">
+        <xsl:attribute name="title"><xsl:value-of select="../@title"/></xsl:attribute>
+      </xsl:if>
+      <xsl:if test="../@onclick">
+        <xsl:attribute name="onclick"><xsl:value-of select="../@onclick"/></xsl:attribute>
+      </xsl:if>
+    </input>
+
+    <label for="{@name}:{@value}">
+      <xsl:apply-templates select="bebop:label"/>
+    </label>
+
+    <br/>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/ColumnPanel.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/ColumnPanel.xsl
new file mode 100644
index 000000000..3a056b6d4
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/ColumnPanel.xsl
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+ <xsl:output method="html" indent="yes"/>
+
+
+ <xsl:template match="bebop:padFrame|bebop:border"
+               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+   <table>
+     <xsl:for-each select="@*">
+         <xsl:attribute name="{name()}">
+             <xsl:value-of select="."/>
+         </xsl:attribute>
+        </xsl:for-each>
+     <tr><td><xsl:apply-templates /></td></tr>
+   </table>
+ </xsl:template>
+
+ <xsl:template match="bebop:pad"
+               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+   <table>
+     <xsl:for-each select="@*">
+         <xsl:attribute name="{name()}">
+             <xsl:value-of select="."/>
+         </xsl:attribute>
+        </xsl:for-each>
+     <xsl:apply-templates />
+   </table>
+ </xsl:template>
+
+ <xsl:template match="bebop:panelRow"
+               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+   <tr>
+     <xsl:for-each select="bebop:cell">
+       <td>
+         <xsl:for-each select="@align|@valign|@colspan|@width">
+           <xsl:attribute name="{local-name()}">
+             <xsl:value-of select="."/>
+           </xsl:attribute>
+         </xsl:for-each>
+         <xsl:apply-templates /></td>
+     </xsl:for-each>
+   </tr>
+ </xsl:template>
+
+ <!-- all bebop:cells should pass through attributes -->
+ <xsl:template match="bebop:cell"
+               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+   <xsl:for-each select="@*">
+     <xsl:attribute name="{name()}">
+       <xsl:value-of select="."/>
+     </xsl:attribute>
+   </xsl:for-each>
+   <xsl:apply-templates />
+ </xsl:template>
+ 
+ <xsl:template match="bebop:columnPanel"
+               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+   <xsl:apply-templates />
+ </xsl:template>
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/DHTMLEditor.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/DHTMLEditor.xsl
new file mode 100644
index 000000000..49909d1cf
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/DHTMLEditor.xsl
@@ -0,0 +1,156 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  
+  <xsl:output method="html" indent="yes"/>
+  
+  <xsl:template match="bebop:dhtmleditor"
+    xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+
+    <xsl:variable name="firstMatch"><xsl:value-of select="//bebop:dhtmleditor/@name"/></xsl:variable>
+    <xsl:if test="@name=$firstMatch">    
+
+      <script type="text/javascript">
+        _editor_url = "/assets/htmlarea/";
+        _editor_lang = "en";
+	var numEd = 0;
+      </script>
+
+      <script type="text/javascript" src="/assets/htmlarea/htmlarea.js"/>
+
+      <script type="text/javascript">
+        <xsl:for-each select="bebop:plugin">
+          HTMLArea.loadPlugin("<xsl:value-of select="@name"/>");
+        </xsl:for-each>
+
+	// Using Styled.js didn't seem to work anymore with htmlarea 3.0rc3,
+	// so instead we configure the editor here
+
+	var css_plugin_args = {
+            combos : [
+                { label: "Style",
+                  options: { "None" : "",
+                             "Main" : "main",
+                             "Dark" : "dark",
+                             "Medium" : "medium",
+                             "Light" : "light"
+                           }
+                }
+            ]
+        };
+
+	<xsl:for-each select="//bebop:dhtmleditor">
+	  var config_<xsl:value-of select="@name"/> = null;
+	  var editor_<xsl:value-of select="@name"/> = null;
+	</xsl:for-each>
+
+        function initDocument() {
+          <xsl:for-each select="//bebop:dhtmleditor">
+	    config_<xsl:value-of select="@name"/> = new HTMLArea.Config();
+            editor_<xsl:value-of select="@name"/> = new HTMLArea("ta_<xsl:value-of select="@name"/>", config_<xsl:value-of select="@name"/>);
+
+	    config_<xsl:value-of select="@name"/>.registerButton("insertlink", "Insert link", _editor_url + "images/ed_link.gif", false, function(editor) {
+              <!-- Modified to add the open in new window button NJ-20062403-->
+              <!--  editor._popupDialog("insert_link.html", function(param) {
+                if (!param) {   // user must have pressed Cancel
+                        return false;
+                }
+                var furl = param["f_url"];
+                var sel = editor._getSelection();
+                var range = editor._createRange(sel);
+                editor._doc.execCommand("createlink", false, furl);
+                }, null); -->
+                var sel = editor._getSelection();
+                var range = editor._createRange(sel);
+                var compare = 0;
+                if (HTMLArea.is_ie) {
+                  compare = range.compareEndPoints("StartToEnd", range);
+                }
+                else {
+                  compare = range.compareBoundaryPoints(range.START_TO_END, range);
+                }
+                if (compare == 0) {
+                  alert("You need to select some text before creating a link");
+                  return;
+                }
+                editor._popupDialog("insert_link.html", function(param) {
+                if (!param) {   // user must have pressed Cancel
+                  return false;
+                }
+                var sel = editor._getSelection();
+                var range = editor._createRange(sel);
+                if (range.insertNode) { // Standards compliant version
+                  var link = document.createElement("a");
+                  var linkText = range.extractContents();
+                  link.href=param["f_url"];
+                  if (param["f_external"])
+                    link.target="_blank";
+                  link.appendChild(linkText);
+                  range.insertNode(link);
+                }
+                else if (range.pasteHTML) { // Alternative non standards version
+                  var target = "";
+                  if (param["f_external"]) {
+                    target='target="_blank"';
+                  }
+                  range.pasteHTML('&lt;a href="' + param["f_url"] + '"' + target + '&gt;' + range.text + '&lt;/a&gt;');
+                }
+                }, null);
+	    });
+            config_<xsl:value-of select="@name"/>.sizeIncludesToolbar = false;
+            config_<xsl:value-of select="@name"/>.statusBar = false;
+            config_<xsl:value-of select="@name"/>.toolbar = [
+                [ "formatblock", "space",
+                  "bold", "italic", "underline", "strikethrough", "separator",
+                  "subscript", "superscript", "separator",
+                  "copy", "cut", "paste", "space", "undo", "redo", "space", "removeformat", "killword"  ],
+                [ "justifyleft", "justifycenter", "justifyright", "justifyfull", "separator",
+                  "lefttoright", "righttoleft", "separator",
+                  "orderedlist", "unorderedlist", "outdent", "indent", "separator",
+                  "textindicator", "separator",
+                  "inserthorizontalrule", "insertlink", "insertimage", "inserttable", "htmlmode", "separator",
+                  "popupeditor", "separator" ]
+            ];
+       <xsl:if test="bebop:config/@hidden-buttons">
+           config_<xsl:value-of select="@name"/>.hideSomeButtons("<xsl:value-of select="bebop:config/@hidden-buttons"/>");
+       </xsl:if>
+	    editor_<xsl:value-of select="@name"/>.config.pageStyle = "@import url(/assets/htmlarea/htmlarea.css);";
+
+            <xsl:for-each select="bebop:plugin">
+	      <xsl:choose>
+		<xsl:when test="@name = 'CSS'">
+		  editor_<xsl:value-of select="../@name"/>.registerPlugin(<xsl:value-of select="@name"/>, css_plugin_args);
+		</xsl:when>
+		<xsl:otherwise>
+		  editor_<xsl:value-of select="../@name"/>.registerPlugin(<xsl:value-of select="@name"/>);
+		</xsl:otherwise>
+	      </xsl:choose>
+	    </xsl:for-each>
+	    
+            setTimeout(function() {
+	      editor_<xsl:value-of select="@name"/>.generate();
+	    }, 500*numEd);
+	    numEd++;
+          </xsl:for-each>
+        }
+
+	HTMLArea.init();
+	HTMLArea.onload = initDocument;
+
+	function wordClean_<xsl:value-of select="@name"/>() {
+	  editor_<xsl:value-of select="@name"/>._wordClean();
+	}
+      </script>
+      <style type="text/css">
+        textarea { background-color: #fff; border: 1px solid 00f; }
+      </style>
+
+    </xsl:if> 
+
+    <div style="width:560px; border:1px outset #666;">
+      <textarea id="ta_{@name}" name="{@name}" rows="{@rows}" cols="{@cols}" wrap="{@wrap}" style="width:100%">
+      <xsl:value-of disable-output-escaping="no" select="text()"/>
+    </textarea>
+    </div>
+    
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/DataTable.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/DataTable.xsl
new file mode 100644
index 000000000..cf40d3ce1
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/DataTable.xsl
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+        xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+        exclude-result-prefixes="bebop">
+
+  <xsl:import href="TabbedPane.xsl"/>
+  <xsl:import href="DimensionalNavbar.xsl"/>
+
+<xsl:template match="bebop:table[@class='dataTable']">
+<table cellpadding="1" cellspacing="2" border="0">
+<xsl:for-each select="thead|bebop:thead"> 
+<xsl:call-template name="dataTableHead">
+  <xsl:with-param name="orderColumn" select="../@order"/>
+  <xsl:with-param name="direction" select="../@direction"/> 
+</xsl:call-template>
+</xsl:for-each>
+<xsl:for-each select="bebop:tbody">
+<xsl:call-template name="dataTableBody"/>
+</xsl:for-each>
+</table>
+</xsl:template>
+
+<xsl:template name="dataTableHead">
+  <xsl:param name="orderColumn">0</xsl:param>
+  <xsl:param name="direction">asc</xsl:param>
+  <tr class="table_header" bgcolor="#ffffff">
+    <xsl:for-each select="cell|bebop:cell">
+          <th class="table_header" nowrap="nowrap">
+            <xsl:text>&#160;</xsl:text>
+            <xsl:apply-templates/>
+            <xsl:choose>
+              <xsl:when test="(position()-1)=$orderColumn">
+              <xsl:text>&#160;</xsl:text>   
+              <img border="0">
+                <xsl:attribute name="src"><xsl:choose><xsl:when test="$direction='asc'"><xsl:value-of select="//@assets"/>/assets/gray-triangle-up.gif</xsl:when><xsl:otherwise><xsl:value-of select="//@assets"/>/assets/gray-triangle-down.gif</xsl:otherwise></xsl:choose></xsl:attribute>
+              </img>
+             </xsl:when> 
+             <xsl:otherwise>
+               <xsl:text>&#160;</xsl:text> 
+               <xsl:text>&#160;</xsl:text> 
+             </xsl:otherwise>
+           </xsl:choose>
+            <xsl:text>&#160;</xsl:text>
+           </th>
+    </xsl:for-each>
+  </tr>
+</xsl:template>
+
+<xsl:template match="thead/cell/bebop:link|bebop:thead/bebop:cell/bebop:link">
+<a class="table_header" href="{@href}">
+<xsl:apply-templates/>
+</a>
+</xsl:template>
+
+<xsl:template name="dataTableBody">
+<tbody>
+<xsl:for-each select="bebop:trow">
+<tr>
+ <xsl:attribute name="class">
+   <xsl:choose>
+     <xsl:when test="position() mod 2">table_odd</xsl:when>
+     <xsl:otherwise>table_even</xsl:otherwise>
+   </xsl:choose>
+ </xsl:attribute>
+ <xsl:attribute name="bgcolor">
+   <xsl:choose>
+     <xsl:when test="position() mod 2">#eaded0</xsl:when>
+     <xsl:otherwise>#ffffff</xsl:otherwise>
+   </xsl:choose>
+ </xsl:attribute>
+      
+ <xsl:for-each select="bebop:cell">
+         <td class="table_cell" nowrap="nowrap">
+           <xsl:for-each select="@align|@valign|@colspan|@width">
+             <xsl:attribute name="{local-name()}">
+              <xsl:value-of select="."/>
+             </xsl:attribute>
+           </xsl:for-each>
+           <xsl:text>&#160;</xsl:text>
+           <xsl:apply-templates/>
+           <xsl:text>&#160;</xsl:text>
+         </td>
+ </xsl:for-each>
+</tr>
+</xsl:for-each>
+</tbody>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/DateTime.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/DateTime.xsl
new file mode 100644
index 000000000..f661da5a8
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/DateTime.xsl
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+  <xsl:output method="html" indent="yes"/>
+
+  <xsl:template match="bebop:datetime"
+    xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+    <xsl:for-each select="*">
+      <xsl:if test="position()=4"><br/></xsl:if>
+      <xsl:if test="position()=5"> : </xsl:if>
+      <xsl:if test="position()=6 and last()=7"> : </xsl:if>
+
+      <xsl:apply-templates select="."/>  
+    </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template match="bebop:date"
+    xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+      <xsl:copy>
+        <xsl:apply-templates/>
+      </xsl:copy>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/DimensionalNavbar.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/DimensionalNavbar.xsl
new file mode 100644
index 000000000..95b85fa43
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/DimensionalNavbar.xsl
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+	xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+  exclude-result-prefixes="bebop">
+
+  <xsl:output method="html" indent="yes"/>
+
+  <xsl:template match="bebop:dimensionalNavbar">
+    <xsl:comment>bebop:dimensionalNavbar</xsl:comment>
+    <xsl:value-of select="@startTag"/>
+    <xsl:for-each select="*">
+      <xsl:apply-templates select="."/>
+      <xsl:if test="position()!=last()">
+        <xsl:choose>
+          <xsl:when test="string-length(../@delimiter)=0">
+            &#160;&gt;&#160;
+          </xsl:when>
+          <xsl:otherwise><xsl:value-of select="../@delimiter"/></xsl:otherwise>
+        </xsl:choose>
+      </xsl:if>
+    </xsl:for-each>
+    <xsl:value-of select="@endTag"/>
+    <xsl:comment>/bebop:dimensionalNavbar</xsl:comment>
+  </xsl:template>
+
+  <xsl:template match="bebop:dimensionalNavbar[@id='global-navbar']">
+    <xsl:comment>bebop:dimensionalNavbar @id='global-navbar'</xsl:comment>
+    <xsl:for-each select="*">
+      <xsl:apply-templates select="."/>
+      <xsl:if test="position()!=last()">&#160;-&#160;</xsl:if>
+    </xsl:for-each>
+    <xsl:comment>/bebop:dimensionalNavbar @id='global-navbar'</xsl:comment>
+  </xsl:template>
+
+  <!-- Top-right links, in the form of a bebop:dimensionalNavbar -->
+  <xsl:template match="bebop:dimensionalNavbar[@class='top-right']">
+    <xsl:value-of select="@startTag"/>
+    <xsl:for-each select="*">
+      <xsl:apply-templates select="."/>
+      <xsl:if test="not(position()=last())">
+        <xsl:value-of select="../@delimiter"/>
+      </xsl:if>
+    </xsl:for-each>
+    <xsl:value-of select="@endTag"/>
+  </xsl:template>
+
+
+  <!-- dimensional navbar
+  <xsl:template match="bebop:dimensionalNavbar">
+    <table border="0" cellpadding="2" cellspacing="0" width="100%">
+      <tr>
+        <td align="{@align}">
+          <font size="2" face="tahoma,verdana,arial,helvetica">
+            <xsl:value-of select="@startTag"/>
+            <xsl:for-each select="*">
+              <xsl:apply-templates select="."/>
+              <xsl:if test="not(position()=last())">
+                <xsl:value-of select="../@delimiter"/>
+              </xsl:if>
+            </xsl:for-each>
+            <xsl:value-of select="@endTag"/>
+          </font>
+        </td>
+      </tr>
+    </table>   
+  </xsl:template>
+  -->
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/FCKEditor.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/FCKEditor.xsl
new file mode 100644
index 000000000..2a175cb26
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/FCKEditor.xsl
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  
+  <xsl:output method="html" indent="yes"/>
+  
+  <xsl:template match="bebop:fckeditor"
+    xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+
+    <xsl:variable name="firstMatch"><xsl:value-of select="//bebop:fckeditor/@name"/></xsl:variable>
+    <!-- Start of the FCKeditor component code -->
+    <xsl:if test="@name=$firstMatch">    
+       
+      <script type="text/javascript">
+        _editor_url = "/assets/fckeditor/";
+        _editor_lang = "en";
+        var numEd = 0;
+      </script>
+      
+      <script type="text/javascript" src="/assets/fckeditor/fckeditor.js"/>
+      
+      <script type="text/javascript">
+        <xsl:for-each select="//bebop:fckeditor">
+           var editor_<xsl:value-of select="@name"/> = null;
+       </xsl:for-each>
+
+        window.onload = function() {
+        <xsl:for-each select="//bebop:fckeditor">
+          editor_<xsl:value-of select="@name"/> = new FCKeditor("ta_<xsl:value-of select="@name"/>") ;
+          editor_<xsl:value-of select="@name"/>.Width = 
+          <xsl:choose>
+          		<xsl:when test="@metadata.width">
+          			'<xsl:value-of select="@metadata.width"/>'; 
+          		</xsl:when>
+          		<xsl:otherwise>
+          			'100%';
+          		</xsl:otherwise>
+          </xsl:choose>
+          editor_<xsl:value-of select="@name"/>.Height = 
+          <xsl:choose>
+          		<xsl:when test="@metadata.height">
+          			'<xsl:value-of select="@metadata.height"/>'; 
+          		</xsl:when>
+          		<xsl:otherwise>
+          			'400';
+          		</xsl:otherwise>
+          </xsl:choose>
+          
+          editor_<xsl:value-of select="@name"/>.BasePath = "/assets/fckeditor/" ;
+          editor_<xsl:value-of select="@name"/>.PluginsPath = editor_<xsl:value-of select="@name"/>.BasePath + "editor/plugins/" ;
+          <xsl:if test="bebop:config/@path">
+           editor_<xsl:value-of select="//bebop:fckeditor/@name"/>.Config['CustomConfigurationsPath'] = "<xsl:value-of select="//bebop:fckeditor/bebop:config/@path"/>";
+          </xsl:if>
+          editor_<xsl:value-of select="@name"/>.ToolbarSet = "Basic";
+          editor_<xsl:value-of select="@name"/>.ReplaceTextarea();
+        }
+        </xsl:for-each>       
+
+      </script>
+
+      <style type="text/css">
+        textarea { background-color: #fff; border: 1px solid 00f; }
+      </style>
+      
+    </xsl:if>
+    <!-- End of fckeditor setup -->
+      
+    <textarea id="ta_{@name}" name="{@name}" style="width:100%" rows="{@rows}" cols="{@cols}" wrap="{@wrap}">
+      <xsl:value-of disable-output-escaping="no" select="text()"/>
+    </textarea>
+    
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/Form.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/Form.xsl
new file mode 100644
index 000000000..79f35a796
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/Form.xsl
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+  <xsl:output method="html" indent="yes"/>
+  
+  
+  <xsl:template match="bebop:form" name="bebopForm"
+    xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+    <xsl:value-of select="@message"/>
+    <form>
+      <xsl:for-each select="@*[not(self::method)]">
+        <xsl:attribute name="{name()}">
+          <xsl:value-of select="."/>
+        </xsl:attribute>
+        <xsl:attribute name="method">
+          <xsl:choose> 
+            <xsl:when test="string-length(../@method)=0">post</xsl:when>
+            <xsl:otherwise><xsl:value-of select="../@method"/></xsl:otherwise>
+          </xsl:choose> 
+        </xsl:attribute>
+      </xsl:for-each>
+      <xsl:apply-templates />
+    </form>
+  </xsl:template>
+  
+  <!-- no-op (transparent) tags -->
+  <xsl:template match="bebop:statel|bebop:pane"
+    xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+    <xsl:apply-templates />
+  </xsl:template>
+  
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/FormWidget.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/FormWidget.xsl
new file mode 100644
index 000000000..2b4ae838a
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/FormWidget.xsl
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<xsl:stylesheet 
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+exclude-result-prefixes="xsl bebop"
+version="1.0">
+
+ <xsl:output method="html" indent="yes"/>
+
+ <xsl:template match="bebop:formWidget">
+    <input>
+        <xsl:for-each select="@*">
+            <xsl:attribute name="{name()}">
+                <xsl:value-of select="."/>
+            </xsl:attribute>
+        </xsl:for-each>
+    </input>
+ </xsl:template>
+
+ <xsl:template match="bebop:formWidget[@type='submit']">
+    <input>
+      <xsl:if test="boolean(@onclick) = false()">
+        <xsl:attribute name="onclick">
+           <xsl:text>dcp_hide(this);</xsl:text>
+        </xsl:attribute>
+      </xsl:if>
+      <xsl:for-each select="@*">
+        <xsl:attribute name="{name()}">
+          <xsl:value-of select="."/>
+        </xsl:attribute>
+      </xsl:for-each>
+    </input>
+ </xsl:template>
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/GridPanel.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/GridPanel.xsl
new file mode 100644
index 000000000..7c647c9b8
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/GridPanel.xsl
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+ <xsl:output method="html" indent="yes"/>
+
+ <xsl:template match="bebop:gridPanel"
+               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+   <table width="100%">
+     <xsl:for-each select="@bottomborder">
+       <xsl:attribute name="border">
+         <xsl:value-of select="."/>
+       </xsl:attribute>
+     </xsl:for-each>
+     <xsl:apply-templates />
+   </table>
+ </xsl:template>
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/Image.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/Image.xsl
new file mode 100644
index 000000000..11683b8d6
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/Image.xsl
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+ <xsl:output method="html" indent="yes"/>
+
+ <xsl:template match="bebop:image" mode="javascript-mode"
+               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+    <xsl:call-template name="bebop:image" />
+ </xsl:template>
+
+ <xsl:template name="bebop:image" match="bebop:image"
+               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+    <img>
+        <xsl:for-each select="@*">
+            <xsl:attribute name="{name()}">
+                <xsl:value-of select="."/>
+            </xsl:attribute>
+        </xsl:for-each>
+    </img>
+ </xsl:template>
+
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/Label.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/Label.xsl
new file mode 100644
index 000000000..c5d82e3c9
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/Label.xsl
@@ -0,0 +1,172 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+ <xsl:output method="html" indent="yes"/>
+
+<!-- ************************************* -->
+
+ <xsl:template match="bebop:label[@color!='' and @weight!='']"
+               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+   <xsl:element name="{@weight}">
+     <xsl:element name="font">
+       <xsl:attribute name="color">
+         <xsl:value-of select="@color"/>
+       </xsl:attribute>
+       <xsl:call-template name="bebop-label-text">
+          <xsl:with-param name="text" select="text()"/>
+          <xsl:with-param name="escape" select="@escape"/>
+       </xsl:call-template>
+     </xsl:element>
+   </xsl:element>
+ </xsl:template>
+
+ <xsl:template match="bebop:label[@color!='' and @weight!='']"
+               xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+	       mode="javascript-mode">
+   <xsl:element name="{@weight}">
+     <xsl:element name="font">
+       <xsl:attribute name="color">
+         <xsl:value-of select="@color"/>
+       </xsl:attribute>
+       <xsl:call-template name="bebop-label-javascript-text">
+          <xsl:with-param name="text" select="text()"/>
+          <xsl:with-param name="escape" select="@escape"/>
+       </xsl:call-template>
+     </xsl:element>
+   </xsl:element>
+ </xsl:template>
+
+<!-- ************************************* -->
+
+ <xsl:template match="bebop:label[@weight!='']"
+               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+   <xsl:element name="{@weight}">
+     <xsl:call-template name="bebop-label-text">
+        <xsl:with-param name="text" select="text()"/>
+        <xsl:with-param name="escape" select="@escape"/>
+     </xsl:call-template>
+   </xsl:element>
+ </xsl:template>
+
+ <xsl:template match="bebop:label[@weight!='']"
+               xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+	       mode="javascript-mode">
+   <xsl:element name="{@weight}">
+     <xsl:call-template name="bebop-label-javascript-text">
+        <xsl:with-param name="text" select="text()"/>
+        <xsl:with-param name="escape" select="@escape"/>
+     </xsl:call-template>
+   </xsl:element>
+ </xsl:template>
+
+<!-- ************************************* -->
+
+ <xsl:template match="bebop:label[@color!='']"
+               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+   <xsl:element name="font">
+     <xsl:attribute name="color">
+       <xsl:value-of select="@color"/>
+     </xsl:attribute>
+     <xsl:call-template name="bebop-label-text">
+        <xsl:with-param name="text" select="text()"/>
+        <xsl:with-param name="escape" select="@escape"/>
+     </xsl:call-template>
+   </xsl:element>
+ </xsl:template>
+
+ <xsl:template match="bebop:label[@color!='']"
+               xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+	       mode="javascript-mode">
+   <xsl:element name="font">
+     <xsl:attribute name="color">
+       <xsl:value-of select="@color"/>
+     </xsl:attribute>
+     <xsl:call-template name="bebop-label-javascript-text">
+        <xsl:with-param name="text" select="text()"/>
+        <xsl:with-param name="escape" select="@escape"/>
+     </xsl:call-template>
+   </xsl:element>
+ </xsl:template>
+
+<!-- ************************************* -->
+
+ <xsl:template match="bebop:label"
+               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+     <xsl:call-template name="bebop-label-text">
+        <xsl:with-param name="text" select="text()"/>
+        <xsl:with-param name="escape" select="@escape"/>
+     </xsl:call-template>
+ </xsl:template>
+
+ <xsl:template match="bebop:label"
+               xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+	       mode="javascript-mode">
+     <xsl:call-template name="bebop-label-javascript-text">
+        <xsl:with-param name="text" select="text()"/>
+        <xsl:with-param name="escape" select="@escape"/>
+     </xsl:call-template>
+ </xsl:template>
+
+<!-- ************************************* -->
+
+ <xsl:template name="bebop-label-text">
+   <xsl:param name="text"/>
+   <xsl:param name="escape"/>
+   <xsl:variable name="realtext">
+     <xsl:choose>
+       <xsl:when test="normalize-space($text)=''">&#160;</xsl:when>
+       <xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise>
+     </xsl:choose>
+   </xsl:variable>
+     
+   <xsl:choose>
+     <xsl:when test="$escape='yes'">
+       <xsl:value-of disable-output-escaping="yes" select="$realtext"/>
+     </xsl:when>
+     <xsl:otherwise>
+       <xsl:value-of disable-output-escaping="no" select="$realtext"/>
+     </xsl:otherwise>
+   </xsl:choose> 
+ </xsl:template>
+
+<!-- ************************************* -->
+
+<xsl:template name="bebop-label-javascript-text">
+  <xsl:param name="text" />
+  <xsl:param name="escape" />
+  <xsl:variable name="lapos">&apos;</xsl:variable>
+  <xsl:variable name="output-text">
+    <xsl:call-template name="string-replace">
+      <xsl:with-param name="from" select="$lapos"/>
+      <xsl:with-param name="to" select="concat('\', $lapos)"/> 
+      <xsl:with-param name="string" select="$text"/>
+    </xsl:call-template>
+  </xsl:variable>
+  <xsl:call-template name="bebop-label-text">
+     <xsl:with-param name="text" select="$output-text"/>
+     <xsl:with-param name="escape" select="$escape"/>
+  </xsl:call-template>
+</xsl:template>
+
+<!-- replace all occurences of the character(s) `from'
+     by the string `to' in the string `string'.-->
+<xsl:template name="string-replace" >
+  <xsl:param name="string"/>
+  <xsl:param name="from"/>
+  <xsl:param name="to"/>
+  <xsl:choose>
+    <xsl:when test="contains($string,$from)">
+      <xsl:value-of select="substring-before($string,$from)"/>
+      <xsl:value-of select="$to"/>
+      <xsl:call-template name="string-replace">
+        <xsl:with-param name="string" select="substring-after($string,$from)"/>
+        <xsl:with-param name="from" select="$from"/>
+        <xsl:with-param name="to" select="$to"/>
+      </xsl:call-template>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:value-of select="$string"/>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/Link.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/Link.xsl
new file mode 100644
index 000000000..e773befd7
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/Link.xsl
@@ -0,0 +1,210 @@
+<?xml version="1.0"?>
+<xsl:stylesheet version="1.0"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+
+ <xsl:param name="root-context-prefix"/>
+
+ <xsl:output method="html" indent="yes"/>
+
+ <xsl:template match="bebop:link">
+   <xsl:choose>
+     <xsl:when test="@confirm">
+       <xsl:call-template name="bebop:link"/>
+     </xsl:when>
+
+     <!--  The item search page should not use the dcp_hide function -->
+     <xsl:when test="/bebop:page[@bebop:classname='com.arsdigita.cms.ui.ItemSearchPage']">
+       <xsl:call-template name="bebop:link"/>
+     </xsl:when>
+
+     <xsl:otherwise>
+       <a>
+         <xsl:if test="boolean(@onclick) = false()">
+           <xsl:attribute name="onclick">
+             <xsl:text>dcp_disable_link(this);</xsl:text>
+           </xsl:attribute>
+         </xsl:if>
+         <xsl:copy-of select="@*[name() != 'href_no_javascript']"/>
+         <xsl:apply-templates/>
+       </a>
+     </xsl:otherwise>
+   </xsl:choose>
+ </xsl:template>
+
+ <xsl:template match="bebop:link[@class = 'actionLink']">
+   <xsl:choose>
+     <xsl:when test="@confirm">
+       <xsl:call-template name="bebop:actionLink"/>
+     </xsl:when>
+
+     <xsl:otherwise>
+       <a href="{@href_no_javascript}">
+         <img src="{$root-context-prefix}/assets/images/action-generic.png" border="0" width="14" height="14">
+           <xsl:attribute name="alt">
+             <xsl:apply-templates/>
+           </xsl:attribute>
+         </img>
+       </a>
+       <xsl:text>&#160;</xsl:text>
+       <a>
+         <xsl:if test="boolean(@onclick) = false()">
+           <xsl:attribute name="onclick">
+             <xsl:text>dcp_disable_link(this);</xsl:text>
+           </xsl:attribute>
+         </xsl:if>
+         <xsl:copy-of select="@*[name() != 'href_no_javascript']"/>
+         <xsl:apply-templates/>
+       </a>
+     </xsl:otherwise>
+   </xsl:choose>
+ </xsl:template>
+
+  <xsl:template match="bebop:link[@class = 'title']">
+   <xsl:choose>
+     <xsl:when test="@confirm">
+       <xsl:call-template name="bebop:actionLink"/>
+     </xsl:when>
+
+     <xsl:otherwise>
+       <a href="{@href_no_javascript}">
+         <img src="{$root-context-prefix}/assets/images/action-generic.png" border="0" width="14" height="14">
+           <xsl:attribute name="alt">
+             <xsl:apply-templates/>
+           </xsl:attribute>
+         </img>
+       </a>
+       <xsl:text>&#160;</xsl:text>
+       <a onclick="{@onclick}">
+         <xsl:copy-of select="@*[name() != 'href_no_javascript' and name() != 'onclick']"/>
+         <xsl:apply-templates/>
+       </a>
+     </xsl:otherwise>
+   </xsl:choose>
+ </xsl:template>
+
+ <xsl:template name="bebop:link"
+               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+       <script LANGUAGE="JavaScript">
+       <![CDATA[ <!-- begin script ]]>
+
+       <!-- This is ugly, but I need the whole output on one line =p -->
+       <![CDATA[ document.write(']]><a><xsl:for-each select="@*[name() != 'href_no_javascript' and name()!= 'confirm']"><xsl:attribute name="{name()}"><xsl:value-of select="."/></xsl:attribute></xsl:for-each><xsl:apply-templates mode="javascript-mode"/><![CDATA[')]]>
+       <![CDATA[ document.write(']]></a><![CDATA[')]]>
+       <![CDATA[ // end script --> ]]>
+       </script>
+
+       <script LANGUAGE="JavaScript">
+       <![CDATA[ <!-- begin script ]]>
+       <![CDATA[document.write("\<!--") ]]>
+       <![CDATA[ // end script --> ]]>
+       </script>
+
+       <a>
+        <xsl:for-each select="@*[name() != 'href']">
+	    <xsl:choose>
+	     <xsl:when test="name() = 'href_no_javascript'">
+	      <xsl:attribute name="href">
+	       <xsl:value-of select="."/>
+	      </xsl:attribute>
+	     </xsl:when>
+	     <xsl:when test="name() = 'onclick'">
+	     </xsl:when>
+	     <xsl:otherwise>
+              <xsl:attribute name="{name()}">
+	       <xsl:value-of select="."/>
+	      </xsl:attribute>
+	     </xsl:otherwise>
+	    </xsl:choose>
+        </xsl:for-each>
+        <xsl:apply-templates />
+       </a>
+
+       <script LANGUAGE="JavaScript">
+       <![CDATA[ <!-- begin script ]]>
+       <![CDATA[ document.write("--\>") ]]>
+       <![CDATA[ // end script --> ]]>
+       </script>
+ </xsl:template>
+
+<xsl:template name="bebop:actionLink">
+       <!-- Begin Image -->
+
+       <!-- Image JavaScript  -->
+       <script LANGUAGE="JavaScript">
+       <![CDATA[ <!-- begin script ]]>
+
+       <!-- This is ugly, but I need the whole output on one line =p -->
+       <![CDATA[ document.write(']]><a href="{@href}" onclick="{@onclick}"><img src="{$root-context-prefix}/assets/images/action-generic.png" border="0" width="14" height="14"><xsl:attribute name="alt"><xsl:apply-templates mode="javascript-mode"/></xsl:attribute></img><![CDATA[')]]>
+       <![CDATA[ document.write(']]></a><![CDATA[')]]>
+       <![CDATA[ // end script --> ]]>
+       </script>
+
+       <!-- Image No JavaScript  -->
+       <script LANGUAGE="JavaScript">
+       <![CDATA[ <!-- begin script ]]>
+       <![CDATA[document.write("\<!--") ]]>
+       <![CDATA[ // end script --> ]]>
+       </script>
+
+       <a href="{@href_no_javascript}">
+         <img src="{$root-context-prefix}/assets/images/action-generic.png" border="0" width="14" height="14">
+           <xsl:attribute name="alt">
+             <xsl:apply-templates/>
+           </xsl:attribute>
+         </img>
+       </a>
+
+       <script LANGUAGE="JavaScript">
+       <![CDATA[ <!-- begin script ]]>
+       <![CDATA[document.write("\<!--") ]]>
+       <![CDATA[ // end script --> ]]>
+       </script>
+
+       <!-- Begin Link -->
+
+       <xsl:text>&#160;</xsl:text>
+
+       <script LANGUAGE="JavaScript">
+       <![CDATA[ <!-- begin script ]]>
+
+       <!-- This is ugly, but I need the whole output on one line =p -->
+       <![CDATA[ document.write(']]><a><xsl:for-each select="@*[name() != 'href_no_javascript' and name()!= 'confirm']"><xsl:attribute name="{name()}"><xsl:value-of select="."/></xsl:attribute></xsl:for-each><xsl:apply-templates mode="javascript-mode"/><![CDATA[')]]>
+       <![CDATA[ document.write(']]></a><![CDATA[')]]>
+       <![CDATA[ // end script --> ]]>
+       </script>
+
+       <script LANGUAGE="JavaScript">
+       <![CDATA[ <!-- begin script ]]>
+       <![CDATA[document.write("\<!--") ]]>
+       <![CDATA[ // end script --> ]]>
+       </script>
+
+       <a>
+        <xsl:for-each select="@*[name() != 'href']">
+	    <xsl:choose>
+	     <xsl:when test="name() = 'href_no_javascript'">
+	      <xsl:attribute name="href">
+	       <xsl:value-of select="."/>
+	      </xsl:attribute>
+	     </xsl:when>
+	     <xsl:when test="name() = 'onclick'">
+	     </xsl:when>
+	     <xsl:otherwise>
+              <xsl:attribute name="{name()}">
+	       <xsl:value-of select="."/>
+	      </xsl:attribute>
+	     </xsl:otherwise>
+	    </xsl:choose>
+        </xsl:for-each>
+        <xsl:apply-templates />
+       </a>
+
+       <script LANGUAGE="JavaScript">
+       <![CDATA[ <!-- begin script ]]>
+       <![CDATA[ document.write("--\>") ]]>
+       <![CDATA[ // end script --> ]]>
+       </script>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/List.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/List.xsl
new file mode 100644
index 000000000..4c7615090
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/List.xsl
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+ <xsl:output method="html" indent="yes"/>
+
+
+ <xsl:template match="bebop:list[@layout='vertical']"
+               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+    <table>
+      <xsl:for-each select="@*">
+        <xsl:attribute name="{name()}">
+          <xsl:value-of select="."/>
+        </xsl:attribute>
+      </xsl:for-each>
+
+      <xsl:for-each select="bebop:cell">
+        <tr><td><xsl:apply-templates/></td></tr>
+      </xsl:for-each>
+    </table>
+ </xsl:template>
+
+
+ <xsl:template match="bebop:list[@layout='horizontal']"
+               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+    <table>
+      <xsl:for-each select="@*">
+        <xsl:attribute name="{name()}">
+          <xsl:value-of select="."/>
+        </xsl:attribute>
+      </xsl:for-each>
+
+      <tr>
+        <xsl:for-each select="bebop:cell">
+          <td><xsl:apply-templates/></td>
+        </xsl:for-each>
+      </tr>
+    </table>
+ </xsl:template>
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/ListPanel.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/ListPanel.xsl
new file mode 100644
index 000000000..8c86baa9a
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/ListPanel.xsl
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+ <xsl:output method="html" indent="yes"/>
+
+ <xsl:template match="bebop:listPanel"
+               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+    <ul>
+      <xsl:for-each select="bebop:cell">
+        <li><xsl:apply-templates /></li>
+      </xsl:for-each>
+    </ul>
+ </xsl:template>
+
+ <xsl:template match="bebop:listPanel[@ordered='true']"
+               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+    <ol>
+      <xsl:for-each select="bebop:cell">
+        <li><xsl:apply-templates /></li>
+      </xsl:for-each>
+    </ol>
+  </xsl:template>
+
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/MultipleSelect.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/MultipleSelect.xsl
new file mode 100644
index 000000000..f03ae35ef
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/MultipleSelect.xsl
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  
+  <xsl:output method="html" indent="yes"/>
+  
+  <xsl:template match="bebop:multiSelect"
+    xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+    <select name="{@name}" multiple="{@multiple}">
+      <xsl:for-each select="@disabled|@size|@title|@*[starts-with(name(), 'on')]">
+        <xsl:attribute name="{name()}">
+          <xsl:value-of select="."/>
+        </xsl:attribute>
+      </xsl:for-each>
+      <xsl:apply-templates/>
+    </select>
+  </xsl:template>
+  
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/Page.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/Page.xsl
new file mode 100644
index 000000000..f962d8811
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/Page.xsl
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<xsl:stylesheet 
+  xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+  xmlns:deditor="http://www.arsdigita.com/deditor/1.0"
+  exclude-result-prefixes="bebop">
+  
+  <xsl:output method="html" indent="yes"
+    doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"/>
+
+  <xsl:param name="root-context-prefix"/>
+  
+  <!-- The contract for this template is that
+       it can be called from any place in the DOM -->
+  <xsl:template name="bebop:pageTitle">
+    <xsl:value-of select="/bebop:page/bebop:title"/>
+  </xsl:template>
+  
+  <!-- The contract for this template is that
+       it must be called in context of bebop:page 
+       element -->
+  <xsl:template name="bebop:pageCSS">
+    <xsl:call-template name="bebop:pageCSSMain"/>
+  </xsl:template>
+  
+  <xsl:template name="bebop:pageCSSMain">
+    <link href="{$root-context-prefix}/css/acs-master.css" rel="stylesheet" type="text/css"/>
+    <xsl:for-each select="bebop:stylesheet">
+      <link href="{@href}" rel="stylesheet" type="{@type}"/>
+    </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template match="bebop:title">
+    <!-- Nada -->
+  </xsl:template>
+  
+  <xsl:template match="bebop:page" 
+    xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+    <html>
+      <head>
+        <title><xsl:call-template name="bebop:pageTitle"/></title>       
+        <xsl:call-template name="bebop:pageCSS"/>
+      </head>
+      <body>
+        <xsl:call-template name="bebop:dcpJavascript"/>
+        <h2><xsl:call-template name="bebop:pageTitle"/></h2>
+        <xsl:apply-templates select="*[position()>1]"/>
+      </body>
+    </html>
+  </xsl:template>
+  
+  <!-- Display the page structure; used by debugging -->
+  <xsl:template match="bebop:structure">
+    <h1>Bebop Page Structure</h1>
+    <xsl:value-of disable-output-escaping="yes" select="text()"/>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/PageErrorDisplay.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/PageErrorDisplay.xsl
new file mode 100644
index 000000000..1cb83885e
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/PageErrorDisplay.xsl
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<xsl:stylesheet version="1.0"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+    xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+
+  <xsl:output method="html" indent="yes"/>
+
+  <xsl:template match="bebop:list[@class='pageErrorDisplay']"
+    xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+    <xsl:if test="count(bebop:cell)">      
+      <table border="0" cellpadding="4" cellspacing="0">
+        <tr><td nowrap="1">
+          <font color="{@color}">Please correct the following errors:</font>
+        </td></tr>
+        <tr><td> 
+          <ul>
+            <xsl:for-each select="bebop:cell">
+              <li><font color="{../@color}"><xsl:apply-templates/></font></li>
+            </xsl:for-each>
+          </ul>
+        </td></tr>
+      </table>
+    </xsl:if>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/PageState.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/PageState.xsl
new file mode 100644
index 000000000..e3a17746a
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/PageState.xsl
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+ <xsl:output method="html" indent="yes"/>
+
+
+ <xsl:template match="bebop:pageState"
+               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+    <input>
+        <xsl:attribute name="type">hidden</xsl:attribute>
+        <xsl:for-each select="@*">
+            <xsl:attribute name="{name()}">
+                <xsl:value-of select="."/>
+            </xsl:attribute>
+        </xsl:for-each>
+    </input>
+ </xsl:template>
+
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/RadioGroup.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/RadioGroup.xsl
new file mode 100644
index 000000000..b773b4a60
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/RadioGroup.xsl
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+  <xsl:output method="html" indent="yes"/>
+
+
+  <xsl:template match="bebop:radioGroup"
+    xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+    <xsl:apply-templates/>
+  </xsl:template>
+
+  <!-- matching class attr is deprecated and preserved for compatibility -->
+  <xsl:template match="bebop:radioGroup[@class='vertical' or @axis='2']"
+    xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+	<xsl:for-each select="bebop:radio">
+      <xsl:apply-templates select="."/><br />
+      <xsl:text disable-output-escaping="yes"> </xsl:text>
+	</xsl:for-each>
+  </xsl:template>
+
+  <xsl:template match="bebop:radio"
+    xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+    <input id="{@name}:{@value}">
+      <xsl:if test="../@readonly">
+        <xsl:attribute name="readonly">readonly</xsl:attribute>        
+      </xsl:if>
+      <xsl:if test="../@disabled">
+        <xsl:attribute name="disabled">disabled</xsl:attribute>        
+      </xsl:if>
+      <xsl:if test="../@title">
+        <xsl:attribute name="title"><xsl:value-of select="../@title"/></xsl:attribute>
+      </xsl:if>
+      <xsl:attribute name="type">radio</xsl:attribute>
+      <xsl:for-each select="@*[not(name()='label')]">
+        <xsl:attribute name="{name()}">
+          <xsl:value-of select="."/>
+        </xsl:attribute>
+      </xsl:for-each>
+      <xsl:apply-templates />
+    </input>
+  </xsl:template>
+
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/SegmentedPanel.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/SegmentedPanel.xsl
new file mode 100644
index 000000000..56bae29fe
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/SegmentedPanel.xsl
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+  xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+
+<xsl:template name="segment">
+  <xsl:param name="header"/>
+  <xsl:param name="headerNodes"/>
+  <xsl:param name="body"/>
+
+  <tr>
+    <td>
+      <table border="0" cellpadding="2" cellspacing="0" width="100%">
+        <tr>
+          <th class="split_pane_header"   cellpadding="0" cellspacing="0">
+            <xsl:choose>
+              <xsl:when test="$header">
+                <xsl:value-of select="$header"/>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:apply-templates select="$headerNodes"/>               
+	      </xsl:otherwise>
+            </xsl:choose>
+          </th>
+        </tr>
+      </table>
+    </td>
+  </tr> 
+  <tr>
+    <td bgcolor="#ffffff">
+      <table border="0" cellpadding="0" cellspacing="0">
+        <tr>
+          <td height="1"/>
+        </tr>
+      </table>
+    </td>
+  </tr>
+  <tr>
+    <td class="split_pane_right_body">
+      <xsl:apply-templates select="$body"/>
+    </td>
+  </tr>
+      
+</xsl:template>
+
+<xsl:template match="bebop:segmentedPanel">
+  <table width="100%" cellspacing="0" cellpadding="0" border="0" >
+    <xsl:for-each select="bebop:segment">
+      <xsl:call-template name="segment">
+        <xsl:with-param name="headerNodes" select="bebop:segmentHeader"/>
+        <xsl:with-param name="body" select="bebop:segmentBody"/>
+      </xsl:call-template>
+    </xsl:for-each>
+  </table>
+</xsl:template>
+
+<xsl:template match="bebop:segmentHeader|bebop:segmentBody">
+  <xsl:apply-templates/>
+</xsl:template>
+
+
+</xsl:stylesheet>
+
+
+
+
diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/Select.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/Select.xsl
new file mode 100644
index 000000000..1faef4d9e
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/Select.xsl
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  
+  <xsl:output method="html" indent="yes"/>
+
+  <xsl:template match="bebop:select[@class='displayOneOptionAsLabel']"
+    xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+    <xsl:choose>
+      <xsl:when test="count(bebop:option)=1">
+        <xsl:choose>
+          <xsl:when test="bebop:option/@label">
+            <xsl:value-of select="bebop:option/@label"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:apply-templates select="bebop:option/bebop:label"/>
+          </xsl:otherwise>
+        </xsl:choose>
+        <input type="hidden" name="{@name}" value="{bebop:option/@value}" />
+      </xsl:when>
+      <xsl:otherwise>
+        <!-- copy-pasting the code here is wrong ! -->
+        <select name="{@name}">
+          <xsl:for-each select="@size|@*[starts-with(name(), 'on')]">
+            <xsl:attribute name="{name()}">
+              <xsl:value-of select="."/>
+            </xsl:attribute>
+          </xsl:for-each>
+          <xsl:apply-templates/>
+        </select>
+      </xsl:otherwise>
+    </xsl:choose>
+    
+  </xsl:template>
+  
+  <xsl:template match="bebop:select"
+    xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+    <select name="{@name}">
+      <xsl:for-each select="@disabled|@size|@title|@id|@*[starts-with(name(), 'on')]">
+        <xsl:attribute name="{name()}">
+          <xsl:value-of select="."/>
+        </xsl:attribute>
+      </xsl:for-each>
+      <xsl:apply-templates/>
+    </select>
+  </xsl:template>
+  
+  <xsl:template match="bebop:option"
+    xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+    <option>
+      <xsl:for-each select="@*[not(name()='label')]">
+        <xsl:attribute name="{name()}">
+          <xsl:value-of select="."/>
+        </xsl:attribute>
+      </xsl:for-each>
+      <xsl:apply-templates select="bebop:label" />
+    </option>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/SplitPanel.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/SplitPanel.xsl
new file mode 100644
index 000000000..d11a19d47
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/SplitPanel.xsl
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+ <xsl:output method="html" indent="yes"/>
+
+ <xsl:template match="bebop:splitPanel"
+               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+   <table width="{@width}" border="{@border}" cellpadding="{@cellpadding}" cellspacing="{@cellspacing}">
+     <tr width="100%">
+       <th width="100%" nowrap="1" valign="middle" align="left" colspan="2">
+         <xsl:apply-templates select="bebop:cell[position()=1]"/>
+       </th>
+     </tr>
+     <tr width="100%">
+       <td width="{@divider_left}" nowrap="1" valign="top">
+         <xsl:apply-templates select="bebop:cell[position()=2]"/>
+       </td>
+       <td width="{@divider_right}" valign="top">
+         <xsl:apply-templates select="bebop:cell[position()>2]"/>
+       </td>
+     </tr>
+   </table>  
+ </xsl:template>
+
+</xsl:stylesheet>
+
diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/TabbedPane.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/TabbedPane.xsl
new file mode 100644
index 000000000..383791f9d
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/TabbedPane.xsl
@@ -0,0 +1,118 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+	xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+	exclude-result-prefixes="bebop">
+
+
+<xsl:template match="bebop:tabStrip">
+  <table border="0" cellpadding="0" cellspacing="0" width="100%">
+    <tr>
+      <td align="left">
+        <table border="0" cellpadding="0" cellspacing="0" width="100%">
+          <tr>
+            <td align="left">
+              <table border="0" cellpadding="0" cellspacing="0">
+                <tr>
+                  <td width="8"/>
+                  <xsl:for-each select="bebop:tab">
+                    
+                    <!-- selected tab -->
+                    <xsl:if test="count(@current)">
+                      <td class="tab_selected">
+                        <table border="0" cellpadding="2" cellspacing="0" width="100%">
+                          <tr class="tab_selected">
+                            <td width="6"/>
+                            <td class="tab_selected">
+                              <xsl:apply-templates/>
+                            </td>
+                            <td width="6"/>
+                          </tr>
+                        </table>
+                      </td>
+                    </xsl:if>
+
+                    <!-- unselected tabs -->
+                    <xsl:if test="count(@href)">
+                      <td>
+                        <table border="0" cellpadding="2" cellspacing="0" width="100%">
+                          <tr>
+                            <td width="6"/>
+                            <td>
+                              <a class="tab_unselected" href="{@href}">
+                                <xsl:apply-templates/>
+                              </a>
+                            </td>
+                            <td width="6"/>
+                          </tr>
+                        </table>
+                      </td>
+                    </xsl:if>
+                  </xsl:for-each>
+
+                </tr>
+              </table>
+            </td>
+
+            <!-- MP: The preview link sits on the right end of the tabstrip. 
+                 It is normally suppressed, but here we explicitly render it. -->
+            <td align="right">
+              <table border="0" cellpadding="2" cellspacing="0" width="100%">
+                <tr>
+                  <td width="6"/>
+                  <td align="right">
+                    <xsl:comment>Item Preview</xsl:comment>
+                    <xsl:for-each select="//bebop:link[@id='preview_link']">
+                      <a target="preview" class="tab_unselected" href="{@href}">
+                        <xsl:apply-templates/>
+                      </a>
+                    </xsl:for-each>          
+                  </td>
+                  <td width="6"/>
+                </tr>
+              </table>
+            </td>
+
+          </tr>
+        </table>
+      </td>
+    </tr>
+    <tr bgcolor="#878175">
+      <td>
+        <table border="0" cellpadding="0" cellspacing="0">
+          <tr>
+            <td height="1"/>
+          </tr>
+        </table>
+      </td>
+    </tr>
+    <tr bgcolor="white">
+      <td>
+        <table border="0" cellpadding="0" cellspacing="0">
+          <tr>
+            <td height="10"/>
+          </tr>
+        </table>
+      </td>
+    </tr>
+  </table>
+</xsl:template>
+
+<!-- currentPane: This holds the body of the pages. -->
+<xsl:template match="bebop:currentPane">
+  <table border="0" cellpadding="0" cellspacing="0" width="100%">
+    <tr>
+      <td>
+        <xsl:apply-templates/>
+      </td>
+    </tr>
+  </table>
+</xsl:template>
+
+<!-- MP: This is a hack to place the Preview Link [@id='preview_link'] -->
+<xsl:template match="*[@id='preview_link']">
+  <!-- do nothing. invisible tag. -->
+</xsl:template>
+
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/Table.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/Table.xsl
new file mode 100644
index 000000000..e4102febf
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/Table.xsl
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+ <xsl:output method="html" indent="yes"/>
+
+ <!-- The make-attribute template used here is defined in BoxPanel.xsl
+      TODO: We need to move such utilities to one place, to make finding
+      them easier
+   -->
+
+ <xsl:template match="bebop:table"
+               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+   <table>
+     <xsl:for-each select="@*">
+       <xsl:attribute name="{name()}">
+         <xsl:value-of select="."/>
+       </xsl:attribute>
+     </xsl:for-each>
+     <xsl:apply-templates select="bebop:thead"/>
+     <xsl:apply-templates select="bebop:tbody"/>
+   </table>
+ </xsl:template>
+
+ <xsl:template match="bebop:thead"
+               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+   <xsl:element name="thead">
+     <tr>
+       <xsl:for-each select="bebop:cell">
+         <th>
+             <xsl:for-each select="@class|@style|@align|@valign|@colspan|@width|@rowspan|@height">
+               <xsl:attribute name="{local-name()}">
+                <xsl:value-of select="."/>
+               </xsl:attribute>
+             </xsl:for-each>
+         <xsl:apply-templates/>
+         </th>
+       </xsl:for-each>
+     </tr>
+   </xsl:element>
+ </xsl:template>
+
+ <xsl:template match="bebop:tbody"
+               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+   <tbody>
+     <xsl:for-each select="bebop:trow">
+       <tr>
+         <xsl:if test="../@striped and (position() mod 2) = 1">
+           <xsl:attribute name="class">rowOdd</xsl:attribute>
+         </xsl:if>
+         <xsl:for-each select="bebop:cell">
+           <td>
+             <xsl:for-each select="@class|@style|@align|@valign|@width|@height">
+               <xsl:attribute name="{local-name()}">
+                <xsl:value-of select="."/>
+               </xsl:attribute>
+             </xsl:for-each>
+             <xsl:apply-templates/>
+           </td>
+         </xsl:for-each>
+       </tr>
+     </xsl:for-each>
+   </tbody>
+ </xsl:template>
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/TextArea.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/TextArea.xsl
new file mode 100644
index 000000000..468ccd622
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/TextArea.xsl
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+ <xsl:output method="html" indent="yes"/>
+
+
+ <xsl:template match="bebop:textarea"
+               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+   <textarea>
+        <xsl:for-each select="@*[not(name()='value')]">
+            <xsl:attribute name="{name()}">
+                <xsl:value-of select="."/>
+            </xsl:attribute>
+        </xsl:for-each>
+	<xsl:if test="string-length(@value)=0">&#160;</xsl:if>
+        <xsl:value-of select="@value"/>
+   </textarea>
+ </xsl:template>
+
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/Tree.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/Tree.xsl
new file mode 100644
index 000000000..b4f279d35
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/Tree.xsl
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+<xsl:stylesheet 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+  xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+  version="1.0">
+
+ <xsl:output method="html" indent="yes"/>
+
+ <xsl:template name="write-node">
+   <xsl:param name="node"/>
+   <xsl:param name="total-indent"/>
+   <xsl:param name="level-indent">&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;</xsl:param>
+   <xsl:for-each select="$node">
+     <tr>
+       <td>
+         <xsl:value-of disable-output-escaping="yes" select="$total-indent"/>
+         <xsl:choose>
+           <xsl:when test="@collapsed='t'">
+             <a href="{@href}">+</a>
+           </xsl:when>
+           <xsl:when test="@expanded='t'">
+             <a href="{@href}">-</a>
+           </xsl:when>
+           <xsl:otherwise>
+             <xsl:text>&#160;</xsl:text>
+           </xsl:otherwise>
+         </xsl:choose>
+         <xsl:text>&#160;</xsl:text>
+         <xsl:apply-templates select="*[position()=1]"/>
+       </td>
+     </tr>
+     <xsl:for-each select="bebop:t_node">
+       <xsl:call-template name="write-node">
+         <xsl:with-param name="node" select="."/>
+         <xsl:with-param name="total-indent">
+           <xsl:copy-of select="$total-indent"/>
+           <xsl:copy-of select="$level-indent"/>
+         </xsl:with-param>
+       </xsl:call-template>
+     </xsl:for-each>
+   </xsl:for-each>
+ </xsl:template>
+  
+ <xsl:template match="bebop:tree">
+   <table>
+     <xsl:for-each select="bebop:t_node">
+       <xsl:call-template name="write-node">
+         <xsl:with-param name="node" select="."/>
+       </xsl:call-template>
+     </xsl:for-each>
+   </table>
+ </xsl:template>
+  
+
+</xsl:stylesheet>
+
+
+
+
diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/Widget.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/Widget.xsl
new file mode 100644
index 000000000..8abc53441
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/Widget.xsl
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<xsl:stylesheet 
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+exclude-result-prefixes="xsl bebop"
+version="1.0">
+
+ <xsl:output method="html" indent="yes"/>
+
+
+ <xsl:template match="bebop:formErrors">    
+ 	<font color="red">
+    <xsl:value-of disable-output-escaping="yes" select="@message"/>
+    </font>
+    <br />
+ </xsl:template>
+ 
+ <xsl:template match="bebop:formWidget">
+    <xsl:element name="input">
+        <xsl:for-each select="@*">
+            <xsl:attribute name="{name()}">
+                <xsl:value-of select="."/>
+            </xsl:attribute>
+        </xsl:for-each>
+    </xsl:element>
+ </xsl:template>
+
+ <xsl:template match="bebop:formWidget[@type='submit']">
+    <input>
+      <xsl:if test="boolean(@onclick) = false()">
+        <xsl:attribute name="onclick">
+             <xsl:text>dcp_hide(this);</xsl:text>
+        </xsl:attribute>
+      </xsl:if>
+      <xsl:for-each select="@*">
+        <xsl:attribute name="{name()}">
+          <xsl:value-of select="."/>
+        </xsl:attribute>
+      </xsl:for-each>
+    </input>
+ </xsl:template>
+
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/XinhaEditor.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/XinhaEditor.xsl
new file mode 100644
index 000000000..2609c5bf9
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/XinhaEditor.xsl
@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+<xsl:stylesheet 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:bebop="http://www.arsdigita.com/bebop/1.0" 
+  exclude-result-prefixes="xsl bebop" 
+  version="1.0">
+  
+  
+  <xsl:output method="html" indent="yes"/>
+  
+  <!-- This is a backport from Mandalay v0.9 to support Xinha editor with the -->
+  <!-- generic theme. Xinha is the follow-up of the discontinued HTMLArea. -->
+  
+  <!-- DE Benutze Xinha -->
+  <!-- EN Use Xinha -->
+
+  <xsl:template match="bebop:xinha">
+    
+    <xsl:variable name="firstMatch">
+      <xsl:value-of select="//bebop:xinha/@name"/>
+    </xsl:variable>
+
+    <xsl:if test="@name=$firstMatch">    
+ 
+      <script type="text/javascript">
+        _editor_url = "<xsl:value-of select="@editor_url"/>";
+        <!-- There is no $lang variable in the original theme, so this is hardcodes to english -->
+        _editor_lang ="<xsl:value-of select="en"/>";
+
+        <!-- DE Definiere, welche Textareas zu Xinha-Editoren werden sollen -->
+        <!-- EN Define all textares which should become xinha editors -->
+
+        xinha_editors = [
+        <xsl:for-each select="//bebop:xinha">
+          'ta_<xsl:value-of select="@name"/>'<xsl:if test="position() != last()">, </xsl:if>
+        </xsl:for-each>
+        ];
+
+        <!-- DE Lade die angegebenen Plugins falls angegeben -->
+        <!-- EN Load the mentioned plugins if any-->
+        xinha_plugins = null;
+        <xsl:if test="bebop:plugin">
+          xinha_plugins = [
+          <xsl:for-each select="bebop:plugin">
+            '<xsl:value-of select="@name"/>'<xsl:if test="position() != last()">, </xsl:if>
+          </xsl:for-each>
+          ];
+        </xsl:if>
+      </script>      
+
+      <!-- DE Lade die externe JavaScript-Datei fuer Xinha -->
+      <script type="text/javascript" src="{@editor_src}"/>
+      
+      <!-- DE Lade die angegebene Konfiguration -->
+      <script type="text/javascript">
+        <xsl:attribute name="src">
+          <xsl:value-of select="bebop:config[@name='XinhaConfig']/@path"/>
+        </xsl:attribute>
+      </script>
+    
+    </xsl:if>
+    
+    <textarea id="ta_{@name}" name="{@name}" rows="{@rows}" cols="{@cols}" wrap="{@wrap}" style="width:100%">
+      <xsl:value-of disable-output-escaping="no" select="text()"/>
+    </textarea>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/bebop.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/bebop.xsl
new file mode 100644
index 000000000..4ca14559f
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/bebop.xsl
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+
+<!-- 
+This is the main stylesheet for Bebop.  It imports all of the .xsl
+files with xsl.import.  This stylesheet is locale-independent. 
+--> 
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+                xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+
+<!-- catch-all rules must have lowest precedence -->
+<xsl:import href="plain.xsl"/>
+
+<!-- templates for each component -->
+<xsl:import href="Page.xsl"/>
+<xsl:import href="BoxPanel.xsl"/>
+<xsl:import href="CheckBoxGroup.xsl"/>
+<xsl:import href="ColumnPanel.xsl"/>
+<xsl:import href="DataTable.xsl"/>
+<xsl:import href="DimensionalNavbar.xsl"/>
+<xsl:import href="Form.xsl"/>
+<xsl:import href="GridPanel.xsl"/>
+<xsl:import href="Image.xsl"/>
+<xsl:import href="Label.xsl"/>
+<xsl:import href="Link.xsl"/>
+<xsl:import href="List.xsl"/>
+<xsl:import href="PageErrorDisplay.xsl"/>
+<xsl:import href="ListPanel.xsl"/>
+<xsl:import href="MultipleSelect.xsl"/>
+<xsl:import href="PageState.xsl"/>
+<xsl:import href="RadioGroup.xsl"/>
+<xsl:import href="Select.xsl"/>
+<xsl:import href="SplitPanel.xsl"/>
+<xsl:import href="TabbedPane.xsl"/>
+<xsl:import href="Table.xsl"/>
+<xsl:import href="TextArea.xsl"/>
+<xsl:import href="DHTMLEditor.xsl"/>
+<xsl:import href="FCKEditor.xsl"/>
+<xsl:import href="XinhaEditor.xsl"/>
+<xsl:import href="Tree.xsl"/>
+<xsl:import href="Widget.xsl"/>
+<xsl:import href="SegmentedPanel.xsl"/>
+<xsl:import href="DateTime.xsl"/>
+<xsl:import href="dcp.xsl"/>
+
+<!-- solid line -->
+<xsl:template match="bebop:solidLine">
+  <hr />
+</xsl:template>
+
+
+</xsl:stylesheet>
+
+
+
+
diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/dcp.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/dcp.xsl
new file mode 100644
index 000000000..ebbbacf7e
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/dcp.xsl
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<xsl:stylesheet
+  xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+  exclude-result-prefixes="bebop">
+
+<xsl:output method="html" indent="yes"/>
+
+<xsl:param name="dcp-on-buttons"/>
+<xsl:param name="dcp-on-links"/>
+
+<xsl:template name="bebop:dcpJavascript">
+  <script language="javascript">
+  <xsl:choose>
+    <xsl:when test="$dcp-on-buttons">
+      function dcp_hide(e) {
+          if (e.form != null) {
+              elements = e.form.elements;
+              for (i=0; i &lt; elements.length; i++) {
+                 if (elements[i].tagName == "INPUT" &amp;&amp; elements[i].type == "submit" &amp;&amp; elements[i] != e) {
+                    elements[i].setAttribute("disabled", "disabled");
+                 }
+             }
+        }
+        try {
+            // IE version - setAttribute("value", .... doesn't work in IE, so results in default browser value (submit query) 
+            // also note, class attribute referred to as className in IE!??!
+            
+            proxybutton = document.createElement("&lt;input class='" + e.getAttribute("className") + "' id = '" + e.getAttribute("id") + "' type='submit' value='" +  e.getAttribute("value") + "' disabled /&gt;");
+        	
+        } catch (error) {
+            // proper version
+            proxybutton = document.createElement('input');
+            proxybutton.setAttribute("disabled", "disabled");
+            proxybutton.setAttribute("value", e.getAttribute("value"));
+            proxybutton.setAttribute("class", e.getAttribute("class"));
+            proxybutton.setAttribute("id", e.getAttribute("id"));
+            proxybutton.setAttribute("type", "submit");
+        }
+        e.parentNode.insertBefore(proxybutton, e);
+          e.style.display = 'none';
+        
+      }
+    </xsl:when>
+    <xsl:otherwise>
+      function dcp_hide(e) { }
+    </xsl:otherwise>
+  </xsl:choose>
+  <xsl:choose>
+    <xsl:when test="$dcp-on-links">
+      
+         
+      function dcp_disable_link(e) { 
+      		proxylink = e.cloneNode(true);
+            proxylink.removeAttribute("href");
+            e.parentNode.insertBefore(proxylink, e);
+            e.style.display = 'none';
+       	
+      }                                                 
+    </xsl:when>
+    <xsl:otherwise>
+        function dcp_disable_link(e) { }
+    </xsl:otherwise>
+  </xsl:choose>
+  </script>
+</xsl:template>
+
+
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/bebop/xsl/plain.xsl b/ccm-core/web/themes/heirloom/packages/bebop/xsl/plain.xsl
new file mode 100644
index 000000000..2b24b2b5d
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/bebop/xsl/plain.xsl
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+
+<!--  The templates associated with any bebop component are in a file
+      named after the component.  This file contains only sundry
+      leftovers: a catch-all and some unused tags.
+  -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+ <xsl:output method="html" indent="yes"/>
+
+ <!-- catch-all -->
+ <xsl:template match="*|@*|text()">
+   <xsl:copy>
+    <xsl:apply-templates/>
+   </xsl:copy>
+ </xsl:template>
+
+ <!-- XXX unused -->
+ <xsl:template match="bebop:sortableTable"
+               xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+    <xsl:apply-templates />
+ </xsl:template>
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/formbuilder/README b/ccm-core/web/themes/heirloom/packages/formbuilder/README
new file mode 100644
index 000000000..c9813a9e4
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/formbuilder/README
@@ -0,0 +1,5 @@
+Used by:
+
+[pb@shuttle ROOT]$ grep  -R  packages/formbuilder/xsl/ *
+static/content-types/com/arsdigita/cms/contenttypes/FormItem.xsl:
+    <xsl:import href="../../../../../../packages/formbuilder/xsl/formbuilder.xsl"/>
diff --git a/ccm-core/web/themes/heirloom/packages/formbuilder/xsl/OptionWidgets.xsl b/ccm-core/web/themes/heirloom/packages/formbuilder/xsl/OptionWidgets.xsl
new file mode 100644
index 000000000..3c0c1bd00
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/formbuilder/xsl/OptionWidgets.xsl
@@ -0,0 +1,122 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" 
+        xmlns:formbuilder="http://www.arsdigita.com/formbuilder/1.0"
+        xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+        xmlns:cms="http://www.arsdigita.com/cms/1.0">
+
+<!-- This contains option widgets such as checkbox and radio as well
+     as select and multi-select -->
+
+<!-- The standard checkbox group -->
+<xsl:template match="component[defaultDomainClass='com.arsdigita.formbuilder.PersistentCheckboxGroup']">
+   <xsl:call-template name="optionGroup">
+     <xsl:with-param name="optionType">checkbox</xsl:with-param>
+   </xsl:call-template>
+</xsl:template>
+
+
+<!-- The standard option group -->
+<xsl:template match="component[defaultDomainClass='com.arsdigita.formbuilder.PersistentRadioGroup']">
+   <xsl:call-template name="optionGroup">
+     <xsl:with-param name="optionType">radio</xsl:with-param>
+   </xsl:call-template>
+</xsl:template>
+
+<xsl:template name="optionGroup">
+   <xsl:param name="optionType"/>
+   <th align="left" valign="top">
+     <xsl:call-template name="printLabel"/>
+   </th>
+   <td align="left" valign="top">
+     <xsl:call-template name="printErrors"/>
+   <xsl:for-each select="component">
+     <xsl:sort select="link/orderNumber"/>
+     <xsl:apply-templates select=".">
+       <xsl:with-param name="optionType" select="$optionType"/>
+     </xsl:apply-templates>
+     <br />
+   </xsl:for-each>
+   </td>
+</xsl:template>
+
+
+<!-- The standard option  -->
+<xsl:template match="component[defaultDomainClass='com.arsdigita.formbuilder.PersistentOption']">
+    <xsl:param name="optionType">checkbox</xsl:param>
+    <xsl:variable name="paramName"><xsl:value-of select="../parameterName"/></xsl:variable>
+    <input>
+      <xsl:attribute name="value"><xsl:value-of select="parameterValue"/></xsl:attribute>
+      <xsl:attribute name="id"><xsl:value-of select="$paramName" />:<xsl:value-of select="parameterValue"/></xsl:attribute>
+      <xsl:attribute name="name"><xsl:value-of select="$paramName"/></xsl:attribute>
+      <xsl:attribute name="type"><xsl:value-of select="$optionType"/></xsl:attribute>
+      <xsl:if test="parameterValue=//bebop:page/cms:contentPanel/cms:item/formbuilder:formInfo/formbuilder:formDefaults[@parameterName=$paramName]/formbuilder:formDefaultValue">
+         <xsl:attribute name="checked">checked</xsl:attribute>
+      </xsl:if>
+      <label>
+         <xsl:attribute name="for"><xsl:value-of select="../parameterName"/>:<xsl:value-of select="parameterValue"/></xsl:attribute>
+        <xsl:value-of select="label"/>
+      </label>
+    </input>
+</xsl:template>
+
+
+<!-- The Persistent Single/Multiple Select -->
+<xsl:template match="component[defaultDomainClass='com.arsdigita.formbuilder.PersistentSingleSelect' or defaultDomainClass='com.arsdigita.formbuilder.PersistentMultipleSelect']">
+   <xsl:variable name="paramName"><xsl:value-of select="parameterName"/></xsl:variable>
+   <th align="left" valign="top">
+     <xsl:call-template name="printLabel"/>
+   </th>
+   <td align="left" valign="top">
+     <xsl:call-template name="printErrors"/>
+   <select>
+     <xsl:attribute name="name"><xsl:value-of select="parameterName"/></xsl:attribute>
+     <xsl:choose>
+       <xsl:when test="defaultDomainClass='com.arsdigita.formbuilder.PersistentMultipleSelect'">
+          <xsl:attribute name="multiple">multiple</xsl:attribute>
+       </xsl:when>
+       <xsl:otherwise>
+         <option value="">-- Select --</option>
+       </xsl:otherwise>
+     </xsl:choose>
+     <xsl:for-each select="component">
+        <option>
+          <xsl:attribute name="value"><xsl:value-of select="parameterValue"/></xsl:attribute>
+          <xsl:if test="parameterValue=//bebop:page/cms:contentPanel/cms:item/formbuilder:formInfo/formbuilder:formDefaults[@parameterName=$paramName]/formbuilder:formDefaultValue">
+             <xsl:attribute name="selected">selected</xsl:attribute>
+          </xsl:if>
+          <xsl:value-of select="label"/>
+        </option>
+     </xsl:for-each>
+   </select>
+   </td>
+</xsl:template>
+
+
+<!-- The DataDrivenSelect -->
+<xsl:template match="component[defaultDomainClass='com.arsdigita.formbuilder.DataDrivenSelect']">
+   <xsl:variable name="paramName"><xsl:value-of select="parameterName"/></xsl:variable>
+   <th align="left" valign="top">
+     <xsl:call-template name="printLabel"/>
+   </th>
+   <td align="left" valign="top">
+     <select>
+      <xsl:attribute name="name"><xsl:value-of select="parameterName"/></xsl:attribute>
+      <xsl:if test="selectOptions/@multiple">
+         <xsl:attribute name="multiple">multiple</xsl:attribute>
+      </xsl:if>
+     <xsl:for-each select="selectOptions/option">
+        <option>
+          <xsl:attribute name="value"><xsl:value-of select="@id"/></xsl:attribute>
+          <xsl:if test="@id=//bebop:page/cms:contentPanel/cms:item/formbuilder:formInfo/formbuilder:formDefaults[@parameterName=$paramName]/formbuilder:formDefaultValue">
+             <xsl:attribute name="selected">selected</xsl:attribute>
+          </xsl:if>
+          <xsl:value-of select="@label"/>
+        </option>
+     </xsl:for-each>                          
+     </select>
+     <xsl:call-template name="printErrors"/>
+   </td>
+</xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-core/web/themes/heirloom/packages/formbuilder/xsl/PersistentDate.xsl b/ccm-core/web/themes/heirloom/packages/formbuilder/xsl/PersistentDate.xsl
new file mode 100644
index 000000000..328d82376
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/formbuilder/xsl/PersistentDate.xsl
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" 
+        xmlns:formbuilder="http://www.arsdigita.com/formbuilder/1.0"
+        xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+        xmlns:cms="http://www.arsdigita.com/cms/1.0">
+
+<!-- The Persistent Date -->
+<xsl:template match="component[defaultDomainClass='com.arsdigita.formbuilder.PersistentDate']">
+   <xsl:variable name="defaultYear">
+    <xsl:call-template name="printDateDefaultValue">
+       <xsl:with-param name="currentDefault" select="defaultValue/year"/>
+       <xsl:with-param name="paramName"><xsl:value-of select="parameterName"/>.year</xsl:with-param>
+       <xsl:with-param name="dateParamName"><xsl:value-of select="parameterName"/></xsl:with-param>
+    </xsl:call-template>
+   </xsl:variable>
+   <xsl:variable name="defaultMonth">
+    <xsl:call-template name="printDateDefaultValue">
+       <xsl:with-param name="currentDefault" select="defaultValue/month"/>
+       <xsl:with-param name="paramName"><xsl:value-of select="parameterName"/>.month</xsl:with-param>
+       <xsl:with-param name="dateParamName"><xsl:value-of select="parameterName"/></xsl:with-param>
+    </xsl:call-template>
+   </xsl:variable>
+
+   <th align="left" valign="top">
+     <xsl:call-template name="printLabel"/>
+   </th>
+   <td align="left" valign="top">
+   <select>
+    <xsl:attribute name="name"><xsl:value-of select="parameterName"/>.month</xsl:attribute>
+   <xsl:for-each select="monthList/month">
+      <option>
+        <xsl:attribute name="value"><xsl:value-of select="@value"/></xsl:attribute>
+        <xsl:if test="$defaultMonth=@value">
+           <xsl:attribute name="selected">selected</xsl:attribute>
+        </xsl:if>
+        <xsl:value-of select="text()"/>
+      </option>
+   </xsl:for-each>
+   </select>
+
+  <input type="text" size="2" maxlength="2">
+    <xsl:attribute name="name"><xsl:value-of select="parameterName"/>.day</xsl:attribute>
+    <xsl:attribute name="value">
+      <xsl:call-template name="printDateDefaultValue">
+         <xsl:with-param name="currentDefault" select="defaultValue/day"/>
+         <xsl:with-param name="paramName"><xsl:value-of select="parameterName"/>.day</xsl:with-param>
+         <xsl:with-param name="dateParamName"><xsl:value-of select="parameterName"/></xsl:with-param>
+      </xsl:call-template>
+    </xsl:attribute>
+  </input>
+
+  <select>
+    <xsl:attribute name="name"><xsl:value-of select="parameterName"/>.year</xsl:attribute>
+   <xsl:for-each select="yearList/year">
+      <option>
+        <xsl:attribute name="value"><xsl:value-of select="@value"/></xsl:attribute>
+        <xsl:if test="@value=$defaultYear">
+           <xsl:attribute name="selected">selected</xsl:attribute>
+        </xsl:if>
+        <xsl:value-of select="text()"/>
+      </option>
+   </xsl:for-each>
+  </select>
+     <xsl:call-template name="printErrors"/>
+   </td>
+</xsl:template>
+
+<!-- This prints out the default value for a date -->
+<xsl:template name="printDateDefaultValue">
+   <xsl:param name="currentDefault"><xsl:value-of select="defaultValue"/></xsl:param>
+   <xsl:param name="paramName"><xsl:value-of select="parameterName"/></xsl:param>
+   <xsl:param name="dateParamName"><xsl:value-of select="parameterName"/></xsl:param>
+   <xsl:choose>
+     <xsl:when test="//bebop:page/cms:contentPanel/cms:item/formbuilder:formInfo/formbuilder:formDefaults[@parameterName=$dateParamName]/formbuilder:formDefaultValue[@type=$paramName]"><xsl:value-of select="//bebop:page/cms:contentPanel/cms:item/formbuilder:formInfo/formbuilder:formDefaults[@parameterName=$dateParamName]/formbuilder:formDefaultValue[@type=$paramName]"/></xsl:when>
+     <xsl:when test="not($currentDefault='')"><xsl:value-of select="$currentDefault"/></xsl:when>
+     <xsl:otherwise></xsl:otherwise>
+   </xsl:choose>
+</xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-core/web/themes/heirloom/packages/formbuilder/xsl/PersistentSubmit.xsl b/ccm-core/web/themes/heirloom/packages/formbuilder/xsl/PersistentSubmit.xsl
new file mode 100644
index 000000000..1127bad16
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/formbuilder/xsl/PersistentSubmit.xsl
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" 
+        xmlns:formbuilder="http://www.arsdigita.com/formbuilder/1.0"
+        xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+
+
+<!-- The standard submit -->
+<xsl:template match="component[defaultDomainClass='com.arsdigita.formbuilder.PersistentSubmit']">
+  <td colspan="2" align="center">
+  <input type="submit"> 
+    <xsl:attribute name="onclick">if(this.value == 'null') { this.value = 'Please Wait'; this.form.submit();  }</xsl:attribute>
+    <xsl:attribute name="name"><xsl:value-of select="parameterName"/></xsl:attribute>
+    <xsl:attribute name="value">
+      <xsl:choose>
+        <xsl:when test="defaultValue">
+          <xsl:value-of select="defaultValue"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="parameterName"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:attribute>
+  </input>
+  </td>
+</xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-core/web/themes/heirloom/packages/formbuilder/xsl/TextWidgets.xsl b/ccm-core/web/themes/heirloom/packages/formbuilder/xsl/TextWidgets.xsl
new file mode 100644
index 000000000..9afe39f2e
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/formbuilder/xsl/TextWidgets.xsl
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" 
+        xmlns:formbuilder="http://www.arsdigita.com/formbuilder/1.0"
+        xmlns:ui="http://www.arsdigita.com/ui/1.0"
+        xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+
+<!-- This contains text widgets such as textfield, password, and textarea -->
+
+<!-- The standard password form -->
+<xsl:template match="component[defaultDomainClass='com.arsdigita.formbuilder.PersistentPassword']">
+   <th align="left" valign="top">
+     <xsl:call-template name="printLabel"/>
+   </th>
+   <td align="left" valign="top">
+     <xsl:call-template name="textFieldTemplate">
+        <xsl:with-param name="type" select="'password'"/>
+     </xsl:call-template>
+     <xsl:call-template name="printErrors"/>
+   </td>
+</xsl:template>
+
+<!-- The standard textField form -->
+<xsl:template match="component[defaultDomainClass='com.arsdigita.formbuilder.PersistentTextField']">
+   <th align="left" valign="top">
+     <xsl:call-template name="printLabel"/>
+   </th>
+   <td align="left" valign="top">
+   <xsl:call-template name="textFieldTemplate">
+      <xsl:with-param name="type" select="'text'"/>
+   </xsl:call-template>
+     <xsl:call-template name="printErrors"/>
+   </td>
+</xsl:template>
+
+
+<!--      added by CS Gupta	-->
+<!-- The standard Email Field form -->
+<xsl:template match="component[defaultDomainClass='com.arsdigita.formbuilder.PersistentEmailField']">
+   <th align="left" valign="top">
+     <xsl:call-template name="printLabel"/>
+   </th>
+   <xsl:variable name="defaultValue"><xsl:call-template name="printDefaultValue"/></xsl:variable>
+   <xsl:variable name="value">
+     <xsl:choose>
+       <xsl:when test="string-length($defaultValue) > 0">
+         <xsl:value-of select="$defaultValue"/>
+       </xsl:when>
+       <xsl:otherwise>
+         <xsl:value-of select="/bebop:page/ui:userBanner/@primaryEmail"/>
+       </xsl:otherwise>
+     </xsl:choose>
+   </xsl:variable>
+   <td align="left" valign="top">
+     <xsl:call-template name="textFieldTemplate">
+        <xsl:with-param name="type" select="'text'"/>
+        <xsl:with-param name="value" select="$value"/>
+     </xsl:call-template>
+     <xsl:call-template name="printErrors"/>
+   </td>
+</xsl:template>
+
+
+<!-- a template for all of the single line text fields -->
+<xsl:template name="textFieldTemplate">
+  <xsl:param name="type"/>
+  <xsl:param name="value">
+    <xsl:call-template name="printDefaultValue"/>
+  </xsl:param>
+
+  <input value="{$value}">
+  <!-- Default values for the dimension of a single line text field are specified here -->
+    <xsl:attribute name="type"><xsl:value-of select="$type"/></xsl:attribute>
+    <xsl:attribute name="maxlength"><xsl:value-of select="maxlength"/></xsl:attribute>
+	<xsl:if test="maxlength=0">
+		<xsl:attribute name="maxlength">30</xsl:attribute>
+	</xsl:if>
+    <xsl:attribute name="name"><xsl:value-of select="parameterName"/></xsl:attribute>
+    <xsl:attribute name="size"><xsl:value-of select="size"/></xsl:attribute>
+	<xsl:if test="size=0">
+		<xsl:attribute name="size">30</xsl:attribute>
+	</xsl:if>
+  </input>
+</xsl:template>
+
+
+<!-- Persistent Text Area -->
+<xsl:template match="component[defaultDomainClass='com.arsdigita.formbuilder.PersistentTextArea']">
+   <th align="left" valign="top">
+     <xsl:call-template name="printLabel"/>
+   </th>
+   <td align="left" valign="top">
+    <xsl:call-template name="printErrors"/>
+    <textarea>
+    <!-- Default values for the dimension of the textarea are specified here -->
+      <xsl:attribute name="name"><xsl:value-of select="parameterName"/></xsl:attribute>
+      <xsl:attribute name="rows"><xsl:value-of select="rows"/></xsl:attribute>
+     	<xsl:if test="rows=0">
+					<xsl:attribute name="rows">5</xsl:attribute>
+			</xsl:if>
+      <xsl:attribute name="cols"><xsl:value-of select="cols"/></xsl:attribute>
+	  	<xsl:if test="cols=0">
+	    <xsl:attribute name="cols">3</xsl:attribute>
+	</xsl:if>
+      <xsl:call-template name="printDefaultValue"/>
+    </textarea>
+    
+   </td>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/formbuilder/xsl/formbuilder.xsl b/ccm-core/web/themes/heirloom/packages/formbuilder/xsl/formbuilder.xsl
new file mode 100644
index 000000000..677d96e8c
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/formbuilder/xsl/formbuilder.xsl
@@ -0,0 +1,148 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" 
+        xmlns:formbuilder="http://www.arsdigita.com/formbuilder/1.0"
+        xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+        xmlns:cms="http://www.arsdigita.com/cms/1.0">
+
+<!-- In this example code, we set things up so that only the actual
+     widgets are called and then it is up to that widget to decide which,
+     if any, WidgetLabel to include. -->
+
+<xsl:import href="PersistentDate.xsl"/>
+<xsl:import href="PersistentSubmit.xsl"/>
+<xsl:import href="OptionWidgets.xsl"/>
+<xsl:import href="TextWidgets.xsl"/>
+
+<xsl:template match="form">
+  <form>
+    <xsl:attribute name="name"><xsl:value-of select="name"/></xsl:attribute>
+    <xsl:attribute name="method">post</xsl:attribute>
+    <xsl:choose>
+      <xsl:when test="../remote = 'true'">
+        <xsl:attribute name="action"><xsl:value-of select="../remoteUrl"/></xsl:attribute>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:attribute name="action"><xsl:value-of select="../@formAction"/></xsl:attribute>
+        <input type="hidden" value="visited">
+          <xsl:attribute name="name">form.<xsl:value-of select="name"/></xsl:attribute>
+        </input>
+      </xsl:otherwise>
+    </xsl:choose>
+
+    <table>
+        <xsl:for-each select="component[not(defaultDomainClass='com.arsdigita.formbuilder.WidgetLabel')]" >
+          <xsl:sort select="link/orderNumber" data-type="number"/>
+          <tr>
+            <xsl:apply-templates select="."/>
+          </tr>
+        </xsl:for-each>
+    </table>
+
+    <xsl:apply-templates select="../formbuilder:pageState/bebop:pageState"/>
+  </form>
+</xsl:template>
+
+<!-- the stand alone form sections -->
+<xsl:template match="formSection">
+  <form>
+    <xsl:attribute name="name"><xsl:value-of select="name"/></xsl:attribute>
+    <xsl:attribute name="method">post</xsl:attribute>
+    <xsl:attribute name="action"><xsl:value-of select="../formAction"/></xsl:attribute>
+    <xsl:for-each select="component" >
+      <xsl:sort select="link/orderNumber" data-type="number"/>
+      <tr>
+        <xsl:apply-templates select="."/>
+      </tr>
+    </xsl:for-each>
+    <xsl:apply-templates select="../formbuilder:pageState/bebop:pageState"/>
+  </form>
+</xsl:template>
+
+<!-- process through the form sections that are embeded within forms -->
+<xsl:template match="component[objectType='com.arsdigita.cms.formbuilder.FormSectionWrapper']">  
+   <xsl:for-each select="formSectionItem/formSection/component[not(defaultDomainClass='com.arsdigita.formbuilder.WidgetLabel')]">
+     <xsl:sort select="link/orderNumber" data-type="number"/>
+      <tr>
+        <xsl:apply-templates select="."/>
+      </tr>    
+   </xsl:for-each>
+</xsl:template>
+
+
+<!-- a utility template to allow components to find and print 
+     the appropriate label -->
+<xsl:template name="printLabel">
+   <!-- not always the next following-sibling, so checking for previous orderNumber -->
+   <xsl:variable name="correspondingLabelOrderNumber" select="./link/orderNumber - 1"/>
+   <xsl:if test="../component[defaultDomainClass='com.arsdigita.formbuilder.WidgetLabel' and link/orderNumber = $correspondingLabelOrderNumber]">
+     <xsl:apply-templates select="../component[defaultDomainClass='com.arsdigita.formbuilder.WidgetLabel' and link/orderNumber = $correspondingLabelOrderNumber]" />
+   </xsl:if>
+</xsl:template>
+
+<!-- a utility template to print out error messages -->
+<xsl:template name="printErrors">
+  <xsl:param name="parameterName"><xsl:value-of select="parameterName"/></xsl:param>   
+   <xsl:if test="//bebop:page/cms:contentPanel/cms:item/formbuilder:formInfo/formbuilder:formError[@id=$parameterName]">
+      <font color="red"><xsl:value-of select="//bebop:page/cms:contentPanel/cms:item/formbuilder:formInfo/formbuilder:formError/@message"/></font><br/>
+   </xsl:if>
+</xsl:template>
+
+
+<!-- This prints out the default value for the parameter
+     When there is only one value, it prints it.  If there are multiple values,
+     it prints them seperated by a ";" -->
+<xsl:template name="printDefaultValue">
+   <xsl:param name="currentDefault"><xsl:value-of select="defaultValue"/></xsl:param>
+   <xsl:param name="paramName"><xsl:value-of select="parameterName"/></xsl:param>
+   <xsl:choose>
+     <xsl:when test="//bebop:page/cms:contentPanel/cms:item/formbuilder:formInfo/formbuilder:formDefaults[@parameterName=$paramName]"><xsl:for-each select="//bebop:page/cms:contentPanel/cms:item/formbuilder:formInfo/formbuilder:formDefaults[@parameterName=$paramName]/formbuilder:formDefaultValue"><xsl:if test="not(position()=1)">;</xsl:if><xsl:value-of select="text()"/></xsl:for-each></xsl:when>
+     <xsl:when test="not($currentDefault='')"><xsl:value-of select="$currentDefault"/></xsl:when>
+     <xsl:otherwise></xsl:otherwise>
+   </xsl:choose>
+</xsl:template>
+
+
+
+<!-- The standard label -->
+<xsl:template match="component[defaultDomainClass='com.arsdigita.formbuilder.WidgetLabel']">
+   <xsl:value-of select="label"/>
+</xsl:template>
+
+
+
+<!-- The hidden variable  -->
+<xsl:template match="component[defaultDomainClass='com.arsdigita.formbuilder.PersistentHidden']">
+    <input type="hidden">
+      <xsl:attribute name="value"><xsl:value-of select="defaultValue"/></xsl:attribute>
+      <xsl:attribute name="name"><xsl:value-of select="parameterName"/></xsl:attribute>
+    </input>
+</xsl:template>
+
+<!-- Unique ID generator -->
+<xsl:template match="component[defaultDomainClass='com.arsdigita.formbuilder.HiddenIDGenerator']">
+    <input type="hidden">
+      <xsl:attribute name="value"><xsl:value-of select="defaultValue"/></xsl:attribute>
+      <xsl:attribute name="name"><xsl:value-of select="parameterName"/></xsl:attribute>
+    </input>
+</xsl:template>
+
+<!-- The Persistent Text Description -->
+<xsl:template match="component[defaultDomainClass='com.arsdigita.formbuilder.PersistentText']">
+    <td colspan="2" align="left">
+    <p><xsl:value-of disable-output-escaping="yes" select="description"/></p>
+    </td>
+</xsl:template>
+
+<!-- The Persistent Text Heading -->
+<xsl:template match="component[defaultDomainClass='com.arsdigita.formbuilder.PersistentHeading']">
+    <td colspan="2" align="left">
+      <p><xsl:value-of disable-output-escaping="yes" select="description"/></p>
+    </td>
+</xsl:template>
+
+<!--
+PersistentDeditor.java
+PersistentLabel.java
+-->
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/login/xsl/login_en.xsl b/ccm-core/web/themes/heirloom/packages/login/xsl/login_en.xsl
new file mode 100644
index 000000000..4131c7332
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/login/xsl/login_en.xsl
@@ -0,0 +1,173 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE stylesheet [
+<!ENTITY nbsp   "&#160;" >
+<!ENTITY copy   "&#169;" >
+]>
+
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:subsite="http://www.arsdigita.com/subsite/1.0"
+  xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+  xmlns:ui="http://www.arsdigita.com/ui/1.0">
+
+  <xsl:import href="../../bebop/xsl/bebop.xsl"/>
+  <xsl:import href="../../ui/xsl/ui.xsl"/>
+
+  <xsl:param name="dispatcher-prefix"/>
+
+  <!-- new version of login page -->
+  <xsl:template match="bebop:page[@application='login']">
+  <!-- DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" -->
+  <html>
+  <head>
+    <title>Log in</title>
+
+    <link href="/css/acs-master.css" type="text/css" rel="stylesheet"/>
+  </head>
+
+  <body link="#000066" vlink="#333399" bgcolor="#FFFFFF">
+    <xsl:call-template name="bebop:dcpJavascript"/>
+    <xsl:apply-templates select="ui:userBanner" />
+
+    <p/>&nbsp;
+
+    <table width="75%" align="center" border="0" cellspacing="0" cellpadding="5">
+      <tr bgcolor="#cc000000">
+        <td align="center">
+          <div class="page-title"><font color="#ffffff"><xsl:value-of select="ui:siteBanner/@sitename" /></font></div>
+        </td>
+      </tr>
+      <tr bgcolor="#ffffff">
+        <td heigth="2"></td>
+      </tr>
+      <tr bgcolor="#e1e1e1">
+        <td>
+          <xsl:choose>
+            <xsl:when test="count(bebop:form)>0">
+              <xsl:apply-templates select="bebop:form"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:apply-templates select="*[not(@metadata.tag)]"/>
+            </xsl:otherwise>
+          </xsl:choose>
+        </td>
+      </tr>
+    </table>
+    <p/>
+    &nbsp;
+
+    <xsl:apply-templates select="ui:siteBanner"/>
+    <xsl:apply-templates select="ui:debugPanel"/>
+    <xsl:apply-templates select="bebop:structure"/>
+  </body>
+  </html>
+  </xsl:template>
+
+  <!-- this rule matches one user -->
+  <xsl:template match="subsite:userInfo">
+    <hr />
+
+    <h3>What we tell other users about you</h3>
+
+      In general we identify content that you've posted by your full name.  In
+      an attempt to protect you from unsolicited bulk email (spam), we keep your
+      email address hidden except from other registered users.
+
+    <h4>Basic Information</h4>
+
+    <ul>
+      <li> Name: <xsl:value-of select="@name"/> </li>
+      <li> User ID:  <xsl:value-of select="@id"/> </li>
+      <li> Email Address:  <xsl:value-of select="@email"/> </li>
+      <li> Personal URL:  <xsl:value-of select="@URI"/> </li>
+      <li> Screen Name:  <xsl:value-of select="@screenName"/> </li>
+    </ul>
+
+    <xsl:apply-templates />
+
+  </xsl:template>
+
+  <xsl:template match="subsite:explainPersistentCookies">
+      Our server can tell your browser to remember certain things, such as your
+      email address and password.  This is convenient for you because, if you're
+      the only person who uses your computer, you won't have to keep telling us
+      your email address and password.
+      <p/>
+      It would be a very bad idea to choose this option if you're using a
+      shared computer in a library or school.  Any subsequent user of this machine
+      would be able to masquerade as you on our service.
+      <p/>
+      Note that you can erase your saved email address and password by choosing
+      the "log out" option from your workspace.
+      <p/>
+  </xsl:template>
+
+  <xsl:template match="subsite:loginPromptMsg[@class='email']">
+    <b>Current users:</b> Please enter your email and password below.
+    <p/>
+    <b>New users:</b> Please begin the registration process
+    by entering a valid email address and leaving the password field blank.
+    You will be directed to another form to complete your registration.
+    <p/>&nbsp;
+  </xsl:template>
+
+  <xsl:template match="subsite:loginPromptMsg[@class='screenName']">
+    <b>Current users:</b> Please enter your screen name and password below.
+    <p/>
+    <b>New users:</b> Please begin the registration process
+    by entering your desired screen name and leaving the password field blank.
+    You will be directed to another form to complete your registration.
+    <p/>&nbsp;
+  </xsl:template>
+
+  <xsl:template match="subsite:promptToEnableCookiesMsg">
+    <br />
+    <b>Note:</b> Our personalized web services require that your browser be enabled for JavaScript and cookies.
+  </xsl:template>
+
+  <xsl:template match="subsite:recoverPasswordMailSent">
+    You have been sent an email that will allow you to change your password.
+  </xsl:template>
+
+  <xsl:template match="subsite:recoverPasswordMailFailed">
+    Unable to send password recovery information via email.
+    <p/>
+    Please contact the system administrator for further help in recovering your password.
+  </xsl:template>
+
+  <xsl:template match="subsite:explainLoginExpired">
+    <p></p>
+    <font size="-1">
+      <table cellpadding="5" cellspacing="1" border="1">
+        <tr>
+          <td bgcolor="#ffffcc"><b>Note:</b> For security reasons, the login page
+            expires after a certain interval to prevent malicious attackers from logging
+            in as you using cached browser passwords.</td>
+        </tr>
+      </table>
+    </font>
+  </xsl:template>
+
+
+  <xsl:template match="subsite:contentCenters">
+    <h4>My Control Centers</h4>
+    <ul>
+    <xsl:for-each select="subsite:center">
+        <li>
+            <a>
+                <xsl:attribute name="href">
+                    <xsl:for-each select="subsite:url">
+                      <xsl:if test="position()=1">
+                        <xsl:value-of select="node()|text()" />
+                      </xsl:if>
+                    </xsl:for-each>
+                 </xsl:attribute>
+                <xsl:value-of select="@name" />
+            </a>
+        </li>
+    </xsl:for-each>
+    </ul>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/lucene/xsl/search.xsl b/ccm-core/web/themes/heirloom/packages/lucene/xsl/search.xsl
new file mode 100644
index 000000000..9493ec3b3
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/lucene/xsl/search.xsl
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+
+<!-- 
+This is the main stylesheet for Bebop.  It imports all of the .xsl
+files with xsl.import.  This stylesheet is locale-independent. 
+--> 
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+                xmlns:search="http://arsdigita.com/search/1.0">
+
+<xsl:import href="../../bebop/xsl/bebop.xsl"/>
+
+<xsl:template match="search:search">
+  <xsl:apply-templates/>
+</xsl:template>
+
+<xsl:template match="search:results">
+<xsl:if test="@size > 0">
+<table class="tabular">
+  <tr>
+    <th>Title</th>
+    <th>Summary</th>
+    <th>Created On</th>
+    <th>Modified On</th>
+    <th>Score</th>
+  </tr>
+  <xsl:for-each select="search:hit">
+    <tr>
+      <td>
+        <a>
+          <xsl:attribute name="href">
+             <xsl:value-of select="@url"/>
+          </xsl:attribute>
+          <xsl:value-of select="@title"/>
+        </a>
+      </td>
+      <td>
+        <xsl:value-of select="@summary"/>
+      </td>
+      <td>
+        <xsl:value-of select="@creationDate"/>
+      </td>
+      <td>
+        <xsl:value-of select="@lastModifiedDate"/>
+      </td>
+      <td>
+        <xsl:value-of select="@score"/>
+      </td>
+    </tr>
+  </xsl:for-each>
+</table>
+</xsl:if>
+</xsl:template>
+
+</xsl:stylesheet>
+
+
+
+
diff --git a/ccm-core/web/themes/heirloom/packages/permissions/xsl/permissions.xsl b/ccm-core/web/themes/heirloom/packages/permissions/xsl/permissions.xsl
new file mode 100644
index 000000000..ba849fcaa
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/permissions/xsl/permissions.xsl
@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:admin="http://www.arsdigita.com/permissions-ui/1.0"
+                xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+                exclude-result-prefixes="admin">
+
+<xsl:import href="../../bebop/xsl/bebop.xsl"/>
+<xsl:import href="../../ui/xsl/ui.xsl"/>
+
+
+<xsl:template match="bebop:dimensionalNavbar[@class='permNavBar']">
+    <xsl:comment>bebop:dimensionalNavbar</xsl:comment>
+    <xsl:for-each select="*">
+      <xsl:apply-templates select="."/>
+      <xsl:if test="position()!=last()">&#160;&gt;&#160;</xsl:if>
+    </xsl:for-each>
+    <p />
+    <xsl:comment>/bebop:dimensionalNavbar</xsl:comment>
+</xsl:template>
+
+<xsl:template match="bebop:list[@class='bulletList']">    
+    <ul>
+      <xsl:for-each select="bebop:cell">
+        <li><xsl:apply-templates/></li>
+      </xsl:for-each>
+    </ul>
+</xsl:template>
+
+<xsl:template match="bebop:label[@class='errorBullet']">    
+    <ul><font color="red">
+        <li><xsl:apply-templates/></li>
+        </font>
+    </ul>
+</xsl:template>
+
+<xsl:template match="bebop:label[@class='heading']">
+    <h2><xsl:apply-templates/></h2>
+</xsl:template>
+
+<xsl:template match="bebop:link[@class='checkBoxChecked']">
+  <a href="{@href}" onclick="{@onclick}">
+    <img src="{$contextPath}/assets/checkbox-checked.gif" border="0" width="12" height="12">
+       <xsl:attribute name="alt">
+         <xsl:apply-templates/>
+       </xsl:attribute>
+    </img>
+  </a>
+  <xsl:text>&#160;</xsl:text>
+  <a href="{@href}" onclick="{@onclick}" class="action_link">
+    <xsl:apply-templates/>
+  </a>
+</xsl:template>
+
+<xsl:template match="bebop:link[@class='checkBoxUnchecked']">
+     <a href="{@href}" onclick="{@onclick}">
+    <img src="{$contextPath}/assets/checkbox-unchecked.gif" border="0" width="12" height="12">
+       <xsl:attribute name="alt">
+         <xsl:apply-templates/>
+       </xsl:attribute>
+    </img>
+  </a>
+  <xsl:text>&#160;</xsl:text>
+  <a href="{@href}" onclick="{@onclick}" class="action_link">
+    <xsl:apply-templates/>
+  </a>
+</xsl:template>
+
+<xsl:template match="bebop:label[@class='checkBoxGreyChecked']">
+    <img src="{$contextPath}/assets/checkbox-checked-gray.gif" border="0" width="12" height="12">
+       <xsl:attribute name="alt">
+         <xsl:apply-templates/>
+       </xsl:attribute>
+    </img>
+  <xsl:text>&#160;</xsl:text>
+</xsl:template>
+
+<xsl:template match="bebop:label[@class='checkBoxGreyUnchecked']">
+    <img src="{$contextPath}/assets/checkbox-unchecked-gray.gif" border="0" width="12" height="12">
+       <xsl:attribute name="alt">
+         <xsl:apply-templates/>
+       </xsl:attribute>
+    </img>
+  <xsl:text>&#160;</xsl:text>
+</xsl:template>
+
+
+
+<!-- Access Denied Page -->
+<xsl:template match="bebop:label[@class='AccessDenied']">
+  <hr />
+  <p>You don't have permission to perform the requested action.</p>
+  <hr />
+</xsl:template>
+
+<!-- Display search error message -->
+<xsl:template match="bebop:list[@class='UserSearchList'][count(bebop:cell)=0]">
+   <p><font color="red">Your search returned no results.</font></p>
+</xsl:template>
+
+</xsl:stylesheet>
+
diff --git a/ccm-core/web/themes/heirloom/packages/placeholder.info b/ccm-core/web/themes/heirloom/packages/placeholder.info
new file mode 100644
index 000000000..e677ccd1e
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/placeholder.info
@@ -0,0 +1,5 @@
+Place holder file to make sure the directory is created and copied with the
+appropriate permissions.
+
+Dir packages, a container for files which are shared among several CCM packages,
+especially provided by core (e.g. bebop).
\ No newline at end of file
diff --git a/ccm-core/web/themes/heirloom/packages/search/xsl/search.xsl b/ccm-core/web/themes/heirloom/packages/search/xsl/search.xsl
new file mode 100644
index 000000000..33336c006
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/search/xsl/search.xsl
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:search="http://rhea.redhat.com/search/1.0"
+  xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+  version="1.0">
+
+  <xsl:output method="html"/>
+
+  <xsl:template match="search:results">
+    <!--
+         <xsl:apply-templates select="search:paginator" mode="page-summary"/>
+    -->
+    <xsl:apply-templates select="search:paginator" mode="results-summary"/>
+    <xsl:if test="search:paginator/@objectCount > 0">
+      <xsl:apply-templates select="search:documents"/>
+      <xsl:if test="search:paginator/@pageCount > 1">
+        <xsl:apply-templates select="search:paginator" mode="pages"/>
+      </xsl:if>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template match="search:paginator" mode="page-summary">
+    <xsl:if test="@objectCount > 0">
+      <div>
+        <xsl:text>Displaying page </xsl:text>
+        <xsl:value-of select="@pageNumber"/>
+        <xsl:text> of </xsl:text>
+        <xsl:value-of select="@pageCount"/>
+        <xsl:text> (maximum of </xsl:text>
+        <xsl:value-of select="@pageSize"/>
+        <xsl:text> results per page)</xsl:text>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template match="search:paginator" mode="results-summary">
+    <div>
+      <xsl:choose>
+        <xsl:when test="@objectCount = 0">
+          <xsl:text>There were no results for your search</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text>Displaying results </xsl:text>
+          <xsl:value-of select="@objectBegin"/>
+          <xsl:text> through </xsl:text>
+          <xsl:value-of select="@objectEnd"/>
+          <xsl:if test="@pageCount > 1">
+            <xsl:text> (total: </xsl:text>
+            <xsl:value-of select="@objectCount"/>
+            <xsl:text>)</xsl:text>
+          </xsl:if>
+        </xsl:otherwise>
+      </xsl:choose>
+    </div>
+  </xsl:template>
+
+  <xsl:template match="search:paginator" mode="pages">
+    <xsl:if test="@objectCount > 0">
+      <div>
+        <xsl:if test="@pageNumber > 1">
+          <a href="{@baseURL}&amp;{@pageParam}={@pageNumber - 1}">&lt;&lt;&lt;Previous </a>
+        </xsl:if>
+        <xsl:text>Page </xsl:text>
+        <xsl:value-of select="@pageNumber"/>
+        <xsl:text> of </xsl:text>
+        <xsl:value-of select="@pageCount"/>
+        <xsl:if test="@pageNumber &lt; @pageCount">
+          <a href="{@baseURL}&amp;{@pageParam}={@pageNumber + 1}"> Next &gt;&gt;&gt;</a>
+        </xsl:if>
+      </div>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template match="search:documents">
+    <table class="data" >
+      <thead>
+        <tr>
+          <th>Score</th>
+          <th>Title</th>
+          <th>Summary</th>
+        </tr>
+      </thead>
+      <tbody>
+        <xsl:for-each select="search:object">
+          <xsl:apply-templates select=".">
+            <xsl:with-param name="class">
+              <xsl:choose>
+                <xsl:when test="position() mod 2">odd</xsl:when>
+                <xsl:otherwise>even</xsl:otherwise>
+              </xsl:choose>
+            </xsl:with-param>
+          </xsl:apply-templates>
+        </xsl:for-each>
+      </tbody>
+    </table>
+  </xsl:template>
+
+  <xsl:template match="search:object">
+    <xsl:param name="class" select="none"/>
+
+    <tr class="{$class}">
+      <td><xsl:value-of select="@score"/></td>
+      <td><a href="{@url}"><xsl:value-of select="@title"/></a></td>
+      <td><em><xsl:value-of select="@summary"/></em></td>
+    </tr>
+  </xsl:template>
+
+  <xsl:template match="search:query">
+    <table>
+      <xsl:for-each select="search:*">
+        <tr valign="top">
+          <xsl:apply-templates select="."/>
+          <td>
+            <!-- Pull in the Submit button, next to the terms field -->
+            <xsl:if test="name() = 'search:terms'">
+              <xsl:apply-templates select="../bebop:formWidget"/>
+            </xsl:if>
+          </td>
+        </tr>
+      </xsl:for-each>
+    </table>
+  </xsl:template>
+
+  <xsl:template match="search:terms">
+    <th align="right">
+      <xsl:text>Query:</xsl:text>
+    </th>
+    <td>
+      <input size="30" type="text" name="{@param}" value="{@value}" title="Enter one or more search terms"/>
+    </td>
+  </xsl:template>
+
+  <xsl:template match="search:filter[@type='objectType']">
+    <th align="right">
+      <xsl:text>Types:</xsl:text>
+    </th>
+    <td>
+      <select size="10" name="{@param}" multiple="multiple">
+        <xsl:for-each select="search:objectType">
+          <xsl:sort select="@name"/>
+          <option value="{@name}">
+            <xsl:if test="@isSelected">
+              <xsl:attribute name="selected">selected</xsl:attribute>
+            </xsl:if>
+            <xsl:value-of select="@name"/>
+          </option>
+        </xsl:for-each>
+      </select>
+    </td>
+  </xsl:template>
+
+  <xsl:template match="search:filter[@type='category']">
+    <th align="right">
+      <xsl:text>Categories:</xsl:text>
+    </th>
+    <td>
+      <select size="10" name="{@param}" multiple="multiple">
+        <xsl:for-each select="search:category">
+          <xsl:sort select="@title"/>
+          <option value="{@oid}">
+            <xsl:if test="@isSelected">
+              <xsl:attribute name="selected">selected</xsl:attribute>
+            </xsl:if>
+            <xsl:value-of select="@title"/>
+          </option>
+        </xsl:for-each>
+      </select>
+      <br/>
+      <input type="checkbox" value="true">
+        <xsl:attribute name="name">
+          <xsl:value-of select="search:includeSubCats/@name"/>
+        </xsl:attribute>
+        <xsl:if test="search:includeSubCats/@value = 'true'">
+          <xsl:attribute name="checked">checked</xsl:attribute>
+        </xsl:if>
+      </input>
+      Include subcategories
+    </td>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/toolbox/xsl/AbstractCollectionTable.xsl b/ccm-core/web/themes/heirloom/packages/toolbox/xsl/AbstractCollectionTable.xsl
new file mode 100644
index 000000000..e279e080d
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/toolbox/xsl/AbstractCollectionTable.xsl
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+                xmlns:km="http://www.arsdigita.com/km/1.0"
+                xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+
+<xsl:template match="bebop:table[@class='abstractCollectionTable']" xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+<table class="fancy" cellpadding="1" cellspacing="2" border="0">
+     <xsl:for-each select="@*[@name!='class']">
+       <xsl:attribute name="{name()}">
+         <xsl:value-of select="."/>
+       </xsl:attribute>
+     </xsl:for-each>
+    <xsl:for-each select="thead|bebop:thead"> 
+    <xsl:call-template name="abstractCollectionTableHead">
+      <xsl:with-param name="orderColumn" select="../@order"/>
+      <xsl:with-param name="direction" select="../@direction"/> 
+    </xsl:call-template>
+    </xsl:for-each>
+    <xsl:apply-templates select="bebop:tbody"/>
+</table>
+</xsl:template>
+
+<xsl:template name="abstractCollectionTableHead">
+  <xsl:param name="orderColumn">0</xsl:param>
+  <xsl:param name="direction">asc</xsl:param>
+  <tr class="table_header" bgcolor="#ffffff">
+    <xsl:for-each select="cell|bebop:cell">
+          <th class="table_header" nowrap="nowrap">
+            <xsl:text>&#160;</xsl:text>
+            <xsl:apply-templates/>
+            <xsl:choose>
+              <xsl:when test="(position()-1)=$orderColumn">
+              <xsl:text>&#160;</xsl:text>   
+              <img border="0">
+                <xsl:attribute name="src"><xsl:choose><xsl:when test="$direction='asc'"><xsl:value-of select="//@assets"/>/assets/gray-triangle-up.gif</xsl:when><xsl:otherwise><xsl:value-of select="//@assets"/>/assets/gray-triangle-down.gif</xsl:otherwise></xsl:choose></xsl:attribute>
+              </img>
+             </xsl:when> 
+             <xsl:otherwise>
+               <xsl:text>&#160;</xsl:text> 
+               <xsl:text>&#160;</xsl:text> 
+             </xsl:otherwise>
+           </xsl:choose>
+            <xsl:text>&#160;</xsl:text>
+           </th>
+    </xsl:for-each>
+  </tr>
+</xsl:template>
+
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/toolbox/xsl/ControlBar.xsl b/ccm-core/web/themes/heirloom/packages/toolbox/xsl/ControlBar.xsl
new file mode 100644
index 000000000..5fef0a72e
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/toolbox/xsl/ControlBar.xsl
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+                xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+
+<xsl:template match="bebop:controlBar">
+<table width="100%"><tr>
+    <xsl:for-each select="bebop:dimensionBar">
+    <td>
+        <table>
+        <tr>
+            <td align="center"><b><xsl:value-of select="bebop:label[@class='dimensionBarTitle']"/></b></td>
+        </tr>
+        <tr>
+            <td align="center">
+            <xsl:variable name="options" select="*[(name()='bebop:label' and @class='dimensionBarOption') or name()='bebop:link']"/>
+                <!-- xsl:choose>
+                    <xsl:when test="count($options) > 10">
+                        You probably don't want to use a slider bar here.
+                    </xsl:when>
+                    <xsl:otherwise>
+                    </xsl:otherwise>
+                </xsl:choose -->
+                    <xsl:for-each select="$options">
+                    <xsl:apply-templates select="."/>
+                    <xsl:if test="position()!=last()"> | </xsl:if>
+                    </xsl:for-each>
+            </td> 
+        </tr>
+        </table>
+    </td>
+    </xsl:for-each>
+</tr>
+</table>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/ui/xsl/debug-panel.xsl b/ccm-core/web/themes/heirloom/packages/ui/xsl/debug-panel.xsl
new file mode 100644
index 000000000..b69689194
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/ui/xsl/debug-panel.xsl
@@ -0,0 +1,326 @@
+<?xml version="1.0"?>
+<!DOCTYPE stylesheet [
+  <!ENTITY lf   "&#xa;" >]>
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+  xmlns:ui="http://www.arsdigita.com/ui/1.0"
+  exclude-result-prefixes="xsl bebop ui">
+
+	<xsl:output 
+	method="xml"
+	doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"
+	doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
+	indent="yes" />
+
+  <xsl:template match="ui:debugPanel">
+    <hr width="100%"/>
+    <h3>Debug Options</h3>
+    <table>
+      <xsl:apply-templates select="ui:debugLink"/>
+    </table>
+  </xsl:template>
+
+  <xsl:template match="ui:debugLink">
+    <tr>
+      <td>
+        <a href="{@url}">
+          <img src="/assets/action-{@type}.png" width="14" height="14" border="0" alt="Debug"/>
+        </a>
+        <xsl:text>&#160;</xsl:text>
+        <a href="{@url}">
+          <xsl:value-of select="@title"/>
+        </a>
+      </td>
+    </tr>
+  </xsl:template>
+
+  <xsl:template match="bebop:structure">
+    <xsl:apply-templates select="bebop:state"/>
+    <xsl:apply-templates select="bebop:params"/>
+    <xsl:variable name="selectedIdx" select="bebop:state/bebop:selected"/>
+    <h1>Page structure</h1>
+    <h2>Legend:</h2>
+    <ul>
+      <li style="color: FireBrick;">Branch visible, self visible</li>
+      <li style="color: HotPink;">Branch visible, self invisible</li>
+      <li style="color: LightPink;">Branch invisible, self visible</li>
+      <li style="color: LightSteelBlue;">Branch invisible, self-invisible</li>
+      <li style="font-weight: bold;">bold if selected</li>
+    </ul>
+    <pre>
+      <xsl:for-each select="bebop:component">
+        <xsl:call-template name="bebopComponent">
+          <xsl:with-param name="selectedIdx" select="$selectedIdx"/>
+        </xsl:call-template>
+      </xsl:for-each>
+    </pre>
+    <h1>XML before transformation</h1>
+    <pre>
+      <xsl:for-each select="/*">
+        <xsl:call-template name="bebopElement"/>
+      </xsl:for-each>
+    </pre>
+    <h1>Stack traces</h1>
+    <dl>
+      <xsl:for-each select="/*">
+        <xsl:call-template name="bebopClassnames"/>
+      </xsl:for-each>
+    </dl>
+  </xsl:template>
+
+  <xsl:template match="bebop:state">
+    <h1>State</h1>
+    <xsl:if test="bebop:selected">
+      <p>Selected: <a href="#selectedComponent"><xsl:value-of select="bebop:selected"/></a></p>
+    </xsl:if>
+    <xsl:if test="bebop:eventName/self::text()">
+      <p>Event: <xsl:value-of select="bebop:eventName"/>
+      Value: <xsl:value-of select="bebop:eventValue"/>
+      </p>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template match="bebop:params">
+    <h1>Params</h1>
+    <table border="0" cellpadding="1" cellspacing="0">
+      <xsl:for-each select="*">
+        <tr>
+          <td style="font-weight: bold;"><xsl:value-of select="@name"/></td>
+          <td><xsl:value-of select="."/></td>
+        </tr>
+      </xsl:for-each>
+    </table>
+  </xsl:template>
+
+  <xsl:template name="bebopComponent">
+    <xsl:param name="padding"/>
+    <xsl:param name="branchVisible" select="@isVisible"/>
+    <xsl:param name="selectedIdx"/>
+
+    <xsl:variable name="selfVisible" select="@isVisible = 'yes'"/>
+
+    <xsl:variable name="newPadding">
+      <xsl:choose>
+        <xsl:when test="count(following-sibling::*) > 0">
+          <xsl:value-of select="concat($padding, '|   ')"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="concat($padding, '    ')"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <span style="color: LightGrey;">
+      <xsl:value-of select="concat($padding, '+-')"/>
+    </span>
+    <span>
+      <xsl:attribute name="style">
+        <xsl:call-template name="componentVisibility">
+          <xsl:with-param name="branchVisible" select="$branchVisible"/>
+          <xsl:with-param name="selfVisible" select="$selfVisible"/>
+        </xsl:call-template>
+        <xsl:if test="$selectedIdx = @idx">
+          font-weight: bold;
+        </xsl:if>
+      </xsl:attribute>
+      <xsl:if test="$selectedIdx = @idx">
+        <xsl:attribute name="id">selectedComponent</xsl:attribute>
+      </xsl:if>
+
+      <xsl:value-of select="@name"/>
+    </span>
+    <xsl:text>&#xa;</xsl:text>
+
+    <xsl:for-each select="*">
+      <xsl:call-template name="bebopComponent">
+        <xsl:with-param name="branchVisible" select="$branchVisible and $selfVisible"/>
+        <xsl:with-param name="selectedIdx" select="$selectedIdx"/>
+        <xsl:with-param name="padding" select="$newPadding"/>
+      </xsl:call-template>
+    </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template name="componentVisibility">
+    <xsl:param name="branchVisible"/>
+    <xsl:param name="selfVisible"/>
+
+    <xsl:choose>
+      <!-- test for the most common case first -->
+      <xsl:when test="not($branchVisible) and $selfVisible">color: LightPink;</xsl:when>
+      <xsl:when test="$branchVisible and $selfVisible">color: FireBrick;</xsl:when>
+      <xsl:when test="$branchVisible and not($selfVisible)">color: HotPink;</xsl:when>
+      <xsl:when test="not($branchVisible) and not($selfVisible)">color: LightSteelBlue;</xsl:when>
+      <xsl:otherwise>CANNOT GET HERE</xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template name="bebopElement">
+    <xsl:param name="breadCrumbs" select="1"/>
+    <xsl:param name="padding"/>
+
+    <xsl:variable name="newPadding">
+      <xsl:choose>
+        <xsl:when test="count(following-sibling::*) > 0">
+          <xsl:value-of select="concat($padding, '|   ')"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="concat($padding, '    ')"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+
+    <xsl:call-template name="bebopPadding">
+      <xsl:with-param name="padding" select="concat($padding, '+-')"/>
+    </xsl:call-template>
+
+    <xsl:call-template name="bebopTag">
+      <xsl:with-param name="str" select="concat('&lt;', name())"/>
+    </xsl:call-template>
+    <xsl:call-template name="bebopAttributes">
+      <xsl:with-param name="breadCrumbs" select="$breadCrumbs"/>
+    </xsl:call-template>
+
+    <xsl:choose>
+      <xsl:when test="*|text()">
+        <xsl:call-template name="bebopTag">
+          <xsl:with-param name="str" select="'>'"/>
+        </xsl:call-template>
+        <xsl:call-template name="bebopClassnameAnchor">
+          <xsl:with-param name="breadCrumbs" select="$breadCrumbs"/>
+        </xsl:call-template>
+        <xsl:text>&lf;</xsl:text>
+
+        <xsl:for-each select="*[not(self::bebop:structure)]|text()">
+          <xsl:choose>
+            <xsl:when test="self::text()">
+              <xsl:call-template name="bebopPadding">
+                <xsl:with-param name="padding" select="concat($newPadding, '+-')"/>
+              </xsl:call-template>
+              <span style="color: SlateGrey;">
+                <xsl:call-template name="abbreviateString">
+                  <xsl:with-param name="str" select="normalize-space(.)"/>
+                </xsl:call-template>
+              </span>
+              <xsl:text>&lf;</xsl:text>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:call-template name="bebopElement">
+                <xsl:with-param name="breadCrumbs" select="concat($breadCrumbs, '.', count(preceding-sibling::*) + 1)"/>
+                <xsl:with-param name="padding" select="$newPadding"/>
+              </xsl:call-template>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:for-each>
+
+        <xsl:call-template name="bebopPadding">
+          <xsl:with-param name="padding">
+            <xsl:choose>
+              <xsl:when test="count(following-sibling::*) > 0">
+                <xsl:value-of select="concat($padding, '| ')"/>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:value-of select="concat($padding, '  ')"/>
+              </xsl:otherwise>
+            </xsl:choose>
+          </xsl:with-param>
+        </xsl:call-template>
+        <xsl:call-template name="bebopTag">
+          <xsl:with-param name="str" select="concat('&lt;/', name(), '>')"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="bebopTag">
+          <xsl:with-param name="str" select="'/>'"/>
+        </xsl:call-template>
+        <xsl:call-template name="bebopClassnameAnchor">
+          <xsl:with-param name="breadCrumbs" select="$breadCrumbs"/>
+        </xsl:call-template>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:text>&lf;</xsl:text>
+  </xsl:template>
+
+  <xsl:template name="bebopAttributes">
+    <xsl:param name="breadCrumbs"/>
+    <xsl:for-each select="@*[not(name() = 'bebop:classname')]">
+      <xsl:call-template name="bebopAttribute">
+        <xsl:with-param name="name" select="name()"/>
+        <xsl:with-param name="value" select="."/>
+      </xsl:call-template>
+    </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template name="bebopAttribute">
+    <xsl:param name="name"/>
+    <xsl:param name="value"/>
+
+    <xsl:text> </xsl:text>
+    <span style="color: DarkGreen;">
+      <xsl:value-of select="$name"/>
+    </span>
+    <xsl:text>=</xsl:text>
+    <span style="color: SaddleBrown;">
+      <xsl:value-of select="concat('&quot;', $value, '&quot;')"/>
+    </span>
+  </xsl:template>
+
+  <xsl:template name="bebopTag">
+    <xsl:param name="str"/>
+   <span style="color: Maroon; font-weight: bold;">
+      <xsl:value-of select="$str"/>
+    </span>
+  </xsl:template>
+
+  <xsl:template name="bebopPadding">
+    <xsl:param name="padding"/>
+    <span style="color: LightGrey;">
+      <xsl:value-of select="$padding"/>
+    </span>
+  </xsl:template>
+
+  <xsl:template name="abbreviateString">
+    <xsl:param name="str"/>
+    <xsl:variable name="strlen" select="string-length($str)"/>
+
+    <xsl:choose>
+      <xsl:when test="$strlen &lt; 60">
+        <xsl:value-of select="$str"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="concat(substring($str, 1, 30),
+                                     '...',
+                                     substring($str, $strlen - 30))"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template name="bebopClassnameAnchor">
+    <xsl:param name="breadCrumbs"/>
+    <xsl:if test="@bebop:classname">
+      <xsl:variable name="anchor" select="$breadCrumbs"/>
+      <sup><a href="#{$anchor}" id="back{$anchor}"><xsl:value-of select="$anchor"/></a></sup>
+    </xsl:if>
+  </xsl:template>
+
+
+  <xsl:template name="bebopClassnames">
+    <xsl:param name="breadCrumbs" select="1"/>
+
+    <xsl:if test="@bebop:classname">
+      <xsl:variable name="anchor" select="$breadCrumbs"/>
+      <dt><a id="{$anchor}" href="#back{$anchor}"><xsl:value-of select="$anchor"/></a></dt>
+      <dd>
+        <pre>
+          <xsl:value-of select="@bebop:classname"/>
+        </pre>
+      </dd>
+    </xsl:if>
+
+    <xsl:for-each select="*">
+      <xsl:call-template name="bebopClassnames">
+        <xsl:with-param name="breadCrumbs" select="concat($breadCrumbs, '.', count(preceding-sibling::*) + 1)"/>
+      </xsl:call-template>
+    </xsl:for-each>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/ui/xsl/simple-page.xsl b/ccm-core/web/themes/heirloom/packages/ui/xsl/simple-page.xsl
new file mode 100644
index 000000000..136744b4e
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/ui/xsl/simple-page.xsl
@@ -0,0 +1,160 @@
+<?xml version="1.0"?>
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+  xmlns:ui="http://www.arsdigita.com/ui/1.0"
+  xmlns:bebop="http://www.arsdigita.com/bebop/1.0">
+  
+  <xsl:import href="../../bebop/xsl/dcp.xsl"/>
+  <xsl:output method="html" indent="yes"/>
+  
+  <xsl:param name="context-prefix"/>
+  
+  <xsl:template name="ui:simplePage" match="bebop:page[@class='simplePage']" >
+    <html>
+      <head>
+        <title><xsl:call-template name="bebop:pageTitle"/></title>
+        <xsl:call-template name="bebop:pageCSS"/>
+      </head>
+      <body>
+        <xsl:call-template name="bebop:dcpJavascript"/>
+        <table width="100%" cellspacing="0" cellpadding="0" border="0">
+          <tr>
+            <td>
+              <xsl:apply-templates select="*[@metadata.tag='top']"/>
+            </td>
+          </tr>
+        </table>
+        
+        <table width="100%" cellspacing="0" cellpadding="0" border="0">
+          <tr>
+            <td bgcolor="#878175">
+              <table cellspacing="0" cellpadding="0" border="0">
+                <tr>
+                  <td height="1"></td>
+                </tr>
+              </table>
+            </td>
+         </tr>
+       </table>
+
+       <table width="100%" cellspacing="0" cellpadding="0" border="0">
+         <tr>
+           <td>
+             <table cellspacing="0" cellpadding="0" border="0">
+               <tr>
+                 <td height="4"></td>
+               </tr>
+             </table>
+           </td>
+         </tr>
+       </table>
+
+       <table width="100%" cellspacing="0" cellpadding="0" border="0">
+         <tr>
+           <td>
+             <div class="page-title">
+               <xsl:call-template name="bebop:pageTitle"/>
+             </div>
+           </td>
+         </tr>
+       </table>
+
+       <table width="100%" cellspacing="0" cellpadding="0" border="0">
+         <tr>
+           <td>
+             <table cellspacing="0" cellpadding="0" border="0">
+               <tr>
+                 <td height="4"></td>
+               </tr>
+             </table>
+           </td>
+         </tr>
+       </table>
+
+       <table width="100%" cellspacing="0" cellpadding="0" border="0">
+         <tr>
+           <td>
+             <xsl:apply-templates select="*[@metadata.tag='left']"/>
+           </td>
+           <td>
+             <xsl:apply-templates select="*[not(@metadata.tag)]"/>
+           </td>
+           <td>
+             <xsl:apply-templates select="*[@metadata.tag='right']"/>
+           </td>
+         </tr>
+       </table>
+
+       <table width="100%" cellspacing="0" cellpadding="0" border="0">
+         <tr>
+           <td>
+             <table cellspacing="0" cellpadding="0" border="0">
+               <tr>
+                 <td height="4"></td>
+               </tr>
+             </table>
+           </td>
+         </tr>
+       </table>
+
+       <table width="100%" cellspacing="0" cellpadding="0" border="0">
+         <tr>
+           <td bgcolor="#878175">
+             <table cellspacing="0" cellpadding="0" border="0">
+               <tr>
+                 <td height="1"></td>
+               </tr>
+             </table>
+           </td>
+         </tr>
+       </table>
+
+       <table width="100%" cellspacing="0" cellpadding="0" border="0">
+         <tr>
+           <td>
+             <xsl:apply-templates select="*[@metadata.tag='bottom']"/>
+           </td>
+         </tr>
+       </table>
+       
+       <xsl:apply-templates select="bebop:structure"/>
+     </body>
+   </html>
+ </xsl:template>
+
+  <xsl:template match="bebop:tabbedPane[@id='page-body']">
+    <div class="tabbed-pane">
+      <table class="tab-set">
+        <tr>
+          <xsl:for-each select="bebop:tabStrip/bebop:tab">
+            <xsl:choose>
+              <xsl:when test="@current">
+                <td class="current-tab-label"><xsl:apply-templates/></td>
+
+                <td class="current-tab-end"/>
+              </xsl:when>
+
+              <xsl:otherwise>
+                <td class="tab-label"><a href="{@href}"><xsl:apply-templates/></a></td>
+
+                <td class="tab-end"/>
+              </xsl:otherwise>
+            </xsl:choose>
+
+            <td class="tab-spacer"/>
+          </xsl:for-each>
+        </tr>
+      </table>
+
+      <table class="rule">
+        <tr><td></td></tr>
+      </table>
+
+    </div>
+      <div class="current-pane">
+        <xsl:apply-templates select="bebop:currentPane/*"/>
+      </div>
+  </xsl:template>
+
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/ui/xsl/site-banner.xsl b/ccm-core/web/themes/heirloom/packages/ui/xsl/site-banner.xsl
new file mode 100644
index 000000000..def6807ca
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/ui/xsl/site-banner.xsl
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<xsl:stylesheet version="1.0"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+    xmlns:ui="http://www.arsdigita.com/ui/1.0">
+  
+ <xsl:output method="html" indent="yes"/>
+ 
+ 
+ <xsl:template name="ui:siteBanner" match="ui:siteBanner" >
+   <div style="text-align: right; font-size: smaller">
+     If you encounter any problems using
+     <a>
+       <xsl:attribute name="href">http://<xsl:value-of select="@hostname"/>/</xsl:attribute>
+       <xsl:value-of select="@sitename"/></a>
+     please contact the
+     <a><xsl:attribute name="href">mailto:<xsl:value-of select="@admin"/></xsl:attribute>
+       site administrator</a>.
+   </div>
+ </xsl:template>
+
+</xsl:stylesheet>
+
+
diff --git a/ccm-core/web/themes/heirloom/packages/ui/xsl/ui.xsl b/ccm-core/web/themes/heirloom/packages/ui/xsl/ui.xsl
new file mode 100644
index 000000000..61aa5c401
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/ui/xsl/ui.xsl
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+
+<!-- 
+A convenient collection of UI XSL templates
+--> 
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+                xmlns:ui="http://www.arsdigita.com/ui/1.0">
+  
+  <!-- templates for each component -->
+  <xsl:import href="simple-page.xsl"/>
+  <xsl:import href="site-banner.xsl"/>
+  <xsl:import href="user-banner.xsl"/>
+  <xsl:import href="debug-panel.xsl"/>
+  
+</xsl:stylesheet>
+
+
+
+
diff --git a/ccm-core/web/themes/heirloom/packages/ui/xsl/url-encoding.xsl b/ccm-core/web/themes/heirloom/packages/ui/xsl/url-encoding.xsl
new file mode 100644
index 000000000..3fec605a4
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/ui/xsl/url-encoding.xsl
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+  <!-- Having this output method=xml here is really unhelpful.
+  If the document is being output as HTML and you include this file
+  suddenly your HTML changes to XHTML halfway down the page which causes 
+  all sorts of problems. Tom Broxton for Runtime Collective 20040610 -->
+  <xsl:output method="xml" indent="yes" encoding="iso-8859-1"/>
+
+  <!-- ISO-8859-1 based URL-encoding demo
+       Written by Mike J. Brown, mike@skew.org.
+       Updated 2002-05-20.
+
+       No license; use freely, but credit me if reproducing in print.
+
+       Also see http://skew.org/xml/misc/URI-i18n/ for a discussion of
+       non-ASCII characters in URIs.
+  -->
+
+  <!-- Characters we'll support.
+       We could add control chars 0-31 and 127-159, but we won't. -->
+  <xsl:variable name="ascii"> !"#$%&amp;'()*+,-./0123456789:;&lt;=&gt;?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~</xsl:variable>
+  <xsl:variable name="latin1">&#160;&#161;&#162;&#163;&#164;&#165;&#166;&#167;&#168;&#169;&#170;&#171;&#172;&#173;&#174;&#175;&#176;&#177;&#178;&#179;&#180;&#181;&#182;&#183;&#184;&#185;&#186;&#187;&#188;&#189;&#190;&#191;&#192;&#193;&#194;&#195;&#196;&#197;&#198;&#199;&#200;&#201;&#202;&#203;&#204;&#205;&#206;&#207;&#208;&#209;&#210;&#211;&#212;&#213;&#214;&#215;&#216;&#217;&#218;&#219;&#220;&#221;&#222;&#223;&#224;&#225;&#226;&#227;&#228;&#229;&#230;&#231;&#232;&#233;&#234;&#235;&#236;&#237;&#238;&#239;&#240;&#241;&#242;&#243;&#244;&#245;&#246;&#247;&#248;&#249;&#250;&#251;&#252;&#253;&#254;&#255;</xsl:variable>
+
+  <!-- Characters that usually don't need to be escaped -->
+  <xsl:variable name="safe">!'()*-.0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~</xsl:variable>
+
+  <xsl:variable name="hex" >0123456789ABCDEF</xsl:variable>
+
+  <xsl:template name="url-encode">
+    <xsl:param name="str"/>   
+    <xsl:if test="$str">
+      <xsl:variable name="first-char" select="substring($str,1,1)"/>
+      <xsl:choose>
+        <xsl:when test="contains($safe,$first-char)">
+          <xsl:value-of select="$first-char"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:variable name="codepoint">
+            <xsl:choose>
+              <xsl:when test="contains($ascii,$first-char)">
+                <xsl:value-of select="string-length(substring-before($ascii,$first-char)) + 32"/>
+              </xsl:when>
+              <xsl:when test="contains($latin1,$first-char)">
+                <xsl:value-of select="string-length(substring-before($latin1,$first-char)) + 160"/>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:message terminate="no">Warning: string contains a character that is out of range! Substituting "?".</xsl:message>
+                <xsl:text>63</xsl:text>
+              </xsl:otherwise>
+            </xsl:choose>
+          </xsl:variable>
+        <xsl:variable name="hex-digit1" select="substring($hex,floor($codepoint div 16) + 1,1)"/>
+        <xsl:variable name="hex-digit2" select="substring($hex,$codepoint mod 16 + 1,1)"/>
+        <xsl:value-of select="concat('%',$hex-digit1,$hex-digit2)"/>
+        </xsl:otherwise>
+      </xsl:choose>
+      <xsl:if test="string-length($str) &gt; 1">
+        <xsl:call-template name="url-encode">
+          <xsl:with-param name="str" select="substring($str,2)"/>
+        </xsl:call-template>
+      </xsl:if>
+    </xsl:if>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/ui/xsl/user-banner.xsl b/ccm-core/web/themes/heirloom/packages/ui/xsl/user-banner.xsl
new file mode 100644
index 000000000..2c71985f5
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/ui/xsl/user-banner.xsl
@@ -0,0 +1,115 @@
+<?xml version="1.0"?>
+<xsl:stylesheet version="1.0"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+    xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
+    xmlns:ui="http://www.arsdigita.com/ui/1.0">
+  
+ <xsl:output method="html" indent="yes"/>
+ 
+ 
+ <xsl:template name="ui:userBanner" match="ui:userBanner" >
+   <xsl:choose>
+    <!-- If a userID is set, then we know user is logged in. If not, -->
+    <!-- Log in message is presented...  -->
+     <xsl:when test="@userID">
+      <table class="globalAdminHeader">
+       <tr>
+        <!-- Shadow man logo by default -->
+        <a href="http://www.redhat.com"><td class="globalLogo"></td></a>
+         <td><xsl:text>&#160;&#160;&#160;&#160;&#160;&#160;</xsl:text></td>
+          <td style="margin: 0; border: 0; padding: 0;">
+           <table align="center" style="margin: 0; border: 0; padding: 0;">
+            <tr>
+             <td style="margin: 0; color: #3f3f3f; border: 0; padding: 0; padding-right: 18px;">
+             <xsl:value-of select="@greeting"/>
+             <xsl:text>&#160;</xsl:text>
+              <strong><xsl:value-of select="@givenName"/>
+               <xsl:text>&#160;</xsl:text>
+               <xsl:value-of select="@familyName"/>
+              </strong>
+             </td>
+            </tr>
+           </table>
+          </td>
+          <td style="margin: 0; border: 0; padding: 0;">
+           <table align="right" style="margin: 0; border: 0; padding: 0;">
+            <tr>
+<!-- Help going away for now, but retaining code -->
+<!--             <td class="global-link-icon">
+               <a href="/assets/help/toc_main.html"><img src="/assets/lifesaver.png" height="18" width="21"/></a>
+             </td>
+             <td class="global-link">
+               <a href="/assets/help/toc_main.html">
+                <xsl:value-of select="@helpLabel"/>
+               </a>
+             </td>
+-->
+             <td class="global-link-icon">
+              <a>
+               <xsl:attribute name="href">
+                <xsl:value-of select="@workspaceURL"/>
+               </xsl:attribute>
+               <img src="/assets/home.png" height="18" width="18"/>
+              </a>
+             </td>
+             <td class="global-link">
+               <a>
+                 <xsl:attribute name="href">
+                  <xsl:value-of select="@workspaceURL"/>
+                 </xsl:attribute>
+                <xsl:value-of select="@portalLabel"/> 
+               </a>
+             </td>
+
+             <td class="global-link-icon">
+              <a>
+               <xsl:attribute name="href">
+                 <xsl:value-of select="@logoutURL"/>
+               </xsl:attribute>
+               <img src="/assets/lock.png" height="18" width="14"/>
+              </a>
+            </td>
+            <td class="global-link">
+              <a>
+               <xsl:attribute name="href">
+                 <xsl:value-of select="@logoutURL"/>
+               </xsl:attribute>
+               <xsl:value-of select="@signoutLabel"/> 
+              </a>
+            </td>
+         </tr>
+       </table>
+      </td>
+     </tr>
+    </table>
+     </xsl:when>
+     <xsl:otherwise>
+      <table class="globalAdminHeader">
+       <tr>
+        <!-- Shadow man logo by default -->
+        <a href="http://www.redhat.com"><td class="globalLogo"></td></a>
+        <td><xsl:text>&#160;&#160;&#160;&#160;&#160;&#160;</xsl:text></td>
+        <td style="margin: 0; border: 0; padding: 0;">
+         <table align="center" style="margin: 0; border: 0; padding: 0;">
+          <tr>
+           <td style="margin: 0; color: #3f3f3f; border: 0; padding: 0; padding-right: 18px;">
+            You are not currently logged in
+           </td>
+          </tr>
+         </table>
+        </td>
+        <td style="font-size: smaller; text-align: right">
+         <a>
+          <xsl:attribute name="href">
+           <xsl:value-of select="@loginURL"/>
+          </xsl:attribute>
+          Login
+         </a>
+       </td>
+       </tr>
+      </table>
+     </xsl:otherwise>
+   </xsl:choose>
+ </xsl:template>
+
+</xsl:stylesheet>
diff --git a/ccm-core/web/themes/heirloom/packages/versioning/footer.jspf b/ccm-core/web/themes/heirloom/packages/versioning/footer.jspf
new file mode 100644
index 000000000..387f7b9ff
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/versioning/footer.jspf
@@ -0,0 +1,4 @@
+<hr size="1" width="67%" align="center" noshade>
+<p align="right"><%= new java.util.Date() %>
+</body>
+</html>
diff --git a/ccm-core/web/themes/heirloom/packages/versioning/graph.jsp b/ccm-core/web/themes/heirloom/packages/versioning/graph.jsp
new file mode 100644
index 000000000..aeb9e19c6
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/versioning/graph.jsp
@@ -0,0 +1,25 @@
+<%@ page
+  import="com.arsdigita.versioning.VersioningServlet.GraphPrinter"
+%>
+
+<%@ include file="header.jspf" %>
+
+<h1>Versioning Dependence Graph</h1>
+
+<blockquote><pre class="programlisting">
+<%
+  GraphPrinter printer = (GraphPrinter) request.getAttribute("graphPrinter");
+
+  if ( printer == null ) {
+      throw new ServletException("couldn't find the printer attribute");
+  }
+  printer.setWriter(out);
+  printer.printGraph();
+%>
+</pre></blockquote>
+
+<div align="center">
+  <a href="main">Main</a>
+</div>
+
+<%@ include file="footer.jspf" %>
diff --git a/ccm-core/web/themes/heirloom/packages/versioning/header.jspf b/ccm-core/web/themes/heirloom/packages/versioning/header.jspf
new file mode 100644
index 000000000..6ffb01ef2
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/versioning/header.jspf
@@ -0,0 +1,6 @@
+<html>
+<head>
+  <title><%= (String) request.getAttribute("title") %></title>
+  <link href="/packages/versioning/vlog.css" rel="stylesheet" type="text/css"/>
+</head>
+<body>
diff --git a/ccm-core/web/themes/heirloom/packages/versioning/main.jsp b/ccm-core/web/themes/heirloom/packages/versioning/main.jsp
new file mode 100644
index 000000000..802cbbd2c
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/versioning/main.jsp
@@ -0,0 +1,56 @@
+<%@ page
+  import="com.arsdigita.versioning.VersioningServlet.VersionedObjects,
+          com.arsdigita.persistence.OID,
+          java.net.URLEncoder"
+%>
+
+<%@ include file="header.jspf" %>
+
+<form action="main" method="GET">
+<span>Object type: <input type="text" name="objectType" maxlength="40"> </span>
+<span><input type="submit" name="search" value=" Search ">
+<input type="hidden" name="cmd" value="typeSearch">
+</form>
+
+<%
+  VersionedObjects oids = (VersionedObjects) request.getAttribute("versionedObjects");
+  if ( oids!= null && oids.size() > 0 ) {
+%>
+
+<h1>OIDs</h1>
+
+<%
+  }
+%>
+
+<table border="1" cellpadding="2" cellspacing="0" align="center" width="80%">
+<tr>
+  <th>Data Object</th>
+  <th colspan="2">Show Txns</th>
+</tr>
+<%
+
+  if ( oids != null ) {
+      while ( oids.hasNext() ) {
+          String serOID = (String) oids.next();
+          String strOID = oids.getOID().toString();
+          String encoded = URLEncoder.encode(serOID);
+          String href = "txns?cmd=showTxns&amp;oid=" + encoded;
+          String taggedHref = href + "&amp;tagged=yes";
+%>
+  <tr>
+    <td><%= strOID %></a></td>
+    <td><a href="<%= href %>">affecting</a></td>
+    <td><a href="<%= taggedHref %>">tagged</a></td>
+  </tr>
+<%
+      }
+  }
+%>
+</table>
+
+<div align="center">
+  <a href="graph?cmd=graph&amp;graphType=versioning">Versioning Dependency Graph</a>
+</div>
+
+<%@ include file="footer.jspf" %>
diff --git a/ccm-core/web/themes/heirloom/packages/versioning/rollback.jsp b/ccm-core/web/themes/heirloom/packages/versioning/rollback.jsp
new file mode 100644
index 000000000..5d400f254
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/versioning/rollback.jsp
@@ -0,0 +1,31 @@
+<%@ page
+  autoFlush="true"
+  contentType="text/plain"
+  import="com.arsdigita.versioning.VersioningServlet.RollbackLogger,
+          com.arsdigita.persistence.OID,
+          com.arsdigita.util.AssertionError,
+          java.io.IOException,
+          java.io.PrintWriter,
+          java.math.BigInteger"
+%>
+
+<%
+  RollbackLogger rbl = (RollbackLogger) request.getAttribute("logger");
+
+  if ( rbl == null ) {
+      throw new ServletException("couldn't find the logger attribute");
+  }
+%>
+
+Rolling back <%= rbl.getOID() %> to txnID=<%= rbl.getTxnID() %>
+
+<%
+  rbl.setWriter(out);
+  try {
+      rbl.rollback();
+  } catch (RuntimeException ex) {
+      rbl.printException(ex);
+  } catch (AssertionError er) {
+      rbl.printException(er);
+  }
+%>
diff --git a/ccm-core/web/themes/heirloom/packages/versioning/txns.jsp b/ccm-core/web/themes/heirloom/packages/versioning/txns.jsp
new file mode 100644
index 000000000..fd7c9a524
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/versioning/txns.jsp
@@ -0,0 +1,50 @@
+<%@ page
+  import="com.arsdigita.versioning.Tag,
+          com.arsdigita.versioning.Transaction,
+          com.arsdigita.versioning.TransactionCollection,
+          com.arsdigita.persistence.OID,
+          com.arsdigita.developersupport.Debug,
+          java.math.BigInteger,
+          java.util.Date"
+%>
+
+<%@ include file="header.jspf" %>
+
+<%
+  TransactionCollection txnColl =
+      (TransactionCollection) request.getAttribute("txns");
+  if ( txnColl == null ) {
+      throw new ServletException("couldn't find the txns attribute");
+  }
+  OID oid = (OID) request.getAttribute("oid");
+  if ( oid == null ) {
+      throw new ServletException("couldn't find the oid attribute");
+  }
+  String encodedOID = (String) request.getAttribute("encodedOID");
+ %>
+
+<h1>Txns for <%= oid.toString() %></h1>
+
+<table border="1" cellpadding="2" cellspacing="0" align="center" width="80%">
+
+<%
+  while ( txnColl.next() ) {
+      Transaction txn = txnColl.getTransaction();
+      BigInteger id = txn.getID();
+      String strID = id.toString();
+      Date date = txn.getTimestamp();
+      String strDate = String.valueOf(date);
+      String href = "rollback?cmd=rollback&amp;txnID=" + id + "&amp;oid=" + encodedOID;
+%>
+  <tr>
+    <td><a href="<%= href %>"><%= id %></a></td>
+    <td><%= date %></td>
+  </tr>
+
+<%
+  }
+%>
+
+</table>
+
+<%@ include file="footer.jspf" %>
diff --git a/ccm-core/web/themes/heirloom/packages/versioning/vlog.css b/ccm-core/web/themes/heirloom/packages/versioning/vlog.css
new file mode 100644
index 000000000..a93416159
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/packages/versioning/vlog.css
@@ -0,0 +1,60 @@
+body {
+    background: white;
+    color: black;
+    margin-left: 3%;
+    margin-right: 3%;
+}
+
+td {
+    padding-left: 8px;
+    margin-top: 0px;
+    margin-bottom: 0px;
+    font-family: arial, helvetica;
+    font-size: x-small;
+}
+
+p {
+    font-family: georgia, arial, helvetica;
+    font-size: x-small;
+}
+
+th {
+    font-family: arial, helvetica;
+    text-align: left;
+    padding-left: 8px;
+    font-size: x-small;
+    background-color: #878175;
+    color: white;
+}
+
+h1 {
+    font-family: arial, helvetica;
+    font-weight: bold;
+    margin-bottom: 4px;
+}
+
+h2 {
+    font-family: arial, helvetica;
+    font-size: small;
+    font-weight: bold;
+    margin-bottom: 4px;
+    margin-top: 4px;
+}
+
+pre {
+    display:        block;
+    font-family:    monospace;
+    white-space:    pre;
+    margin:         0%;
+    padding-top:    0.5ex;
+    padding-bottom: 0.5ex;
+    padding-left:   1ex;
+    padding-right:  1ex;
+    width:          100%;
+}
+
+pre.programlisting {
+    background: WhiteSmoke;
+    color:  black;
+    border: 1px solid black;
+}
diff --git a/ccm-core/web/themes/heirloom/placeholder.info b/ccm-core/web/themes/heirloom/placeholder.info
new file mode 100644
index 000000000..2f0a5833b
--- /dev/null
+++ b/ccm-core/web/themes/heirloom/placeholder.info
@@ -0,0 +1,5 @@
+Place holder file to make sure the directory is created and copied with the
+appropriate permissions.
+
+Heirloom, a container for the built-in theme of the previous Red Hat CCM.
+Serves still as a fallback for various newer themes if nothing else is working.
\ No newline at end of file
diff --git a/ccm-core/web/themes/placeholder.info b/ccm-core/web/themes/placeholder.info
new file mode 100644
index 000000000..73aeb47bd
--- /dev/null
+++ b/ccm-core/web/themes/placeholder.info
@@ -0,0 +1,5 @@
+Place holder file to make sure the directory is created and copied with the
+appropriate permissions.
+
+Container for all the various themes, each in its own directory or directory 
+tree, which make up the design and look & feel of a site.
\ No newline at end of file
diff --git a/ccm-gen-aplaws/bundles/nsh/cfg/applications.cfg b/ccm-gen-aplaws/bundles/nsh/cfg/applications.cfg
index 08d741617..9e28de10b 100755
--- a/ccm-gen-aplaws/bundles/nsh/cfg/applications.cfg
+++ b/ccm-gen-aplaws/bundles/nsh/cfg/applications.cfg
@@ -14,7 +14,6 @@ ccm-cms-assets-relatedlink
 # -- ccm-cms-types-address
 ccm-cms-types-article
 ccm-cms-types-bookmark
-ccm-cms-types-contact
 ccm-cms-types-event
 ccm-cms-types-faqitem
 ccm-cms-types-filestorageitem
@@ -23,11 +22,13 @@ ccm-cms-types-formsectionitem
 ccm-cms-types-glossaryitem
 ccm-cms-types-mparticle
 ccm-cms-types-newsitem
+ccm-cms-types-simpleaddress
 
 # Applications
 # -- ccm-docmgr
 ccm-forum
 ccm-forum-categorised
+ccm-themedirector
 ccm-user-preferences
 
 # LDN extensions
@@ -38,7 +39,6 @@ ccm-ldn-search
 ccm-ldn-shortcuts
 ccm-ldn-subsite
 ccm-ldn-terms
-ccm-ldn-theme
 ccm-ldn-util
 
 # integration layer app
diff --git a/ccm-gen-aplaws/bundles/nsh/cfg/integration.properties b/ccm-gen-aplaws/bundles/nsh/cfg/integration.properties
index a1cef9f61..0fb81f5ba 100755
--- a/ccm-gen-aplaws/bundles/nsh/cfg/integration.properties
+++ b/ccm-gen-aplaws/bundles/nsh/cfg/integration.properties
@@ -96,10 +96,10 @@ 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_context=
-com.arsdigita.london.theme.default_theme_manifest=ccm-gen-aplaws.web.mf
-com.arsdigita.london.theme.default_theme_path=__ccm__/themes/aplaws-generic
-com.arsdigita.london.theme.file_extensions=bmp css gif jpeg jpg js png xml xsl
+themedirector.default_theme_context=
+themedirector.default_theme_manifest=ccm-gen-aplaws.web.mf
+themedirector.default_theme_path=__ccm__/themes/aplaws-generic
+themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl
 
 # com.arsdigita.london.cms.dublin.audience_domain=LGAL
 
diff --git a/ccm-gen-aplaws/bundles/staatsschiff/cfg/applications.cfg b/ccm-gen-aplaws/bundles/staatsschiff/cfg/applications.cfg
index d605bc4cf..588a1ec36 100755
--- a/ccm-gen-aplaws/bundles/staatsschiff/cfg/applications.cfg
+++ b/ccm-gen-aplaws/bundles/staatsschiff/cfg/applications.cfg
@@ -41,6 +41,9 @@ ccm-ldn-terms
 ccm-ldn-theme
 ccm-ldn-util
 
+# sci extensions
+# --------------
+ccm-sci-publications
 # integration layer app
 ccm-gen-aplaws
 
diff --git a/ccm-gen-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt b/ccm-gen-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt
index 73c1cb5bf..bf5a09a50 100755
--- a/ccm-gen-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt
+++ b/ccm-gen-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt
@@ -35,3 +35,7 @@ http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::ur
 # Global default, from application's own web app
 http://::host::/resource/::webapp::/__ccm__/apps/::application::/xsl/::url::-::locale::.xsl
 http://::host::/resource/::webapp::/__ccm__/apps/::application::/xsl/::url::.xsl
+
+# Global default, from application's own web app - relocated version >= 6.6.1
+http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl
+http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::.xsl
diff --git a/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/oracle-se-1.0.0-1.0.1.sql b/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/oracle-se-1.0.0-1.0.1.sql
deleted file mode 100755
index 1e238fe7c..000000000
--- a/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/oracle-se-1.0.0-1.0.1.sql
+++ /dev/null
@@ -1 +0,0 @@
-@@ default/default-theme.sql
diff --git a/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/oracle-se-6.3.0-6.3.1.sql b/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/oracle-se-6.3.0-6.3.1.sql
deleted file mode 100755
index 12df8a632..000000000
--- a/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/oracle-se-6.3.0-6.3.1.sql
+++ /dev/null
@@ -1 +0,0 @@
-@@ ../oracle-se/upgrade/6.3.0-6.3.1/add-is_deleted.sql
diff --git a/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/postgres-1.0.0-1.0.1.sql b/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/postgres-1.0.0-1.0.1.sql
deleted file mode 100755
index c82cbc756..000000000
--- a/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/postgres-1.0.0-1.0.1.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-begin;
-\i default/default-theme.sql
-commit;
diff --git a/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/postgres-1.0.1-1.0.2.sql b/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/postgres-1.0.1-1.0.2.sql
deleted file mode 100755
index c921550c8..000000000
--- a/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/postgres-1.0.1-1.0.2.sql
+++ /dev/null
@@ -1 +0,0 @@
-\i ../postgres/upgrade/1.0.1-1.0.2/date-to-timestamptz.sql
diff --git a/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/postgres-6.3.0-6.3.1.sql b/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/postgres-6.3.0-6.3.1.sql
deleted file mode 100755
index 91e97eb6c..000000000
--- a/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/postgres-6.3.0-6.3.1.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-begin;
-
-\i ../postgres/upgrade/6.3.0-6.3.1/add-is_deleted.sql
-
-commit;
diff --git a/ccm-ldn-theme/src/ccm-ldn-theme.config b/ccm-ldn-theme/src/ccm-ldn-theme.config
deleted file mode 100755
index a400df463..000000000
--- a/ccm-ldn-theme/src/ccm-ldn-theme.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<registry>
-   <config class="com.arsdigita.london.theme.ThemeConfig"
-           storage="ccm-ldn-theme/theme.properties"/>
-</registry>
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeConfig_parameter.properties b/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeConfig_parameter.properties
deleted file mode 100755
index 5e94b6d4b..000000000
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeConfig_parameter.properties
+++ /dev/null
@@ -1,44 +0,0 @@
-com.arsdigita.london.theme.file_extensions.title=Graphics File Extensions (Themes)
-com.arsdigita.london.theme.file_extensions.purpose=A list of file extensions that should be included when the designer requests 'all graphics files'
-com.arsdigita.london.theme.file_extensions.example=jpeg jpg gif xsl css js png
-com.arsdigita.london.theme.file_extensions.format=[string]
-
-com.arsdigita.london.theme.default_theme_dir.title=The path to the default themes directory (Themes Application)
-com.arsdigita.london.theme.default_theme_dir.purpose=This is the path to the defalut themes directory.  When a new "theme" is created, this directory is copied and the new directory is the base for the new themes.  It is provided relative to the "webapps" directory.
-com.arsdigita.london.theme.default_theme_dir.example=/ROOT/__ccm__/themes/aplaws/
-com.arsdigita.london.theme.default_theme_dir.format=[string]
-
-com.arsdigita.london.theme.theme_pub_file_watch_startup_delay.title=The number of seconds before checking for update of published theme files [0 means never start] (Themes Application)
-com.arsdigita.london.theme.theme_pub_file_watch_startup_delay.purpose=This is the number of seconds before checking for recently published files.  It should only be used on multi-jvm installations since the files are already synced on single jvm settings.
-com.arsdigita.london.theme.theme_pub_file_watch_startup_delay.example=[300]
-com.arsdigita.london.theme.theme_pub_file_watch_startup_delay.format=[integer]
-
-com.arsdigita.london.theme.theme_pub_file_watch_poll_delay.title=The number of seconds between checks for recently published theme files (Themes Application)
-com.arsdigita.london.theme.theme_pub_file_watch_poll_delay.purpose=This is the number of seconds between checks for recently published files.  It should only be used on multi-jvm installations since the files are already synced on single jvm settings.
-com.arsdigita.london.theme.theme_pub_file_watch_poll_delay.example=[300]
-com.arsdigita.london.theme.theme_pub_file_watch_poll_delay.format=[integer]
-
-com.arsdigita.london.theme.theme_dev_file_watch_startup_delay.title=The number of seconds before checking for updated development theme files [0 means never start] (Themes Application)
-com.arsdigita.london.theme.theme_dev_file_watch_startup_delay.purpose=This is the number of seconds before checking for updated development files.  It should only be used on multi-jvm installations since the files are already synced on single jvm settings.
-com.arsdigita.london.theme.theme_dev_file_watch_startup_delay.example=[300]
-com.arsdigita.london.theme.theme_dev_file_watch_startup_delay.format=[integer]
-
-com.arsdigita.london.theme.theme_dev_file_watch_poll_delay.title=The number of seconds between checks for update development theme files (Themes Application)
-com.arsdigita.london.theme.theme_dev_file_watch_poll_delay.purpose=This is the number of seconds between checks for updated development files.  It should only be used on multi-jvm installations since the files are already synced on single jvm settings.
-com.arsdigita.london.theme.theme_dev_file_watch_poll_delay.example=[300]
-com.arsdigita.london.theme.theme_dev_file_watch_poll_delay.format=[integer]
-
-com.arsdigita.london.theme.default_theme_manifest.title=The manifest file containing the default themes directory (Themes Application)
-com.arsdigita.london.theme.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.
-com.arsdigita.london.theme.default_theme_manifest.example=[ccm-ldn-theme.web.mf]
-com.arsdigita.london.theme.default_theme_manifest.format=[string]
-
-com.arsdigita.london.theme.default_theme_path.title=The path to the directory for the default theme (Themes Application)
-com.arsdigita.london.theme.default_theme_path.purpose=This is the directory that all of the default themes are copied from.  It is specified and used to filter out files listed in the manifest file chosen specified by the com.arsdigita.london.theme.default_theme_manifest.title attribute.  If this is null then no filter is applied.
-com.arsdigita.london.theme.default_theme_path.example=[__ccm__/themes/default/]
-com.arsdigita.london.theme.default_theme_path.format=[string]
-
-com.arsdigita.london.theme.default_theme_context.title=The servlet context containing the theme
-com.arsdigita.london.theme.default_theme_context.purpose=This is the servlet context path containing the theme. It should start and end with a /
-com.arsdigita.london.theme.default_theme_context.example=[/ccm-ldn-theme/]
-com.arsdigita.london.theme.default_theme_context.format=[string]
diff --git a/ccm-ldn-theme/.classpath b/ccm-themedirector/.classpath
similarity index 100%
rename from ccm-ldn-theme/.classpath
rename to ccm-themedirector/.classpath
diff --git a/ccm-ldn-theme/.project b/ccm-themedirector/.project
similarity index 100%
rename from ccm-ldn-theme/.project
rename to ccm-themedirector/.project
diff --git a/ccm-ldn-theme/.settings/org.eclipse.jdt.core.prefs b/ccm-themedirector/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from ccm-ldn-theme/.settings/org.eclipse.jdt.core.prefs
rename to ccm-themedirector/.settings/org.eclipse.jdt.core.prefs
diff --git a/ccm-ldn-theme/.settings/org.eclipse.jdt.ui.prefs b/ccm-themedirector/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from ccm-ldn-theme/.settings/org.eclipse.jdt.ui.prefs
rename to ccm-themedirector/.settings/org.eclipse.jdt.ui.prefs
diff --git a/ccm-ldn-theme/.svnignore b/ccm-themedirector/.svnignore
similarity index 100%
rename from ccm-ldn-theme/.svnignore
rename to ccm-themedirector/.svnignore
diff --git a/ccm-ldn-theme/TODO b/ccm-themedirector/TODO
similarity index 100%
rename from ccm-ldn-theme/TODO
rename to ccm-themedirector/TODO
diff --git a/ccm-ldn-theme/application.xml b/ccm-themedirector/application.xml
similarity index 81%
rename from ccm-ldn-theme/application.xml
rename to ccm-themedirector/application.xml
index c1a535b94..f503dc0db 100755
--- a/ccm-ldn-theme/application.xml
+++ b/ccm-themedirector/application.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
-  name="ccm-ldn-theme"
-  prettyName="Theme"
-  version="6.6.0"
+  name="ccm-themedirector"
+  prettyName="Theme Director"
+  version="6.6.1"
   release="1"
   webapp="ROOT">
   <ccm:dependencies>
@@ -16,7 +16,7 @@
     <ccm:contact uri="mailto:rhea@redhat.com" type="support"/>
   </ccm:contacts>
   <ccm:description>
-     The theme package allows graphic designers a way to upload files 
+     The themedirector package allows graphic designers a way to upload files
      that can then be used alter the styling within a subsite.
   </ccm:description>
 </ccm:application>
diff --git a/ccm-ldn-theme/doc/theme-standalone/README b/ccm-themedirector/doc/theme-standalone/README
similarity index 84%
rename from ccm-ldn-theme/doc/theme-standalone/README
rename to ccm-themedirector/doc/theme-standalone/README
index 6aacc8c7b..78c1fa7a0 100644
--- a/ccm-ldn-theme/doc/theme-standalone/README
+++ b/ccm-themedirector/doc/theme-standalone/README
@@ -1,3 +1,7 @@
+As of CCM version 6.6.1 package ccm-ldn-themes became a generic package and
+has been renamed to ccm-themedirector.
+All names below and anywhere in the files should be adopted accordingly.
+
 Up to APLAWS version 1.0.4 theme had been installed into its own
 application context: [webapps]/ccm-ldn-theme.
 
diff --git a/ccm-ldn-theme/doc/theme-standalone/bebop-define.tld b/ccm-themedirector/doc/theme-standalone/bebop-define.tld
similarity index 100%
rename from ccm-ldn-theme/doc/theme-standalone/bebop-define.tld
rename to ccm-themedirector/doc/theme-standalone/bebop-define.tld
diff --git a/ccm-ldn-theme/doc/theme-standalone/bebop-show.tld b/ccm-themedirector/doc/theme-standalone/bebop-show.tld
similarity index 100%
rename from ccm-ldn-theme/doc/theme-standalone/bebop-show.tld
rename to ccm-themedirector/doc/theme-standalone/bebop-show.tld
diff --git a/ccm-ldn-theme/doc/theme-standalone/web.xml b/ccm-themedirector/doc/theme-standalone/web.xml
similarity index 100%
rename from ccm-ldn-theme/doc/theme-standalone/web.xml
rename to ccm-themedirector/doc/theme-standalone/web.xml
diff --git a/ccm-ldn-theme/pdl/com/arsdigita/london/themes/Theme.pdl b/ccm-themedirector/pdl/com/arsdigita/themedirector/Theme.pdl
similarity index 87%
rename from ccm-ldn-theme/pdl/com/arsdigita/london/themes/Theme.pdl
rename to ccm-themedirector/pdl/com/arsdigita/themedirector/Theme.pdl
index e1d39b767..49e0b02ce 100755
--- a/ccm-ldn-theme/pdl/com/arsdigita/london/themes/Theme.pdl
+++ b/ccm-themedirector/pdl/com/arsdigita/themedirector/Theme.pdl
@@ -15,17 +15,17 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-model com.arsdigita.london.theme;
+model com.arsdigita.themedirector;
 
 import com.arsdigita.web.Application;
 import com.arsdigita.kernel.ACSObject;
 import com.arsdigita.kernel.Party;
 
-object type ThemeApplication extends Application {
-    Theme[0..1] defaultTheme = join theme_app.default_theme_id to
-                                 theme_themes.theme_id;
+object type ThemeDirector extends Application {
+    Theme[0..1] defaultTheme = join theme_director.default_theme_id
+                               to   theme_themes.theme_id;
 
-    reference key (theme_app.application_id);
+    reference key (theme_director.application_id);
 }
 
 // This represents a collection of files that can be used to
diff --git a/ccm-ldn-theme/pdl/com/arsdigita/london/themes/ThemeFile.pdl b/ccm-themedirector/pdl/com/arsdigita/themedirector/ThemeFile.pdl
similarity index 98%
rename from ccm-ldn-theme/pdl/com/arsdigita/london/themes/ThemeFile.pdl
rename to ccm-themedirector/pdl/com/arsdigita/themedirector/ThemeFile.pdl
index 7b07349fe..2a0fafa2b 100755
--- a/ccm-ldn-theme/pdl/com/arsdigita/london/themes/ThemeFile.pdl
+++ b/ccm-themedirector/pdl/com/arsdigita/themedirector/ThemeFile.pdl
@@ -15,7 +15,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-model com.arsdigita.london.theme;
+model com.arsdigita.themedirector;
 
 
 object type ThemeFile {
diff --git a/ccm-ldn-theme/sql/ccm-ldn-theme/default/theme-files-unique-constraint.sql b/ccm-themedirector/sql/ccm-themedirector/default/theme-files-unique-constraint.sql
similarity index 100%
rename from ccm-ldn-theme/sql/ccm-ldn-theme/default/theme-files-unique-constraint.sql
rename to ccm-themedirector/sql/ccm-themedirector/default/theme-files-unique-constraint.sql
diff --git a/ccm-ldn-theme/sql/ccm-ldn-theme/oracle-se-create.sql b/ccm-themedirector/sql/ccm-themedirector/oracle-se-create.sql
similarity index 100%
rename from ccm-ldn-theme/sql/ccm-ldn-theme/oracle-se-create.sql
rename to ccm-themedirector/sql/ccm-themedirector/oracle-se-create.sql
diff --git a/ccm-ldn-theme/sql/ccm-ldn-theme/postgres-create.sql b/ccm-themedirector/sql/ccm-themedirector/postgres-create.sql
similarity index 100%
rename from ccm-ldn-theme/sql/ccm-ldn-theme/postgres-create.sql
rename to ccm-themedirector/sql/ccm-themedirector/postgres-create.sql
diff --git a/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/default/default-theme.sql b/ccm-themedirector/sql/ccm-themedirector/upgrade/default/1.0.0-1.0.1/default-theme.sql
similarity index 100%
rename from ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/default/default-theme.sql
rename to ccm-themedirector/sql/ccm-themedirector/upgrade/default/1.0.0-1.0.1/default-theme.sql
diff --git a/ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se-1.0.0-1.0.1.sql b/ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se-1.0.0-1.0.1.sql
new file mode 100755
index 000000000..64e2673bb
--- /dev/null
+++ b/ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se-1.0.0-1.0.1.sql
@@ -0,0 +1 @@
+@@ default/1.0.0-1.0.1/default-theme.sql
diff --git a/ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/oracle-se-1.0.1-1.0.2.sql b/ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se-1.0.1-1.0.2.sql
similarity index 100%
rename from ccm-ldn-theme/sql/ccm-ldn-theme/upgrade/oracle-se-1.0.1-1.0.2.sql
rename to ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se-1.0.1-1.0.2.sql
diff --git a/ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se-6.3.0-6.3.1.sql b/ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se-6.3.0-6.3.1.sql
new file mode 100755
index 000000000..c3f47589f
--- /dev/null
+++ b/ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se-6.3.0-6.3.1.sql
@@ -0,0 +1 @@
+@@ oracle-se/upgrade/6.3.0-6.3.1/add-is_deleted.sql
diff --git a/ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se-6.6.0-6.6.1.sql b/ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se-6.6.0-6.6.1.sql
new file mode 100644
index 000000000..9f6fdb94b
--- /dev/null
+++ b/ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se-6.6.0-6.6.1.sql
@@ -0,0 +1,22 @@
+--
+-- Copyright (C) 2011 Peter Boy All Rights Reserved.
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+-- $DateTime: 2011/03/27 23:15:09 $
+-- $Id: oracle-se-6.6.0-6.6.1  pboy $
+
+@@ default/6.3.0-6.3.1/upd_theme_app_table.sql
+@@ default/6.3.0-6.3.1/upd_system_tables.sql
diff --git a/ccm-ldn-theme/sql/ccm-ldn-theme/oracle-se/upgrade/6.3.0-6.3.1/add-is_deleted.sql b/ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se/6.3.0-6.3.1/add-is_deleted.sql
similarity index 100%
rename from ccm-ldn-theme/sql/ccm-ldn-theme/oracle-se/upgrade/6.3.0-6.3.1/add-is_deleted.sql
rename to ccm-themedirector/sql/ccm-themedirector/upgrade/oracle-se/6.3.0-6.3.1/add-is_deleted.sql
diff --git a/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-1.0.0-1.0.1.sql b/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-1.0.0-1.0.1.sql
new file mode 100755
index 000000000..c9b402648
--- /dev/null
+++ b/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-1.0.0-1.0.1.sql
@@ -0,0 +1,3 @@
+begin;
+\i default/1.0.0-1.0.1/default-theme.sql
+commit;
diff --git a/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-1.0.1-1.0.2.sql b/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-1.0.1-1.0.2.sql
new file mode 100755
index 000000000..31afca8dc
--- /dev/null
+++ b/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-1.0.1-1.0.2.sql
@@ -0,0 +1 @@
+\i postgres/upgrade/1.0.1-1.0.2/date-to-timestamptz.sql
diff --git a/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-6.3.0-6.3.1.sql b/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-6.3.0-6.3.1.sql
new file mode 100755
index 000000000..62af03a38
--- /dev/null
+++ b/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-6.3.0-6.3.1.sql
@@ -0,0 +1,5 @@
+begin;
+
+\i postgres/upgrade/6.3.0-6.3.1/add-is_deleted.sql
+
+commit;
diff --git a/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-6.6.0-6.6.1.sql b/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-6.6.0-6.6.1.sql
new file mode 100644
index 000000000..6d66821db
--- /dev/null
+++ b/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres-6.6.0-6.6.1.sql
@@ -0,0 +1,27 @@
+--
+-- Copyright (C) 2011 Peter Boy All Rights Reserved.
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+-- $DateTime: 2010/11/10 23:15:09 $
+
+\echo Red Hat Enterprise ccm-themedirector 6.6.0 -> 6.6.1 Upgrade Script (PostgreSQL)
+
+begin;
+
+\i default/6.3.0-6.3.1/upd_theme_app_table.sql
+\i default/6.3.0-6.3.1/upd_system_tables.sql
+
+commit;
diff --git a/ccm-ldn-theme/sql/ccm-ldn-theme/postgres/upgrade/1.0.1-1.0.2/date-to-timestamptz.sql b/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres/1.0.1-1.0.2/date-to-timestamptz.sql
similarity index 100%
rename from ccm-ldn-theme/sql/ccm-ldn-theme/postgres/upgrade/1.0.1-1.0.2/date-to-timestamptz.sql
rename to ccm-themedirector/sql/ccm-themedirector/upgrade/postgres/1.0.1-1.0.2/date-to-timestamptz.sql
diff --git a/ccm-ldn-theme/sql/ccm-ldn-theme/postgres/upgrade/6.3.0-6.3.1/add-is_deleted.sql b/ccm-themedirector/sql/ccm-themedirector/upgrade/postgres/6.3.0-6.3.1/add-is_deleted.sql
similarity index 100%
rename from ccm-ldn-theme/sql/ccm-ldn-theme/postgres/upgrade/6.3.0-6.3.1/add-is_deleted.sql
rename to ccm-themedirector/sql/ccm-themedirector/upgrade/postgres/6.3.0-6.3.1/add-is_deleted.sql
diff --git a/ccm-themedirector/src/ccm-themedirector.config b/ccm-themedirector/src/ccm-themedirector.config
new file mode 100755
index 000000000..abe1dd067
--- /dev/null
+++ b/ccm-themedirector/src/ccm-themedirector.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<registry>
+   <config class="com.arsdigita.themedirector.ThemeDirectorConfig"
+           storage="ccm-themedirector/theme.properties"/>
+</registry>
diff --git a/ccm-ldn-theme/src/ccm-ldn-theme.load b/ccm-themedirector/src/ccm-themedirector.load
similarity index 65%
rename from ccm-ldn-theme/src/ccm-ldn-theme.load
rename to ccm-themedirector/src/ccm-themedirector.load
index a217ccd2a..ad4502297 100755
--- a/ccm-ldn-theme/src/ccm-ldn-theme.load
+++ b/ccm-themedirector/src/ccm-themedirector.load
@@ -9,10 +9,10 @@
   <!--
     <table name=""/>
   -->
-    <initializer class="com.arsdigita.london.theme.Initializer"/>
+    <initializer class="com.arsdigita.themedirector.Initializer"/>
   </provides>
   <scripts>
-    <schema directory="ccm-ldn-theme"/>
-    <data class="com.arsdigita.london.theme.Loader"/>
+    <schema directory="ccm-themedirector"/>
+    <data class="com.arsdigita.themedirector.Loader"/>
   </scripts>
 </load>
diff --git a/ccm-ldn-theme/src/ccm-ldn-theme.upgrade b/ccm-themedirector/src/ccm-themedirector.upgrade
similarity index 75%
rename from ccm-ldn-theme/src/ccm-ldn-theme.upgrade
rename to ccm-themedirector/src/ccm-themedirector.upgrade
index 1197c14f8..e146253a5 100755
--- a/ccm-ldn-theme/src/ccm-ldn-theme.upgrade
+++ b/ccm-themedirector/src/ccm-themedirector.upgrade
@@ -8,4 +8,7 @@
   <version from="6.3.0" to="6.3.1">
     <script sql="ccm-ldn-theme/upgrade/::database::-6.3.0-6.3.1.sql"/>
   </version>
+  <version from="6.6.0" to="6.6.1">
+    <script sql="ccm-themedirector/upgrade/::database::-6.6.0-6.6.1.sql"/>
+  </version>
 </upgrade>
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/Initializer.java b/ccm-themedirector/src/com/arsdigita/themedirector/Initializer.java
similarity index 84%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/Initializer.java
rename to ccm-themedirector/src/com/arsdigita/themedirector/Initializer.java
index 903953064..a9600159f 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/Initializer.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/Initializer.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.theme;
+package com.arsdigita.themedirector;
 
 import com.arsdigita.bebop.page.PageTransformer;
 import com.arsdigita.db.DbHelper;
@@ -25,16 +25,17 @@ import com.arsdigita.domain.DomainObjectInstantiator;
 import com.arsdigita.kernel.ACSObjectInstantiator;
 import com.arsdigita.london.subsite.Subsite;
 import com.arsdigita.london.subsite.SubsiteConfig;
-import com.arsdigita.london.theme.ui.ThemeXSLParameterGenerator;
-import com.arsdigita.london.theme.util.ThemeDevelopmentFileManager;
-import com.arsdigita.london.theme.util.ThemePublishedFileManager;
+import com.arsdigita.themedirector.ui.ThemeXSLParameterGenerator;
+import com.arsdigita.themedirector.util.ThemeDevelopmentFileManager;
+import com.arsdigita.themedirector.util.ThemePublishedFileManager;
 import com.arsdigita.persistence.DataObject;
 import com.arsdigita.persistence.pdl.ManifestSource;
 import com.arsdigita.persistence.pdl.NameFilter;
 import com.arsdigita.runtime.CompoundInitializer;
 import com.arsdigita.runtime.ContextCloseEvent;
+import com.arsdigita.runtime.ContextInitEvent;
 import com.arsdigita.runtime.DomainInitEvent;
-import com.arsdigita.runtime.LegacyInitEvent;
+// import com.arsdigita.runtime.LegacyInitEvent;
 import com.arsdigita.runtime.PDLInitializer;
 import com.arsdigita.runtime.RuntimeConfig;
 import com.arsdigita.templating.PatternStylesheetResolver;
@@ -57,10 +58,11 @@ public class Initializer extends CompoundInitializer {
 
         add(new PDLInitializer
             (new ManifestSource
-             ("ccm-ldn-theme.pdl.mf",
+             ("ccm-themedirector.pdl.mf",
               new NameFilter(DbHelper.getDatabaseSuffix(database), "pdl"))));
     }
 
+    @Override
     public void init(DomainInitEvent evt) {
         PatternStylesheetResolver.registerPatternGenerator(
             "theme",
@@ -87,15 +89,17 @@ public class Initializer extends CompoundInitializer {
                                                  instantiator);
 
         evt.getFactory().registerInstantiator(
-            ThemeApplication.BASE_DATA_OBJECT_TYPE,
+            ThemeDirector.BASE_DATA_OBJECT_TYPE,
             new ACSObjectInstantiator() {
                 public DomainObject doNewInstance(DataObject dataObject) {
-                    return new ThemeApplication(dataObject);
+                    return new ThemeDirector(dataObject);
                 }
             });
     }
 
-    public void init(LegacyInitEvent evt) {
+    @Override
+    // public void init(LegacyInitEvent evt) {
+    public void init(ContextInitEvent evt) {
         // This sets up the subsite for so that the form will include
         // all of the themes already in the database
         ThemeCollection collection = ThemeCollection.getAllThemes();
@@ -106,13 +110,13 @@ public class Initializer extends CompoundInitializer {
         }
 
         // start thread for monitoring queue
-        int devStartupDelay = ThemeApplication.getConfig()
+        int devStartupDelay = ThemeDirector.getConfig()
             .getThemeDevFileWatchStartupDelay().intValue();
-        int devPollDelay = ThemeApplication.getConfig()
+        int devPollDelay = ThemeDirector.getConfig()
             .getThemeDevFileWatchPollDelay().intValue();
-        int pubStartupDelay = ThemeApplication.getConfig()
+        int pubStartupDelay = ThemeDirector.getConfig()
             .getThemePubFileWatchStartupDelay().intValue();
-        int pubPollDelay = ThemeApplication.getConfig()
+        int pubPollDelay = ThemeDirector.getConfig()
             .getThemePubFileWatchPollDelay().intValue();
         ThemePublishedFileManager.startWatchingFiles
             (pubStartupDelay, pubPollDelay, null);
@@ -123,6 +127,7 @@ public class Initializer extends CompoundInitializer {
     /**
      * 
      */
+    @Override
     public void close(ContextCloseEvent evt) {
         ThemePublishedFileManager.getInstance().stopWatchingFiles();
         ThemeDevelopmentFileManager.getInstance().stopWatchingFiles();
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/Loader.java b/ccm-themedirector/src/com/arsdigita/themedirector/Loader.java
similarity index 78%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/Loader.java
rename to ccm-themedirector/src/com/arsdigita/themedirector/Loader.java
index 4b03b80fb..7e941bcd6 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/Loader.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/Loader.java
@@ -16,15 +16,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.theme;
+package com.arsdigita.themedirector;
 
-import com.arsdigita.loader.PackageLoader;
 
 import com.arsdigita.kernel.Kernel;
 import com.arsdigita.kernel.KernelExcursion;
-
+import com.arsdigita.loader.PackageLoader;
 import com.arsdigita.runtime.ScriptContext;
-
 import com.arsdigita.web.ApplicationType;
 import com.arsdigita.web.Application;
 
@@ -36,7 +34,7 @@ import org.apache.log4j.Logger;
  * @author Randy Graebner &lt;randyg@redhat.com&gt;
  * @version $Id: Loader.java 2004 2009-10-03 22:23:08Z pboy $
  */
-public class Loader extends PackageLoader implements ThemeConstants {
+public class Loader extends PackageLoader implements ThemeDirectorConstants {
 
     private static final Logger s_log = Logger.getLogger(Loader.class);
 
@@ -44,7 +42,7 @@ public class Loader extends PackageLoader implements ThemeConstants {
         new KernelExcursion() {
             public void excurse() {
                 setEffectiveParty(Kernel.getSystemParty());
-                setupThemeApplication();
+                setupThemeDirector();
             }
         }.run();
     }
@@ -54,19 +52,23 @@ public class Loader extends PackageLoader implements ThemeConstants {
      * Creates theme manager as a legacy-compatible application type.
      * 
      */
-    private void setupThemeApplication() {
+    private void setupThemeDirector() {
+
+        // create application type
         ApplicationType type = ApplicationType.createApplicationType(
-                                               "theme",
-                                               "CCM Themes Admin",
-                                               ThemeApplication.BASE_DATA_OBJECT_TYPE);
+                                               "themedirector",
+                                               "CCM Themes Administration",
+                                               ThemeDirector.BASE_DATA_OBJECT_TYPE);
         type.setDescription("CCM themes administration");
 
         Application admin = Application.retrieveApplicationForPath("/admin/");
 
+        // create application instance
         Application app =
             Application.createApplication(type,
                                           "themes",
-                                          "CCM Themes Admin",
+                                          "CCM Themes Administration",
                                           admin);
+        app.setDescription("CCM themes administration");
     }
 }
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/Theme.java b/ccm-themedirector/src/com/arsdigita/themedirector/Theme.java
similarity index 92%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/Theme.java
rename to ccm-themedirector/src/com/arsdigita/themedirector/Theme.java
index 6a974b390..58a2704d4 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/Theme.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/Theme.java
@@ -16,9 +16,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.theme;
+package com.arsdigita.themedirector;
 
-import com.arsdigita.util.Assert;
+import com.arsdigita.domain.DataObjectNotFoundException;
+import com.arsdigita.domain.DomainObjectFactory;
 import com.arsdigita.kernel.ACSObject;
 import com.arsdigita.kernel.Party;
 import com.arsdigita.persistence.DataObject;
@@ -26,22 +27,22 @@ import com.arsdigita.persistence.DataCollection;
 import com.arsdigita.persistence.OID;
 import com.arsdigita.persistence.SessionManager;
 import com.arsdigita.persistence.DataAssociation;
-import com.arsdigita.domain.DataObjectNotFoundException;
-import com.arsdigita.domain.DomainObjectFactory;
+import com.arsdigita.util.Assert;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
 
 /**
- * Represents a Theme within the system.  Specifically, it represents
+ * Represents a Theme within the system. Specifically, it represents
  * a grouping of files that can be used to style a given subsite.
  *
  *  @author Randy Graebner %lt;randyg@alum.mit.edu&gt;
  */
-public class Theme extends ACSObject {
+public final class Theme extends ACSObject {
     
     public static final String BASE_DATA_OBJECT_TYPE = 
-        "com.arsdigita.london.theme.Theme";
+                               "com.arsdigita.themedirector.Theme";
 
     public static final String TITLE = "title";
     public static final String DESCRIPTION = "description";
@@ -118,19 +119,19 @@ public class Theme extends ACSObject {
         );
     }
 
-    public void setTitle(String title) {
+    public final void setTitle(String title) {
         set(TITLE, title);
     }
 
-    public String getTitle() {
+    public final String getTitle() {
         return(String)get(TITLE);
     }
 
-    public void setDescription(String description) {
+    public final void setDescription(String description) {
         set(DESCRIPTION, description);
     }
 
-    public String getDescription() {
+    public final String getDescription() {
         return(String)get(DESCRIPTION);
     }
 
@@ -140,11 +141,11 @@ public class Theme extends ACSObject {
      * a "holiday" theme, the value of this parameter will be 'holiday'
      * so the files will be located at /__ccm__/themes/holiday
      */
-    public void setURL(String url) {
+    public final void setURL(String url) {
         set(URL, url);
     }
 
-    public String getURL() {
+    public final String getURL() {
         return(String)get(URL);
     }
 
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeCollection.java b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeCollection.java
similarity index 96%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeCollection.java
rename to ccm-themedirector/src/com/arsdigita/themedirector/ThemeCollection.java
index b42edb58c..73a190ea9 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeCollection.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeCollection.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.theme;
+package com.arsdigita.themedirector;
 
 import com.arsdigita.kernel.ACSObjectCollection;
 import com.arsdigita.domain.DomainObject;
@@ -26,7 +26,7 @@ import java.util.Date;
 
 /**
  * This class contains a collection of {@link
- * com.arsdigita.london.theme.Theme types}.
+ * com.arsdigita.themedirector.Theme types}.
  *
  * @see com.arsdigita.domain.DomainCollection
  * @see com.arsdigita.persistence.DataCollection
@@ -53,6 +53,7 @@ public class ThemeCollection extends ACSObjectCollection {
      * the collection.
      *
      */
+    @Override
     public DomainObject getDomainObject() {
         return new Theme(m_dataCollection.getDataObject());
     }
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeApplication.java b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirector.java
similarity index 85%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeApplication.java
rename to ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirector.java
index 23b41bae6..b1108f0a7 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeApplication.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirector.java
@@ -16,29 +16,29 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.theme;
+package com.arsdigita.themedirector;
 
-import com.arsdigita.web.Application;
+import com.arsdigita.domain.DataObjectNotFoundException;
 import com.arsdigita.persistence.OID;
 import com.arsdigita.persistence.DataObject;
-import com.arsdigita.domain.DataObjectNotFoundException;
+import com.arsdigita.web.Application;
 
 import org.apache.log4j.Logger;
 
 /**
- * Base class of the ccm-ldn-theme application (module)
+ * Base class of the ccm-themedirector application (module)
  * 
  */
-public class ThemeApplication extends Application {
+public class ThemeDirector extends Application {
+
+    private static final Logger s_log = Logger.getLogger(ThemeDirector.class);
 
     public static final String DEFAULT_THEME = "defaultTheme";
-    
-    private static final Logger s_log = Logger.getLogger(Theme.class);
 
-    public static final String BASE_DATA_OBJECT_TYPE 
-        = "com.arsdigita.london.theme.ThemeApplication";
+    public static final String BASE_DATA_OBJECT_TYPE  =
+                               "com.arsdigita.themedirector.ThemeDirector";
 
-    public static ThemeConfig s_config = new ThemeConfig();
+    public static ThemeDirectorConfig s_config = new ThemeDirectorConfig();
 
     static {
         s_log.debug("Static initalizer starting...");
@@ -46,15 +46,15 @@ public class ThemeApplication extends Application {
         s_log.debug("Static initalizer finished.");
     }
 
-    public static ThemeConfig getConfig() {
+    public static ThemeDirectorConfig getConfig() {
         return s_config;
     }
 
-    public ThemeApplication(DataObject obj) {
+    public ThemeDirector(DataObject obj) {
         super(obj);
     }
 
-    public ThemeApplication(OID oid) 
+    public ThemeDirector(OID oid)
         throws DataObjectNotFoundException {
 
         super(oid);
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeConfig.java b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConfig.java
similarity index 60%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeConfig.java
rename to ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConfig.java
index ce2dcf4a6..03b582e60 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeConfig.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConfig.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.theme;
+package com.arsdigita.themedirector;
 
 import com.arsdigita.persistence.DataCollection;
 import com.arsdigita.persistence.SessionManager;
@@ -39,56 +39,98 @@ import org.apache.log4j.Logger;
 /**
  *  This is the configuration file for the Theme application
  */
-public class ThemeConfig extends AbstractConfig {
+public class ThemeDirectorConfig extends AbstractConfig {
     
-    private static final Logger s_log = Logger.getLogger(ThemeConfig.class);
+    /** A logger instance.  */
+    private static final Logger s_log = Logger.getLogger(ThemeDirectorConfig.class);
 
-    private StringParameter m_fileExtParam;
-    private StringParameter m_defaultThemeManifest;
-    private StringParameter m_defaultThemePath;
-    private StringParameter m_defaultThemeContext;
+    /** Singelton config object.  */
+    private static ThemeDirectorConfig s_conf;
+
+    /**
+     * Gain a ThemeDirectorConfig object.
+     *
+     * Singelton pattern, don't instantiate a config object using the
+     * constructor directly!
+     * @return
+     */
+    public static synchronized ThemeDirectorConfig getConfig() {
+        if (s_conf == null) {
+            s_conf = new ThemeDirectorConfig();
+            s_conf.load();
+        }
+
+        return s_conf;
+    }
+
+    // set of configuration parameters
+    /** Directory that all of the default themes are copied from. */
+    private final Parameter m_defaultThemePath =
+            new StringParameter
+                ("themedirector.default_theme_path",
+                 Parameter.OPTIONAL, "/themes/master/");
+            //   Parameter.OPTIONAL, "/__ccm__/themes/default/");
+
+    /** Servlet context path containing the theme.                           */
+    private final Parameter m_defaultThemeContext =
+            new StringParameter
+                ("themedirector.default_theme_context",
+                 Parameter.OPTIONAL, "");
+//               Parameter.OPTIONAL, "/ccm-themedirector/");
+
+    /** File containing the default themes directory. Used in conjuntion with
+        com.arsdigita.themedirectory.default_directory_filter to dictate the
+       final default directoroy.                                             */
+    private final Parameter m_defaultThemeManifest =
+            new StringParameter
+                ("themedirector.default_theme_manifest",
+                 Parameter.OPTIONAL, "ccm-themedirector.web.mf");
+
+    /** list of file extensions that should be included when the designer 
+        requests 'all graphics files' */
+    private final Parameter m_fileExtParam =
+            new StringParameter
+                ("themedirector.graphics_file_extensions",
+                  Parameter.REQUIRED, "bmp css gif jpeg jpg js png xml xsl");
+
+    /** number of seconds before checking for updated development files.
+        in a multi-jvm installation. (0 means never start)                   */
+    private final Parameter m_themeDevFileWatchStartupDelay =
+            new IntegerParameter
+                ("themedirector.theme_dev_file_watch_startup_delay",
+                 Parameter.REQUIRED, new Integer(60*2));
+
+    /** Number of seconds between checks for updated development files
+        in a multi-jvm installation.                                         */
+    private final Parameter m_themeDevFileWatchPollDelay =
+            new IntegerParameter
+                ("themedirector.theme_dev_file_watch_poll_delay",
+                 Parameter.REQUIRED, new Integer(60*90));   //once every 90 minutes
+
+    /** Number of seconds before checking for update of published theme files
+        in a multi-jvm installation. (0 means never start)                   */
+    private final Parameter m_themePubFileWatchStartupDelay =
+            new IntegerParameter
+                ("themedirector.theme_pub_file_watch_startup_delay",
+                 Parameter.REQUIRED, new Integer(60*2));
+
+    /** number of seconds between checks for recently published theme files
+        in a multi-jvm installation.                                         */
+    private final Parameter m_themePubFileWatchPollDelay =
+            new IntegerParameter
+                ("themedirector.theme_pub_file_watch_poll_delay",
+                 Parameter.REQUIRED, new Integer(60*60));  // default to once an hour
 
-    private IntegerParameter m_themeDevFileWatchStartupDelay;
-    private IntegerParameter m_themeDevFileWatchPollDelay;
-    private IntegerParameter m_themePubFileWatchStartupDelay;
-    private IntegerParameter m_themePubFileWatchPollDelay;
     
+    /** */
     private Collection m_downloadFileExtensions = null;
 
-    public ThemeConfig() {
-        m_fileExtParam = new StringParameter
-            ("com.arsdigita.london.theme.file_extensions", 
-             Parameter.REQUIRED, "jpeg jpg gif xsl css js png bmp");
-
-        m_defaultThemeManifest = new StringParameter
-            ("com.arsdigita.london.theme.default_theme_manifest", 
-             Parameter.OPTIONAL, "ccm-ldn-theme.web.mf");
-
-        m_defaultThemeContext = new StringParameter
-            ("com.arsdigita.london.theme.default_theme_context", 
-             Parameter.OPTIONAL, "");
-//           Parameter.OPTIONAL, "/ccm-ldn-theme/");
-
-        m_defaultThemePath = new StringParameter
-            ("com.arsdigita.london.theme.default_theme_path", 
-             Parameter.OPTIONAL, "/__ccm__/themes/default/");
-
-        m_themePubFileWatchStartupDelay = new IntegerParameter
-            ("com.arsdigita.london.theme.theme_pub_file_watch_startup_delay", 
-             Parameter.REQUIRED, new Integer(60*2));
-
-        m_themePubFileWatchPollDelay = new IntegerParameter
-            ("com.arsdigita.london.theme.theme_pub_file_watch_poll_delay", 
-             Parameter.REQUIRED, new Integer(60*60));  // default to once an hour
-
-        m_themeDevFileWatchStartupDelay = new IntegerParameter
-            ("com.arsdigita.london.theme.theme_dev_file_watch_startup_delay", 
-             Parameter.REQUIRED, new Integer(60*2));
-
-        // default to once every 90 minutes
-        m_themeDevFileWatchPollDelay = new IntegerParameter
-            ("com.arsdigita.london.theme.theme_dev_file_watch_poll_delay", 
-             Parameter.REQUIRED, new Integer(60*90));  
+    /** 
+     * Constructor.
+     * Singelton pattern, don't instantiate a config object using the
+     * constructor directly! Use getConfig() instead.
+     */
+    public ThemeDirectorConfig() {
 
         register(m_fileExtParam);
         register(m_defaultThemeContext);
@@ -194,17 +236,23 @@ public class ThemeConfig extends AbstractConfig {
         return defaultThemePath;
     }
 
+
     private static final String DEFAULT_THEME_URL =
-        ThemeApplication.DEFAULT_THEME + "." + Theme.URL;
+        ThemeDirector.DEFAULT_THEME + "." + Theme.URL;
     private static final String DEFAULT_THEME_URL_ATTRIBUTE =
         "defaultThemeURLAttribute";
 
+    /** 
+     * 
+     * @param req
+     * @return
+     */
     public static String getDefaultThemeURL( HttpServletRequest req ) {
         String themeURL = (String) req.getAttribute( DEFAULT_THEME_URL_ATTRIBUTE );
         if( null != themeURL ) return themeURL;
 
         DataCollection themeApps = SessionManager.getSession().retrieve
-            ( ThemeApplication.BASE_DATA_OBJECT_TYPE );
+            ( ThemeDirector.BASE_DATA_OBJECT_TYPE );
         themeApps.addPath( DEFAULT_THEME_URL );
 
         if( themeApps.next() ) {
diff --git a/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConfig_parameter.properties b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConfig_parameter.properties
new file mode 100755
index 000000000..269537b19
--- /dev/null
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConfig_parameter.properties
@@ -0,0 +1,45 @@
+themedirector.default_theme_path.title=The path to the directory for the default theme (Themes Application)
+themedirector.default_theme_path.purpose=This is the directory that all of the default themes are copied from.  It is specified and used to filter out files listed in the manifest file chosen specified by the com.arsdigita.london.theme.default_theme_manifest.title attribute.  If this is null then no filter is applied.
+themedirector.default_theme_path.example=[__ccm__/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]
+themedirector.default_theme_manifest.format=[string]
+
+themedirector.graphics_file_extensions.title=Graphics File Extensions (Themes)
+themedirector.graphics_file_extensions.purpose=A list of file extensions that should be included when the designer requests 'all graphics files'
+themedirector.graphics_file_extensions.example=css gif jpeg jpg js png xsl
+themedirector.graphics_file_extensions.format=[string]
+
+themedirector.default_theme_dir.title=The path to the default themes directory (Themes Application)
+themedirector.default_theme_dir.purpose=This is the path to the defalut themes directory.  When a new "theme" is created, this directory is copied and the new directory is the base for the new themes.  It is provided relative to the "webapps" directory.
+themedirector.default_theme_dir.example=/ROOT/__ccm__/themes/aplaws/
+themedirector.default_theme_dir.format=[string]
+
+themedirector.theme_dev_file_watch_startup_delay.title=The number of seconds before checking for updated development theme files [0 means never start] (Themes Application)
+themedirector.theme_dev_file_watch_startup_delay.purpose=This is the number of seconds before checking for updated development files.  It should only be used on multi-jvm installations since the files are already synced on single jvm settings.
+themedirector.theme_dev_file_watch_startup_delay.example=[300]
+themedirector.theme_dev_file_watch_startup_delay.format=[integer]
+
+themedirector.theme_dev_file_watch_poll_delay.title=The number of seconds between checks for update development theme files (Themes Application)
+themedirector.theme_dev_file_watch_poll_delay.purpose=This is the number of seconds between checks for updated development files.  It should only be used on multi-jvm installations since the files are already synced on single jvm settings.
+themedirector.theme_dev_file_watch_poll_delay.example=[300]
+themedirector.theme_dev_file_watch_poll_delay.format=[integer]
+
+themedirector.theme_pub_file_watch_startup_delay.title=The number of seconds before checking for update of published theme files [0 means never start] (Themes Application)
+themedirector.theme_pub_file_watch_startup_delay.purpose=This is the number of seconds before checking for recently published files.  It should only be used on multi-jvm installations since the files are already synced on single jvm settings.
+themedirector.theme_pub_file_watch_startup_delay.example=[300]
+themedirector.theme_pub_file_watch_startup_delay.format=[integer]
+
+themedirector.theme_pub_file_watch_poll_delay.title=The number of seconds between checks for recently published theme files (Themes Application)
+themedirector.theme_pub_file_watch_poll_delay.purpose=This is the number of seconds between checks for recently published files.  It should only be used on multi-jvm installations since the files are already synced on single jvm settings.
+themedirector.theme_pub_file_watch_poll_delay.example=[300]
+themedirector.theme_pub_file_watch_poll_delay.format=[integer]
+
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeConstants.java b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConstants.java
similarity index 78%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeConstants.java
rename to ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConstants.java
index 999604617..c5d23535c 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeConstants.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConstants.java
@@ -16,15 +16,18 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.theme;
+package com.arsdigita.themedirector;
 
 
 /**
  *  Constants shared by the theme application.  
  */
-public interface ThemeConstants {
-    public final static String PROD_DIR_STUB = "themes-prod";
-    public final static String DEV_DIR_STUB = "themes-dev";
+public interface ThemeDirectorConstants {
+
+//  public final static String PROD_DIR_STUB = "themes-prod";
+//  public final static String DEV_DIR_STUB = "themes-dev";
+    public final static String PROD_DIR_STUB = "published-themedir";
+    public final static String DEV_DIR_STUB = "devel-themedir";
     // TODO: it would be nice if this value in com.arsdigita.web.URL
     // was public
     public final static String CCM_PREFIX = "__ccm__";
@@ -38,12 +41,14 @@ public interface ThemeConstants {
     public final static String ROOT_WEBAPP_PATH = "/ROOT";
 
     public final static String PROD_THEMES_BASE_DIR = 
-        CCM_PREFIX + "/" + PROD_DIR_STUB+ "/";
+    //  CCM_PREFIX + "/" + PROD_DIR_STUB+ "/";
+        "themes" + "/" + PROD_DIR_STUB+ "/";
     public final static String DEV_THEMES_BASE_DIR = 
-        CCM_PREFIX + "/" + DEV_DIR_STUB + "/";
+    //  CCM_PREFIX + "/" + DEV_DIR_STUB + "/";
+        "themes" + "/" + DEV_DIR_STUB + "/";
     public static final String THEME_XML_PREFIX = "theme:";
     public final static String XML_NS = 
-        "http://ccm.redhat.com/london/theme/1.0";
+        "http://ccm.redhat.com/theme/1.0";
 
     public final static String PREVIEW_PREFIX = "/theme";
 
@@ -54,4 +59,5 @@ public interface ThemeConstants {
     public final static String XSL_VALIDATION_ERRORS = "theme:xslErrors";
     public final static String XSL_VALIDATION_FATALS = "theme:xslFatals";
     public final static String XSL_ERROR_INFO = "theme:xslErrorInfo";
+
 }
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeResources.properties b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorResources.properties
similarity index 100%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeResources.properties
rename to ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorResources.properties
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeResources_fr.properties b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorResources_de.properties
similarity index 91%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeResources_fr.properties
rename to ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorResources_de.properties
index 49be7ac6e..6eff0600e 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeResources_fr.properties
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorResources_de.properties
@@ -1,8 +1,8 @@
-theme.title=Title
-theme.description=Description
+theme.title=Titel
+theme.description=Beschreiobung
 theme.url=URL
-theme.create_new_theme=Create New Theme
-theme.none_available=No themes are available
+theme.create_new_theme=Neues Theme erstellen
+theme.none_available=Keine Themes verf\u00fcgbar.
 theme.download_default_base_styles=Download default base styles
 theme.select_or_create=Select or Create a Theme
 theme.available_themes=Available Themes
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeResources_de.properties b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorResources_en.properties
similarity index 100%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeResources_de.properties
rename to ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorResources_en.properties
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeResources_en.properties b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorResources_fr.properties
similarity index 100%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeResources_en.properties
rename to ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorResources_fr.properties
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeDirectoryPatternGenerator.java b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectoryPatternGenerator.java
similarity index 93%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeDirectoryPatternGenerator.java
rename to ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectoryPatternGenerator.java
index 6b9614d82..a7b78cab2 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeDirectoryPatternGenerator.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectoryPatternGenerator.java
@@ -16,10 +16,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.theme;
+package com.arsdigita.themedirector;
 
-import com.arsdigita.templating.PatternGenerator;
 import com.arsdigita.dispatcher.DispatcherHelper;
+import com.arsdigita.templating.PatternGenerator;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -32,9 +32,10 @@ import java.util.ArrayList;
  *  between "dev" and "prod" is needed.
  */
 public class ThemeDirectoryPatternGenerator implements PatternGenerator,
-                                                       ThemeConstants {
+                                                       ThemeDirectorConstants {
     public String[] generateValues(String key,
                                    HttpServletRequest req) {
+        
         List themes = new ArrayList();
         
         // Create a list of theme directories, most preferrable
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeFile.java b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeFile.java
similarity index 86%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeFile.java
rename to ccm-themedirector/src/com/arsdigita/themedirector/ThemeFile.java
index 74920aa0f..161cc582f 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeFile.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeFile.java
@@ -16,23 +16,25 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.theme;
+package com.arsdigita.themedirector;
 
-import com.arsdigita.util.Assert;
-import com.arsdigita.persistence.DataObject;
-import com.arsdigita.persistence.OID;
+import com.arsdigita.db.Sequences;
 import com.arsdigita.domain.DataObjectNotFoundException;
 import com.arsdigita.domain.DomainObject;
-import java.math.BigDecimal;
-import java.util.Date;
-import org.apache.log4j.Logger;
-import com.arsdigita.db.Sequences;
+import com.arsdigita.persistence.DataObject;
+import com.arsdigita.persistence.OID;
 import com.arsdigita.persistence.PersistenceException;
+import com.arsdigita.util.Assert;
+
+import java.math.BigDecimal;
 import java.sql.SQLException;
+import java.util.Date;
+
+import org.apache.log4j.Logger;
 
 
 /**
- *  this represents a single file within a theme and is used as a way
+ *  This represents a single file within a theme and is used as a way
  *  of storing the files in the database so that they can be shared
  *  across multiple servers
  *
@@ -40,11 +42,12 @@ import java.sql.SQLException;
  */
 public class ThemeFile extends DomainObject {
     
+    /** A logger instance.  */
     private static final Logger s_log =
-        Logger.getLogger(ThemeFile.class);
+                                Logger.getLogger(ThemeFile.class);
 
     public static final String BASE_DATA_OBJECT_TYPE = 
-        "com.arsdigita.london.theme.ThemeFile";
+        "com.arsdigita.themedirector.ThemeFile";
 
     public static final String ID = "id";
     public static final String FILE_PATH = "filePath";
@@ -62,18 +65,34 @@ public class ThemeFile extends DomainObject {
     public static final String DRAFT = "draft";
 
 
+    /**
+     * Constructor
+     */
     public ThemeFile() {
         this(BASE_DATA_OBJECT_TYPE);
     }
     
+    /**
+     * Constructor
+     * @param type
+     */
     public ThemeFile(String type) {
         super(type);
     }
 
+    /** 
+     * Constructor
+     * @param obj
+     */
     public ThemeFile(DataObject obj) {
         super(obj);
     }
 
+    /**
+     * Constructor
+     * @param theme
+     * @param filePath
+     */
     public ThemeFile(Theme theme, String filePath) {
         this();
         setTheme(theme);
@@ -91,6 +110,7 @@ public class ThemeFile extends DomainObject {
     /**
      * Called from base class (DomainObject) constructors.
      */
+    @Override
     protected void initialize() {
         super.initialize();
         if (isNew()) {
@@ -101,6 +121,7 @@ public class ThemeFile extends DomainObject {
         }
     }
 
+    @Override
     protected void beforeSave() {
         super.beforeSave();
         if (getLastModifiedDate() == null) {
@@ -123,7 +144,7 @@ public class ThemeFile extends DomainObject {
         return (BigDecimal)get(ID);
     }
 
-    public void setFilePath(String filePath) {
+    public final void setFilePath(String filePath) {
         set(FILE_PATH, filePath);
     }
 
@@ -132,7 +153,9 @@ public class ThemeFile extends DomainObject {
     }
 
     public void setVersion(String version) {
-        Assert.isTrue(LIVE.equals(version) || DRAFT.equals(version), "The version must be either " + LIVE + " or " + DRAFT + " but was actually " + version);
+        Assert.isTrue(LIVE.equals(version) || DRAFT.equals(version), 
+                "The version must be either " + LIVE + " or " + DRAFT +
+                " but was actually " + version);
         set(VERSION, version);
     }
 
@@ -156,7 +179,7 @@ public class ThemeFile extends DomainObject {
         return(Date)get(LAST_MODIFIED_DATE);
     }
 
-    public void setTheme(Theme theme) {
+    public final void setTheme(Theme theme) {
         setAssociation(THEME, theme);
     }
 
@@ -173,6 +196,7 @@ public class ThemeFile extends DomainObject {
         set(DELETED, new Boolean(deleted));
     }
 
+    @Override
     public boolean isDeleted() {
         return Boolean.TRUE.equals(get(DELETED));
     }
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeFileCollection.java b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeFileCollection.java
similarity index 98%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeFileCollection.java
rename to ccm-themedirector/src/com/arsdigita/themedirector/ThemeFileCollection.java
index cc7f52ba9..03f27fd07 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeFileCollection.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeFileCollection.java
@@ -16,10 +16,11 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.theme;
+package com.arsdigita.themedirector;
 
 import com.arsdigita.domain.DomainCollection;
 import com.arsdigita.persistence.DataCollection;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeObserver.java b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeObserver.java
similarity index 87%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeObserver.java
rename to ccm-themedirector/src/com/arsdigita/themedirector/ThemeObserver.java
index 5cf8f4200..ef088c6ff 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeObserver.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeObserver.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.theme;
+package com.arsdigita.themedirector;
 
 import com.arsdigita.domain.DomainObjectObserver;
 import com.arsdigita.domain.DomainObject;
@@ -25,11 +25,11 @@ import com.arsdigita.persistence.PersistenceException;
 import com.arsdigita.persistence.SessionManager;
 import com.arsdigita.persistence.TransactionContext;
 
-import java.util.Set;
-import java.util.HashSet;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
-import java.util.Calendar;
+import java.util.HashSet;
+import java.util.Set;
 
 import org.apache.log4j.Logger;
 
@@ -39,11 +39,12 @@ import org.apache.log4j.Logger;
 // update other servers.
 public class ThemeObserver implements DomainObjectObserver {
 
-    public static final String THEME_TXN_ATTR = 
-        ThemeObserver.class.getName() + ".listener";
-
+    /** A logger instance.  */
     private static final Logger s_log = 
-        Logger.getLogger(ThemeObserver.class);
+                                Logger.getLogger(ThemeObserver.class);
+
+    public static final String THEME_TXN_ATTR =
+        ThemeObserver.class.getName() + ".listener";
 
     
     // The following events aren't needed
@@ -63,7 +64,11 @@ public class ThemeObserver implements DomainObjectObserver {
     public void beforeDelete(DomainObject dobj) throws PersistenceException {}
 
     
-    // The two events that trigger updates
+    /**
+     * One of the two events that trigger updates.
+     * @param dobj
+     * @throws PersistenceException
+     */
     public void afterSave(DomainObject dobj) throws PersistenceException {
         // if it was published in the last 3 minutes...3 minutes should
         // be long enough so that all other processes are run but
@@ -93,6 +98,12 @@ public class ThemeObserver implements DomainObjectObserver {
         } 
     }
 
-    // there currently is no way to delete a Theme.
+    /**
+     * Deletion not supported, empty implementation.
+     * Triggers an update as well, but there is currently is no way 
+     * to delete a Theme.
+     * @param dobj
+     * @throws PersistenceException
+     */
     public void afterDelete(DomainObject dobj) throws PersistenceException {}
 }
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemePatternGenerator.java b/ccm-themedirector/src/com/arsdigita/themedirector/ThemePatternGenerator.java
similarity index 91%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/ThemePatternGenerator.java
rename to ccm-themedirector/src/com/arsdigita/themedirector/ThemePatternGenerator.java
index 8f6542749..a2e812a13 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemePatternGenerator.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/ThemePatternGenerator.java
@@ -16,13 +16,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.theme;
-
-import com.arsdigita.london.subsite.Subsite;
+package com.arsdigita.themedirector;
 
 import com.arsdigita.dispatcher.DispatcherHelper;
 import com.arsdigita.templating.PatternGenerator;
 
+import com.arsdigita.london.subsite.Subsite;
+
 import javax.servlet.http.HttpServletRequest;
 
 import java.util.List;
@@ -31,9 +31,17 @@ import java.util.ArrayList;
 import org.apache.log4j.Logger;
 
 public class ThemePatternGenerator implements PatternGenerator {
+
+    /** A logger instance.  */
     private static final Logger s_log =
         Logger.getLogger( ThemePatternGenerator.class );
 
+    /** 
+     * 
+     * @param key
+     * @param req
+     * @return
+     */
     public String[] generateValues(String key,
                                    HttpServletRequest req) {
         List themes = new ArrayList();
@@ -62,7 +70,7 @@ public class ThemePatternGenerator implements PatternGenerator {
             }
         } 
 
-        String defaultThemeURL = ThemeConfig.getDefaultThemeURL( req );
+        String defaultThemeURL = ThemeDirectorConfig.getDefaultThemeURL( req );
         if( null != defaultThemeURL ) themes.add( defaultThemeURL );
 
         return (String[])themes.toArray(new String[themes.size()]);
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeTransactionListener.java b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeTransactionListener.java
similarity index 92%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeTransactionListener.java
rename to ccm-themedirector/src/com/arsdigita/themedirector/ThemeTransactionListener.java
index 02f8ef42e..31bc1c8eb 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/ThemeTransactionListener.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeTransactionListener.java
@@ -16,35 +16,36 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.theme;
+package com.arsdigita.themedirector;
 
 import java.util.Set;
 import java.util.Iterator;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import com.arsdigita.london.theme.ThemeConstants;
 import com.arsdigita.domain.DomainCollection;
-import com.arsdigita.web.Host;
 import com.arsdigita.persistence.PersistenceException;
 import com.arsdigita.persistence.TransactionContext;
 import com.arsdigita.persistence.TransactionListener;
 import com.arsdigita.web.Application;
 import com.arsdigita.web.ApplicationCollection;
+import com.arsdigita.web.Host;
+
+import java.io.IOException;
 import java.net.URL;
 import java.net.URLConnection;
-import java.io.IOException;
 
 import org.apache.log4j.Logger;
 
 /**
- * calls the appropriate jsp pages on all of the hosts so that
+ * Calls the appropriate jsp pages on all of the hosts so that
  * published files are synced across servers
  */
-class ThemeTransactionListener implements TransactionListener, ThemeConstants {
+class ThemeTransactionListener implements TransactionListener, ThemeDirectorConstants {
     
+    /** A logger instance.  */
     private static final Logger s_log = 
-        Logger.getLogger(ThemeTransactionListener.class);
+                                Logger.getLogger(ThemeTransactionListener.class);
 
     private Collection m_urls;
 
@@ -68,7 +69,7 @@ class ThemeTransactionListener implements TransactionListener, ThemeConstants {
 
         // find the mount location
         ApplicationCollection collection = Application.retrieveAllApplications();
-        collection.filterToApplicationType(ThemeApplication.BASE_DATA_OBJECT_TYPE);
+        collection.filterToApplicationType(ThemeDirector.BASE_DATA_OBJECT_TYPE);
         String mountPoint = null;
         if (collection.next()) {
             // it should only be mounted once but the jsp does not
@@ -110,12 +111,16 @@ class ThemeTransactionListener implements TransactionListener, ThemeConstants {
     public void beforeAbort(TransactionContext txn) {}
     public void afterAbort(TransactionContext txn) {}
 
+    /** 
+     * 
+     */
     private class SyncServers extends Thread {
         private Collection m_allURLs;
         public SyncServers(Collection urls) {
             m_allURLs = urls;
         }
 
+        @Override
         public void run() {
             Iterator iter = m_allURLs.iterator();
             while (iter.hasNext()) {
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/dispatcher/InternalThemePrefixerServlet.java b/ccm-themedirector/src/com/arsdigita/themedirector/dispatcher/InternalThemePrefixerServlet.java
similarity index 97%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/dispatcher/InternalThemePrefixerServlet.java
rename to ccm-themedirector/src/com/arsdigita/themedirector/dispatcher/InternalThemePrefixerServlet.java
index d9da13c2c..e989a7f6a 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/dispatcher/InternalThemePrefixerServlet.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/dispatcher/InternalThemePrefixerServlet.java
@@ -14,20 +14,21 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.theme.dispatcher;
+package com.arsdigita.themedirector.dispatcher;
 
+import com.arsdigita.bebop.page.PageTransformer;
 import com.arsdigita.dispatcher.DispatcherHelper;
 import com.arsdigita.web.InternalPrefixerServlet;
-import com.arsdigita.bebop.page.PageTransformer;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.ServletConfig;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 import java.io.IOException;
+
 import org.apache.log4j.Logger;
 
 /**
@@ -39,6 +40,7 @@ import org.apache.log4j.Logger;
  */
 public class InternalThemePrefixerServlet extends InternalPrefixerServlet {
 
+    /** A logger instance.  */
     private static final Logger s_log =
         Logger.getLogger(InternalPrefixerServlet.class);
 
@@ -52,6 +54,7 @@ public class InternalThemePrefixerServlet extends InternalPrefixerServlet {
      */
     public final static String THEME_PREVIEW_URL = "themePreviewURL";
 
+    @Override
     public void init()
         throws ServletException {
         ServletConfig conf = getServletConfig();
@@ -63,6 +66,7 @@ public class InternalThemePrefixerServlet extends InternalPrefixerServlet {
         }
     }
 
+    @Override
     protected void service(HttpServletRequest req,
                            HttpServletResponse resp)
         throws ServletException, IOException {
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/dispatcher/ThemeDownloadServlet.java b/ccm-themedirector/src/com/arsdigita/themedirector/dispatcher/ThemeDownloadServlet.java
similarity index 95%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/dispatcher/ThemeDownloadServlet.java
rename to ccm-themedirector/src/com/arsdigita/themedirector/dispatcher/ThemeDownloadServlet.java
index f2ceca922..4d30653da 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/dispatcher/ThemeDownloadServlet.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/dispatcher/ThemeDownloadServlet.java
@@ -17,7 +17,7 @@
  */
 
 
-package com.arsdigita.london.theme.dispatcher;
+package com.arsdigita.themedirector.dispatcher;
 
 import com.arsdigita.cms.ContentType;
 import com.arsdigita.dispatcher.AccessDeniedException;
@@ -28,10 +28,10 @@ import com.arsdigita.kernel.Party;
 import com.arsdigita.kernel.permissions.PermissionService;
 import com.arsdigita.kernel.permissions.PrivilegeDescriptor;
 import com.arsdigita.kernel.permissions.UniversalPermissionDescriptor;
-import com.arsdigita.london.theme.Theme;
-import com.arsdigita.london.theme.ThemeConstants;
-import com.arsdigita.london.theme.util.ManifestReader;
-import com.arsdigita.london.theme.util.WhiteListFilenameFilter;
+import com.arsdigita.themedirector.Theme;
+import com.arsdigita.themedirector.ThemeDirectorConstants;
+import com.arsdigita.themedirector.util.ManifestReader;
+import com.arsdigita.themedirector.util.WhiteListFilenameFilter;
 import com.arsdigita.runtime.RegistryConfig;
 import com.arsdigita.util.Files;
 import com.arsdigita.util.IO;
@@ -41,6 +41,7 @@ import com.arsdigita.web.LoginSignal;
 import com.arsdigita.web.Web;
 import com.arsdigita.xml.Document;
 import com.arsdigita.xml.Element;
+
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FilenameFilter;
@@ -56,6 +57,7 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.xml.parsers.ParserConfigurationException;
+
 import org.apache.log4j.Logger;
 
 
@@ -63,8 +65,9 @@ import org.apache.log4j.Logger;
  * A servlet that multiplexes all XSL files registered
  * against content types into one.
  */
-public class ThemeDownloadServlet extends BaseServlet implements ThemeConstants {
+public class ThemeDownloadServlet extends BaseServlet implements ThemeDirectorConstants {
 
+    /** A logger instance.  */
     private static final Logger s_log =
         Logger.getLogger(ThemeDownloadServlet.class);
 
@@ -72,6 +75,10 @@ public class ThemeDownloadServlet extends BaseServlet implements ThemeConstants
     public static final String PUBLISHED_PREFIX = "theme-published-";
     public static final String DEVELOPMENT_PREFIX = "theme-dev-";
 
+    /**
+     * 
+     * @param sreq
+     */
     private void checkPermission(HttpServletRequest sreq) {
         Party party = Kernel.getContext().getParty();
         if (party == null) {
@@ -89,6 +96,14 @@ public class ThemeDownloadServlet extends BaseServlet implements ThemeConstants
         }
     }
 
+    /**
+     *
+     * @param sreq
+     * @param sresp
+     * @throws ServletException
+     * @throws IOException
+     */
+    @Override
     protected void doService(HttpServletRequest sreq,
                              HttpServletResponse sresp)
         throws ServletException, IOException {
@@ -195,6 +210,11 @@ public class ThemeDownloadServlet extends BaseServlet implements ThemeConstants
 
     // XXX copy+paste of Templating.multiplexXSLFiles but with some
     // URL munging. Should be reconciled later
+    /**
+     * 
+     * @param paths
+     * @return
+     */
     public static InputStream multiplexXSLFiles(Iterator paths) {
         StringBuffer buf = new StringBuffer();
         Element root = new Element("xsl:stylesheet",
@@ -226,7 +246,8 @@ public class ThemeDownloadServlet extends BaseServlet implements ThemeConstants
      *  creating our zip.  Without this, we would have to iterate through
      *  the file list an extra time.  If the
      */
-    private class DirectoryFilter extends WhiteListFilenameFilter implements FilenameFilter {
+    private class DirectoryFilter extends WhiteListFilenameFilter
+                                  implements FilenameFilter {
         // there has to be a better way to do this...I have a hard
         // time believing that this filter is actually necessary...can we
         // do this by adding some magic to the Files.createZipFile class?
@@ -241,6 +262,7 @@ public class ThemeDownloadServlet extends BaseServlet implements ThemeConstants
             m_type = type;
         }
 
+        @Override
         public boolean accept(File dir, String name) {
             return super.accept(dir, name)  &&
                 (dir.getAbsolutePath().indexOf("/" + m_type + "/" + m_directoryName) > -1
@@ -250,6 +272,9 @@ public class ThemeDownloadServlet extends BaseServlet implements ThemeConstants
     }
 
 
+    /**
+     * 
+     */
     private class ZipWriterManifestReader extends ManifestReader {
         private ZipOutputStream m_out;
 
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeContainer.java b/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeContainer.java
similarity index 93%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeContainer.java
rename to ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeContainer.java
index aca749b22..db223ccb2 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeContainer.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeContainer.java
@@ -16,9 +16,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.theme.ui;
+package com.arsdigita.themedirector.ui;
 
-import com.arsdigita.london.theme.ui.listeners.ApproveThemeActionListener;
+import com.arsdigita.themedirector.ui.listeners.ApproveThemeActionListener;
 import com.arsdigita.bebop.ActionLink;
 import com.arsdigita.bebop.FormProcessException;
 import com.arsdigita.bebop.GridPanel;
@@ -34,10 +34,10 @@ import com.arsdigita.bebop.event.FormSubmissionListener;
 import com.arsdigita.bebop.event.FormSectionEvent;
 import com.arsdigita.bebop.event.PrintEvent;
 import com.arsdigita.bebop.event.PrintListener;
-import com.arsdigita.london.theme.Theme;
-import com.arsdigita.london.theme.ThemeConstants;
-import com.arsdigita.london.theme.dispatcher.ThemeDownloadServlet;
-import com.arsdigita.london.theme.util.GlobalizationUtil;
+import com.arsdigita.themedirector.Theme;
+import com.arsdigita.themedirector.ThemeDirectorConstants;
+import com.arsdigita.themedirector.dispatcher.ThemeDownloadServlet;
+import com.arsdigita.themedirector.util.GlobalizationUtil;
 import com.arsdigita.toolbox.ui.ActionGroup;
 import com.arsdigita.toolbox.ui.ModalPanel;
 import com.arsdigita.web.RedirectSignal;
@@ -49,16 +49,22 @@ import org.apache.log4j.Logger;
  *
  *  @author Randy Graebner &lt;randyg@redhat.com&gt;
  */
-public class ThemeContainer extends SimpleContainer implements ThemeConstants {
+public class ThemeContainer extends SimpleContainer implements ThemeDirectorConstants {
     
+    /** A logger instance.  */
     private static final Logger s_log = 
-        Logger.getLogger(ThemeContainer.class);
+                                Logger.getLogger(ThemeContainer.class);
 
     private ThemeSelectionModel m_model;
     private ThemeForm m_editForm;
     private ThemeValidationPanel m_validationPanel;
     private SimpleContainer m_mainPanel;
 
+    /**
+     * Constructor. 
+     * @param model
+     * @param parent
+     */
     public ThemeContainer(ThemeSelectionModel model, final ModalPanel parent) {
         super();
         m_model = model;
@@ -113,6 +119,7 @@ public class ThemeContainer extends SimpleContainer implements ThemeConstants {
                            (GlobalizationUtil.globalize("theme.preview_themes")));
 
         previewLink.addActionListener(new PreviewThemeActionListener(m_model) {
+                @Override
                 public void actionPerformed(ActionEvent e) {
                     PageState state = e.getPageState();
                     boolean areValid = 
@@ -148,6 +155,7 @@ public class ThemeContainer extends SimpleContainer implements ThemeConstants {
 
         approveThemeLink.addActionListener
             (new ApproveThemeActionListener(m_model) {
+                    @Override
                     public void actionPerformed(ActionEvent e) {
                         PageState state = e.getPageState();
                         boolean areValid = 
@@ -206,11 +214,19 @@ public class ThemeContainer extends SimpleContainer implements ThemeConstants {
     }
 
 
+    /**
+     *
+     * @param page
+     */
+    @Override
     public void register(Page page) {
         page.setVisibleDefault(m_editForm, false);
         page.setVisibleDefault(m_validationPanel, false);
     }
 
+    /**
+     * 
+     */
     private class ProductionFilesDownloadLink extends Link {
         ProductionFilesDownloadLink(final ThemeSelectionModel model) {
             super(new Label(GlobalizationUtil.globalize
@@ -229,6 +245,7 @@ public class ThemeContainer extends SimpleContainer implements ThemeConstants {
                   });
         }
 
+        @Override
         public boolean isVisible(PageState state) {
             return super.isVisible(state) &&
                 m_model.getSelectedTheme(state)
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeControlPanel.java b/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeControlPanel.java
similarity index 93%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeControlPanel.java
rename to ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeControlPanel.java
index 884c22701..dc31c8076 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeControlPanel.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeControlPanel.java
@@ -16,13 +16,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.theme.ui;
+package com.arsdigita.themedirector.ui;
 
-import com.arsdigita.london.theme.Theme;
-import com.arsdigita.london.theme.ThemeApplication;
-import com.arsdigita.london.theme.ThemeConstants;
-import com.arsdigita.london.theme.ui.listeners.CancelListener;
-import com.arsdigita.london.theme.util.GlobalizationUtil;
+import com.arsdigita.themedirector.Theme;
+import com.arsdigita.themedirector.ThemeDirector;
+import com.arsdigita.themedirector.ThemeDirectorConstants;
+import com.arsdigita.themedirector.ui.listeners.CancelListener;
+import com.arsdigita.themedirector.util.GlobalizationUtil;
 
 import com.arsdigita.bebop.ActionLink;
 import com.arsdigita.bebop.Form;
@@ -62,7 +62,7 @@ import org.apache.log4j.Logger;
  *  contains a list of the themes on the left side and it manages the state
  *  to show the correct forms/containers on the left
  */
-public class ThemeControlPanel extends SelectionPanel implements ThemeConstants {
+public class ThemeControlPanel extends SelectionPanel implements ThemeDirectorConstants {
     
     private static final Logger s_log = Logger.getLogger(ThemeControlPanel.class);
 
@@ -156,7 +156,7 @@ public class ThemeControlPanel extends SelectionPanel implements ThemeConstants
             public void init( FormSectionEvent ev ) {
                 FormData data = ev.getFormData();
 
-                ThemeApplication app = (ThemeApplication) Web.getContext().getApplication();
+                ThemeDirector app = (ThemeDirector) Web.getContext().getApplication();
                 Theme theme = app.getDefaultTheme();
 
                 if( null != theme )
@@ -174,7 +174,7 @@ public class ThemeControlPanel extends SelectionPanel implements ThemeConstants
                     theme = Theme.retrieve( themeID );
                 }
 
-                ThemeApplication app = (ThemeApplication) Web.getContext().getApplication();
+                ThemeDirector app = (ThemeDirector) Web.getContext().getApplication();
                 app.setDefaultTheme( theme );
             }
         } );
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeFilesList.java b/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeFilesList.java
similarity index 91%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeFilesList.java
rename to ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeFilesList.java
index d3058680b..b4d6eb226 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeFilesList.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeFilesList.java
@@ -16,19 +16,19 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.theme.ui;
+package com.arsdigita.themedirector.ui;
 
 import com.arsdigita.bebop.Label;
 import com.arsdigita.bebop.Page;
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.SimpleContainer;
-import com.arsdigita.london.theme.Theme;
-import com.arsdigita.london.theme.ThemeConstants;
-import com.arsdigita.london.theme.ThemeFile;
-import com.arsdigita.london.theme.ThemeFileCollection;
-import com.arsdigita.london.theme.ui.listeners.FileRemovalRequestListener;
-import com.arsdigita.london.theme.util.GlobalizationUtil;
-import com.arsdigita.london.theme.util.WhiteListFilenameFilter;
+import com.arsdigita.themedirector.Theme;
+import com.arsdigita.themedirector.ThemeDirectorConstants;
+import com.arsdigita.themedirector.ThemeFile;
+import com.arsdigita.themedirector.ThemeFileCollection;
+import com.arsdigita.themedirector.ui.listeners.FileRemovalRequestListener;
+import com.arsdigita.themedirector.util.GlobalizationUtil;
+import com.arsdigita.themedirector.util.WhiteListFilenameFilter;
 import com.arsdigita.toolbox.ui.FormatStandards;
 import com.arsdigita.util.Files;
 import com.arsdigita.web.Web;
@@ -45,7 +45,7 @@ import org.apache.log4j.Logger;
  *
  *  @author Randy Graebner &lt;randyg@redhat.com&gt;
  */
-class ThemeFilesList extends SimpleContainer implements ThemeConstants {
+class ThemeFilesList extends SimpleContainer implements ThemeDirectorConstants {
 
     private static final Logger s_log =
         Logger.getLogger(ThemeFilesList.class);
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeForm.java b/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeForm.java
similarity index 96%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeForm.java
rename to ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeForm.java
index 159b086a7..9a9fe21e2 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeForm.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeForm.java
@@ -16,10 +16,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.theme.ui;
+package com.arsdigita.themedirector.ui;
 
-import com.arsdigita.london.theme.Theme;
-// import com.arsdigita.london.theme.ThemeApplication;
+import com.arsdigita.themedirector.Theme;
+// import com.arsdigita.london.theme.ThemeDirector;
 import com.arsdigita.bebop.Form;
 import com.arsdigita.bebop.SaveCancelSection;
 import com.arsdigita.bebop.form.TextField;
@@ -39,10 +39,10 @@ import com.arsdigita.persistence.DataCollection;
 import com.arsdigita.persistence.SessionManager;
 import com.arsdigita.util.UncheckedWrapperException;
 import com.arsdigita.util.IO;
-import com.arsdigita.london.theme.ThemeConstants;
-import com.arsdigita.london.theme.ThemeApplication;
-import com.arsdigita.london.theme.util.GlobalizationUtil;
-import com.arsdigita.london.theme.util.ManifestReader;
+import com.arsdigita.themedirector.ThemeDirectorConstants;
+import com.arsdigita.themedirector.ThemeDirector;
+import com.arsdigita.themedirector.util.GlobalizationUtil;
+import com.arsdigita.themedirector.util.ManifestReader;
 import com.arsdigita.london.subsite.Subsite;
 import com.arsdigita.london.subsite.Site;
 import com.arsdigita.toolbox.ui.Cancellable;
@@ -62,7 +62,7 @@ import org.apache.log4j.Logger;
  *
  *  @author Randy Graenber &lt;randyg@redhat.com&gt;
  */
-public class ThemeForm extends Form implements Cancellable, ThemeConstants {
+public class ThemeForm extends Form implements Cancellable, ThemeDirectorConstants {
     
     private static final Logger s_log = Logger.getLogger(ThemeForm.class);
 
@@ -349,12 +349,12 @@ public class ThemeForm extends Form implements Cancellable, ThemeConstants {
     private void copyDefaultFiles(File newDirectory) throws IOException {
         ClassLoader loader = Thread.currentThread().getContextClassLoader();
         InputStream is = loader.getResourceAsStream
-            (ThemeApplication.getConfig().getDefaultThemeManifest());
+            (ThemeDirector.getConfig().getDefaultThemeManifest());
 
         if (is == null) {
             throw new IllegalStateException
                 ("no such resource: " + 
-                 ThemeApplication.getConfig().getDefaultThemeManifest());
+                 ThemeDirector.getConfig().getDefaultThemeManifest());
         }
         
         if ( !newDirectory.mkdirs() ) {
@@ -375,7 +375,7 @@ public class ThemeForm extends Form implements Cancellable, ThemeConstants {
             super(stream);
             m_newDirectory = newDirectory;
 
-            m_directoryFilter = ThemeApplication.getConfig().getDefaultThemePath();
+            m_directoryFilter = ThemeDirector.getConfig().getDefaultThemePath();
         }
 
         public void processManifestFileLine(InputStream is,
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeListModelBuilder.java b/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeListModelBuilder.java
similarity index 96%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeListModelBuilder.java
rename to ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeListModelBuilder.java
index f66740798..066a2ee7d 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeListModelBuilder.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeListModelBuilder.java
@@ -16,12 +16,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.theme.ui;
+package com.arsdigita.themedirector.ui;
 
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.List;
 import com.arsdigita.bebop.list.ListModel;
-import com.arsdigita.london.theme.Theme;
+import com.arsdigita.themedirector.Theme;
 import com.arsdigita.persistence.SessionManager;
 import com.arsdigita.persistence.DataCollection;
 import com.arsdigita.bebop.list.AbstractListModelBuilder;
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeProperties.java b/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeProperties.java
similarity index 97%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeProperties.java
rename to ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeProperties.java
index dd170834d..f83c6819c 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeProperties.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeProperties.java
@@ -1,13 +1,13 @@
-package com.arsdigita.london.theme.ui;
+package com.arsdigita.themedirector.ui;
 
-import com.arsdigita.london.theme.util.GlobalizationUtil;
+import com.arsdigita.themedirector.util.GlobalizationUtil;
 import com.arsdigita.bebop.GridPanel;
 import com.arsdigita.bebop.Label;
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.event.PrintListener;
 import com.arsdigita.bebop.event.PrintEvent;
 import com.arsdigita.toolbox.ui.FormatStandards;
-import com.arsdigita.london.theme.Theme;
+import com.arsdigita.themedirector.Theme;
 import org.apache.log4j.Logger;
 
 /**
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeSelectionModel.java b/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeSelectionModel.java
similarity index 94%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeSelectionModel.java
rename to ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeSelectionModel.java
index 267c55b18..7a4ea6c06 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeSelectionModel.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeSelectionModel.java
@@ -16,13 +16,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.theme.ui;
+package com.arsdigita.themedirector.ui;
 
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.SingleSelectionModel;
 import com.arsdigita.bebop.parameters.BigDecimalParameter;
 import com.arsdigita.kernel.ui.ACSObjectSelectionModel;
-import com.arsdigita.london.theme.Theme;
+import com.arsdigita.themedirector.Theme;
 
 
 public class ThemeSelectionModel extends ACSObjectSelectionModel {
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeValidationPanel.java b/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeValidationPanel.java
similarity index 96%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeValidationPanel.java
rename to ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeValidationPanel.java
index 151ea92c2..2307c1f54 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeValidationPanel.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeValidationPanel.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.theme.ui;
+package com.arsdigita.themedirector.ui;
 
 import com.arsdigita.bebop.ActionLink;
 import com.arsdigita.bebop.GridPanel;
@@ -27,11 +27,11 @@ import com.arsdigita.bebop.event.ActionEvent;
 import com.arsdigita.bebop.event.ActionListener;
 import com.arsdigita.bebop.RequestLocal;
 import com.arsdigita.bebop.SimpleComponent;
-import com.arsdigita.london.theme.ThemeConstants;
-import com.arsdigita.london.theme.Theme;
-import com.arsdigita.london.theme.ui.listeners.LoggingErrorListener;
-import com.arsdigita.london.theme.util.GlobalizationUtil;
-import com.arsdigita.london.theme.util.TransformerExceptionContainer;
+import com.arsdigita.themedirector.ThemeDirectorConstants;
+import com.arsdigita.themedirector.Theme;
+import com.arsdigita.themedirector.ui.listeners.LoggingErrorListener;
+import com.arsdigita.themedirector.util.GlobalizationUtil;
+import com.arsdigita.themedirector.util.TransformerExceptionContainer;
 import com.arsdigita.web.Web;
 import com.arsdigita.xml.Element;
 import java.io.File;
@@ -56,7 +56,7 @@ import org.apache.log4j.Logger;
  *
  *  @author Randy Graebner &lt;randyg@redhat.com&gt;
  */
-class ThemeValidationPanel extends GridPanel implements ThemeConstants {
+class ThemeValidationPanel extends GridPanel implements ThemeDirectorConstants {
     
     private static final Logger s_log = 
         Logger.getLogger(ThemeValidationPanel.class);
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeXSLParameterGenerator.java b/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeXSLParameterGenerator.java
similarity index 84%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeXSLParameterGenerator.java
rename to ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeXSLParameterGenerator.java
index 5cb087aa7..a0460a723 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeXSLParameterGenerator.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/ui/ThemeXSLParameterGenerator.java
@@ -16,12 +16,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.theme.ui;
+package com.arsdigita.themedirector.ui;
 
-import com.arsdigita.london.theme.dispatcher.InternalThemePrefixerServlet;
-import com.arsdigita.london.theme.ThemeConstants;
-import com.arsdigita.london.theme.ThemeConfig;
-import com.arsdigita.london.theme.ThemeApplication;
+import com.arsdigita.themedirector.dispatcher.InternalThemePrefixerServlet;
+import com.arsdigita.themedirector.ThemeDirectorConstants;
+import com.arsdigita.themedirector.ThemeDirectorConfig;
+import com.arsdigita.themedirector.ThemeDirector;
 import com.arsdigita.templating.XSLParameterGenerator;
 import javax.servlet.http.HttpServletRequest;
 import com.arsdigita.web.Web;
@@ -38,7 +38,7 @@ import com.arsdigita.london.subsite.SubsiteContext;
  *  @author Randy Graebner (randyg@redhat.com)
  */
 public class ThemeXSLParameterGenerator implements XSLParameterGenerator,
-                                                   ThemeConstants {
+                                                   ThemeDirectorConstants {
     /**
      *  This returns the correct value for the parameter.  This is the
      *  value that is added to the transformer and is available to all
@@ -66,7 +66,7 @@ public class ThemeXSLParameterGenerator implements XSLParameterGenerator,
             }
 
             if( null == themeURL ) {
-                String defaultThemeURL = ThemeConfig.getDefaultThemeURL( request );
+                String defaultThemeURL = ThemeDirectorConfig.getDefaultThemeURL( request );
 
                 if( null != defaultThemeURL ) themeURL = "/" + defaultThemeURL;
             }
@@ -82,8 +82,8 @@ public class ThemeXSLParameterGenerator implements XSLParameterGenerator,
             // this means that there is not theme associated with the
             // given subsite, so we return the default theme
             themeURL = 
-                ThemeApplication.getConfig().getDefaultThemeContext() +
-                ThemeApplication.getConfig().getDefaultThemePath();
+                ThemeDirector.getConfig().getDefaultThemeContext() +
+                ThemeDirector.getConfig().getDefaultThemePath();
             if (themeURL.endsWith("/")) {
                 themeURL = themeURL.substring(0, themeURL.length()-1);
             }
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/listeners/ApproveThemeActionListener.java b/ccm-themedirector/src/com/arsdigita/themedirector/ui/listeners/ApproveThemeActionListener.java
similarity index 92%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/ui/listeners/ApproveThemeActionListener.java
rename to ccm-themedirector/src/com/arsdigita/themedirector/ui/listeners/ApproveThemeActionListener.java
index f6c51c42f..416e65bd9 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/listeners/ApproveThemeActionListener.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/ui/listeners/ApproveThemeActionListener.java
@@ -16,19 +16,19 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.theme.ui.listeners;
+package com.arsdigita.themedirector.ui.listeners;
 
 import com.arsdigita.bebop.event.ActionEvent;
 import com.arsdigita.bebop.event.ActionListener;
 import com.arsdigita.kernel.Kernel;
 import com.arsdigita.london.subsite.Subsite;
-import com.arsdigita.london.theme.Theme;
-import com.arsdigita.london.theme.ThemeConstants;
-import com.arsdigita.london.theme.ThemeFile;
-import com.arsdigita.london.theme.ThemeObserver;
-import com.arsdigita.london.theme.ui.ThemeSelectionModel;
-import com.arsdigita.london.theme.util.ThemeFileUtil;
-import com.arsdigita.london.theme.util.WhiteListFilenameFilter;
+import com.arsdigita.themedirector.Theme;
+import com.arsdigita.themedirector.ThemeDirectorConstants;
+import com.arsdigita.themedirector.ThemeFile;
+import com.arsdigita.themedirector.ThemeObserver;
+import com.arsdigita.themedirector.ui.ThemeSelectionModel;
+import com.arsdigita.themedirector.util.ThemeFileUtil;
+import com.arsdigita.themedirector.util.WhiteListFilenameFilter;
 import com.arsdigita.persistence.DataOperation;
 import com.arsdigita.persistence.SessionManager;
 import com.arsdigita.util.Files;
@@ -50,7 +50,7 @@ import org.apache.log4j.Logger;
  *
  *  @author Randy Graebner &lt;randyg@redhat.com&gt;
  */
-public class ApproveThemeActionListener implements ThemeConstants, ActionListener {
+public class ApproveThemeActionListener implements ThemeDirectorConstants, ActionListener {
 
     private static final Logger s_log =
         Logger.getLogger(ApproveThemeActionListener.class);
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/listeners/CancelListener.java b/ccm-themedirector/src/com/arsdigita/themedirector/ui/listeners/CancelListener.java
similarity index 97%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/ui/listeners/CancelListener.java
rename to ccm-themedirector/src/com/arsdigita/themedirector/ui/listeners/CancelListener.java
index 932e0c9a0..e8c0c434b 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/listeners/CancelListener.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/ui/listeners/CancelListener.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.theme.ui.listeners;
+package com.arsdigita.themedirector.ui.listeners;
 
 import com.arsdigita.bebop.PageState;
 import com.arsdigita.toolbox.ui.Cancellable;
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/listeners/FileRemovalRequestListener.java b/ccm-themedirector/src/com/arsdigita/themedirector/ui/listeners/FileRemovalRequestListener.java
similarity index 88%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/ui/listeners/FileRemovalRequestListener.java
rename to ccm-themedirector/src/com/arsdigita/themedirector/ui/listeners/FileRemovalRequestListener.java
index fe8486e9b..cfafbeae0 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/listeners/FileRemovalRequestListener.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/ui/listeners/FileRemovalRequestListener.java
@@ -16,13 +16,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.theme.ui.listeners;
+package com.arsdigita.themedirector.ui.listeners;
 
 import com.arsdigita.bebop.event.RequestEvent;
 import com.arsdigita.bebop.event.RequestListener;
 import com.arsdigita.domain.DomainObjectFactory;
-import com.arsdigita.london.theme.ThemeConstants;
-import com.arsdigita.london.theme.ThemeFile;
+import com.arsdigita.themedirector.ThemeDirectorConstants;
+import com.arsdigita.themedirector.ThemeFile;
 import com.arsdigita.persistence.OID;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -35,7 +35,7 @@ import org.apache.log4j.Logger;
  *
  *  @author Sebastian Skracic sskracic@redhat.com
  */
-public class FileRemovalRequestListener implements ThemeConstants, RequestListener {
+public class FileRemovalRequestListener implements ThemeDirectorConstants, RequestListener {
 
     private static final Logger s_log =
         Logger.getLogger(FileRemovalRequestListener.class);
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/listeners/LoggingErrorListener.java b/ccm-themedirector/src/com/arsdigita/themedirector/ui/listeners/LoggingErrorListener.java
similarity index 96%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/ui/listeners/LoggingErrorListener.java
rename to ccm-themedirector/src/com/arsdigita/themedirector/ui/listeners/LoggingErrorListener.java
index 27a2c3536..250908829 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/listeners/LoggingErrorListener.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/ui/listeners/LoggingErrorListener.java
@@ -16,12 +16,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.theme.ui.listeners;
+package com.arsdigita.themedirector.ui.listeners;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
-import com.arsdigita.london.theme.util.TransformerExceptionContainer;
+import com.arsdigita.themedirector.util.TransformerExceptionContainer;
 import javax.xml.transform.ErrorListener;
 
 import org.apache.log4j.Level;
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/util/GlobalizationUtil.java b/ccm-themedirector/src/com/arsdigita/themedirector/util/GlobalizationUtil.java
similarity index 89%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/util/GlobalizationUtil.java
rename to ccm-themedirector/src/com/arsdigita/themedirector/util/GlobalizationUtil.java
index a86ea451e..7ec3e17bd 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/util/GlobalizationUtil.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/util/GlobalizationUtil.java
@@ -16,15 +16,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.theme.util;
+package com.arsdigita.themedirector.util;
 
 import com.arsdigita.globalization.GlobalizedMessage;
 
 /**
- * <p>
- * .
- * Contains methods to simplify globalizing keys
- * </p>
+ * Methods to simplify globalizing keys
  *
  * @author <a href="mailto:yon@arsdigita.com">yon@arsdigita.com</a>
  * @version $Revision: #1 $ $Date: 2003/11/18 $
@@ -33,7 +30,7 @@ import com.arsdigita.globalization.GlobalizedMessage;
 public class GlobalizationUtil {
     
     public static final String BUNDLE_NAME = 
-        "com.arsdigita.london.theme.ui.ThemeResources";
+        "com.arsdigita.themedirector.ThemeDirectorResources";
     
     public static GlobalizedMessage globalize(String key) {
         return new GlobalizedMessage(key, BUNDLE_NAME);
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/util/ManifestReader.java b/ccm-themedirector/src/com/arsdigita/themedirector/util/ManifestReader.java
similarity index 97%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/util/ManifestReader.java
rename to ccm-themedirector/src/com/arsdigita/themedirector/util/ManifestReader.java
index e8076b4b2..51320f8a8 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/util/ManifestReader.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/util/ManifestReader.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.theme.util;
+package com.arsdigita.themedirector.util;
 
 
 import java.io.InputStream;
@@ -27,8 +27,8 @@ import java.util.HashMap;
 import com.arsdigita.web.Web;
 import com.arsdigita.util.UncheckedWrapperException;
 import java.util.Collection;
-import com.arsdigita.london.theme.ThemeApplication;
-import com.arsdigita.london.theme.ThemeConstants;
+import com.arsdigita.themedirector.ThemeDirector;
+import com.arsdigita.themedirector.ThemeDirectorConstants;
 import javax.servlet.ServletContext;
 import org.apache.log4j.Logger;
 
@@ -41,7 +41,7 @@ import org.apache.log4j.Logger;
  *  override the "processManifestFileLine" to write the contents to
  *  the file system while another may write it to a zip file.
  */
-public abstract class ManifestReader implements ThemeConstants {
+public abstract class ManifestReader implements ThemeDirectorConstants {
 
     private static final Logger s_log = 
         Logger.getLogger(ManifestReader.class);
@@ -114,7 +114,7 @@ public abstract class ManifestReader implements ThemeConstants {
     public void processFile() {
             LineNumberReader lines =
                 new LineNumberReader(new InputStreamReader(m_stream));
-            Collection extensions = ThemeApplication.getConfig()
+            Collection extensions = ThemeDirector.getConfig()
                 .getDownloadFileExtensions();
 
             try {
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/util/ThemeDevelopmentFileManager.java b/ccm-themedirector/src/com/arsdigita/themedirector/util/ThemeDevelopmentFileManager.java
similarity index 96%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/util/ThemeDevelopmentFileManager.java
rename to ccm-themedirector/src/com/arsdigita/themedirector/util/ThemeDevelopmentFileManager.java
index 4bbd05543..ebc634e79 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/util/ThemeDevelopmentFileManager.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/util/ThemeDevelopmentFileManager.java
@@ -13,11 +13,11 @@
 *
 */
 
-package com.arsdigita.london.theme.util;
+package com.arsdigita.themedirector.util;
 
-import com.arsdigita.london.theme.Theme;
-import com.arsdigita.london.theme.ThemeFile;
-import com.arsdigita.london.theme.ThemeFileCollection;
+import com.arsdigita.themedirector.Theme;
+import com.arsdigita.themedirector.ThemeFile;
+import com.arsdigita.themedirector.ThemeFileCollection;
 
 import java.io.File;
 
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/util/ThemeFileManager.java b/ccm-themedirector/src/com/arsdigita/themedirector/util/ThemeFileManager.java
similarity index 96%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/util/ThemeFileManager.java
rename to ccm-themedirector/src/com/arsdigita/themedirector/util/ThemeFileManager.java
index a7d64deee..28397b1c4 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/util/ThemeFileManager.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/util/ThemeFileManager.java
@@ -13,7 +13,7 @@
 *
 */
 
-package com.arsdigita.london.theme.util;
+package com.arsdigita.themedirector.util;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -24,11 +24,11 @@ import javax.servlet.ServletContext;
 
 import org.apache.log4j.Logger;
 
-import com.arsdigita.london.theme.Theme;
-import com.arsdigita.london.theme.ThemeApplication;
-import com.arsdigita.london.theme.ThemeCollection;
-import com.arsdigita.london.theme.ThemeConstants;
-import com.arsdigita.london.theme.ThemeFileCollection;
+import com.arsdigita.themedirector.Theme;
+import com.arsdigita.themedirector.ThemeDirector;
+import com.arsdigita.themedirector.ThemeCollection;
+import com.arsdigita.themedirector.ThemeDirectorConstants;
+import com.arsdigita.themedirector.ThemeFileCollection;
 import com.arsdigita.persistence.SessionManager;
 import com.arsdigita.persistence.TransactionContext;
 import com.arsdigita.web.Application;
@@ -56,7 +56,7 @@ import com.arsdigita.web.Web;
  *
  * @version $Revision: #2 $ $DateTime: 2004/01/30 17:24:49 $
  */
-public abstract class ThemeFileManager extends Thread implements ThemeConstants {
+public abstract class ThemeFileManager extends Thread implements ThemeDirectorConstants {
 
     private Logger m_log;
 
@@ -189,7 +189,7 @@ public abstract class ThemeFileManager extends Thread implements ThemeConstants
     protected String getBaseDirectory() {
         if (m_baseDirectory == null) {
             ApplicationCollection collection = Application.retrieveAllApplications();
-            collection.filterToApplicationType(ThemeApplication.BASE_DATA_OBJECT_TYPE);
+            collection.filterToApplicationType(ThemeDirector.BASE_DATA_OBJECT_TYPE);
             Application app = null;
             if (collection.next()) {
                 // it should only be mounted once but the jsp does not
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/util/ThemeFileUtil.java b/ccm-themedirector/src/com/arsdigita/themedirector/util/ThemeFileUtil.java
similarity index 97%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/util/ThemeFileUtil.java
rename to ccm-themedirector/src/com/arsdigita/themedirector/util/ThemeFileUtil.java
index 94966de11..30ce6ffb0 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/util/ThemeFileUtil.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/util/ThemeFileUtil.java
@@ -13,11 +13,11 @@
 *
 */
 
-package com.arsdigita.london.theme.util;
+package com.arsdigita.themedirector.util;
 
-import com.arsdigita.london.theme.Theme;
-import com.arsdigita.london.theme.ThemeFile;
-import com.arsdigita.london.theme.ThemeFileCollection;
+import com.arsdigita.themedirector.Theme;
+import com.arsdigita.themedirector.ThemeFile;
+import com.arsdigita.themedirector.ThemeFileCollection;
 import com.arsdigita.util.Assert;
 import org.apache.log4j.Logger;
 import java.util.Date;
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/util/ThemePublishedFileManager.java b/ccm-themedirector/src/com/arsdigita/themedirector/util/ThemePublishedFileManager.java
similarity index 97%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/util/ThemePublishedFileManager.java
rename to ccm-themedirector/src/com/arsdigita/themedirector/util/ThemePublishedFileManager.java
index 33005227e..04161ee93 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/util/ThemePublishedFileManager.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/util/ThemePublishedFileManager.java
@@ -13,10 +13,10 @@
 *
 */
 
-package com.arsdigita.london.theme.util;
+package com.arsdigita.themedirector.util;
 
-import com.arsdigita.london.theme.Theme;
-import com.arsdigita.london.theme.ThemeFileCollection;
+import com.arsdigita.themedirector.Theme;
+import com.arsdigita.themedirector.ThemeFileCollection;
 import com.arsdigita.templating.Templating;
 import java.io.File;
 import org.apache.log4j.Logger;
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/util/TransformerExceptionContainer.java b/ccm-themedirector/src/com/arsdigita/themedirector/util/TransformerExceptionContainer.java
similarity index 99%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/util/TransformerExceptionContainer.java
rename to ccm-themedirector/src/com/arsdigita/themedirector/util/TransformerExceptionContainer.java
index fa9210cf4..f318b043f 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/util/TransformerExceptionContainer.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/util/TransformerExceptionContainer.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-package com.arsdigita.london.theme.util;
+package com.arsdigita.themedirector.util;
 
 
 import javax.xml.transform.SourceLocator;
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/util/WhiteListFilenameFilter.java b/ccm-themedirector/src/com/arsdigita/themedirector/util/WhiteListFilenameFilter.java
similarity index 90%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/util/WhiteListFilenameFilter.java
rename to ccm-themedirector/src/com/arsdigita/themedirector/util/WhiteListFilenameFilter.java
index 5dd3db978..ca37fd51c 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/util/WhiteListFilenameFilter.java
+++ b/ccm-themedirector/src/com/arsdigita/themedirector/util/WhiteListFilenameFilter.java
@@ -15,9 +15,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-package com.arsdigita.london.theme.util;
+package com.arsdigita.themedirector.util;
 
-import com.arsdigita.london.theme.ThemeApplication;
+import com.arsdigita.themedirector.ThemeDirector;
 import java.io.File;
 import java.io.FilenameFilter;
 import java.util.Collection;
@@ -39,7 +39,7 @@ public class WhiteListFilenameFilter implements FilenameFilter {
 
     public synchronized static boolean inWhiteList(String filename) {
         if (s_extensions == null) {
-            s_extensions = ThemeApplication.getConfig().getDownloadFileExtensions();
+            s_extensions = ThemeDirector.getConfig().getDownloadFileExtensions();
         }
         int extIndex = filename.lastIndexOf(".") + 1;
         return    extIndex > 0
diff --git a/ccm-ldn-theme/web/WEB-INF/web.ccm-ldn-theme.xml b/ccm-themedirector/web/WEB-INF/web.ccm-themedirector.xml
similarity index 73%
rename from ccm-ldn-theme/web/WEB-INF/web.ccm-ldn-theme.xml
rename to ccm-themedirector/web/WEB-INF/web.ccm-themedirector.xml
index 17e7af7e4..c85d9847f 100644
--- a/ccm-ldn-theme/web/WEB-INF/web.ccm-ldn-theme.xml
+++ b/ccm-themedirector/web/WEB-INF/web.ccm-themedirector.xml
@@ -4,35 +4,35 @@
  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-themes  -  servlet declarations BEGIN   -->
+    <!-- module ccm-themedirector  -  servlet declarations BEGIN   -->
     <servlet>
         <servlet-name>theme-files</servlet-name>
         <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
         <init-param>
             <param-name>template-path</param-name>
-            <param-value>/templates/ccm-ldn-theme</param-value>
+            <param-value>/templates/ccm-themedirector</param-value>
         </init-param>
     </servlet>
 
     <servlet>
         <servlet-name>ThemeDownload</servlet-name>
-        <servlet-class>com.arsdigita.london.theme.dispatcher.ThemeDownloadServlet</servlet-class>
+        <servlet-class>com.arsdigita.themedirector.dispatcher.ThemeDownloadServlet</servlet-class>
     </servlet>
 
     <servlet>
         <servlet-name>ThemePreviewServlet</servlet-name>
         <display-name>Servlet to allow admins to preview look/feel</display-name>
         <servlet-class>
-            com.arsdigita.london.theme.dispatcher.InternalThemePrefixerServlet
+            com.arsdigita.themedirector.dispatcher.InternalThemePrefixerServlet
     </servlet-class>
         <init-param>
             <param-name>prefix</param-name>
             <param-value>/theme</param-value>
         </init-param>
     </servlet>
-    <!-- module ccm-ldn-themes  -  servlet declarations END   -->
+    <!-- module ccm-themedirector  -  servlet declarations END   -->
 
-    <!-- module ccm-ldn-theme  -  servlet mappings BEGIN   -->
+    <!-- module ccm-themedirector  -  servlet mappings BEGIN   -->
     <servlet-mapping>
         <servlet-name>theme-files</servlet-name>
         <url-pattern>/theme-files/*</url-pattern>
@@ -47,6 +47,6 @@
         <servlet-name>ThemePreviewServlet</servlet-name>
         <url-pattern>/theme/*</url-pattern>
     </servlet-mapping>
-    <!-- module ccm-ldn-themes  -  servlet mappings END   -->
+    <!-- module ccm-themedirector  -  servlet mappings END   -->
 
 </web-app>
diff --git a/ccm-ldn-theme/web/__ccm__/themes-dev/placeholder.txt b/ccm-themedirector/web/__ccm__/themes-dev/placeholder.txt
similarity index 100%
rename from ccm-ldn-theme/web/__ccm__/themes-dev/placeholder.txt
rename to ccm-themedirector/web/__ccm__/themes-dev/placeholder.txt
diff --git a/ccm-ldn-theme/web/__ccm__/themes-prod/placeholder.txt b/ccm-themedirector/web/__ccm__/themes-prod/placeholder.txt
similarity index 100%
rename from ccm-ldn-theme/web/__ccm__/themes-prod/placeholder.txt
rename to ccm-themedirector/web/__ccm__/themes-prod/placeholder.txt
diff --git a/ccm-ldn-theme/web/__ccm__/themes/default/acs-subsite-index.xsl b/ccm-themedirector/web/__ccm__/themes/default/acs-subsite-index.xsl
similarity index 100%
rename from ccm-ldn-theme/web/__ccm__/themes/default/acs-subsite-index.xsl
rename to ccm-themedirector/web/__ccm__/themes/default/acs-subsite-index.xsl
diff --git a/ccm-ldn-theme/web/__ccm__/themes/default/admin-index.xsl b/ccm-themedirector/web/__ccm__/themes/default/admin-index.xsl
similarity index 100%
rename from ccm-ldn-theme/web/__ccm__/themes/default/admin-index.xsl
rename to ccm-themedirector/web/__ccm__/themes/default/admin-index.xsl
diff --git a/ccm-ldn-theme/web/__ccm__/themes/default/atoz-index.xsl b/ccm-themedirector/web/__ccm__/themes/default/atoz-index.xsl
similarity index 100%
rename from ccm-ldn-theme/web/__ccm__/themes/default/atoz-index.xsl
rename to ccm-themedirector/web/__ccm__/themes/default/atoz-index.xsl
diff --git a/ccm-ldn-theme/web/__ccm__/themes/default/content-center-index.xsl b/ccm-themedirector/web/__ccm__/themes/default/content-center-index.xsl
similarity index 100%
rename from ccm-ldn-theme/web/__ccm__/themes/default/content-center-index.xsl
rename to ccm-themedirector/web/__ccm__/themes/default/content-center-index.xsl
diff --git a/ccm-ldn-theme/web/__ccm__/themes/default/content-section-admin.xsl b/ccm-themedirector/web/__ccm__/themes/default/content-section-admin.xsl
similarity index 100%
rename from ccm-ldn-theme/web/__ccm__/themes/default/content-section-admin.xsl
rename to ccm-themedirector/web/__ccm__/themes/default/content-section-admin.xsl
diff --git a/ccm-ldn-theme/web/__ccm__/themes/default/content-section-index.xsl b/ccm-themedirector/web/__ccm__/themes/default/content-section-index.xsl
similarity index 100%
rename from ccm-ldn-theme/web/__ccm__/themes/default/content-section-index.xsl
rename to ccm-themedirector/web/__ccm__/themes/default/content-section-index.xsl
diff --git a/ccm-ldn-theme/web/__ccm__/themes/default/forum-index.xsl b/ccm-themedirector/web/__ccm__/themes/default/forum-index.xsl
similarity index 100%
rename from ccm-ldn-theme/web/__ccm__/themes/default/forum-index.xsl
rename to ccm-themedirector/web/__ccm__/themes/default/forum-index.xsl
diff --git a/ccm-ldn-theme/web/__ccm__/themes/default/navigation-admin.xsl b/ccm-themedirector/web/__ccm__/themes/default/navigation-admin.xsl
similarity index 100%
rename from ccm-ldn-theme/web/__ccm__/themes/default/navigation-admin.xsl
rename to ccm-themedirector/web/__ccm__/themes/default/navigation-admin.xsl
diff --git a/ccm-ldn-theme/web/__ccm__/themes/default/navigation-index.xsl b/ccm-themedirector/web/__ccm__/themes/default/navigation-index.xsl
similarity index 100%
rename from ccm-ldn-theme/web/__ccm__/themes/default/navigation-index.xsl
rename to ccm-themedirector/web/__ccm__/themes/default/navigation-index.xsl
diff --git a/ccm-ldn-theme/web/__ccm__/themes/default/rss-index.xsl b/ccm-themedirector/web/__ccm__/themes/default/rss-index.xsl
similarity index 100%
rename from ccm-ldn-theme/web/__ccm__/themes/default/rss-index.xsl
rename to ccm-themedirector/web/__ccm__/themes/default/rss-index.xsl
diff --git a/ccm-ldn-theme/web/__ccm__/themes/default/search-index.xsl b/ccm-themedirector/web/__ccm__/themes/default/search-index.xsl
similarity index 100%
rename from ccm-ldn-theme/web/__ccm__/themes/default/search-index.xsl
rename to ccm-themedirector/web/__ccm__/themes/default/search-index.xsl
diff --git a/ccm-ldn-theme/web/__ccm__/themes/default/shortcuts-index.xsl b/ccm-themedirector/web/__ccm__/themes/default/shortcuts-index.xsl
similarity index 100%
rename from ccm-ldn-theme/web/__ccm__/themes/default/shortcuts-index.xsl
rename to ccm-themedirector/web/__ccm__/themes/default/shortcuts-index.xsl
diff --git a/ccm-ldn-theme/web/__ccm__/themes/default/simplesurvey-index.xsl b/ccm-themedirector/web/__ccm__/themes/default/simplesurvey-index.xsl
similarity index 100%
rename from ccm-ldn-theme/web/__ccm__/themes/default/simplesurvey-index.xsl
rename to ccm-themedirector/web/__ccm__/themes/default/simplesurvey-index.xsl
diff --git a/ccm-ldn-theme/web/__ccm__/themes/default/sitemap-index.xsl b/ccm-themedirector/web/__ccm__/themes/default/sitemap-index.xsl
similarity index 100%
rename from ccm-ldn-theme/web/__ccm__/themes/default/sitemap-index.xsl
rename to ccm-themedirector/web/__ccm__/themes/default/sitemap-index.xsl
diff --git a/ccm-ldn-theme/web/__ccm__/themes/default/subsite-index.xsl b/ccm-themedirector/web/__ccm__/themes/default/subsite-index.xsl
similarity index 100%
rename from ccm-ldn-theme/web/__ccm__/themes/default/subsite-index.xsl
rename to ccm-themedirector/web/__ccm__/themes/default/subsite-index.xsl
diff --git a/ccm-ldn-theme/web/__ccm__/themes/default/webdev-support-index.xsl b/ccm-themedirector/web/__ccm__/themes/default/webdev-support-index.xsl
similarity index 100%
rename from ccm-ldn-theme/web/__ccm__/themes/default/webdev-support-index.xsl
rename to ccm-themedirector/web/__ccm__/themes/default/webdev-support-index.xsl
diff --git a/ccm-ldn-theme/web/__ccm__/themes/default/workspace-admin.xsl b/ccm-themedirector/web/__ccm__/themes/default/workspace-admin.xsl
similarity index 100%
rename from ccm-ldn-theme/web/__ccm__/themes/default/workspace-admin.xsl
rename to ccm-themedirector/web/__ccm__/themes/default/workspace-admin.xsl
diff --git a/ccm-ldn-theme/web/__ccm__/themes/default/workspace-edit.xsl b/ccm-themedirector/web/__ccm__/themes/default/workspace-edit.xsl
similarity index 100%
rename from ccm-ldn-theme/web/__ccm__/themes/default/workspace-edit.xsl
rename to ccm-themedirector/web/__ccm__/themes/default/workspace-edit.xsl
diff --git a/ccm-ldn-theme/web/__ccm__/themes/default/workspace-index.xsl b/ccm-themedirector/web/__ccm__/themes/default/workspace-index.xsl
similarity index 100%
rename from ccm-ldn-theme/web/__ccm__/themes/default/workspace-index.xsl
rename to ccm-themedirector/web/__ccm__/themes/default/workspace-index.xsl
diff --git a/ccm-ldn-theme/web/templates/ccm-ldn-theme/index.jsp b/ccm-themedirector/web/templates/ccm-themedirector/index.jsp
similarity index 90%
rename from ccm-ldn-theme/web/templates/ccm-ldn-theme/index.jsp
rename to ccm-themedirector/web/templates/ccm-themedirector/index.jsp
index f0e2d6946..fedd830d8 100755
--- a/ccm-ldn-theme/web/templates/ccm-ldn-theme/index.jsp
+++ b/ccm-themedirector/web/templates/ccm-themedirector/index.jsp
@@ -5,7 +5,7 @@
 
   <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
   <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
-  <jsp:directive.page import="com.arsdigita.london.theme.ui.ThemeControlPanel"/>
+  <jsp:directive.page import="com.arsdigita.themedirector.ui.ThemeControlPanel"/>
   <jsp:directive.page import="com.arsdigita.toolbox.ui.ApplicationAuthenticationListener"/>
 
   <jsp:scriptlet>
diff --git a/ccm-ldn-theme/web/templates/ccm-ldn-theme/sync-theme.jsp b/ccm-themedirector/web/templates/ccm-themedirector/sync-theme.jsp
similarity index 66%
rename from ccm-ldn-theme/web/templates/ccm-ldn-theme/sync-theme.jsp
rename to ccm-themedirector/web/templates/ccm-themedirector/sync-theme.jsp
index 6bb1a823c..aa2891622 100755
--- a/ccm-ldn-theme/web/templates/ccm-ldn-theme/sync-theme.jsp
+++ b/ccm-themedirector/web/templates/ccm-themedirector/sync-theme.jsp
@@ -5,20 +5,20 @@
 
   <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
   <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
-  <jsp:directive.page import="com.arsdigita.london.theme.util.ThemePublishedFileManager"/>
-  <jsp:directive.page import="com.arsdigita.london.theme.util.ThemeDevelopmentFileManager"/>
-  <jsp:directive.page import="com.arsdigita.london.theme.util.ThemeFileManager"/>
-  <jsp:directive.page import="com.arsdigita.london.theme.ThemeFile"/>
-  <jsp:directive.page import="com.arsdigita.london.theme.Theme"/>
+  <jsp:directive.page import="com.arsdigita.themedirector.util.ThemePublishedFileManager"/>
+  <jsp:directive.page import="com.arsdigita.themedirector.util.ThemeDevelopmentFileManager"/>
+  <jsp:directive.page import="com.arsdigita.themedirector.util.ThemeFileManager"/>
+  <jsp:directive.page import="com.arsdigita.themedirector.ThemeFile"/>
+  <jsp:directive.page import="com.arsdigita.themedirector.Theme"/>
   <jsp:directive.page import="javax.servlet.jsp.JspWriter"/>
   <jsp:directive.page import="com.arsdigita.domain.DataObjectNotFoundException"/>
-    <jsp:directive.page import="com.arsdigita.dispatcher.AccessDeniedException"/>
-    <jsp:directive.page import="com.arsdigita.kernel.Party"/>
-    <jsp:directive.page import="com.arsdigita.kernel.Kernel"/>
-    <jsp:directive.page import="com.arsdigita.kernel.Resource"/>
-    <jsp:directive.page import="com.arsdigita.kernel.permissions.PermissionDescriptor"/>
-    <jsp:directive.page import="com.arsdigita.kernel.permissions.PrivilegeDescriptor"/>
-    <jsp:directive.page import="com.arsdigita.kernel.permissions.PermissionService"/>
+  <jsp:directive.page import="com.arsdigita.dispatcher.AccessDeniedException"/>
+  <jsp:directive.page import="com.arsdigita.kernel.Party"/>
+  <jsp:directive.page import="com.arsdigita.kernel.Kernel"/>
+  <jsp:directive.page import="com.arsdigita.kernel.Resource"/>
+  <jsp:directive.page import="com.arsdigita.kernel.permissions.PermissionDescriptor"/>
+  <jsp:directive.page import="com.arsdigita.kernel.permissions.PrivilegeDescriptor"/>
+  <jsp:directive.page import="com.arsdigita.kernel.permissions.PermissionService"/>
   <jsp:scriptlet>
     DispatcherHelper.cacheDisable(response);
 
@@ -32,7 +32,8 @@
                 theme = Theme.findByURL(themeURL);
             } catch (DataObjectNotFoundException e) {
                 // no item so we just return
-                out.println("Unable to sync theme with URL " + themeURL + " because no theme found");
+                out.println("Unable to sync theme with URL " + themeURL +
+                            " because no theme found");
                 return;
             }
         }
diff --git a/ccm-ldn-theme/web/templates/ccm-ldn-theme/undoTheme-login.jsp b/ccm-themedirector/web/templates/ccm-themedirector/undoTheme-login.jsp
similarity index 97%
rename from ccm-ldn-theme/web/templates/ccm-ldn-theme/undoTheme-login.jsp
rename to ccm-themedirector/web/templates/ccm-themedirector/undoTheme-login.jsp
index af3516142..71244fd9b 100755
--- a/ccm-ldn-theme/web/templates/ccm-ldn-theme/undoTheme-login.jsp
+++ b/ccm-themedirector/web/templates/ccm-themedirector/undoTheme-login.jsp
@@ -7,7 +7,7 @@
 <%@ page import = "com.arsdigita.kernel.security.Credential" %>
 <%@ page import = "com.arsdigita.kernel.security.CredentialException" %>
 <%@ page import = "com.arsdigita.globalization.GlobalizedMessage" %>
-<%@ page import = "com.arsdigita.london.theme.util.GlobalizationUtil" %>
+<%@ page import = "com.arsdigita.themedirector.util.GlobalizationUtil" %>
 
 <%!
     /**
@@ -81,8 +81,8 @@ out.println(GlobalizationUtil.globalize("theme.undo.please_login").localize());
 </td>
 <td>
   <input type="password" name="password" size="25"/>
-</td>
   <input type="hidden" name="timestamp" value="<%=Credential.create("timestamp", 1000 * 300)%>"/>
+</td>
 </tr>
 <tr>
 <td colspan="2">
diff --git a/ccm-ldn-theme/web/templates/ccm-ldn-theme/undoTheme.jsp b/ccm-themedirector/web/templates/ccm-themedirector/undoTheme.jsp
similarity index 98%
rename from ccm-ldn-theme/web/templates/ccm-ldn-theme/undoTheme.jsp
rename to ccm-themedirector/web/templates/ccm-themedirector/undoTheme.jsp
index b2926e584..b4576a6b3 100755
--- a/ccm-ldn-theme/web/templates/ccm-ldn-theme/undoTheme.jsp
+++ b/ccm-themedirector/web/templates/ccm-themedirector/undoTheme.jsp
@@ -12,11 +12,11 @@
 <%@ page import = "com.arsdigita.kernel.Kernel" %>
 <%@ page import = "com.arsdigita.kernel.Party" %>
 <%@ page import = "com.arsdigita.kernel.security.*" %>
-<%@ page import = "com.arsdigita.london.theme.Theme" %>
+<%@ page import = "com.arsdigita.themedirector.Theme" %>
 <%@ page import = "com.arsdigita.web.Web" %>
 <%@ page import = "javax.security.auth.login.LoginException" %>
 <%@ page import = "javax.security.auth.login.FailedLoginException" %>
-<%@ page import = "com.arsdigita.london.theme.util.GlobalizationUtil" %>
+<%@ page import = "com.arsdigita.themedirector.util.GlobalizationUtil" %>
    
 <%! 
     /*
diff --git a/ccm-themedirector/web/themes/devel-themedir/placeholder.txt b/ccm-themedirector/web/themes/devel-themedir/placeholder.txt
new file mode 100644
index 000000000..25107306a
--- /dev/null
+++ b/ccm-themedirector/web/themes/devel-themedir/placeholder.txt
@@ -0,0 +1,2 @@
+This is a place holder file that is here to make sure that the
+directory is created and correctly copied with the appropriate permissions.
\ No newline at end of file
diff --git a/ccm-ldn-theme/web/__ccm__/apps/theme/xsl/action-group.xsl b/ccm-themedirector/web/themes/heirloom/apps/themedirector/xsl/action-group.xsl
similarity index 76%
rename from ccm-ldn-theme/web/__ccm__/apps/theme/xsl/action-group.xsl
rename to ccm-themedirector/web/themes/heirloom/apps/themedirector/xsl/action-group.xsl
index 47d1fa02f..7052e0a07 100755
--- a/ccm-ldn-theme/web/__ccm__/apps/theme/xsl/action-group.xsl
+++ b/ccm-themedirector/web/themes/heirloom/apps/themedirector/xsl/action-group.xsl
@@ -5,7 +5,9 @@
   xmlns:cms="http://www.arsdigita.com/cms/1.0"
 >
   <xsl:param name="static-prefix"/>
-<!-- TODO: this is a copy of the file at /cms/web/__ccm__/static/cms/admin/layout-panel/layout-panel.xsl and should be deleted when that file is moved in to core. -->
+<!-- TODO: this is a copy of the file at 
+           /cms/web/__ccm__/static/cms/admin/layout-panel/layout-panel.xsl
+           and should be deleted when that file is moved in to core. -->
   <xsl:template match="bebop:actionGroup">
     <div class="action-group">
       <div class="subject">
@@ -18,11 +20,13 @@
             <td class="action-icon">
               <xsl:choose>
                 <xsl:when test="@class">
-                  <img src="{$static-prefix}/cms/admin/action-group/action-{@class}.png" height="14" width="14"/>
+                  <img src="{$static-prefix}/cms/admin/action-group/action-{@class}.png"
+                       height="14" width="14"/>
                 </xsl:when>
 
                 <xsl:otherwise>
-                  <img src="{$static-prefix}/cms/admin/action-group/action-generic.png" height="14" width="14"/>
+                  <img src="{$static-prefix}/cms/admin/action-group/action-generic.png"
+                       height="14" width="14"/>
                 </xsl:otherwise>
               </xsl:choose>
             </td>
diff --git a/ccm-ldn-theme/web/__ccm__/apps/theme/xsl/index.xsl b/ccm-themedirector/web/themes/heirloom/apps/themedirector/xsl/index.xsl
similarity index 93%
rename from ccm-ldn-theme/web/__ccm__/apps/theme/xsl/index.xsl
rename to ccm-themedirector/web/themes/heirloom/apps/themedirector/xsl/index.xsl
index a97699f5e..3ddead6b7 100755
--- a/ccm-ldn-theme/web/__ccm__/apps/theme/xsl/index.xsl
+++ b/ccm-themedirector/web/themes/heirloom/apps/themedirector/xsl/index.xsl
@@ -9,10 +9,10 @@
   <xsl:import href="../../../../../ROOT/packages/bebop/xsl/bebop.xsl"/>
   <xsl:import href="../../../../../ROOT/packages/ui/xsl/ui.xsl"/>
   -->
-  <!-- IMPORT DEFINITIONS ccm-ldn-theme installed into the main CCM webapp
+  <!-- IMPORT DEFINITIONS ccm-themedirector 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/ui/xsl/ui.xsl"/>
 
   <xsl:import href="layout-panel.xsl"/>
   <xsl:import href="section.xsl"/>
diff --git a/ccm-ldn-theme/web/__ccm__/apps/theme/xsl/layout-panel.xsl b/ccm-themedirector/web/themes/heirloom/apps/themedirector/xsl/layout-panel.xsl
similarity index 92%
rename from ccm-ldn-theme/web/__ccm__/apps/theme/xsl/layout-panel.xsl
rename to ccm-themedirector/web/themes/heirloom/apps/themedirector/xsl/layout-panel.xsl
index 18f2b0e55..6ab197ed7 100755
--- a/ccm-ldn-theme/web/__ccm__/apps/theme/xsl/layout-panel.xsl
+++ b/ccm-themedirector/web/themes/heirloom/apps/themedirector/xsl/layout-panel.xsl
@@ -4,7 +4,9 @@
   xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
 >
 
-<!-- TODO: this is a copy of the file at /cms/web/__ccm__/static/cms/admin/layout-panel/layout-panel.xsl and should be deleted when that file is moved in to core. -->
+<!-- TODO: this is a copy of the file at 
+           /cms/web/__ccm__/static/cms/admin/layout-panel/layout-panel.xsl
+           and should be deleted when that file is moved in to core. -->
   <xsl:template match="bebop:layoutPanel">
     <div class="layout-panel">
       <xsl:if test="bebop:top">
diff --git a/ccm-ldn-theme/web/__ccm__/apps/theme/xsl/section.xsl b/ccm-themedirector/web/themes/heirloom/apps/themedirector/xsl/section.xsl
similarity index 73%
rename from ccm-ldn-theme/web/__ccm__/apps/theme/xsl/section.xsl
rename to ccm-themedirector/web/themes/heirloom/apps/themedirector/xsl/section.xsl
index 46b39911b..b660a9f2d 100755
--- a/ccm-ldn-theme/web/__ccm__/apps/theme/xsl/section.xsl
+++ b/ccm-themedirector/web/themes/heirloom/apps/themedirector/xsl/section.xsl
@@ -5,7 +5,9 @@
   xmlns:cms="http://www.arsdigita.com/cms/1.0"
 >
 
-<!-- TODO: this is a copy of the file at /cms/web/__ccm__/static/cms/admin/layout-panel/layout-panel.xsl and should be deleted when that file is moved in to core. -->
+<!-- TODO: this is a copy of the file at 
+           /cms/web/__ccm__/static/cms/admin/layout-panel/layout-panel.xsl
+           and should be deleted when that file is moved in to core. -->
   <xsl:template match="bebop:section">
     <div class="section">
       <div class="heading">
diff --git a/ccm-themedirector/web/themes/published-themedir/placeholder.txt b/ccm-themedirector/web/themes/published-themedir/placeholder.txt
new file mode 100644
index 000000000..25107306a
--- /dev/null
+++ b/ccm-themedirector/web/themes/published-themedir/placeholder.txt
@@ -0,0 +1,2 @@
+This is a place holder file that is here to make sure that the
+directory is created and correctly copied with the appropriate permissions.
\ No newline at end of file
diff --git a/ccm-themedirector/web/themes/static/default/acs-subsite-index.xsl b/ccm-themedirector/web/themes/static/default/acs-subsite-index.xsl
new file mode 100644
index 000000000..3d6994bfa
--- /dev/null
+++ b/ccm-themedirector/web/themes/static/default/acs-subsite-index.xsl
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+  version="1.0" >
+<!--
+  <xsl:import href="../../../../ROOT/__ccm__/apps/acs-subsite/xsl/index.xsl"/>
+-->
+  <xsl:import href="../../heirloom/apps/acs-subsite/xsl/index.xsl"/>
+
+</xsl:stylesheet>
diff --git a/ccm-themedirector/web/themes/static/default/admin-index.xsl b/ccm-themedirector/web/themes/static/default/admin-index.xsl
new file mode 100644
index 000000000..7aea67457
--- /dev/null
+++ b/ccm-themedirector/web/themes/static/default/admin-index.xsl
@@ -0,0 +1,9 @@
+<?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
new file mode 100644
index 000000000..4c4311f12
--- /dev/null
+++ b/ccm-themedirector/web/themes/static/default/atoz-index.xsl
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version="1.0">
+
+  <xsl:import href="../../../__ccm__/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
new file mode 100644
index 000000000..bb6ab9923
--- /dev/null
+++ b/ccm-themedirector/web/themes/static/default/content-center-index.xsl
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+  version="1.0" >
+  
+  <xsl:import href="../../../../ROOT/__ccm__/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
new file mode 100644
index 000000000..4f09aa6b7
--- /dev/null
+++ b/ccm-themedirector/web/themes/static/default/content-section-admin.xsl
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+  version="1.0" >
+  
+  <xsl:import href="../../../../ROOT/__ccm__/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
new file mode 100644
index 000000000..b3717fe2a
--- /dev/null
+++ b/ccm-themedirector/web/themes/static/default/content-section-index.xsl
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+  version="1.0" >
+  
+  <xsl:import href="../../../../ROOT/__ccm__/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
new file mode 100644
index 000000000..ae4f389d7
--- /dev/null
+++ b/ccm-themedirector/web/themes/static/default/forum-index.xsl
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+  version="1.0" >
+  
+  <xsl:import href="../../../../ccm-forum/__ccm__/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
new file mode 100644
index 000000000..1d22f7546
--- /dev/null
+++ b/ccm-themedirector/web/themes/static/default/navigation-admin.xsl
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+  version="1.0" >
+  
+  <xsl:import href="../../../../ROOT/__ccm__/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
new file mode 100644
index 000000000..0dad215f9
--- /dev/null
+++ b/ccm-themedirector/web/themes/static/default/navigation-index.xsl
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+  version="1.0" >
+  
+  <xsl:import href="../../../../ROOT/__ccm__/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
new file mode 100644
index 000000000..bb6a235da
--- /dev/null
+++ b/ccm-themedirector/web/themes/static/default/rss-index.xsl
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<xsl:stylesheet 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+  version="1.0" >
+
+  <xsl:import href="../../../../ccm-ldn-rss/__ccm__/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
new file mode 100644
index 000000000..91908404d
--- /dev/null
+++ b/ccm-themedirector/web/themes/static/default/search-index.xsl
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+  version="1.0" >
+  
+  <xsl:import href="../../../../ccm-ldn-search/__ccm__/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
new file mode 100644
index 000000000..e891ce813
--- /dev/null
+++ b/ccm-themedirector/web/themes/static/default/shortcuts-index.xsl
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<xsl:stylesheet 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+  version="1.0" >
+
+  <xsl:import href="../../../../ccm-ldn-shortcuts/__ccm__/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
new file mode 100644
index 000000000..f17e01f0a
--- /dev/null
+++ b/ccm-themedirector/web/themes/static/default/simplesurvey-index.xsl
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<xsl:stylesheet 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+  version="1.0" >
+    
+  <xsl:import href="../../../../ccm-simplesurvey/__ccm__/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
new file mode 100644
index 000000000..6a6ec8dc1
--- /dev/null
+++ b/ccm-themedirector/web/themes/static/default/sitemap-index.xsl
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<xsl:stylesheet 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+  version="1.0">
+  
+  <xsl:import href="../../../../ROOT/__ccm__/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
new file mode 100644
index 000000000..129c2b22a
--- /dev/null
+++ b/ccm-themedirector/web/themes/static/default/subsite-index.xsl
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<xsl:stylesheet 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+  version="1.0" >
+  
+  <xsl:import href="../../../../ccm-ldn-subsite/__ccm__/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
new file mode 100644
index 000000000..cbc02c643
--- /dev/null
+++ b/ccm-themedirector/web/themes/static/default/webdev-support-index.xsl
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<xsl:stylesheet 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+  version="1.0" >
+ 
+  <xsl:import href="../../../../ROOT/__ccm__/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
new file mode 100644
index 000000000..f95b21504
--- /dev/null
+++ b/ccm-themedirector/web/themes/static/default/workspace-admin.xsl
@@ -0,0 +1,7 @@
+<xsl:stylesheet 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+  version="1.0">
+
+  <xsl:import href="../../../../ROOT/__ccm__/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
new file mode 100644
index 000000000..c0f6c299d
--- /dev/null
+++ b/ccm-themedirector/web/themes/static/default/workspace-edit.xsl
@@ -0,0 +1,7 @@
+<xsl:stylesheet 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+  version="1.0">
+
+  <xsl:import href="../../../../ROOT/__ccm__/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
new file mode 100644
index 000000000..e1cc327e3
--- /dev/null
+++ b/ccm-themedirector/web/themes/static/default/workspace-index.xsl
@@ -0,0 +1,7 @@
+<xsl:stylesheet 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+  version="1.0">
+
+  <xsl:import href="../../../../ROOT/__ccm__/apps/workspace/xsl/index.xsl"/>
+  
+</xsl:stylesheet>
diff --git a/environment/project.xml.nsh b/environment/project.xml.nsh
index dd0e9af4a..e3964fc8b 100644
--- a/environment/project.xml.nsh
+++ b/environment/project.xml.nsh
@@ -6,10 +6,10 @@
 <ccm:project   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
                xmlns:ccm="http://ccm.redhat.com/ccm-project" 
               ccmVersion="6.1" 
-                    name="aplaws-gen" 
+                    name="aplaws-nsh" 
               prettyName="APLAWS plus NSH" 
-                 version="1-0-9" 
-                 release="rc-3" 
+                 version="1-1-1" 
+                 release="r796" 
                   webxml="web.xml-aplaws" 
                   webapp="ROOT" 
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
@@ -20,6 +20,9 @@
 
 
 <ccm:build>
+<!-- included modules are the same as for 1.0.9 as a intermediate version. New modules will be
+     added  later  -->
+
 <!--   Main apps   -->
 <!--   - - - - -   -->
         <ccm:application name="ccm-core"/>
@@ -27,15 +30,15 @@
         <ccm:application name="ccm-cms"/>
 
         <ccm:application name="ccm-cms-assets-fileattachment"/>
-        <ccm:application name="ccm-cms-assets-imagestep"/>
+        <ccm:application name="ccm-cms-assets-imagestep"/>  <!-- previously ldn-image-step -->
         <ccm:application name="ccm-cms-assets-notes"/>
         <ccm:application name="ccm-cms-assets-relatedlink"/>
 
-<!--    <ccm:application name="ccm-cms-types-address"/>              -->
+<!--    <ccm:application name="ccm-cms-types-address"/>  now simpleaddress -->
 <!--    <ccm:application name="ccm-cms-types-agenda"/>               -->
         <ccm:application name="ccm-cms-types-article"/>
         <ccm:application name="ccm-cms-types-bookmark"/>
-        <ccm:application name="ccm-cms-types-contact"/>
+<!--    <ccm:application name="ccm-cms-types-contact"/>              -->
 <!--    <ccm:application name="ccm-cms-types-esdservice"/>           -->
         <ccm:application name="ccm-cms-types-event"/>
         <ccm:application name="ccm-cms-types-faqitem"/>
@@ -54,7 +57,9 @@
 <!--    <ccm:application name="ccm-cms-types-organization"/>         -->
 <!--    <ccm:application name="ccm-cms-types-pressrelease"/>         -->
 <!--    <ccm:application name="ccm-cms-types-service"/>              -->
-<!-- Fuer OpenCCM aktivieren:                                        -->
+<!-- simpleadddress is the old types-address. Included for backwards
+     compatibility to be able to transfer data to new type member or person  -->
+        <ccm:application name="ccm-cms-types-simpleaddress"/>  
 <!--    <ccm:application name="ccm-cms-types-siteproxy"/>            -->
 <!--    <ccm:application name="ccm-cms-types-xmlfeed"/>              -->
 
@@ -69,6 +74,7 @@
         <ccm:application name="ccm-forum"/>
         <ccm:application name="ccm-forum-categorised"/>
 <!--    <ccm:application name="ccm-simplesurvey"/>                   -->
+        <ccm:application name="ccm-themedirector"/>
         <ccm:application name="ccm-user-preferences"/>
 <!--    <ccm:application name="ccm-weblog"/>                         -->
 <!--    <ccm:application name="ccm-webpage"/>                        -->
@@ -89,7 +95,6 @@
         <ccm:application name="ccm-ldn-shortcuts"/>
         <ccm:application name="ccm-ldn-subsite"/>                    
         <ccm:application name="ccm-ldn-terms"/>
-        <ccm:application name="ccm-ldn-theme"/>
         <ccm:application name="ccm-ldn-util"/>
 
 
diff --git a/environment/project.xml.staatsschiff b/environment/project.xml.staatsschiff
index 98d2f990b..9cefe9df0 100644
--- a/environment/project.xml.staatsschiff
+++ b/environment/project.xml.staatsschiff
@@ -8,7 +8,7 @@
                     name="aplaws-staatsschiff" 
               prettyName="APLAWS plus" 
                  version="1-1-1" 
-                 release="753" 
+                 release="780" 
                   webxml="web.xml-aplaws" 
                   webapp="ROOT" 
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
@@ -42,7 +42,7 @@
         <ccm:application name="ccm-cms-types-formsectionitem"/>
         <ccm:application name="ccm-cms-types-glossaryitem"/>         
 <!--    <ccm:application name="ccm-cms-types-htmlform"/>             -->
-        <ccm:application name="ccm-cms-types-image"/>
+        <ccm:application name="ccm-cms-types-image"/>     
 <!--    <ccm:application name="ccm-cms-types-inlinesite"/>           -->
 <!--    <ccm:application name="ccm-cms-types-job"/>                  -->
 <!--    <ccm:application name="ccm-cms-types-legalnotice"/>          -->
@@ -92,6 +92,7 @@
 
 <!--  gen integration layer  -->
 <!--  - - - - - - -  -->
+        <ccm:application name="ccm-sci-publications"/>
         <ccm:application name="ccm-gen-aplaws"/>