diff --git a/site/content/entry/citra-progress-report-2017-september.md b/site/content/entry/citra-progress-report-2017-september.md
index 1385b88..12657cb 100644
--- a/site/content/entry/citra-progress-report-2017-september.md
+++ b/site/content/entry/citra-progress-report-2017-september.md
@@ -15,14 +15,14 @@ There's also been many changes this month that improve the speed of emulation ac
 the board, on top of the usual improvements in accuracy and features. And because
 of that, I've dubbed this month #Speedtember. Let's dive right in.
 
-{{% callout %}}
+{{% alert info %}}
 Hello everyone! We're all terribly sorry for the delay in getting this progress
 report out the door, but our main technical writer [anodium](https://github.com/anodium),
 was just a bit busy surviving both Hurricane Irma and Maria. Although she's a
 trooper and claims it's not an excuse for the delay, we find that her personal
 safety is a tad more important. We're all glad that she's safe and sound, and in
 a state where she can keep pumping out quality articles for Citra!
-{{% /callout %}}
+{{% /alert %}}
 
 ## [Switchable Page Tables](https://github.com/citra-emu/citra/pull/2952) by [MerryMage](https://github.com/MerryMage)
 
diff --git a/site/themes/citra-bs-theme/layouts/shortcodes/alert.html b/site/themes/citra-bs-theme/layouts/shortcodes/alert.html
new file mode 100644
index 0000000..37b67e9
--- /dev/null
+++ b/site/themes/citra-bs-theme/layouts/shortcodes/alert.html
@@ -0,0 +1,3 @@
+<div class="alert alert-{{.Get 0}}">
+  {{ .Inner }}
+</div>
\ No newline at end of file
diff --git a/site/themes/citra-bs-theme/layouts/shortcodes/callout.html b/site/themes/citra-bs-theme/layouts/shortcodes/callout.html
deleted file mode 100644
index 0b0dc6e..0000000
--- a/site/themes/citra-bs-theme/layouts/shortcodes/callout.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="alert alert-info">
-    {{ .Inner }}
-</div>
diff --git a/site/themes/citra-bs-theme/layouts/shortcodes/figure.html b/site/themes/citra-bs-theme/layouts/shortcodes/figure.html
index 25304f9..95e5809 100644
--- a/site/themes/citra-bs-theme/layouts/shortcodes/figure.html
+++ b/site/themes/citra-bs-theme/layouts/shortcodes/figure.html
@@ -13,7 +13,7 @@
     {{ with .Get "title" }}
     <figcaption>
         <h4>
-            {{ . }}
+            {{ . | markdownify }}
         </h4>
     </figcaption>
     {{ end }}
diff --git a/site/themes/citra-bs-theme/layouts/shortcodes/sidebyside.html b/site/themes/citra-bs-theme/layouts/shortcodes/sidebyside.html
index 37a0bd1..8bb3119 100644
--- a/site/themes/citra-bs-theme/layouts/shortcodes/sidebyside.html
+++ b/site/themes/citra-bs-theme/layouts/shortcodes/sidebyside.html
@@ -9,6 +9,7 @@
     {{ range $figure := $figures }}
         {{ $.Scratch.Set "src" (index (split $figure "=") 0) }}
         {{ $.Scratch.Set "title" (index (split $figure "=") 1) }}
+        {{ $.Scratch.Set "link" (index (split $figure "=") 2) }}
         <div class="theme-table-image col-sm-{{ $.Scratch.Get "size" }}">
             <figure style="padding: 0px;">
                 {{ if eq $type "gifv" }}
@@ -20,10 +21,14 @@
                     </div>
                 {{ else if eq $type "image" }}
                     <img src="{{ printf "%s%s" $path ($.Scratch.Get "src") }}" alt="{{ $.Scratch.Get "title" }}" />
+                {{ else if eq $type "imagelink" }}
+                    <a href="{{ $.Scratch.Get "link" }}" style="border-bottom-style: none;" >
+                        <img src="{{ printf "%s%s" $path ($.Scratch.Get "src") }}" alt="{{ $.Scratch.Get "title" }}" />
+                    </a>
                 {{ end }}
                 <figcaption>
                     <h4>
-                        {{ $.Scratch.Get "title" }}
+                        {{ $.Scratch.Get "title" | markdownify }}
                     </h4>
                 </figcaption>
             </figure>