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 05f8ecb84..e7b6e46a4 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,10 +1,16 @@
 <#import "./main.html.ftl" as main>
+<#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">
-                <h1>Index Item Title</h1>
+                <@contentitem.details />
+                <#--  <h1>Index Item Title ${CmsPagesCategorizedItemModel.title}</h1>
+<pre>
+CmsPagesContentItemTypeModel.displayName = ${CmsPagesContentItemTypeModel.displayName}
+CmsPagesContentItemTypeModel.itemClass = ${CmsPagesContentItemTypeModel.itemClass}
+</pre>
                 <div class="row">
                     <p class="col-8">
                         Enim pariatur esse nisi commodo cupidatat dolor reprehenderit commodo. Nulla mollit officia dolore ipsum elit irure excepteur ex excepteur est non aliqua. Tempor est amet id occaecat deserunt ea adipisicing laborum tempor exercitation dolor ex quis laboris. Nulla quis sit exercitation ex sunt ipsum adipisicing consequat mollit sunt. Ea fugiat commodo ullamco reprehenderit non. Ea laborum aute non ex Lorem sint anim. In sunt sit laboris amet ipsum tempor officia incididunt eu nostrud voluptate labore veniam.
@@ -143,7 +149,7 @@
                 </p>
                 <p>
                     Ut ut excepteur enim exercitation mollit cillum id sit magna. Ullamco ullamco do reprehenderit nisi consequat. Id dolore eu laborum ex ipsum fugiat veniam id incididunt aliquip proident nulla commodo. Officia deserunt consequat in id ex sit. Lorem nostrud officia culpa enim labore id sit.
-                </p>
+                </p>  -->
             </div>
             <div class="col-lg-4">
                 <!-- Attachments -->
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
new file mode 100644
index 000000000..7ff408349
--- /dev/null
+++ b/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/contentitems/org.librecms.contenttypes.Article.html.ftl
@@ -0,0 +1,8 @@
+<#macro details>
+    <h1>${CmsPagesCategorizedItemModel.title}</h1>
+    <p class="item-description">${CmsPagesCategorizedItemModel.description</p>
+
+    <div>
+        ${CmsPagesArticleModel.text}
+    </div>
+</#macro>
\ No newline at end of file
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
new file mode 100644
index 000000000..b819394a1
--- /dev/null
+++ b/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/contentitems/org.librecms.contenttypes.News.html.ftl
@@ -0,0 +1,8 @@
+<@macro details>
+    <h1>${CmsPagesCategorizedItemModel.title}</h1>
+    <p class="item-description">${CmsPagesCategorizedItemModel.description}</p>
+
+    <div>
+        ${CmsPagesNewsModel.text}
+    </div>
+</@macro>
\ No newline at end of file