diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a76e983..6b99f3d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup Hugo
         uses: peaceiris/actions-hugo@v2
         with:
-          hugo-version: '0.74.2'
+          hugo-version: '0.104.3'
           extended: true
 
       - name: Configure AWS Credentials
diff --git a/.gitignore b/.gitignore
index 4cf6559..bafe440 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 .DS_Store
 /resources/_gen/
 /result
+.hugo_build.lock
+
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 117238e..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "themes/hugo-clarity"]
-	path = themes/hugo-clarity
-	url = git@github.com:softinio/hugo-clarity.git
diff --git a/config.toml b/config.toml
index df245a9..a7c69e3 100644
--- a/config.toml
+++ b/config.toml
@@ -3,7 +3,6 @@ title = "Salar Rahmanian"
 author = "Salar Rahmanian"
 enableRobotsTXT = true
 enableEmoji = true
-theme = "hugo-clarity"
 paginate = 10
 
 [markup]
@@ -89,3 +88,6 @@ gzip = false
 [[deployment.matchers]]
 pattern = "^.+\\.(html|xml|json)$"
 gzip = true
+
+[[module.imports]]
+path = "github.com/softinio/hugo-clarity"
diff --git a/content/about.md b/content/about.md
index a2a9aa1..3b1aec8 100644
--- a/content/about.md
+++ b/content/about.md
@@ -19,5 +19,5 @@ As a long term Vim user and Neovim fan I also have started contributing plugins
 
 [Watch my talks](https://watch.softinio.com)
 
-![Salar Rahmanian's Family](/img/SalarRahmanianFamily.jpg)
+![Salar Rahmanian Family](/img/SalarRahmanianFamily.jpg)
 
diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000..b9612ec
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,5 @@
+module softinio.com
+
+go 1.18
+
+require github.com/softinio/hugo-clarity v0.0.0-20220804231030-5179510a03ea // indirect
diff --git a/go.sum b/go.sum
new file mode 100644
index 0000000..2ec3931
--- /dev/null
+++ b/go.sum
@@ -0,0 +1,2 @@
+github.com/softinio/hugo-clarity v0.0.0-20220804231030-5179510a03ea h1:fJw3f89X83BAkTnwM8rP5lihcw3Z8gSOc3pNso3IRa4=
+github.com/softinio/hugo-clarity v0.0.0-20220804231030-5179510a03ea/go.mod h1:FhIE2pdxA/KkNA0FW425TKxr/DWrtS6hNiVZEHIg5oY=
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 65a8dc6..a4192af 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,3 +1,10 @@
+{{- $s := .Site.Params }}
+{{ $t := .Site.Title }}
+{{- if or .Params.enableMathNotation $s.enableMathNotation }}
+  {{ partialCached "math" . }}
+{{- end }}
+{{- $iconsDir := default "icons/" .Site.Params.iconsDir }}
+{{- $defaultFooterLogo := printf "%s%s" $iconsDir "apple-touch-icon.png"}}
 <footer class = 'footer'>
   <div class = 'footer_inner wrap pale'>
     <img src = '{{ absURL "softinio.jpg" }}' class = 'icon icon_2 transparent'>
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index f27857e..5e449b8 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -1,3 +1,13 @@
+{{- $params := site.Params }}
+{{- $separator := default "|" $params.titleSeparator }}
+{{- $title := "" }}
+{{- if and .Title (ne (trim (lower .Site.Title) "") (trim (lower .Title) "")) }}
+  {{- if eq .Kind "taxonomy" }}
+    {{- $title = default .Title ( T (lower .Title) ) }}
+  {{- else }}
+    {{- $title = .Title }}
+  {{- end }}
+{{- end }}
   <title>{{ if and .Title (ne (trim (lower .Site.Title) "") (trim (lower .Title) "")) }}{{ .Title }} | {{ end }}{{ .Site.Title }}</title>
   <meta charset='utf-8'>
   {{ hugo.Generator }}
@@ -12,6 +22,27 @@
   {{- partial "opengraph.html" . }}
   {{- partial "favicon.html" . }}
   <link rel='canonical' href='{{ .Permalink }}'>
+{{ range .AlternativeOutputFormats -}}
+  {{ printf `<link rel="%s" type="%s" href="%s" title="%s" />` .Rel .MediaType.Type .Permalink $.Site.Title | safeHTML }}
+{{ end -}}
+<!-- preload assets declaration -->
+<!-- preload main css file -->
+{{ $styles := partialCached "func/getStylesBundle" . }}
+<link rel="preload" href="{{ $styles.Permalink }}" integrity = "{{ $styles.Data.Integrity }}" as="style" crossorigin="anonymous">
+
+<!-- preload main javascript file -->
+{{ $bundle := partialCached "func/getJavascriptBundle" . }}
+<link rel="preload" href="{{ $bundle.Permalink }}" as="script" integrity=
+"{{ $bundle.Data.Integrity }}" crossorigin="anonymous">
+
+<!-- link main css file -->
+<link rel="stylesheet" type="text/css" href="{{ $styles.Permalink }}" integrity="{{ $styles.Data.Integrity }}" crossorigin="anonymous">
+<!-- load all custom css files -->
+{{- with $params.customCSS }}
+  {{- range . -}}
+  <link rel="stylesheet" href="{{ relURL . }}">
+  {{- end }}
+{{- end }}
 <!-- author & description & keywords  -->
 <meta name="author" content="{{ .Site.Params.author | safeHTML }}" />
 
diff --git a/themes/hugo-clarity b/themes/hugo-clarity
deleted file mode 160000
index ee665f3..0000000
--- a/themes/hugo-clarity
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ee665f39448f396068c534f899bbde8dd62b1eb9