Merge branch 'Lednerb:master' into master

15 files changed, 170 insertions, 84 deletions

diff --git a/README.md b/README.md
index e9f9d72..5bdef31 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,14 @@
 ## Bilberry Hugo Theme
-[![All Contributors](https://img.shields.io/badge/all_contributors-22-orange.svg?style=flat-square)](#contributors)
 [![GitHub version](https://img.shields.io/github/release/Lednerb/bilberry-hugo-theme/all.svg?style=flat-square)](https://github.com/Lednerb/bilberry-hugo-theme/releases)
+[![Hugo Version](https://img.shields.io/badge/Hugo-%5E0.53-ff4088?style=flat-square&logo=hugo)](https://gohugo.io/)
 [![License](https://img.shields.io/github/license/Lednerb/bilberry-hugo-theme.svg?style=flat-square)](https://github.com/Lednerb/bilberry-hugo-theme/blob/master/LICENSE.md)
-[![Discord](https://img.shields.io/discord/479643633814077465.svg?style=flat-square&label=Discord%20Chat&colorB=7289da)](https://discord.gg/vZVHJ4j)
-[![GitHub stars](https://img.shields.io/github/stars/Lednerb/bilberry-hugo-theme.svg?style=social&label=Stars)](https://github.com/Lednerb/bilberry-hugo-theme)
+[![Hugo Themes](https://img.shields.io/badge/Hugo_Themes-@Bilberry-ff4088)](https://themes.gohugo.io/themes/bilberry-hugo-theme/)
 
+[![Build GH-Pages](https://github.com/Lednerb/bilberry-hugo-theme/workflows/Update%20GitHub%20Pages/badge.svg)](https://github.com/Lednerb/bilberry-hugo-theme/deployments/activity_log?environment=github-pages)
+[![Contributors](https://img.shields.io/badge/contributors-36-orange.svg?style=flat-square)](#contributors)
+[![Discord](https://img.shields.io/discord/479643633814077465.svg?style=flat-square&label=Discord%20Chat&colorB=7289da)](https://discord.gg/vZVHJ4j)
 
-This is a premium theme for [HUGO](https://gohugo.io), inspired by the [Lingonberry WordPress](http://www.andersnoren.se/teman/lingonberry-wordpress-theme/) theme from Anders Norén.
+This is a premium [Hugo](https://gohugo.io) theme, inspired by the [Lingonberry WordPress](http://www.andersnoren.se/teman/lingonberry-wordpress-theme/) theme from Anders Norén.
 
 Bilberry is an adaption that comes with different optimizations and little features as listed below.
 <br>Click here for a [DEMO / PREVIEW](https://lednerb.github.io/bilberry-hugo-theme).
@@ -271,6 +273,42 @@ Just create a new site and copy your site's short name to the `config.toml` file
 
 You can manage and moderate the comments either on your website or at the disqus management panel.
 
+#### Utterances comments
+If you want to enable the functionality for your users to write comments below your articles. You need to follow instructions in [Utterances](https://utteranc.es/) website.
+
+To activate Utterances in your blog you have to customize the JS-snippet below or by adding your configuration to `config.toml`.
+
+**Example:**
+
+Snippet displayed in Utterances:
+```html
+<script src="https://utteranc.es/client.js"
+  repo="Lednerb/bilberry-hugo-theme"
+  issue-term="pathname"
+  label="Comment"
+  theme="github-light"
+  crossorigin="anonymous"
+  async>
+</script>
+<div id="utterances"></div>
+```
+
+Your `config.toml`
+```toml
+#[...]
+[params]
+
+    #[...]
+
+    # Utterances
+    utterances    = true
+    utterancesJsUrl     = "https://utteranc.es/client.js"
+    utterancesRepository    = "Lednerb/bilberry-hugo-theme"
+    utterancesIssueTerm   = "pathname"
+    utterancesLabel   = "Comment"
+    utterancesTheme = "github-light"
+    utterancesCrossOrigin = "anonymous"
+```
 
 ### Responsive Design
 Bilberry is optimized for desktop and mobile devices (tablets and smartphones).
diff --git a/assets/js/theme.js b/assets/js/theme.js
index 006055a..71d4751 100644
--- a/assets/js/theme.js
+++ b/assets/js/theme.js
@@ -52,14 +52,25 @@ $(document).ready(function () {
     });
 
     // Commento support to block search focus when hitting the S key
-    blockSearchFocus = false;
+    blockSearchFocusCommento = false;
 
     $('#commento').focusin(function() {
-      blockSearchFocus = true;
+        blockSearchFocusCommento = true;
     });
 
     $('#commento').focusout(function() {
-      blockSearchFocus = false;
+        blockSearchFocusCommento = false;
+    });
+
+    // Utterances support to block search focus when hitting the S key
+    blockSearchFocusUtterances = false;
+
+    $('#utterances').focusin(function() {
+        blockSearchFocusUtterances = true;
+    });
+
+    $('#utterances').focusout(function() {
+        blockSearchFocusUtterances = false;
     });
 
     // Keyboard-Support
@@ -69,7 +80,7 @@ $(document).ready(function () {
                 $("nav").slideUp();
             $("#search").autocomplete("val", "");
         }
-        else if (e.keyCode === 83 && !blockSearchFocus) {
+        else if (e.keyCode === 83 && !blockSearchFocusCommento || !blockSearchFocusUtterances) {
             if (!$("nav").hasClass('permanentTopNav'))
                 $("nav").slideDown();
             $("#search").focus();
diff --git a/config.toml b/config.toml
new file mode 100644
index 0000000..e08c844
--- /dev/null
+++ b/config.toml
@@ -0,0 +1,3 @@
+[module]
+  [module.hugoVersion]
+    min = "0.53"
diff --git a/exampleSite/config.toml b/exampleSite/config.toml
index ec691c8..2948011 100644
--- a/exampleSite/config.toml
+++ b/exampleSite/config.toml
@@ -5,7 +5,7 @@ theme = "bilberry-hugo-theme"
 # Generate the robots.txt file for SEO
 enableRobotsTXT = true
 
-# Change to one of your content languages definded at the end.
+# Change to one of your content languages defined at the end.
 DefaultContentLanguage = "en"
 
 # Enable / Disable Google Analytics statistics for your site
@@ -48,6 +48,15 @@ disqusShortname = ""
   # Enable / Disable comments on the articles via commento
   commentoJsURL = "https://commento.lednerb.de/js/commento.js"
 
+  # Enable / Disable Utterances comments
+  utterances    = true
+  utterancesJsUrl     = "https://utteranc.es/client.js"
+  utterancesRepository    = "Lednerb/bilberry-hugo-theme"
+  utterancesIssueTerm   = "pathname"
+  utterancesLabel   = "Comment"
+  utterancesTheme = "github-light"
+  utterancesCrossOrigin = "anonymous"
+
   # Media configuration
     # let hugo automatically resize and crop your images to the correct sizes
     # NB: When enabled the image files get renamed by adding additional information,
@@ -83,7 +92,7 @@ disqusShortname = ""
     # Set to true to pin only to the first page, false to all pages
     # pinOnlyToFirstPage = true
 
-    # enable automatical localization of the article's PublishedDate with momentjs
+    # enable automatic localization of the article's PublishedDate with momentjs
     enableMomentJs = true
 
     # customize the date format | only works if momentjs is disabled | only works with English month names
@@ -131,7 +140,7 @@ disqusShortname = ""
     creditsUrl = "https://github.com/Lednerb/bilberry-hugo-theme"
 
 
-# customize your available languages for your multi-langual site
+# customize your available languages for your multi-lingual site
 # or delete the [Languages] blog to use the theme with only one supported language
 [Languages]
   [Languages.en]
diff --git a/exampleSite/content/gallery/my-trip-to-scotland/index.de.md b/exampleSite/content/gallery/my-trip-to-scotland/index.de.md
index bbaab40..ad01d25 100644
--- a/exampleSite/content/gallery/my-trip-to-scotland/index.de.md
+++ b/exampleSite/content/gallery/my-trip-to-scotland/index.de.md
@@ -9,7 +9,7 @@ author: "Lednerb"
 Im Juni 2017 habe ich mit meinem besten Freund Schottland für 2 Wochen besucht und bereist.
 Wir fuhren viel durch das schöne Land und sahen eine Reihe verschiedener Tiere: Rinder, Hirsche, Vögel, Delfine und Schafe. Überall Schafe!
 
-Auf einem schönen, kleinen Campingplatz sahen wir am frühen Morgen Rinder im Nebel und machten ein Foto. Dieses Bild hat seither den Titel "Rindviehcher im Nebel".
+Auf einem schönen, kleinen Campingplatz sahen wir am frühen Morgen Rinder im Nebel und machten ein Foto. Dieses Bild hat seither den Titel "Rindviecher im Nebel".
 
 Wir fuhren mit dem Auto durch den Eurotunnel Calais-Folkstone nach Großbritannien und fuhren die Westküste nach Norden und besuchten die Isle of Skye - eine wunderschöne Insel, die man in seinem Leben auf jeden Fall gesehen haben sollte. Dann ging es weiter Richtung Norden nach Durness, wo wir den Straßen nach Osten folgten, entlang an den Küsten und via Single-Track-Roads nach Lindisfarne.
 
diff --git a/exampleSite/content/gallery/my-trip-to-scotland/index.md b/exampleSite/content/gallery/my-trip-to-scotland/index.md
index 34ce7f2..55d801f 100644
--- a/exampleSite/content/gallery/my-trip-to-scotland/index.md
+++ b/exampleSite/content/gallery/my-trip-to-scotland/index.md
@@ -9,7 +9,7 @@ author: "Lednerb"
 In June 2017 I've visited Scotland with my best friend for two weeks.
 We drove a lot through the beautiful countryside and saw a lot of different animals: cattle, deer, birds, dolphins, and sheep. Sheep everywhere!
 
-At one beautiful camping site, we saw cattle in fog in the very early morning and took a picture of it. The image now has the title "Rindviehcher im Nebel", a quite funny German phrase that means cattle in the fog.
+At one beautiful camping site, we saw cattle in fog in the very early morning and took a picture of it. The image now has the title "Rindviecher im Nebel", a quite funny German phrase that means cattle in the fog.
 
 We arrived by car via the Eurotunnel Calais-Folkstone and drove the west coast to the north, visited the Isle of Skye (everyone should've seen this place before death), headed over to the north to Durness and took the north and east coast roads to Lindisfarne.
 
diff --git a/exampleSite/content/link/duckduckgo.md b/exampleSite/content/link/duckduckgo.md
index 34de59a..6e6de09 100644
--- a/exampleSite/content/link/duckduckgo.md
+++ b/exampleSite/content/link/duckduckgo.md
@@ -8,4 +8,4 @@ tags: ['search engine']
 # Set your external url
 link: "https://duckduckgo.com"
 ---
-A search engnine that respects your privacy.
+A search engine that respects your privacy.
diff --git a/exampleSite/content/page/about-bilberry.de.md b/exampleSite/content/page/about-bilberry.de.md
index a43eb4e..70d863b 100644
--- a/exampleSite/content/page/about-bilberry.de.md
+++ b/exampleSite/content/page/about-bilberry.de.md
@@ -18,6 +18,6 @@ Das Theme beinhaltet viele Features wie bspw.:
     - Einfache Konfiguration und Erweiterung um persönliche Typen
 
 
-*Dieses Theme ist eine Adaptopn des Lingonberry Themes von [Anders Norén](http://www.andersnoren.se/teman/lingonberry-wordpress-theme/)*
+*Dieses Theme ist eine Adaption des Lingonberry Themes von [Anders Norén](http://www.andersnoren.se/teman/lingonberry-wordpress-theme/)*
 
 **[Weitere Informationen auf GitHub](https://github.com/Lednerb/bilberry-hugo-theme)**
diff --git a/exampleSite/content/page/about-bilberry.md b/exampleSite/content/page/about-bilberry.md
index d5b7872..e9fc774 100644
--- a/exampleSite/content/page/about-bilberry.md
+++ b/exampleSite/content/page/about-bilberry.md
@@ -14,7 +14,7 @@ It is full of little nice features, such as:
 - keyboard shortcut for the search (press the `s` key, type something and hit `enter` or `esc`)
 - responsive design - optimized for desktop and mobile devices
 - full internationalization (i18n) support (en, de, fr, ru, es out of the box!)
-- full mutli-language support
+- full multi-language support
 - custom post types (`article`, `audio`, `code`, `gallery`, `link`, `page`, `picture`, `quote`, `video`)
     - easy configuration to add more according to your needs
 
diff --git a/exampleSite/content/status/version-2-2-0-released.md b/exampleSite/content/status/version-2-2-0-released.md
index 5adc93c..95355fe 100644
--- a/exampleSite/content/status/version-2-2-0-released.md
+++ b/exampleSite/content/status/version-2-2-0-released.md
@@ -4,4 +4,4 @@ date: 2020-08-15T10:45:44+02:00
 icon: "fa-rocket"
 showDate: false
 ---
-I'm happy to anounce a new theme release with the powerful new `status` post type!
+I'm happy to announce a new theme release with the powerful new `status` post type!
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 9322621..8f746a0 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -89,7 +89,9 @@
     {{ end }}
 
     {{ with .Params.original_url }}
-    <link rel=”canonical” href=”{{ . }}” />
+    <link rel="canonical" href="{{ . }}" />
+    {{ else }}
+    <link rel="canonical" href="{{ .Permalink }}">
     {{ end }}
 
     <link rel="stylesheet" href="{{ "theme.css" | absURL }}">
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index dd301be..9d5e47b 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -11,6 +11,7 @@
         <div id="comments-container">
             {{ template "_internal/disqus.html" . }}
             {{ partial "commento.html" . }}
+            {{ partial "utterances.html" . }}
         </div>
     {{ end }}
 {{ end }}
diff --git a/layouts/partials/utterances.html b/layouts/partials/utterances.html
new file mode 100644
index 0000000..df98121
--- /dev/null
+++ b/layouts/partials/utterances.html
@@ -0,0 +1,10 @@
+{{ if .Site.Params.utterances }}
+<script src="{{ .Site.Params.utterancesJsUrl }}"
+        repo="{{ .Site.Params.utterancesRepository }}"
+        issue-term="{{.Site.Params.utterancesIssueTerm}}"
+        theme="{{ .Site.Params.utterancesTheme }}"
+        crossorigin="{{ .Site.Params.utterancesCrossOrigin }}"
+        async>
+</script>
+<div id="utterances"></div>
+{{ end }}
diff --git a/package-lock.json b/package-lock.json
index 1513776..cb46568 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1937,14 +1937,42 @@
       }
     },
     "browserslist": {
-      "version": "4.14.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.3.tgz",
-      "integrity": "sha512-GcZPC5+YqyPO4SFnz48/B0YaCwS47Q9iPChRGi6t7HhflKBcINzFrJvRfC+jp30sRMKxF+d4EHGs27Z0XP1NaQ==",
+      "version": "4.16.6",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
+      "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
       "requires": {
-        "caniuse-lite": "^1.0.30001131",
-        "electron-to-chromium": "^1.3.570",
-        "escalade": "^3.1.0",
-        "node-releases": "^1.1.61"
+        "caniuse-lite": "^1.0.30001219",
+        "colorette": "^1.2.2",
+        "electron-to-chromium": "^1.3.723",
+        "escalade": "^3.1.1",
+        "node-releases": "^1.1.71"
+      },
+      "dependencies": {
+        "caniuse-lite": {
+          "version": "1.0.30001230",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz",
+          "integrity": "sha512-5yBd5nWCBS+jWKTcHOzXwo5xzcj4ePE/yjtkZyUV1BTUmrBaA9MRGC+e7mxnqXSA90CmCA8L3eKLaSUkt099IQ=="
+        },
+        "colorette": {
+          "version": "1.2.2",
+          "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
+          "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w=="
+        },
+        "electron-to-chromium": {
+          "version": "1.3.738",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.738.tgz",
+          "integrity": "sha512-vCMf4gDOpEylPSLPLSwAEsz+R3ShP02Y3cAKMZvTqule3XcPp7tgc/0ESI7IS6ZeyBlGClE50N53fIOkcIVnpw=="
+        },
+        "escalade": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+          "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
+        },
+        "node-releases": {
+          "version": "1.1.72",
+          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.72.tgz",
+          "integrity": "sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw=="
+        }
       }
     },
     "buffer": {
@@ -2302,9 +2330,9 @@
       "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
     },
     "color-string": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz",
-      "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.6.0.tgz",
+      "integrity": "sha512-c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA==",
       "requires": {
         "color-name": "^1.0.0",
         "simple-swizzle": "^0.2.2"
@@ -3047,9 +3075,9 @@
       "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0="
     },
     "dns-packet": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
-      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz",
+      "integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==",
       "requires": {
         "ip": "^1.1.0",
         "safe-buffer": "^5.0.1"
@@ -3138,29 +3166,24 @@
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
-    "electron-to-chromium": {
-      "version": "1.3.570",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.570.tgz",
-      "integrity": "sha512-Y6OCoVQgFQBP5py6A/06+yWxUZHDlNr/gNDGatjH8AZqXl8X0tE4LfjLJsXGz/JmWJz8a6K7bR1k+QzZ+k//fg=="
-    },
     "elliptic": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
-      "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
       "requires": {
-        "bn.js": "^4.4.0",
-        "brorand": "^1.0.1",
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
         "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.0"
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
       },
       "dependencies": {
         "bn.js": {
-          "version": "4.11.9",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
         }
       }
     },
@@ -3322,11 +3345,6 @@
         "through": "~2.3.6"
       }
     },
-    "escalade": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.0.tgz",
-      "integrity": "sha512-mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig=="
-    },
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
@@ -5056,9 +5074,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.19",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-      "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
     "lodash.memoize": {
       "version": "4.1.2",
@@ -5523,11 +5541,6 @@
         }
       }
     },
-    "node-releases": {
-      "version": "1.1.61",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.61.tgz",
-      "integrity": "sha512-DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g=="
-    },
     "nopt": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
@@ -5892,9 +5905,9 @@
       "dev": true
     },
     "path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
     },
     "path-to-regexp": {
       "version": "0.1.7",
@@ -8426,9 +8439,9 @@
       }
     },
     "url-parse": {
-      "version": "1.4.7",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
-      "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz",
+      "integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==",
       "requires": {
         "querystringify": "^2.1.1",
         "requires-port": "^1.0.0"
@@ -8745,9 +8758,9 @@
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         },
         "ssri": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-          "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz",
+          "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
           "requires": {
             "figgy-pudding": "^3.5.1"
           }
@@ -9180,9 +9193,9 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "ws": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
-      "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
+      "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
       "requires": {
         "async-limiter": "~1.0.0"
       }
@@ -9193,9 +9206,9 @@
       "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
     },
     "y18n": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz",
+      "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ=="
     },
     "yallist": {
       "version": "4.0.0",
diff --git a/theme.toml b/theme.toml
index 3614b37..e447d54 100644
--- a/theme.toml
+++ b/theme.toml
@@ -1,20 +1,19 @@
 name = "Bilberry Hugo Theme"
 license = "MIT"
 licenselink = "https://github.com/Lednerb/bilberry-hugo-theme/blob/master/LICENSE.md"
-description = "Bilberry is a premium hugo theme with a lot of nice features. It is an adaption and optimization for hugo from the Lingonberry WordPress theme by Anders Norén."
-homepage = "https://lednerb.github.io/bilberry-hugo-theme/"
-tags = ["blog", "personal", "responsive", "commento", "comments", "disabled javascript", "gallery", "code", "coding", "programming", "audio", "video", "algolia", "disqus", "search", "font awesome", "pages", "posts", "multilingual", "highlight.js", "syntax highlighting", "premium", "shortcuts"]
-features = ["search", "algolia integration", "post types", "i18n", 'multilangual', 'blog', 'google analytics', 'comments', 'disqus integration', "highlight.js", "syntax highlighting", "premium theme", "shortcuts"]
-min_version = "0.53"
+description = "Bilberry is a premium Hugo theme with many great features. This is a Hugo adaptation and further optimization of the Lingonberry WordPress theme by Anders Norén."
+
+homepage = "https://github.com/Lednerb/bilberry-hugo-theme"
+demosite = "https://lednerb.github.io/bilberry-hugo-theme"
 
-theme_version = "2.1.0"
+tags = ["blog", "personal", "responsive", "commento", "comments", "disabled javascript", "gallery", "code", "coding", "programming", "audio", "video", "algolia", "disqus", "search", "font awesome", "pages", "posts", "multilingual", "highlight.js", "syntax highlighting", "premium", "shortcuts"]
+features = ["search", "algolia integration", "post types", "i18n", 'multilingual', 'blog', 'google analytics', 'comments', 'disqus integration', "highlight.js", "syntax highlighting", "premium theme", "shortcuts"]
 
 [author]
   name = "Lednerb | Sascha Brendel"
   homepage = "https://sascha-brendel.de"
 
-# If porting an existing theme
 [original]
   name = "Lingonberry"
-  homepage = "http://www.andersnoren.se/teman/lingonberry-wordpress-theme/"
+  homepage = "https://andersnoren.se/teman/lingonberry-wordpress-theme/"
   repo = "https://wordpress.org/themes/lingonberry/"