diff --git a/ccm-bundle-devel-wildfly/pom.xml b/ccm-bundle-devel-wildfly/pom.xml
index 7870a2837..9b881d256 100644
--- a/ccm-bundle-devel-wildfly/pom.xml
+++ b/ccm-bundle-devel-wildfly/pom.xml
@@ -280,6 +280,14 @@
                                 <include>scripts/</include>
                             </includes>
                         </overlay>
+                        <!-- <overlay>
+                            <groupId>org.librecms</groupId>
+                            <artifactId>ccm-cms-default-theme</artifactId>
+                            <type>jar</type>
+                            <includes>
+                                <include>themes/librecms/scripts/</include>
+                            </includes>
+                        </overlay> -->
                     </overlays>
                 </configuration>
             </plugin>
diff --git a/ccm-bundle-devel/pom.xml b/ccm-bundle-devel/pom.xml
index 6f6c3b4df..77c7cba87 100644
--- a/ccm-bundle-devel/pom.xml
+++ b/ccm-bundle-devel/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -12,7 +13,7 @@
     <groupId>org.libreccm</groupId>
     <artifactId>ccm-bundle-devel</artifactId>
     <packaging>pom</packaging>
-    
+
     <name>LibreCCM Devel Bundle</name>
     <url>http://www.libreccm.org/bundles/devel</url>
 
@@ -22,7 +23,7 @@
             <artifactId>ccm-core</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.libreccm</groupId>
             <artifactId>ccm-editor</artifactId>
@@ -38,12 +39,17 @@
             <artifactId>ccm-theme-foundry</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
-         <dependency>
+        <dependency>
             <groupId>org.librecms</groupId>
             <artifactId>ccm-theme-ftllibs-devel</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
-        
+        <dependency>
+            <groupId>org.librecms</groupId>
+            <artifactId>ccm-cms-default-theme</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>net.sf.saxon</groupId>
             <artifactId>Saxon-HE</artifactId>
@@ -60,15 +66,15 @@
             <artifactId>ccm-cms</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
-       <!-- CCM Modules end -->
-        
+        <!-- CCM Modules end -->
+
         <!-- Dependencies for log4j 2 including adapter for the log4j 1.2 API -->
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
     </dependencies>
 
     <reporting>
diff --git a/ccm-cms-default-theme/scripts/librecms.d.ts b/ccm-cms-default-theme/scripts/librecms.d.ts
index cb0ff5c3b..01dfd7921 100644
--- a/ccm-cms-default-theme/scripts/librecms.d.ts
+++ b/ccm-cms-default-theme/scripts/librecms.d.ts
@@ -1 +1 @@
-export {};
+import "bootstrap";
diff --git a/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/default.html.ftl b/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/default.html.ftl
new file mode 100644
index 000000000..285df7c02
--- /dev/null
+++ b/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/default.html.ftl
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Default Template</title>
+        <link href="${themeUrl}/styles/librecms.css" rel="stylesheet" />
+    </head>
+    <body>
+        <p>This theme works.</p>
+        <pre>${themeUrl}</pre>
+    </body>
+</html>
\ No newline at end of file
diff --git a/ccm-cms-default-theme/src/main/resources/themes/librecms/theme.json b/ccm-cms-default-theme/src/main/resources/themes/librecms/theme.json
index 28403755f..75e6a1900 100644
--- a/ccm-cms-default-theme/src/main/resources/themes/librecms/theme.json
+++ b/ccm-cms-default-theme/src/main/resources/themes/librecms/theme.json
@@ -2,10 +2,35 @@
     "name": "librecms",
     "type": "freemarker",
     "master-theme": null,
-    "title": "LibreCMS Default Theme",
-    "description": "The LibreCMS default theme",
-    "template": [],
-    "default-template": null,
+    "title": {
+        "values": {
+            "value": [
+                {
+                    "lang": "en",
+                    "value": "LibreCMS Default Theme"
+                },
+                {
+                    "lang": "de",
+                    "value": "LibreCMS Standard Theme"
+                }
+            ]
+        }
+    },
+    "description": {
+        "values": {
+            "value": [
+                {
+                    "lang": "en",
+                    "value": "The LibreCMS default theme"
+                },
+                {
+                    "lang": "de",
+                    "value": "Das LibreCMS Standard Theme"
+                }
+            ]
+        }
+    },
+
     "mvc-templates": {
         "default": {
             "description": {
@@ -32,8 +57,11 @@
             }
         }
     },
+
     "views": {
-        "default": "default",
-        "@default": "default"
+        "default": {
+            "default": "default",
+            "@default": "default"
+        }
     }
 }
diff --git a/ccm-cms-default-theme/src/main/typescript/librecms.ts b/ccm-cms-default-theme/src/main/typescript/librecms.ts
index 162c22815..6fcacc09f 100644
--- a/ccm-cms-default-theme/src/main/typescript/librecms.ts
+++ b/ccm-cms-default-theme/src/main/typescript/librecms.ts
@@ -1 +1 @@
-import bootstrap from "bootstrap";
\ No newline at end of file
+import "bootstrap";
\ No newline at end of file
