diff --git a/src/main/resources/default/kb/en/user/noodle.html.pasta b/src/main/resources/default/kb/en/user/noodle.html.pasta
index 292a7dafe..55e301d72 100644
--- a/src/main/resources/default/kb/en/user/noodle.html.pasta
+++ b/src/main/resources/default/kb/en/user/noodle.html.pasta
@@ -35,7 +35,7 @@
             </li>
             <li>
                 Macro calls: <k:inlineCode>isEmpty("test")</k:inlineCode>. All available macros are listed here:
-                <a href="/system/tags">Tagliatelle Tag Overview</a>.
+                <k:link link="/system/tags" name="Tagliatelle Tag Overview" target="_blank"/>.
             </li>
             <li>
                 If statements: <k:inlineCode>if (condition) { statements; }</k:inlineCode>
diff --git a/src/main/resources/default/kb/en/user/tagliatelle.html.pasta b/src/main/resources/default/kb/en/user/tagliatelle.html.pasta
index f0deb25b8..da4e7449c 100644
--- a/src/main/resources/default/kb/en/user/tagliatelle.html.pasta
+++ b/src/main/resources/default/kb/en/user/tagliatelle.html.pasta
@@ -1,4 +1,9 @@
-<k:article code="T2IQI" lang="de" parent="AHJEC" title="Tagliatelle Template Engine" permissions="" crossReferences="HP9RC">
+<k:article code="T2IQI"
+           lang="de"
+           parent="AHJEC"
+           title="Tagliatelle Template Engine"
+           permissions=""
+           crossReferences="HP9RC">
     <i:block name="description">Defines the syntax of the Tagliatelle Template Engine.</i:block>
 
     <i:block name="sidebar">
@@ -11,15 +16,15 @@
 
     <k:section heading="Common" anchor="common">
         <p>
-            <b>Tagliatelle</b> is template engine which renders a statically typed and compiled templates. This is mainly
-            used to render the HTML output of the web-server but can be used to generate any form of text output.
+            <b>Tagliatelle</b> is a template engine which renders statically typed and compiled templates. This is
+            mainly used to render the HTML output of the web-server but can be used to generate any form of text output.
         </p>
         <p>
-            Tagliatelle uses Noodle (<k:ref code="HP9RC" />) as expression language. An expression can be placed anywhere
+            Tagliatelle uses Noodle (<k:ref code="HP9RC"/>) as expression language. An expression can be placed anywhere
             in the template by prefixing it with an <b>@@</b>, i.e. <k:inlineCode>@@myVariable</k:inlineCode>. If the
-            boundaries of the expression are unclear, it can be put into parentheses like <k:inlineCode>@@(3+4)</k:inlineCode>.
-            If a tag expects an expression anyway, the "@@" can be omitted. (Note that the "@@" can be escaped by
-            putting two in a row: <k:inlineCode>@@@@</k:inlineCode>.
+            boundaries of the expression are unclear, it can be put into parentheses like
+            <k:inlineCode>@@(3+4)</k:inlineCode>. If a tag expects an expression anyway, the "@@" can be omitted. (Note
+            that the "@@" can be escaped by putting two in a row: <k:inlineCode>@@@@</k:inlineCode>.
         </p>
         <p>
             The main part of the templates are made up of special <b>tags</b> (hence the name Tag-liatelle). These tags
@@ -29,9 +34,9 @@
     </k:section>
     <k:section heading="Anatomy of a tag" anchor="anatomy-of-a-tag">
         <p>
-            Tags are organized in <b>tag libraries</b>. Each library has a prefix assigned, e.g. <b>k</b>. All templates for
-            this tag library are then placed in <k:inlineCode>tags/k/tagName.html.pasta</k:inlineCode> and can be referenced
-            using <k:inlineCode>&lt;k:tagName&gt;</k:inlineCode>.
+            Tags are organized in <b>tag libraries</b>. Each library has a prefix assigned, e.g. <b>k</b>. All templates
+            for this tag library are then placed in <k:inlineCode>tags/k/tagName.html.pasta</k:inlineCode> and can be
+            referenced using <k:inlineCode>&lt;k:tagName&gt;</k:inlineCode>.
         </p>
         <p>
             If a tag supports custom attributes, these are defined in the template via
@@ -42,6 +47,7 @@
         </p>
     </k:section>
     <k:section heading="Available tags and macros" anchor="available-tags-and-macros">
-        A list of all available tags and macros can be found here: <a href="/system/tags">Tagliatelle Tag Overview</a>.
+        A list of all available tags and macros can be found here:
+        <k:link link="/system/tags" name="Tagliatelle Tag Overview" target="_blank"/>.
     </k:section>
 </k:article>