diff --git a/assets/css/_common/_page/post.scss b/assets/css/_common/_page/post.scss
index 4ae894d..e8aa31b 100644
--- a/assets/css/_common/_page/post.scss
+++ b/assets/css/_common/_page/post.scss
@@ -210,7 +210,7 @@
           }
 
           .space {
-            white-space: pre-wrap;
+            white-space: pre;
           }
         }
 
diff --git a/layouts/shortcodes/typeit.html b/layouts/shortcodes/typeit.html
index a3c4772..98f420a 100644
--- a/layouts/shortcodes/typeit.html
+++ b/layouts/shortcodes/typeit.html
@@ -9,8 +9,10 @@
     {{ $content = highlight $content (.Get "code") "encoding=utf-8" }}
     {{ $content = replaceRE `<div class="highlight">\s*?<pre class="chroma">\s*?<code.*?>(?s)(.*?)</code>\s*?</pre>\s*?</div>` "$1" $content }}
     {{ $content = trim $content "\n" }}
-    {{ $content = replaceRE `\n</span>` "</span><br />" $content | replaceRE `\n` "<br />" }}
-    {{ $content = replaceRE `>( +)<span` "><span class=space>$1</span><span" $content }}
+    {{ $content = replaceRE `\n</span>` "</span>\n" $content }}
+    {{ $content = replaceRE `(?m)^(<span.*?>)(.*?)\[(.*?)\]\((.*?)\)(.*?)(</span>)` "$1$2$6<a href=$4>$3</a>$1$5$6" $content }}
+    {{ $content = replaceRE `(?m)^( +)<span` "<span class=space>$1</span><span" $content }}
+    {{ $content = replaceRE `</span>( +)<span` "</span></span><span class=space>$1</span><span" $content | replaceRE `\n` "<br />" }}
     <div id={{ printf "r%s" $id }} hidden=true>{{ $content | safeHTML }}</div>
     <div class={{ .Get "class" | default "typeit-code" }} id={{ $id }}></div>
 {{ else }}