diff --git a/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/category-page.html.ftl b/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/category-page.html.ftl
index e7b6e46a4..52bf67517 100644
--- a/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/category-page.html.ftl
+++ b/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/category-page.html.ftl
@@ -1,11 +1,19 @@
 <#import "./main.html.ftl" as main>
-<#import "./contentitems/${CmsPagesContentItemTypeModel.itemClass}.html.ftl" as contentitem>
+<#--  <#import "./contentitems/${CmsPagesContentItemTypeModel.itemClass}.html.ftl" as contentitem>  -->
 
 <@main.librecms>
     <div class="container">
         <div class="row align-items-start justify-content-center">
             <div class="col-lg-8">
-                <@contentitem.details />
+                <#if CmsPagesContentItemTypeModel.itemClass != "">
+                    <#assign itemTemplate = .getOptionalTemplate("./contentitems/${CmsPagesContentItemTypeModel.itemClass}.html.ftl")>
+                    <#if itemTemplate.exists>
+                        <#import "./contentitems/${CmsPagesContentItemTypeModel.itemClass}.html.ftl" as contentitem>
+                    <#else>
+                        <#import "./contentitems/default.html.ftl" as contentitem>
+                    </#if>
+                    <@contentitem.details />                
+                </#if>                
                 <#--  <h1>Index Item Title ${CmsPagesCategorizedItemModel.title}</h1>
 <pre>
 CmsPagesContentItemTypeModel.displayName = ${CmsPagesContentItemTypeModel.displayName}
diff --git a/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/contentitems/default.html.ftl b/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/contentitems/default.html.ftl
new file mode 100644
index 000000000..2aa26531a
--- /dev/null
+++ b/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/contentitems/default.html.ftl
@@ -0,0 +1,4 @@
+<#macro details>
+    <h1>${CmsPagesCategorizedItemModel.title}</h1>
+    <p class="item-description">${CmsPagesCategorizedItemModel.description}</p>
+</#macro>
\ No newline at end of file
diff --git a/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/contentitems/org.librecms.contenttypes.Article.html.ftl b/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/contentitems/org.librecms.contenttypes.Article.html.ftl
index 7ff408349..6d2e6da2c 100644
--- a/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/contentitems/org.librecms.contenttypes.Article.html.ftl
+++ b/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/contentitems/org.librecms.contenttypes.Article.html.ftl
@@ -1,6 +1,6 @@
 <#macro details>
     <h1>${CmsPagesCategorizedItemModel.title}</h1>
-    <p class="item-description">${CmsPagesCategorizedItemModel.description</p>
+    <p class="item-description">${CmsPagesCategorizedItemModel.description}</p>
 
     <div>
         ${CmsPagesArticleModel.text}
diff --git a/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/contentitems/org.librecms.contenttypes.News.html.ftl b/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/contentitems/org.librecms.contenttypes.News.html.ftl
index b819394a1..4f4fd9336 100644
--- a/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/contentitems/org.librecms.contenttypes.News.html.ftl
+++ b/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/contentitems/org.librecms.contenttypes.News.html.ftl
@@ -1,8 +1,9 @@
-<@macro details>
+<#macro details>
     <h1>${CmsPagesCategorizedItemModel.title}</h1>
+    <div>${CmsPagesNewsModel.getReleaseDate('yyyy-MM-dd')}</div>
     <p class="item-description">${CmsPagesCategorizedItemModel.description}</p>
 
     <div>
         ${CmsPagesNewsModel.text}
     </div>
-</@macro>
\ No newline at end of file
+</#macro>
\ No newline at end of file