diff --git a/Dockerfile b/Dockerfile
index a4a9951cf..3a7ceacf7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,11 +10,11 @@ WORKDIR /opt/build
 # Install nodejs, yarn and hugo
 RUN apt-get update  \
     && apt-get install -y gnupg gnupg2 gnupg1 \
-    && curl -sL https://deb.nodesource.com/setup_15.x | bash - \
+    && curl -sL https://deb.nodesource.com/setup_16.x | bash - \
     && apt-get install -y nodejs \
     && apt-get update \
     && npm install --global yarn \
-    && curl -L  https://github.com/gohugoio/hugo/releases/download/v0.76.3/hugo_0.76.3_Linux-64bit.deb -o /tmp/hugo.deb \
+    && curl -L  https://github.com/gohugoio/hugo/releases/download/v0.125.3/hugo_0.125.3_linux-amd64.deb -o /tmp/hugo.deb \
     && dpkg -i /tmp/hugo.deb \
     && rm /tmp/hugo.deb
 
diff --git a/src/config/_default/config.toml b/src/config/_default/config.toml
index 3fae752c0..eb054da52 100644
--- a/src/config/_default/config.toml
+++ b/src/config/_default/config.toml
@@ -4,7 +4,14 @@ title = "IVPN"
 theme = "ivpn-v3"
 paginate = 8
 summaryLength = 35
-disableKinds = ["sitemap", "taxonomyTerm"]
+disableKinds = ["sitemap", "taxonomy"]
+
+pygmentsUseClasses=true
+pygmentsCodefencesGuessSyntax=true
+pygmentsCodefences=true
+pygmentsStyle="monokai"
+pygmentsOptions="noclasses=false"
+
 
 [markup.goldmark.renderer]
     unsafe= true
diff --git a/src/themes/ivpn-v3/assets/scss/components/highlight.scss b/src/themes/ivpn-v3/assets/scss/components/highlight.scss
index 4721cadb0..2e5f1ee53 100644
--- a/src/themes/ivpn-v3/assets/scss/components/highlight.scss
+++ b/src/themes/ivpn-v3/assets/scss/components/highlight.scss
@@ -10,6 +10,10 @@
     pre code span {
         display: inline;
     }
+
+    pre code .cl{
+        color: #b35a5a !important;
+    }
 }
 
 .bold {
diff --git a/src/themes/ivpn-v3/layouts/blog/single.html b/src/themes/ivpn-v3/layouts/blog/single.html
index 2a287e445..d1de383c8 100644
--- a/src/themes/ivpn-v3/layouts/blog/single.html
+++ b/src/themes/ivpn-v3/layouts/blog/single.html
@@ -1,19 +1,19 @@
 {{ define "main" }}
 <section class="blog-article">
     <div class="breadcrumb">
-        <a href="/blog/">IVPN Blog</a><span class="breadcrumb-seperator">></span>{{ range .Params.categories }}{{ with ($.Site.GetPage (printf "/categories/%s" (. | urlize))) }}<a href="{{ .URL }}">{{ .Title }}</a>{{ end }}{{ end }}<span class="breadcrumb-seperator">></span>{{ .Title }}
+        <a href="/blog/">IVPN Blog</a><span class="breadcrumb-seperator">></span>{{ range .Params.categories }}{{ with ($.Site.GetPage (printf "/categories/%s" (. | urlize))) }}<a href="{{ .Permalink }}">{{ .Title }}</a>{{ end }}{{ end }}<span class="breadcrumb-seperator">></span>{{ .Title }}
     </div>
     <div class="blog-article__heading">
         <h1>{{ .Title }}</h1>
         <p>
             {{ range .Params.categories }}
                 {{ with ($.Site.GetPage (printf "/categories/%s" (. | urlize))) }}
-                    <a href="{{ .URL }}" class="badge">{{ .Title }}</a>
+                    <a href="{{ .Permalink }}" class="badge">{{ .Title }}</a>
                 {{ end }}
             {{ end }}
             {{ range .Params.authors }}
                 {{ with ($.Site.GetPage (printf "/authors/%s" (. | urlize))) }}
-                    By <a href="{{ .URL }}">{{ .Title }}</a> |
+                    By <a href="{{ .Permalink }}">{{ .Title }}</a> |
                 {{ end }}
             {{ end }}
             Posted on {{ .Date.Format "January 2, 2006"}}
@@ -68,14 +68,14 @@ <h3>{{ len .Params.comments }} Comments</h3>
                 <div class="blog-article__highlighted">
                     {{ range .Params.categories }}
                         {{ with ($.Site.GetPage (printf "/categories/%s" (. | urlize))) }}
-                            <a href="{{ .URL }}" class="badge">{{ .Title }}</a>
+                            <a href="{{ .Permalink }}" class="badge">{{ .Title }}</a>
                         {{ end }}
                     {{ end }}
-                    <h4><a href="{{ .Page.URL }}">{{ .Page.Title }}</a></h4>
+                    <h4><a href="{{ .Page.Permalink }}">{{ .Page.Title }}</a></h4>
                     <p class="blog-article__highlighted-meta">
                         {{ range .Params.authors }}
                             {{ with ($.Site.GetPage (printf "/authors/%s" (. | urlize))) }}
-                                By <a href="{{ .URL }}">{{ .Title }}</a>
+                                By <a href="{{ .Permalink }}">{{ .Title }}</a>
                             {{ end }}
                         {{ end }}
                     </p>
@@ -93,22 +93,22 @@ <h4><a href="{{ .Page.URL }}">{{ .Page.Title }}</a></h4>
                 <div class="blog-article__related">
                     <div class="blog-article__related-image">
                         {{ if .Params.thumbnailImage }}
-                            <a href="{{ .Page.URL }}">
+                            <a href="{{ .Page.Permalink }}">
                                 <img src="{{ site.Params.cdnUrl }}{{ .Params.thumbnailImage }}" alt="{{ .Title }}">
                             </a>
                         {{ end }}
                         {{ range .Params.categories }}
                             {{ with ($.Site.GetPage (printf "/categories/%s" (. | urlize))) }}
-                                <a href="{{ .URL }}" class="badge">{{ .Title }}</a>
+                                <a href="{{ .Permalink }}" class="badge">{{ .Title }}</a>
                             {{ end }}
                         {{ end }}
                     </div>
-                    <h4><a href="{{ .Page.URL }}">{{ .Page.Title }}</a></h4>
+                    <h4><a href="{{ .Page.Permalink }}">{{ .Page.Title }}</a></h4>
                     <p class="blog-article__related-meta">
                         Posted on {{ .Date.Format "January 2, 2006"}} by
                         {{ range .Params.authors }}
                             {{ with ($.Site.GetPage (printf "/authors/%s" (. | urlize))) }}
-                                <a href="{{ .URL }}">{{ .Title }}</a>
+                                <a href="{{ .Permalink }}">{{ .Title }}</a>
                             {{ end }}
                         {{ end }}
                     </p>
diff --git a/src/themes/ivpn-v3/layouts/pages/guides.html b/src/themes/ivpn-v3/layouts/pages/guides.html
index 0b394d641..b3ec34327 100644
--- a/src/themes/ivpn-v3/layouts/pages/guides.html
+++ b/src/themes/ivpn-v3/layouts/pages/guides.html
@@ -5,7 +5,7 @@
         <h2>Get started</h2>
         <section class="guides">
             {{ range where .Pages "Params.section" "Basic" }}
-            <a href="{{ .URL }}">
+            <a href="{{ .Permalink }}">
                 <span>{{ .Title }}</span>
                 <em>Read more</em>
             </a>
@@ -14,7 +14,7 @@ <h2>Get started</h2>
         <h2>Advanced Privacy and Anonymity</h2>
         <section class="guides">
             {{ range where .Pages "Params.section" "Advanced" }}
-            <a href="{{ .URL }}">
+            <a href="{{ .Permalink }}">
                 <span>{{ .Title }}</span>
                 <em>Read more</em>
             </a>
@@ -23,7 +23,7 @@ <h2>Advanced Privacy and Anonymity</h2>
         <h2>Misc</h2>
         <section class="guides">
             {{ range where .Pages "Params.section" "Misc" }}
-            <a href="{{ .URL }}">
+            <a href="{{ .Permalink }}">
                 <span>{{ .Title }}</span>
                 <em>Read more</em>
             </a>
diff --git a/src/themes/ivpn-v3/layouts/pages/help-details.html b/src/themes/ivpn-v3/layouts/pages/help-details.html
index 9e0540cce..2840baf37 100644
--- a/src/themes/ivpn-v3/layouts/pages/help-details.html
+++ b/src/themes/ivpn-v3/layouts/pages/help-details.html
@@ -34,7 +34,7 @@ <h3>Related Articles</h3>
                         {{ if isset .Params "h1" }}
                             {{ if not (in .Params.h1 $pageH1) }}
                             <li>
-                                <a href="{{ .URL }}">{{ .Params.h1 }}</a>
+                                <a href="{{ .Permalink }}">{{ .Params.h1 }}</a>
                             </li>
                             {{ end }}
                         {{ end }}
diff --git a/src/themes/ivpn-v3/layouts/pages/help.html b/src/themes/ivpn-v3/layouts/pages/help.html
index 0b6efd439..32b71a062 100644
--- a/src/themes/ivpn-v3/layouts/pages/help.html
+++ b/src/themes/ivpn-v3/layouts/pages/help.html
@@ -28,7 +28,7 @@ <h1>Help Center</h1>
                 <ul class="list">
                     {{ range where .Site.Pages ".Params.sections" "intersect" (slice .Params.section) }}
                     <li>
-                        <a href="{{ .URL }}">{{ .Params.h1 }}</a>
+                        <a href="{{ .Permalink }}">{{ .Params.h1 }}</a>
                     </li>
                     {{ end }}
                 </ul>
diff --git a/src/themes/ivpn-v3/layouts/pages/setup-article.html b/src/themes/ivpn-v3/layouts/pages/setup-article.html
index 3bcd4e286..f89b9825b 100644
--- a/src/themes/ivpn-v3/layouts/pages/setup-article.html
+++ b/src/themes/ivpn-v3/layouts/pages/setup-article.html
@@ -7,7 +7,7 @@ <h1>{{ .Params.section }}</h1>
             <nav id="nav">
                 {{ $listItem := .Params.listItem }}
                 {{ range .Parent.Pages }}
-                <a class="{{ if eq .Params.listItem $listItem }}active{{ end }}" href="{{ .URL }}">{{ .Params.listItem }}</a>
+                <a class="{{ if eq .Params.listItem $listItem }}active{{ end }}" href="{{ .Permalink }}">{{ .Params.listItem }}</a>
                 {{ end }}
             </nav>
             <main id="main">
diff --git a/src/themes/ivpn-v3/layouts/pages/setup-list.html b/src/themes/ivpn-v3/layouts/pages/setup-list.html
index 1351e605d..c54736be1 100644
--- a/src/themes/ivpn-v3/layouts/pages/setup-list.html
+++ b/src/themes/ivpn-v3/layouts/pages/setup-list.html
@@ -6,7 +6,7 @@ <h1>{{ .Params.section }}</h1>
         <div class="listing">
             <nav id="nav">
                 {{ range .Pages }}
-                <a href="{{ .URL }}">{{ .Params.listItem }}</a>
+                <a href="{{ .Permalink }}">{{ .Params.listItem }}</a>
                 {{ end }}
             </nav>
             <main id="main">
diff --git a/src/themes/ivpn-v3/layouts/partials/blog-article.html b/src/themes/ivpn-v3/layouts/partials/blog-article.html
index b46d898a2..a716aed38 100644
--- a/src/themes/ivpn-v3/layouts/partials/blog-article.html
+++ b/src/themes/ivpn-v3/layouts/partials/blog-article.html
@@ -1,5 +1,5 @@
 <article class="article">
-    <a href="{{ .Page.URL }}" class="article__image {{ if eq .Params.thumbnailImage nil }}article__image--placeholder{{ end }}">
+    <a href="{{ .Page.Permalink }}" class="article__image {{ if eq .Params.thumbnailImage nil }}article__image--placeholder{{ end }}">
         {{ if .Params.thumbnailImage }}
             <img src="{{ site.Params.cdnUrl }}{{ .Params.thumbnailImage }}" class="img-fluid" alt="{{ .Page.Title }}"/>
         {{ else }}
@@ -9,20 +9,20 @@
     <div class="article__summary">
         {{ range .Params.categories }}
             {{ with ($.Site.GetPage (printf "/categories/%s" (. | urlize))) }}
-                <a href="{{ .URL }}" class="badge">{{ .Title }}</a>
+                <a href="{{ .Permalink }}" class="badge">{{ .Title }}</a>
             {{ end }}
         {{ end }}
-        <h3><a href="{{ .Page.URL }}">{{ .Page.Title }}</a></h3>
+        <h3><a href="{{ .Page.Permalink }}">{{ .Page.Title }}</a></h3>
         <p class="article-meta">
             {{ range .Params.authors }}
                 {{ with ($.Site.GetPage (printf "/authors/%s" (. | urlize))) }}
-                    By <a href="{{ .URL }}">{{ .Title }}</a> |
+                    By <a href="{{ .Permalink }}">{{ .Title }}</a> |
                 {{ end }}
             {{ end }}
             Posted on {{ .Page.Date.Format "January 2, 2006"}}
         </p>
 
         <p class="article-summary">{{ .Page.Summary | safeHTML }}</p>
-        <a class="article-continue" href="{{ .Page.URL }}">Continue reading</a>
+        <a class="article-continue" href="{{ .Page.Permalink }}">Continue reading</a>
     </div>
 </article>
diff --git a/src/themes/ivpn-v3/layouts/partials/blog-categories.html b/src/themes/ivpn-v3/layouts/partials/blog-categories.html
index b7bd7893f..cc63e4226 100644
--- a/src/themes/ivpn-v3/layouts/partials/blog-categories.html
+++ b/src/themes/ivpn-v3/layouts/partials/blog-categories.html
@@ -1,7 +1,7 @@
 <section class="blog__categories">
     {{ range sort .Site.Taxonomies.categories ".Page.Weight" "asc" }}
         <div class="blog__category">
-            <a href="{{ .Page.URL }}">
+            <a href="{{ .Page.Permalink }}">
                 <span class="title">{{ .Page.Title }}</span>
                 <span class="sub-title">({{ .Count }} {{ if eq .Count 1 }}article{{ else }}articles{{ end }})</span>
             </a>
diff --git a/src/themes/ivpn-v3/layouts/partials/blog-side-bar.html b/src/themes/ivpn-v3/layouts/partials/blog-side-bar.html
index d5ccfd9a2..fa56f8115 100644
--- a/src/themes/ivpn-v3/layouts/partials/blog-side-bar.html
+++ b/src/themes/ivpn-v3/layouts/partials/blog-side-bar.html
@@ -1,7 +1,7 @@
 <div>
     <p class="sidebar-header">Tags</p>
     {{ range .Site.Taxonomies.tags }}
-        <a href="{{ .Page.URL }}" rel="noindex, dofollow" class="tag">{{ .Page.Title }}</a>
+        <a href="{{ .Page.Permalink }}" rel="noindex, dofollow" class="tag">{{ .Page.Title }}</a>
     {{ end }}
 </div>
 <div class="blog__highlighted">
@@ -10,14 +10,14 @@
         <div class="blog__highlighted-article blog__highlighted-article--border-top">
             {{ range .Params.categories }}
                 {{ with ($.Site.GetPage (printf "/categories/%s" (. | urlize))) }}
-                    <a href="{{ .URL }}" class="badge steel-badge">{{ .Title }}</a>
+                    <a href="{{ .Permalink }}" class="badge steel-badge">{{ .Title }}</a>
                 {{ end }}
             {{ end }}
-            <h4><a href="{{ .Page.URL }}">{{ .Page.Title }}</a></h4>
+            <h4><a href="{{ .Page.Permalink }}">{{ .Page.Title }}</a></h4>
             <p class="blog__highlighted-meta">
                 {{ range .Params.authors }}
                     {{ with ($.Site.GetPage (printf "/authors/%s" (. | urlize))) }}
-                        By <a href="{{ .URL }}">{{ .Title }}</a>
+                        By <a href="{{ .Permalink }}">{{ .Title }}</a>
                     {{ end }}
                 {{ end }}
             </p>