diff --git a/Server/MarkdownPreviewer/server.py b/Server/MarkdownPreviewer/server.py
index 5c53db3..c3473ba 100644
--- a/Server/MarkdownPreviewer/server.py
+++ b/Server/MarkdownPreviewer/server.py
@@ -21,6 +21,7 @@ from .pandoc import Pandoc, Div, Span, Header, Attr, Plain, PString, Inline, Ima
 
 from .admonition import blockquote_filter, create_warning, create_information, Theorem, Proof
 from .penrose import Penrose
+from .tikz import Tikz, Circuitikz
 from .image import ImageFilter
 
 def parse_title(content):
@@ -236,6 +237,12 @@ async def main(base_path):
 
     codeblock.AddCallback("penrose", pen)
 
+    t = Tikz(base_path)
+    c = Circuitikz(base_path)
+
+    codeblock.AddCallback("tikz", t)
+    codeblock.AddCallback("circuitikz", c)
+
     pipeline.AddCallback('BlockQuote', blockquote, replace=True)
     pipeline.AddCallback('CodeBlock', codeblock, replace=True)