diff --git a/content/posts/vpn-gateway/index.md b/content/posts/vpn-gateway/index.md
index 442d70b..e9b8746 100644
--- a/content/posts/vpn-gateway/index.md
+++ b/content/posts/vpn-gateway/index.md
@@ -6,7 +6,7 @@ image: resource:user-settings.png
 
 VPNs are a way of accessing application which sit on a separate network using an encrypted tunnel. Contrary to popular belief, they are not designed to be used for anonymising your internet habits. Whilst VPNs are designed to enable a client to access the servers network, it's possible to use them to provide a server to access to its client's network. With this, and a simple HTTP server, it's possible to open up applications on your home network to the internet, without the need for a static IP, or a port forward!
 
-{{< mermaid caption="Network layout" >}}
+{{<mermaid caption="Network layout">}}
 graph LR
 
 A[End Users]
@@ -20,7 +20,7 @@ end
 A-->B
 C---B
 C-->D
-{{< /mermaid >}}
+{{</mermaid>}}
 
 ## Requirements
 
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 16da53c..a355827 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -13,6 +13,10 @@
     {{ partial "style.html" "css/font-awesome.min.css" }}
     {{ partial "style.html" "css/highlight.css" }}
 
+    {{ if eq .Params.layout "flickr" }}
+      {{ partial "style.html" "css/lightgallery.min.css" }}
+    {{ end }}
+
     <title>{{ partial "title-item.html" . }}{{ .Site.Title }}</title>
 
     {{ partial "metadata.html" . }}
@@ -28,10 +32,24 @@
 
     {{ partial "footer.html" . }}
 
+    {{ $raw_content := "" }}
+
+    {{ if .Content }}
+      {{ $raw_content = .RawContent }}
+    {{ end }}
+
     {{ partial "script.html" "js/jquery.js" }}
-    {{ partial "script_async.html" "js/lightgallery.js" }}
+
+    {{ if eq .Params.layout "flickr" }}
+      {{ partial "script_async.html" "js/lightgallery.js" }}
+    {{ end }}
+
     {{ partial "script_async.html" "js/bootstrap.js" }}
-    {{ partial "script_async.html" "js/mermaid.js" }}
+
+    {{ if in $raw_content "{{<mermaid" }}
+      {{ partial "script_async.html" "js/mermaid.js" }}
+    {{ end }}
+
     {{ partial "script_async.html" "js/app.js" }}
   </body>
 </html>
diff --git a/scripts/build.sh b/scripts/build.sh
index 1152f39..2b7f97b 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -12,6 +12,7 @@ cp -r $BASEDIR/node_modules/lightgallery/dist/fonts $STATIC_BUILD
 cp -r $STATIC_SRC/img $STATIC_BUILD/img
 cp -r $BASEDIR/node_modules/lightgallery/dist/img/* $STATIC_BUILD/img
 cp -r $BASEDIR/node_modules/@fortawesome/fontawesome-free/css/all.min.css $STATIC_BUILD/css/font-awesome.min.css
+cp $BASEDIR/node_modules/lightgallery/dist/css/lightgallery.min.css $STATIC_BUILD/css/lightgallery.min.css
 cp -r $BASEDIR/node_modules/@fortawesome/fontawesome-free/webfonts $STATIC_BUILD
 
 cp $BASEDIR/node_modules/jquery/dist/jquery.min.js $STATIC_BUILD/js/jquery.js
diff --git a/static/src/scss/style.scss b/static/src/scss/style.scss
index 4b2a33f..f690dd0 100644
--- a/static/src/scss/style.scss
+++ b/static/src/scss/style.scss
@@ -1,6 +1,5 @@
 @import "variables";
 
-@import "node_modules/lightgallery/src/sass/lightgallery";
 @import "node_modules/bootstrap/scss/bootstrap";