diff --git a/website/elm/Demo.elm b/website/elm/Demo.elm
index 9ba08488..74d365f5 100644
--- a/website/elm/Demo.elm
+++ b/website/elm/Demo.elm
@@ -26,7 +26,7 @@ demo data =
                 p []
                     [ Markdown.toHtml [] data.info
                     ]
-            , div [ class "mt-5" ]
+            , div [ class "mt-5 columns is-centered" ]
                 [ video
                     [ src data.url
                     , controls True
diff --git a/website/shell.nix b/website/shell.nix
index f759b17e..356643cf 100644
--- a/website/shell.nix
+++ b/website/shell.nix
@@ -1,7 +1,8 @@
 let
   nixpkgs = builtins.fetchTarball {
-    ## need fix to zola-0.11.0 for now
-    url = "https://github.com/NixOS/nixpkgs/archive/92e990a8d6bc35f1089c76dd8ba68b78da90da59.tar.gz";
+    #url = "channel:nixos-21.05";
+    url = "https://github.com/NixOS/nixpkgs/archive/2d6ab6c6b92f7aaf8bc53baba9754b9bfdce56f2.tar.gz";
+    #sha256 = "0l975q132x08qvw73qj391dl6qk9a661my8njcg5sl5rcmna3bmj";
   };
   pkgs = import nixpkgs { };
 in
diff --git a/website/site/content/docs/install/quickstart.md b/website/site/content/docs/install/quickstart.md
index 2a85ba3e..e5b8e9d6 100644
--- a/website/site/content/docs/install/quickstart.md
+++ b/website/site/content/docs/install/quickstart.md
@@ -40,10 +40,10 @@ likely you want to change these to match your use-case/setup.
 
 {% infobubble(mode="info", title="⚠ Please note") %}
 
-Please have a look at the [configuration
-page](@/docs/configure/_index.md) page, before making docspell
-publicly available. By default, everyone can create an account. This
-is great for trying out and using it in an internal network. But when
-opened up to the outside, it is recommended to lock this down.
+Please have a look at the [configuration page](/docs/configure/) page,
+before making docspell publicly available. By default, everyone can
+create an account. This is great for trying out and using it in an
+internal network. But when opened up to the outside, it is recommended
+to lock this down.
 
 {% end %}
diff --git a/website/site/content/docs/query/_index.md b/website/site/content/docs/query/_index.md
index 03b1f89d..ecfac32a 100644
--- a/website/site/content/docs/query/_index.md
+++ b/website/site/content/docs/query/_index.md
@@ -13,7 +13,9 @@ your documents. It is targeted at "power users" and it needs to be
 enabled explicitely in your user settings.
 
 <div class="colums">
+
 {{ figure(file="enable-powersearch.png") }}
+
 </div>
 
 This changes the search bar on the items list page to expect a query
diff --git a/website/site/templates/shortcodes/incl_conf.html b/website/site/templates/shortcodes/incl_conf.md
similarity index 100%
rename from website/site/templates/shortcodes/incl_conf.html
rename to website/site/templates/shortcodes/incl_conf.md