diff --git a/core/wiki/currpalettepreview.tid b/core/wiki/currpalettepreview.tid
index b80748737..b5f549666 100644
--- a/core/wiki/currpalettepreview.tid
+++ b/core/wiki/currpalettepreview.tid
@@ -1,11 +1,40 @@
 title: $:/snippets/currpalettepreview
 
+\define resolve-colour(macrocall)
+\import $:/core/macros/utils
+\whitespace trim
+<$wikify name="name" text="""$macrocall$""">
+<<name>>
+</$wikify>
+\end
 \define swatchStyle()
 background-color: $(swatchColour)$;
 \end
+\define swatch-inner()
+<$set name="swatchColour" value={{##$(colourResolved)$}}>
+<$list filter="[<swatchColour>!prefix[<<colour ]!suffix[>>]]" variable="ignore">
+<div class="tc-swatch" style=<<swatchStyle>> title=<<swatchTitle>>/>
+</$list>
+<$list filter="[<swatchColour>prefix[<<colour ]suffix[>>]]" variable="ignore">
+<$wikify name="colourResolved" text="""<$macrocall $name="resolve-colour" macrocall=<<swatchColour>>/>""">
+<<swatch-inner>>
+</$wikify>
+</$list>
+</$set>
+\end
 \define swatch()
-<$set name="swatchColour" value={{##$(colour)$}}
-><div class="tc-swatch" style=<<swatchStyle>> title=<<colour>>/></$set>
+<$set name="swatchColour" value={{##$(colour)$}}>
+<$set name="swatchTitle" value=<<colour>>>
+<$list filter="[<swatchColour>!prefix[<<colour ]!suffix[>>]]" variable="ignore">
+<div class="tc-swatch" style=<<swatchStyle>> title=<<swatchTitle>>/>
+</$list>
+<$list filter="[<swatchColour>prefix[<<colour ]suffix[>>]]" variable="ignore">
+<$wikify name="colourResolved" text="""<$macrocall $name="resolve-colour" macrocall=<<swatchColour>>/>""">
+<<swatch-inner>>
+</$wikify>
+</$list>
+</$set>
+</$set>
 \end
 <div class="tc-swatches-horiz"><$list filter="
 foreground
@@ -15,4 +44,4 @@ primary
 page-background
 tab-background
 tiddler-info-background
-" variable="colour"><<swatch>></$list></div>
\ No newline at end of file
+" variable="colour"><<swatch>></$list></div>