diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/Loader.java b/ccm-ldn-theme/src/com/arsdigita/london/theme/Loader.java
index 6639ca86a..4b03b80fb 100755
--- a/ccm-ldn-theme/src/com/arsdigita/london/theme/Loader.java
+++ b/ccm-ldn-theme/src/com/arsdigita/london/theme/Loader.java
@@ -50,11 +50,15 @@ public class Loader extends PackageLoader implements ThemeConstants {
     }
 
 
+    /** 
+     * Creates theme manager as a legacy-compatible application type.
+     * 
+     */
     private void setupThemeApplication() {
-        ApplicationType type = ApplicationType
-            .createApplicationType("theme",
-                                   "CCM Themes Admin",
-                                   ThemeApplication.BASE_DATA_OBJECT_TYPE);
+        ApplicationType type = ApplicationType.createApplicationType(
+                                               "theme",
+                                               "CCM Themes Admin",
+                                               ThemeApplication.BASE_DATA_OBJECT_TYPE);
         type.setDescription("CCM themes administration");
 
         Application admin = Application.retrieveApplicationForPath("/admin/");
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/util/ThemeResources.properties b/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeResources.properties
similarity index 100%
rename from ccm-ldn-theme/src/com/arsdigita/london/theme/util/ThemeResources.properties
rename to ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeResources.properties
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeResources_de.properties b/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeResources_de.properties
new file mode 100755
index 000000000..49be7ac6e
--- /dev/null
+++ b/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeResources_de.properties
@@ -0,0 +1,34 @@
+theme.title=Title
+theme.description=Description
+theme.url=URL
+theme.create_new_theme=Create New Theme
+theme.none_available=No themes are available
+theme.download_default_base_styles=Download default base styles
+theme.select_or_create=Select or Create a Theme
+theme.available_themes=Available Themes
+theme.edit=Edit Theme
+theme.download_dev_theme_files=Download Development Theme Files
+theme.download_prod_theme_files=Download Published Theme Files
+theme.files_list_dev=Files in this Theme (Development Directory)
+theme.validate_themes=Validate Theme
+theme.preview_themes=Validate and Preview Theme
+theme.approve_themes=Validate and Publish Theme
+theme.reapprove_themes=Validate and Republish Theme
+theme.last_published_date=Last Published On
+theme.last_published_user=Last Published By
+theme.not_yet_published_user=---
+theme.not_yet_published_date=Never Published
+theme.validation_results=Validation Results:
+themes.validation_errors=The following errors were found during validation:
+themes.no_validation_errors=No errors were found during validation
+theme.revalidate_theme=Revalidate Theme
+theme.return_to_previous=Return to Main Theme Page
+theme.undo.login_page_expired=The login page expired.  Please re-enter your information.
+theme.undo.incorrect_login=The login attempt failed.  Either the email or password entered is incorrect
+theme.undo.login_error=Error Logging In; please try again.
+theme.undo.insufficient_privileges=The user you have logged in as, {0}, does not have sufficient privilege.
+theme.undo.please_login=You must log in as an administrator before you can access this page.
+theme.undo.default_style=Default Style
+theme.none=None
+theme.save=Save
+theme.set_default_theme=Default Theme
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeResources_en.properties b/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeResources_en.properties
new file mode 100755
index 000000000..49be7ac6e
--- /dev/null
+++ b/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeResources_en.properties
@@ -0,0 +1,34 @@
+theme.title=Title
+theme.description=Description
+theme.url=URL
+theme.create_new_theme=Create New Theme
+theme.none_available=No themes are available
+theme.download_default_base_styles=Download default base styles
+theme.select_or_create=Select or Create a Theme
+theme.available_themes=Available Themes
+theme.edit=Edit Theme
+theme.download_dev_theme_files=Download Development Theme Files
+theme.download_prod_theme_files=Download Published Theme Files
+theme.files_list_dev=Files in this Theme (Development Directory)
+theme.validate_themes=Validate Theme
+theme.preview_themes=Validate and Preview Theme
+theme.approve_themes=Validate and Publish Theme
+theme.reapprove_themes=Validate and Republish Theme
+theme.last_published_date=Last Published On
+theme.last_published_user=Last Published By
+theme.not_yet_published_user=---
+theme.not_yet_published_date=Never Published
+theme.validation_results=Validation Results:
+themes.validation_errors=The following errors were found during validation:
+themes.no_validation_errors=No errors were found during validation
+theme.revalidate_theme=Revalidate Theme
+theme.return_to_previous=Return to Main Theme Page
+theme.undo.login_page_expired=The login page expired.  Please re-enter your information.
+theme.undo.incorrect_login=The login attempt failed.  Either the email or password entered is incorrect
+theme.undo.login_error=Error Logging In; please try again.
+theme.undo.insufficient_privileges=The user you have logged in as, {0}, does not have sufficient privilege.
+theme.undo.please_login=You must log in as an administrator before you can access this page.
+theme.undo.default_style=Default Style
+theme.none=None
+theme.save=Save
+theme.set_default_theme=Default Theme
diff --git a/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeResources_fr.properties b/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeResources_fr.properties
new file mode 100755
index 000000000..49be7ac6e
--- /dev/null
+++ b/ccm-ldn-theme/src/com/arsdigita/london/theme/ui/ThemeResources_fr.properties
@@ -0,0 +1,34 @@
+theme.title=Title
+theme.description=Description
+theme.url=URL
+theme.create_new_theme=Create New Theme
+theme.none_available=No themes are available
+theme.download_default_base_styles=Download default base styles
+theme.select_or_create=Select or Create a Theme
+theme.available_themes=Available Themes
+theme.edit=Edit Theme
+theme.download_dev_theme_files=Download Development Theme Files
+theme.download_prod_theme_files=Download Published Theme Files
+theme.files_list_dev=Files in this Theme (Development Directory)
+theme.validate_themes=Validate Theme
+theme.preview_themes=Validate and Preview Theme
+theme.approve_themes=Validate and Publish Theme
+theme.reapprove_themes=Validate and Republish Theme
+theme.last_published_date=Last Published On
+theme.last_published_user=Last Published By
+theme.not_yet_published_user=---
+theme.not_yet_published_date=Never Published
+theme.validation_results=Validation Results:
+themes.validation_errors=The following errors were found during validation:
+themes.no_validation_errors=No errors were found during validation
+theme.revalidate_theme=Revalidate Theme
+theme.return_to_previous=Return to Main Theme Page
+theme.undo.login_page_expired=The login page expired.  Please re-enter your information.
+theme.undo.incorrect_login=The login attempt failed.  Either the email or password entered is incorrect
+theme.undo.login_error=Error Logging In; please try again.
+theme.undo.insufficient_privileges=The user you have logged in as, {0}, does not have sufficient privilege.
+theme.undo.please_login=You must log in as an administrator before you can access this page.
+theme.undo.default_style=Default Style
+theme.none=None
+theme.save=Save
+theme.set_default_theme=Default Theme