diff --git a/editions/tw5.com/tiddlers/system/wikitext-macros.tid b/editions/tw5.com/tiddlers/system/wikitext-macros.tid
index 78705fc24..8a0fe87c4 100644
--- a/editions/tw5.com/tiddlers/system/wikitext-macros.tid
+++ b/editions/tw5.com/tiddlers/system/wikitext-macros.tid
@@ -30,7 +30,7 @@ $src$
 \end
 
 \define tw-code(tiddler)
-<pre><code><$view tiddler="$tiddler$" format="text"/></code></pre>
+<$codeblock language={{$tiddler$!!type}} code={{$tiddler$}}/>
 \end
 
 \define tw-code-link(tiddler)