diff --git a/magnolia-module-standard-templating-kit/src/main/resources/templating-kit/pages/global/htmlHeader.ftl b/magnolia-module-standard-templating-kit/src/main/resources/templating-kit/pages/global/htmlHeader.ftl
index d2eb32b..a1f9cac 100644
--- a/magnolia-module-standard-templating-kit/src/main/resources/templating-kit/pages/global/htmlHeader.ftl
+++ b/magnolia-module-standard-templating-kit/src/main/resources/templating-kit/pages/global/htmlHeader.ftl
@@ -29,18 +29,21 @@
     <link rel="shortcut icon" type="image/ico" href="#" />
 [/#comment]
 
-[#list stkfn.theme(pageModel.site).cssFiles as cssFile]
-    [#if cssFile.conditionalComment?has_content]
-    <!--[if ${cssFile.conditionalComment}]>
-    [/#if]
-    <link rel="stylesheet" type="text/css" href="${cssFile.link}" media="${cssFile.media}" />
-    [#if cssFile.conditionalComment?has_content]
-    <![endif]-->
-    [/#if]
-[/#list]
-[#list pageDef.cssFiles as cssFile]
+
+[#macro listCssFiles list]
+    [#list list as cssFile]
+        [#if cssFile.conditionalComment?has_content]
+<!--[if ${cssFile.conditionalComment}]>
+        [/#if]
     <link rel="stylesheet" type="text/css" href="${cssFile.link}" media="${cssFile.media}" />
-[/#list]
+        [#if cssFile.conditionalComment?has_content]
+<![endif]-->
+        [/#if]
+    [/#list]
+[/#macro]
+
+[@listCssFiles list=stkfn.theme(pageModel.site).cssFiles /]
+[@listCssFiles list=pageDef.cssFiles /]
 
 [#if pageModel.logoImageLink?has_content]
     <style type="text/css">
@@ -72,15 +75,15 @@
                 }
             };
         </script>
-[#list stkfn.theme(pageModel.site).jsFiles as jsFile]
-    <script src="${jsFile.link}" type="text/javascript"></script>
-[/#list]
 
-[#list pageModel.site.jsFiles as jsFile]
-    <script src="${jsFile.link}" type="text/javascript"></script>
-[/#list]
+<!--<![endif]-->
 
-[#list pageDef.jsFiles as jsFile]
+[#macro listJsFiles list]
+    [#list list as jsFile]
     <script src="${jsFile.link}" type="text/javascript"></script>
-[/#list]
-<!--<![endif]-->
+    [/#list]
+[/#macro]
+
+[@listJsFiles list=stkfn.theme(pageModel.site).jsFiles /]
+[@listJsFiles list=pageModel.site.jsFiles /]
+[@listJsFiles list=pageDef.jsFiles /]