diff --git a/README.md b/README.md
index 6437df9..812599b 100644
--- a/README.md
+++ b/README.md
@@ -69,7 +69,7 @@ paginate     = 10
   dateform        = "Jan 2, 2006"
   dateformShort   = "Jan 2"
   dateformNum     = "2006-01-02"
-  dateformNumTime = "2006-01-02 15:04 -0700"
+  dateformNumTime = "2006-01-02 15:04"
 
   # Subtitle for home
   homeSubtitle = "A simple and beautiful blog"
diff --git a/data/langFlags.yaml b/data/langFlags.yaml
index cda2411..2464fed 100644
--- a/data/langFlags.yaml
+++ b/data/langFlags.yaml
@@ -11,3 +11,4 @@ ru: ru
 tr: tr
 ml: in
 gl: es-ga
+zh-hk: hong_kong
diff --git a/docs/svgs.md b/docs/svgs.md
index 8807930..956c328 100644
--- a/docs/svgs.md
+++ b/docs/svgs.md
@@ -11,10 +11,12 @@
 - [dribbble](https://simpleicons.org/?q=dribbble)
 - [email](https://feathericons.com/?query=mail)
 - [facebook](https://simpleicons.org/?q=facebook)
+- git
 - gitbook
 - [github](https://feathericons.com/?query=github)
 - [gitlab](https://feathericons.com/?query=gitlab)
 - [goodreads](https://simpleicons.org/?q=goodreads)
+- [googlescholar](https://simpleicons.org/?q=googlescholar)
 - [hackerone](https://simpleicons.org/?q=hackerone)
 - [hackerrank](https://simpleicons.org/?q=hackerrank)
 - [instagram](https://feathericons.com/?query=instagram)
@@ -28,20 +30,21 @@
 - [orcid](https://simpleicons.org/?q=orcid)
 - [linkedin](https://feathericons.com/?query=linked)
 - [pinterest](https://simpleicons.org/?q=pinterest)
+- [peertube](https://simpleicons.org/?q=peertube)
 - [podcasts-apple](https://simpleicons.org/?q=podcast)
 - [podcasts-google](https://simpleicons.org/?q=podcast)
 - [reddit](https://simpleicons.org/?q=reddit)
 - [slack](https://simpleicons.org/?q=slack)
 - [soundcloud](https://simpleicons.org/?q=soundcloud)
-- stackoverflow
+- [stackoverflow](https://simpleicons.org/?q=stackoverflow)
 - [steam](https://simpleicons.org/?q=Steam)
-- telegram
+- [telegram](https://simpleicons.org/?q=telegram)
 - [tumblr](https://simpleicons.org/?q=tumblr)
-- twitch
-- twitter
+- [twitch](https://simpleicons.org/?q=twitch)
+- [twitter](https://simpleicons.org/?q=twitter)
 - [whatsapp](https://simpleicons.org/?q=whatsapp)
 - [xampp](https://simpleicons.org/?q=xampp)
 - [xing](https://simpleicons.org/?q=xing)
 - [xmpp](https://simpleicons.org/?q=xmpp)
 - [ycombinator](https://simpleicons.org/?q=ycombinator)
-- youtube
+- [youtube](https://simpleicons.org/?q=youtube)
diff --git a/exampleSite/config.toml b/exampleSite/config.toml
index da7a50f..9de6227 100644
--- a/exampleSite/config.toml
+++ b/exampleSite/config.toml
@@ -51,9 +51,10 @@ disableHugoGeneratorInject = false
   dateform        = "Jan 2, 2006"
   dateformShort   = "Jan 2"
   dateformNum     = "2006-01-02"
-  dateformNumTime = "2006-01-02 15:04 -0700"
+  dateformNumTime = "2006-01-02 15:04"
 
   # Metadata mostly used in document's head
+  # 
   description = "Nice theme for homepages and blogs"
   keywords = ""
   images = [""]
@@ -61,30 +62,44 @@ disableHugoGeneratorInject = false
   homeSubtitle = "Hello Friend NG"
 
   # Prefix of link to the git commit detail page. GitInfo must be enabled.
+  #
   # gitUrl = ""
 
   # Set disableReadOtherPosts to true in order to hide the links to other posts.
+  #
   disableReadOtherPosts = false
 
   # Sharing buttons
+  #
   # There are a lot of buttons preconfigured. If you want to change them,
   # generate the buttons here: https://sharingbuttons.io
   # and add them into your own `layouts/partials/sharing-buttons.html`
+  #
   enableSharingButtons = true
 
   # Integrate Javascript files or stylesheets by adding the url to the external assets or by
   # linking local files with their path relative to the static folder, e.g. "css/styles.css"
+  #
   customCSS = []
   customJS  = []
 
   # Toggle this option need to rebuild SCSS, requires extended version of Hugo
+  #
   justifyContent = false  # Set "text-align: justify" to .post-content.
 
   # Default theme "light" or "dark"
+  #
   defaultTheme = "dark"
   themeColor = "#252627"
 
+  # Custom footer 
+  # If you want, you can easily override the default footer with your own content. 
+  #
+  # footerLeft = "Powered by <a href=\"http://gohugo.io\">Hugo</a>"
+  # footerRight = "Made with &#10084; by <a href=\"https://github.com/rhazdon\">Djordje Atlialp</a>"
+
   # Colors for favicons
+  #
   [params.favicon.color]
     mask = "#252627"
     msapplication = "#252627"
@@ -101,6 +116,7 @@ disableHugoGeneratorInject = false
     # logoCursorAnimate  = "2s"
 
   # Uncomment this if you want a portrait on your start page
+  #
   # [params.portrait]
   #   path     = "/img/image.jpg"
   #   alt      = "Portrait"
diff --git a/i18n/de.toml b/i18n/de.toml
index 2f0317b..7ef99a2 100644
--- a/i18n/de.toml
+++ b/i18n/de.toml
@@ -34,3 +34,6 @@ other = "Inhaltsverzeichnis"
 [wordCount]
 one   = "Ein Wort"
 other = "{{ .Count }} Wörter"
+
+[lastModified]
+other = "Letzte Aktualisierung"
diff --git a/i18n/en.toml b/i18n/en.toml
index 467981c..03c0444 100644
--- a/i18n/en.toml
+++ b/i18n/en.toml
@@ -34,3 +34,6 @@ other = "Table of Contents"
 [wordCount]
 one   = "One Word"
 other = "{{ .Count }} Words"
+
+[lastModified]
+other = "Last updated"
diff --git a/i18n/es.toml b/i18n/es.toml
index 1643ec7..1dce9bb 100644
--- a/i18n/es.toml
+++ b/i18n/es.toml
@@ -34,3 +34,6 @@ other = "Tabla de Contenido"
 [wordCount]
 one   = "Una Palabra"
 other = "{{ .Count }} Palabras"
+
+[lastModified]
+other = "Ultima actualización"
diff --git a/i18n/fr.toml b/i18n/fr.toml
index 9ea342e..1ba6fe9 100644
--- a/i18n/fr.toml
+++ b/i18n/fr.toml
@@ -34,3 +34,6 @@ other = "Table des matières"
 [wordCount]
 one   = "Un Mot"
 other = "{{ .Count }} Mots"
+
+[lastModified]
+other = "Mise à jour"
diff --git a/i18n/hi.toml b/i18n/hi.toml
index aa84bf9..6486c73 100644
--- a/i18n/hi.toml
+++ b/i18n/hi.toml
@@ -33,4 +33,7 @@ other = "अनुक्रमणिका"
 
 [wordCount]
 one   = "एक शब्द"
-other = "{{ .Count }} शब्द"
\ No newline at end of file
+other = "{{ .Count }} शब्द"
+
+[lastModified]
+other = "आखरी अपडेट"
diff --git a/i18n/it.toml b/i18n/it.toml
index 6a730e9..f78a5a0 100644
--- a/i18n/it.toml
+++ b/i18n/it.toml
@@ -34,3 +34,6 @@ other = "Contenuti"
 [wordCount]
 one   = "Una parola"
 other = "{{ .Count }} parole"
+
+[lastModified]
+other = "Ultimo aggiornamento"
diff --git a/i18n/lmo.toml b/i18n/lmo.toml
index 64d6a97..7616dda 100644
--- a/i18n/lmo.toml
+++ b/i18n/lmo.toml
@@ -34,3 +34,6 @@ other = "Contegnuu"
 [wordCount]
 one   = "Ona parolla"
 other = "{{ .Count }} paroll"
+
+[lastModified]
+other = "Last update"
diff --git a/i18n/ml.toml b/i18n/ml.toml
index 0eea4f6..a6aa087 100644
--- a/i18n/ml.toml
+++ b/i18n/ml.toml
@@ -34,3 +34,6 @@ other = "ഉള്ളടക്ക പട്ടിക"
 [wordCount]
 one   = "ഒരു വാക്ക്"
 other = "{{ .Count }} വാക്കുകൾ"
+
+[lastModified]
+other = "അവസാനമായി പുതുക്കിയത്"
diff --git a/i18n/pt-br.toml b/i18n/pt-br.toml
index 25a6f6c..b53cbcc 100644
--- a/i18n/pt-br.toml
+++ b/i18n/pt-br.toml
@@ -33,4 +33,7 @@ other = "Índice"
 
 [wordCount]
 one   = "Uma Palavra"
-other = "{{ .Count }} Palavras"
\ No newline at end of file
+other = "{{ .Count }} Palavras"
+
+[lastModified]
+other = "Última actualização"
diff --git a/i18n/ru.toml b/i18n/ru.toml
index 2b75f94..2f16ec4 100644
--- a/i18n/ru.toml
+++ b/i18n/ru.toml
@@ -38,3 +38,6 @@ one   = "{{ .Count }} слово"
 few   = "{{ .Count }} слова"
 many  = "{{ .Count }} слов"
 other = "{{ .Count }} слов"
+
+[lastModified]
+other = "Последнее обновление"
diff --git a/i18n/tr.toml b/i18n/tr.toml
index 4b50e98..df7af32 100644
--- a/i18n/tr.toml
+++ b/i18n/tr.toml
@@ -34,3 +34,6 @@ other = "İçindekiler"
 [wordCount]
 one   = "One Kelime"
 other = "{{ .Count }} Kelime"
+
+[lastModified]
+other = "Son güncelleme"
diff --git a/i18n/zh-hk.toml b/i18n/zh-hk.toml
new file mode 100644
index 0000000..4a2106a
--- /dev/null
+++ b/i18n/zh-hk.toml
@@ -0,0 +1,39 @@
+# Translations for Chinese (Hong Kong) [Cantonese]
+# https://gohugo.io/content-management/multilingual/#translation-of-strings
+
+# Generic
+#
+[translations]
+other = "譯文"
+
+[postAvailable]
+other = "其他語言"
+
+
+# 404.html
+#
+[archives]
+other = "貼文"
+
+[home]
+other = "主頁"
+
+[notFound]
+other = "哎呀，揾唔到添……"
+
+
+# posts/single.html
+#
+[readingTime]
+one   = "一分鐘"
+other = "{{ .Count }}分鐘"
+
+[tableOfContents]
+other = "目錄"
+
+[wordCount]
+one   = "一粒字"
+other = "{{ .Count }}字"
+
+[lastModified]
+other = "最後修改"
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 21bce3b..c5c04c0 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -14,17 +14,17 @@
         <article>
             <h2 class="post-title"><a href="{{ .Permalink }}">{{ .Title | markdownify }}</a></h2>
 
-            {{- if .Params.toc }}
+            {{ if .Params.toc }}
                 <hr />
                 <aside id="toc">
                 <div class="toc-title">{{ i18n "tableOfContents" }}</div>
                     {{ .TableOfContents }}
                 </aside>
                 <hr />
-            {{- end }}
+            {{ end }}
 
             {{ with .Params.Cover }}
-                <img src="/{{ . }}" class="post-cover" />
+                <img src="{{ . | relURL }}" class="post-cover" />
             {{ end }}
 
             <div class="post-content">
@@ -35,14 +35,8 @@
         <hr />
 
         <div class="post-info">
-  			{{- with .Params.tags }}
-  				<p>
-  					<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-tag meta-icon"><path d="M20.59 13.41l-7.17 7.17a2 2 0 0 1-2.83 0L2 12V2h10l8.59 8.59a2 2 0 0 1 0 2.82z"></path><line x1="7" y1="7" x2="7" y2="7"></line></svg>
-  					{{- range . -}}
-  					     <span class="tag"><a href="{{ "tags/" | absLangURL }}{{ . | urlize }}">{{.}}</a></span>
-  					{{- end }}
-  				</p>
-  			{{- end }}
+            {{ partial "tags.html" . }}
+            {{ partial "categories.html" . }}
 
             {{- if .GitInfo }}
 			    <p><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-git-commit"><circle cx="12" cy="12" r="4"></circle><line x1="1.05" y1="12" x2="7" y2="12"></line><line x1="17.01" y1="12" x2="22.96" y2="12"></line></svg><a href="{{ .Site.Params.gitUrl -}}{{ .GitInfo.Hash }}" target="_blank" rel="noopener">{{ .GitInfo.AbbreviatedHash }}</a> @ {{ if .Site.Params.dateformNum }}{{ dateFormat .Site.Params.dateformNum .GitInfo.AuthorDate.Local }}{{ else }}{{ dateFormat "2006-01-02" .GitInfo.AuthorDate.Local }}{{ end }}</p>
diff --git a/layouts/partials/categories.html b/layouts/partials/categories.html
new file mode 100644
index 0000000..e3b5b16
--- /dev/null
+++ b/layouts/partials/categories.html
@@ -0,0 +1,9 @@
+{{ with .Params.categories }}
+    <p>
+        <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-folder meta-icon"><path d="M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h5l2 3h9a2 2 0 0 1 2 2z"></path></svg>
+
+        {{ range . -}}
+            <span class="tag"><a href="{{ "categories/" | absLangURL }}{{ . | urlize }}/">{{.}}</a></span>
+        {{ end }}
+    </p>
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 2953aab..b8856db 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -13,8 +13,8 @@
     </div>
     <div class="footer__inner">
         <div class="footer__content">
-            <span>Powered by <a href="http://gohugo.io">Hugo</a></span>
-            <span>Made with &#10084; by <a href="https://github.com/rhazdon">Djordje Atlialp</a></span>
-        </div>
+            <span>{{ .Site.Params.footerLeft | default "Powered by <a href=\"http://gohugo.io\">Hugo</a>" | safeHTML }}</span>
+            <span>{{ .Site.Params.footerRight | default "Made with &#10084; by <a href=\"https://github.com/rhazdon\">Djordje Atlialp</a>" | safeHTML }}</span>
+          </div>
     </div>
 </footer>
diff --git a/layouts/partials/svg.html b/layouts/partials/svg.html
index 0a13b71..0bea1c7 100644
--- a/layouts/partials/svg.html
+++ b/layouts/partials/svg.html
@@ -20,6 +20,8 @@
     <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M4 4h16c1.1 0 2 .9 2 2v12c0 1.1-.9 2-2 2H4c-1.1 0-2-.9-2-2V6c0-1.1.9-2 2-2z"></path><polyline points="22,6 12,13 2,6"></polyline></svg>
 {{- else if (eq .name "facebook") -}}
     <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M18 2h-3a5 5 0 0 0-5 5v3H7v4h3v8h4v-8h3l1-4h-4V7a1 1 0 0 1 1-1h3z"></path></svg>
+{{- else if (eq .name "git") -}}
+    <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-git-pull-request"><circle cx="18" cy="18" r="3"></circle><circle cx="6" cy="6" r="3"></circle><path d="M13 6h3a2 2 0 0 1 2 2v7"></path><line x1="6" y1="9" x2="6" y2="21"></line></svg>
 {{- else if (eq .name "gitbook") -}}
     <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="185 127 1067 769" fill-rule="evenodd" fill="currentColor" stroke="none"><path d="M666.026437,768.67745 C683.230722,768.67745 697.226738,782.67354 697.226738,799.870648 C697.226738,817.067756 683.230722,831.063847 666.026437,831.063847 C648.829421,831.063847 634.833405,817.067756 634.833405,799.870648 C634.833405,782.67354 648.829421,768.67745 666.026437,768.67745 M1155.95679,575.450573 C1138.7525,575.450573 1124.75649,561.453028 1124.75649,544.25592 C1124.75649,527.051544 1138.7525,513.055453 1155.95679,513.055453 C1173.1538,513.055453 1187.14982,527.051544 1187.14982,544.25592 C1187.14982,561.453028 1173.1538,575.450573 1155.95679,575.450573 M1155.95679,447.646843 C1102.68819,447.646843 1059.34822,490.987043 1059.34822,544.25592 C1059.34822,554.629425 1061.07083,564.957866 1064.47099,574.997022 L745.327505,744.879153 C727.195774,718.750597 697.806756,703.261571 666.026437,703.261571 C629.204762,703.261571 595.634965,724.326937 579.395922,757.264559 L292.679649,606.108815 C262.392257,590.182229 239.714873,540.291718 242.120711,494.88583 C243.367967,471.199467 251.557992,452.814697 264.01747,445.716348 C271.932749,441.223004 281.45289,441.616953 291.542872,446.904009 L293.45882,447.914321 C369.419335,487.935756 618.059409,618.895438 628.521533,623.758019 C644.679169,631.228512 653.662902,634.257994 681.181035,621.21116 L1195.13924,353.910249 C1202.66929,351.066839 1211.45387,343.849287 1211.45387,332.888493 C1211.45387,317.682936 1195.73379,311.689387 1195.68873,311.689387 C1166.47124,297.671491 1121.52641,276.635198 1077.70237,256.119325 C984.03314,212.258705 877.860826,162.546998 831.229728,138.132338 C790.977371,117.059703 758.574877,134.820841 752.797959,138.414353 L741.5712,143.968888 C531.726898,247.743185 250.898022,386.826066 234.910466,396.55268 C206.278815,413.973656 188.548298,448.67896 186.25294,491.767673 C182.666715,560.072026 217.514296,631.273576 267.321681,657.402132 L570.493595,813.756259 C577.324431,861.062115 618.044872,896.481179 666.026437,896.481179 C718.805142,896.481179 761.834025,853.934692 762.629187,801.341779 L1096.54059,620.379652 C1113.47013,633.612557 1134.46124,640.866452 1155.95679,640.866452 C1209.22538,640.866452 1252.5668,597.524798 1252.5668,544.25592 C1252.5668,490.987043 1209.22538,447.646843 1155.95679,447.646843"></path></svg>
 {{- else if (eq .name "github") -}}
@@ -28,6 +30,8 @@
     <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M22.65 14.39L12 22.13 1.35 14.39a.84.84 0 0 1-.3-.94l1.22-3.78 2.44-7.51A.42.42 0 0 1 4.82 2a.43.43 0 0 1 .58 0 .42.42 0 0 1 .11.18l2.44 7.49h8.1l2.44-7.51A.42.42 0 0 1 18.6 2a.43.43 0 0 1 .58 0 .42.42 0 0 1 .11.18l2.44 7.51L23 13.45a.84.84 0 0 1-.35.94z"></path></svg>
 {{- else if (eq .name "goodreads") -}}
     <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="currentColor" stroke="none"><path d="M19.525 15.977V.49h-2.059v2.906h-.064c-.211-.455-.481-.891-.842-1.307-.36-.412-.767-.777-1.232-1.094-.466-.314-.962-.561-1.519-.736C13.256.09 12.669 0 12.038 0c-1.21 0-2.3.225-3.246.67-.947.447-1.743 1.057-2.385 1.83-.642.773-1.133 1.676-1.47 2.711-.336 1.037-.506 2.129-.506 3.283 0 1.199.141 2.326.425 3.382.286 1.057.737 1.976 1.368 2.762.631.78 1.412 1.397 2.375 1.833.961.436 2.119.661 3.471.661 1.248 0 2.33-.315 3.262-.946s1.638-1.473 2.119-2.525h.061v2.284c0 2.044-.421 3.607-1.264 4.705-.84 1.081-2.224 1.638-4.146 1.638-.572 0-1.128-.061-1.669-.181-.542-.12-1.036-.315-1.487-.57-.437-.271-.827-.601-1.143-1.038-.316-.435-.526-.961-.632-1.593H5.064c.067.887.315 1.654.737 2.3.424.646.961 1.172 1.602 1.593.641.406 1.367.706 2.172.902.811.194 1.639.3 2.494.3 1.383 0 2.541-.195 3.486-.555.947-.376 1.714-.902 2.301-1.608.601-.708 1.021-1.549 1.293-2.556.27-1.007.42-2.134.42-3.367l-.044.062zm-7.484-.557c-.955 0-1.784-.189-2.479-.571-.697-.38-1.277-.882-1.732-1.503-.467-.621-.797-1.332-1.022-2.139s-.332-1.633-.332-2.484c0-.871.105-1.725.301-2.563.21-.84.54-1.587.992-2.24.451-.652 1.037-1.182 1.728-1.584s1.533-.605 2.51-.605 1.803.209 2.495.621c.676.415 1.247.959 1.683 1.634.436.677.751 1.429.947 2.255.195.826.285 1.656.285 2.482 0 .852-.12 1.678-.345 2.484-.226.807-.572 1.518-1.038 2.139-.465.621-1.021 1.123-1.698 1.503-.676.382-1.458.571-2.359.571h.064z"/></svg>
+{{- else if (eq .name "googlescholar") -}}
+    <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="currentColor" stroke="none"><path xmlns="http://www.w3.org/2000/svg" d="M12 24a7 7 0 1 1 0-14 7 7 0 0 1 0 14zm0-24L0 9.5l4.838 3.94A8 8 0 0 1 12 9a8 8 0 0 1 7.162 4.44L24 9.5z"/></svg>
 {{- else if (eq .name "gpg") -}}
     <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="currentColor" stroke="none"><path d="M2.968 11.583h1.274v-3.82A7.76 7.76 0 0 1 12.005 0a7.76 7.76 0 0 1 7.762 7.763v3.783c-.018.01-.037.028-.056.037l-.01.01-.008.009h-.01l-.01.01-.009.009H19.636l-.018.018h-.02l-.018.01h-.01l-.009.01-.009.009h-.01l-.009.009-.009.01-.01.009-.009.009-.028.019-.019.01-.028.018-.018.01-.02.009-.027.018-.019.01-.01.009-.027.019-.02.01-.046.027-.019.01-.018.009-.02.01h-.008l-.057.027h-.019c-.018.01-.037.02-.065.038h-.01l-.009.01-.028.018-.018.01-.029.018-.018.01h-.01l-.028.018-.018.01-.02.009c-.018.01-.046.019-.065.028l-.018.01-.02.009-.037.018-.037.02-.047.018-.047.019-.019.009-.037.019-.019.01c-1.545.739-4.017 1.516-8.708 1.853-3.362.244-5.403 1.723-6.724 3.502zm4.842 0h8.371v-3.82a4.184 4.184 0 0 0-4.186-4.186A4.184 4.184 0 0 0 7.81 7.763zm13.222 1.461V24H5.572c1.704-.946 2.968-.852 5.075-.787 2.865.094 6.03-1.105 7.585-2.696 1.554-1.592-.14-.375-1.901.074-1.76.45-5.17.497-7.454-.103 7.173.094 9.973-2.219 11.555-4.307 1.583-2.079-.683-.365-2.153.356-1.47.72-4.036 1.227-6.864.852 4.27-.01 7.52-2.144 9.607-4.345z"/></svg>
 {{- else if (eq .name "hackerone") -}}
@@ -56,6 +60,8 @@
     <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="currentColor" stroke-width="2"><path d="M12 0C5.372 0 0 5.372 0 12s5.372 12 12 12 12-5.372 12-12S18.628 0 12 0zM7.369 4.378c.525 0 .947.431.947.947s-.422.947-.947.947a.95.95 0 0 1-.947-.947c0-.525.422-.947.947-.947zm-.722 3.038h1.444v10.041H6.647V7.416zm3.562 0h3.9c3.712 0 5.344 2.653 5.344 5.025 0 2.578-2.016 5.025-5.325 5.025h-3.919V7.416zm1.444 1.303v7.444h2.297c3.272 0 4.022-2.484 4.022-3.722 0-2.016-1.284-3.722-4.097-3.722h-2.222z"/></svg>
 {{- else if (eq .name "pinterest") }}
     <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="currentColor" stroke="none"><path d="M12.017 0C5.396 0 .029 5.367.029 11.987c0 5.079 3.158 9.417 7.618 11.162-.105-.949-.199-2.403.041-3.439.219-.937 1.406-5.957 1.406-5.957s-.359-.72-.359-1.781c0-1.663.967-2.911 2.168-2.911 1.024 0 1.518.769 1.518 1.688 0 1.029-.653 2.567-.992 3.992-.285 1.193.6 2.165 1.775 2.165 2.128 0 3.768-2.245 3.768-5.487 0-2.861-2.063-4.869-5.008-4.869-3.41 0-5.409 2.562-5.409 5.199 0 1.033.394 2.143.889 2.741.099.12.112.225.085.345-.09.375-.293 1.199-.334 1.363-.053.225-.172.271-.401.165-1.495-.69-2.433-2.878-2.433-4.646 0-3.776 2.748-7.252 7.92-7.252 4.158 0 7.392 2.967 7.392 6.923 0 4.135-2.607 7.462-6.233 7.462-1.214 0-2.354-.629-2.758-1.379l-.749 2.848c-.269 1.045-1.004 2.352-1.498 3.146 1.123.345 2.306.535 3.55.535 6.607 0 11.985-5.365 11.985-11.987C23.97 5.39 18.592.026 11.985.026L12.017 0z"/></svg>
+{{- else if (eq .name "peertube") }}
+    <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="currentColor" stroke="none"><path d="M3,0v12l9-6L3,0z M3,12v12l9-6L3,12z M12,6v12l9-6L12,6z"/></svg>
 {{- else if (eq .name "podcasts-apple") -}}
     <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="currentColor" stroke="none"><path d="M5.34 0A5.328 5.328 0 000 5.34v13.32A5.328 5.328 0 005.34 24h13.32A5.328 5.328 0 0024 18.66V5.34A5.328 5.328 0 0018.66 0zm6.525 2.568c2.336 0 4.448.902 6.056 2.587 1.224 1.272 1.912 2.619 2.264 4.392.12.59.12 2.2.007 2.864a8.506 8.506 0 01-3.24 5.296c-.608.46-2.096 1.261-2.336 1.261-.088 0-.096-.091-.056-.46.072-.592.144-.715.48-.856.536-.224 1.448-.874 2.008-1.435a7.644 7.644 0 002.008-3.536c.208-.824.184-2.656-.048-3.504-.728-2.696-2.928-4.792-5.624-5.352-.784-.16-2.208-.16-3 0-2.728.56-4.984 2.76-5.672 5.528-.184.752-.184 2.584 0 3.336.456 1.832 1.64 3.512 3.192 4.512.304.2.672.408.824.472.336.144.408.264.472.856.04.36.03.464-.056.464-.056 0-.464-.176-.896-.384l-.04-.03c-2.472-1.216-4.056-3.274-4.632-6.012-.144-.706-.168-2.392-.03-3.04.36-1.74 1.048-3.1 2.192-4.304 1.648-1.737 3.768-2.656 6.128-2.656zm.134 2.81c.409.004.803.04 1.106.106 2.784.62 4.76 3.408 4.376 6.174-.152 1.114-.536 2.03-1.216 2.88-.336.43-1.152 1.15-1.296 1.15-.023 0-.048-.272-.048-.603v-.605l.416-.496c1.568-1.878 1.456-4.502-.256-6.224-.664-.67-1.432-1.064-2.424-1.246-.64-.118-.776-.118-1.448-.008-1.02.167-1.81.562-2.512 1.256-1.72 1.704-1.832 4.342-.264 6.222l.413.496v.608c0 .336-.027.608-.06.608-.03 0-.264-.16-.512-.36l-.034-.011c-.832-.664-1.568-1.842-1.872-2.997-.184-.698-.184-2.024.008-2.72.504-1.878 1.888-3.335 3.808-4.019.41-.145 1.133-.22 1.814-.211zm-.13 2.99c.31 0 .62.06.844.178.488.253.888.745 1.04 1.259.464 1.578-1.208 2.96-2.72 2.254h-.015c-.712-.331-1.096-.956-1.104-1.77 0-.733.408-1.371 1.112-1.745.224-.117.534-.176.844-.176zm-.011 4.728c.988-.004 1.706.349 1.97.97.198.464.124 1.932-.218 4.302-.232 1.656-.36 2.074-.68 2.356-.44.39-1.064.498-1.656.288h-.003c-.716-.257-.87-.605-1.164-2.644-.341-2.37-.416-3.838-.218-4.302.262-.616.974-.966 1.97-.97z"/></svg>
 {{- else if (eq .name "podcasts-google") -}}
diff --git a/layouts/partials/tags.html b/layouts/partials/tags.html
new file mode 100644
index 0000000..c78403d
--- /dev/null
+++ b/layouts/partials/tags.html
@@ -0,0 +1,9 @@
+{{ with .Params.tags }}
+    <p>
+        <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-tag meta-icon"><path d="M20.59 13.41l-7.17 7.17a2 2 0 0 1-2.83 0L2 12V2h10l8.59 8.59a2 2 0 0 1 0 2.82z"></path><line x1="7" y1="7" x2="7" y2="7"></line></svg>
+
+        {{ range . -}}
+            <span class="tag"><a href="{{ "tags/" | absLangURL }}{{ . | urlize }}/">{{.}}</a></span>
+        {{ end }}
+    </p>
+{{ end }}
\ No newline at end of file
diff --git a/layouts/posts/single.html b/layouts/posts/single.html
index 35899b6..6a17c01 100644
--- a/layouts/posts/single.html
+++ b/layouts/posts/single.html
@@ -43,18 +43,8 @@
     <hr />
 
     <div class="post-info">
-      {{- with .Params.tags }}
-        <p>
-          <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-tag meta-icon">
-            <path d="M20.59 13.41l-7.17 7.17a2 2 0 0 1-2.83 0L2 12V2h10l8.59 8.59a2 2 0 0 1 0 2.82z"></path>
-            <line x1="7" y1="7" x2="7" y2="7"></line>
-          </svg>
-
-          {{- range . -}}
-             <span class="tag"><a href="{{ "tags/" | absLangURL }}{{ . | urlize }}/">{{.}}</a></span>
-          {{- end }}
-        </p>
-      {{- end }}
+      {{ partial "tags.html" . }}
+      {{ partial "categories.html" . }}
 
       <p>
         <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-file-text">
@@ -74,7 +64,21 @@
           <line x1="8" y1="2" x2="8" y2="6"></line>
           <line x1="3" y1="10" x2="21" y2="10"></line>
         </svg>
-        {{ if .Site.Params.dateformNumTime }}{{ dateFormat .Site.Params.dateformNumTime .Date.Local }}{{ else }}{{ dateFormat "2006-01-02 15:04 -0700" .Date.Local }}{{ end }}
+        {{ if .Site.Params.dateformNumTime }}
+          {{ dateFormat .Site.Params.dateformNumTime .Date.Local }}
+        {{ else }}
+          {{ dateFormat "2006-01-02 15:04" .Date.Local }}
+        {{ end }}
+
+        {{ if .Lastmod }} 
+          {{ if not (eq .Lastmod .Date )}}
+            {{ if .Site.Params.dateformNumTime }}
+              ({{ i18n "lastModified" }}: {{ dateFormat .Site.Params.dateformNumTime .Lastmod.Local }})
+            {{ else }} 
+              ({{ i18n "lastModified" }}: {{ dateFormat "2006-01-02 15:04" .Lastmod.Local }})
+            {{ end }}
+          {{ end }}
+        {{ end }}
       </p>
 
       {{- if .GitInfo }}