diff --git a/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/assets.html.ftl b/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/assets.html.ftl
index fd1f252be..d8c0413a7 100644
--- a/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/assets.html.ftl
+++ b/ccm-cms-default-theme/src/main/resources/themes/librecms/templates/assets.html.ftl
@@ -2,10 +2,26 @@
     <p>foo</p>
 </#macro>
 
-<#macro "org.librecms.assets.FileAsset">
-    <p><code>A file asset</code></p>
+<#macro "org.librecms.assets.FileAsset" asset>
+    <h3><a href="${asset.assetPath}">${asset.title}</a></h3>
+    <p>${asset.description}</p>
+    <small>${asset.mimeType} ${asset.size} Bytes</small>
+    <#--  <p><code>A file asset</code></p>  -->
 </#macro>
 
-<#macro "org.librecms.assets.RelatedLink">
-    <p><code>A releated link</code></p>
+<#macro "org.librecms.assets.RelatedLink" asset>
+    <#if asset.externalLink>
+        <div>
+            <a href="${asset.targetUrl}">${asset.title}</a>
+            <svg class="bi" 
+                 fill="current-color"
+                 height="1em"
+                 width="1em">
+                <use xlink:href="${themeUrl}/images/bootstrap-icons.svg#globe" />
+            </svg>
+            <span class="visually-hidden">External link</span>
+        </div>
+    <#else>
+        <a href="${asset.targetItemPath}">${asset.title}</a>
+    </#if>
 </#macro>
\ No newline at end of file
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 0207eabbd..7d63836f3 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
@@ -23,42 +23,12 @@
                         <ul class="list-group">
                             <#items as attachment>
                                 <li class="list-group-item">
-                                    ${attachment.asset.type}
-                                    <#--  <code>${.vars["assets"]["foo"]}  -->
-                                    <#--  <code>${.vars["org.librecms.assets.FileAsset"]}</code>  -->
-                                    <#--  <code>${.vars[attachment.asset.type]}</code>  -->
-                                    <@.vars["assets"][attachment.asset.type] />
+                                    <@.vars["assets"][attachment.asset.type] attachment.asset />
                                 </li>
                             </#items>
                         </ul>
                     </#list>
                 </#list> 
-                <!-- Attachments -->
-                <h2>Notes</h2>
-                <ul class="list-group mb-4">
-                    <li class="list-group-item">
-                        <p>
-                            A side note with some text
-                        </p>
-                        <p>
-                            Occaecat sit eu ipsum irure. Enim consectetur aute anim proident sint dolor sint ea ex eu adipisicing et. Veniam laborum mollit velit incididunt aliquip do esse officia eu ea nostrud nulla.
-                        </p>
-                    </li>
-                </ul>
-                <h2>More information</h2>
-                <p>
-                    Consequat occaecat eu ullamco amet id tempor.
-                </p>
-                <ul class="list-group mb-4">    
-                    <li class="list-group-item">
-                        <p>Anim ex ut reprehenderit in enim id proident duis pariatur est anim do.</p>
-                        <a href="https://example.com">A related link</a>
-                    </li>
-                    <li class="list-group-item">
-                        <p>Quis minim deserunt incididunt ea voluptate laboris fugiat elit nulla.</p>
-                        <a href="https://example.com">Some download link</a>
-                    </li>
-                </ul>
             </div>
         </div>
         <#list CmsPagesItemListModel.getItems()>