diff --git a/core/ui/EditTemplate/tags.tid b/core/ui/EditTemplate/tags.tid
index c9f65e4c5..e806fd90c 100644
--- a/core/ui/EditTemplate/tags.tid
+++ b/core/ui/EditTemplate/tags.tid
@@ -4,13 +4,24 @@ tags: $:/tags/EditTemplate
 \define lingo-base() $:/language/EditTemplate/
 \define tag-styles()
 background-color:$(backgroundColor)$;
+fill:$(foregroundColor)$;
+color:$(foregroundColor)$;
+\end
+\define tag-body-inner(colour,fallbackTarget,colourA,colourB)
+<$vars foregroundColor=<<contrastcolour target:"""$colour$""" fallbackTarget:"""$fallbackTarget$""" colourA:"""$colourA$""" colourB:"""$colourB$""">> backgroundColor="""$colour$""">
+<span style=<<tag-styles>> class="tc-tag-label">
+<$view field="title" format="text" />
+<$button message="tm-remove-tag" param={{!!title}} class="tc-btn-invisible tc-remove-tag-button">&times;</$button>
+</span>
+</$vars>
+\end
+\define tag-body(colour,palette)
+<$macrocall $name="tag-body-inner" colour="""$colour$""" fallbackTarget={{$palette$##tag-background}} colourA={{$palette$##foreground}} colourB={{$palette$##background}}/>
 \end
 <div class="tc-edit-tags">
 <$fieldmangler>
-<$list filter="[all[current]tags[]sort[title]]" storyview="pop"><$set name="backgroundColor" value={{!!color}}><span style=<<tag-styles>> class="tc-tag-label">
-<$view field="title" format="text" />
-<$button message="tm-remove-tag" param={{!!title}} class="tc-btn-invisible tc-remove-tag-button">&times;</$button></span>
-</$set>
+<$list filter="[all[current]tags[]sort[title]]" storyview="pop">
+<$macrocall $name="tag-body" colour={{!!color}} palette={{$:/palette}}/>
 </$list>
 
 <div class="tc-edit-add-tag">