diff --git a/.gitmodules b/.gitmodules
index b72087b..1a6d209 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "themes/KeepIt"]
 	path = themes/KeepIt
 	url = https://github.com/Fastbyte01/KeepIt.git
+[submodule "themes/hugo-coder"]
+	path = themes/hugo-coder
+	url = https://github.com/luizdepra/hugo-coder.git
diff --git a/config.toml b/config.toml
index 348d425..9910ae5 100644
--- a/config.toml
+++ b/config.toml
@@ -2,7 +2,7 @@ baseURL = "//notmy.space/"
 languageCode = "en"
 defaultContentLanguage = "en"
 title = "William Floyd"
-theme = "KeepIt"
+theme = "hugo-coder"
 
 [module]
 [[module.mounts]]
@@ -10,76 +10,98 @@ theme = "KeepIt"
   target = 'content'
   excludeFiles = "**/media/src"
 
-paginate = 12
+paginate = 20
+
+pygmentsStyle = "bw"
+pygmentsCodeFences = true
+pygmentsCodeFencesGuessSyntax = true
+
 enableEmoji = true
-googleAnalytics = "UA-63647911-2"
-enableRobotsTXT = false
-canonifyURLs = true
-
-[sitemap]
-  changefreq = "daily"
-  filename = "sitemap.xml"
-  priority = 0.5
-
-[blackfriday]
-  hrefTargetBlank = true
-  nofollowLinks = true
-  noreferrerLinks = true
 
 [permalinks]
-  posts = "/:year/:month/:title/"
-
-[menu]
-  [[menu.main]]
-    name = "Posts"
-    url = "/posts/"
-    weight = 1
-
-  [[menu.main]]
-    name = "Categories"
-    url = "/categories/"
-    weight = 3
-
-  [[menu.main]]
-    name = "About"
-    url = "/about"
-    weight = 4
+  posts = "/:year/:month/:filename/"
 
 [params]
-    subtitle = "This is not MySpace, it's my space"
-    since = 2018
-    author = "William Floyd"
-    home_mode = ""
+author = "William Floyd"
+description = "William Floyd's personal website"
+gravatar = "william.png2000@gmail.com"
+dateFormat = "January 2, 2006"
+since = 2018
+# Right To Left, shift content direction for languagues such as Arabic
+rtl = false
+# Specify light/dark colorscheme
+# Supported values:
+# "auto" (use preference set by browser)
+# "dark" (dark background, light foreground)
+# "light" (light background, dark foreground) (default)
+colorScheme = "auto"
+# Hide the toggle button, along with the associated vertical divider
+hideColorSchemeToggle = false
+# Series see also post count
+maxSeeAlsoItems = 5
+# Custom CSS
+customCSS = []
+# Custom SCSS, file path is relative to Hugo's asset folder (default: {your project root}/assets)
+customSCSS = []
+# Custom JS
+customJS = []
 
-[params.gravatar]
-    email = "william.png2000@gmail.com"
+# If you want to use Google Tag Manager(https://analytics.google.com/) for analytics, add this section
+[params.googleTagManager]
+id = "UA-63647911-2"
 
-[params.social]
-    GitHub = "W-Floyd"
-    Linkedin = "william-floyd"
-    Email   = "william.png2000@gmail.com"
-    Steam = "W-Floyd"
+# If you want to implement a Content-Security-Policy, add this section
+scriptsrc = [
+  "'self'",
+  "'unsafe-inline'",
+  "https://www.google-analytics.com",
+  "https://cdn.jsdelivr.net/"
+]
+prefetchsrc = ["'self'"]
+# connect-src directive – defines valid targets for to XMLHttpRequest (AJAX), WebSockets or EventSource
+connectsrc = ["'self'", "https://www.google-analytics.com"]
 
-[params.share]
+[taxonomies]
+category = "categories"
+series = "series"
+tag = "tags"
+author = "authors"
 
-[privacy]
-  [privacy.disqus]
-    disable = false
-  [privacy.googleAnalytics]
-    anonymizeIP = true
-    disable = false
-    respectDoNotTrack = true
-    useSessionStorage = true
-  [privacy.instagram]
-    disable = false
-    simple = true
-  [privacy.twitter]
-    disable = false
-    enableDNT = true
-    simple = true
-  [privacy.vimeo]
-    disable = false
-    simple = true
-  [privacy.youtube]
-    disable = false
-    privacyEnhanced = true
\ No newline at end of file
+[[params.social]]
+name = "Github"
+icon = "fa fa-2x fa-github"
+weight = 1
+url = "https://github.com/W-Floyd/"
+
+[[params.social]]
+name = "LinkedIn"
+icon = "fa fa-2x fa-linkedin"
+weight = 2
+url = "https://www.linkedin.com/in/william-floyd/"
+
+[[params.social]]
+name = "Email"
+icon = "fa fa-2x fa-envelope"
+weight = 3
+url = "mailto:william.png2000@gmail.com"
+
+[[params.social]]
+name = "RSS"
+icon = "fa fa-2x fa-rss"
+weight = 4
+url = "https://notmy.space/posts/index.xml"
+rel = "alternate"
+type = "application/rss+xml"
+
+[languages.en]
+languageName = ":uk:"
+
+[[languages.en.menu.main]]
+name = "About"
+weight = 1
+url = "about/"
+
+[[languages.en.menu.main]]
+name = "Posts"
+weight = 2
+url = "posts/"
\ No newline at end of file
diff --git a/content/posts/smart-yogurt-maker-part-01/index.md b/content/posts/smart-yogurt-maker-part-01/index.md
index c898011..d4f7c81 100644
--- a/content/posts/smart-yogurt-maker-part-01/index.md
+++ b/content/posts/smart-yogurt-maker-part-01/index.md
@@ -18,7 +18,7 @@ tags: [
 ]
 ---
 
-Part 1 | [Part 2](../smart-yogurt-maker-part-02)
+Part 1 | [Part 2](/2022/03/smart-yogurt-maker-part-02)
 
 ***
 
diff --git a/content/posts/smart-yogurt-maker-part-02/index.md b/content/posts/smart-yogurt-maker-part-02/index.md
index b7cb1ba..fe0a734 100644
--- a/content/posts/smart-yogurt-maker-part-02/index.md
+++ b/content/posts/smart-yogurt-maker-part-02/index.md
@@ -18,7 +18,7 @@ tags: [
 ]
 ---
 
-[Part 1](../smart-yogurt-maker-part-01) | Part 2
+[Part 1](/2022/01/smart-yogurt-maker-part-01) | Part 2
 
 ***
 
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
deleted file mode 100644
index cb8d947..0000000
--- a/layouts/_default/single.html
+++ /dev/null
@@ -1,111 +0,0 @@
-{{ define "content" -}}
-{{ $cdn_url := .Scratch.Get "cdn_url" }}
-<article class="post-warp">
-    <header class="post-header">
-        <h1 class="post-title">{{ .Title }}</h1>
-        <div class="post-meta">
-            {{ i18n "Written" }} {{ i18n "by" }} <a href="{{.Site.BaseURL }}" rel="author">{{ if isset .Params "author" }}{{ .Params.author }}{{ else }}{{ .Site.Params.author }}{{ end }}</a>
-                <span class="post-time">
-                    {{ i18n "on" }} <time datetime={{.Date.Format (.Site.Params.dateFormatToUse | default "2006-01-02") }} >{{ .Date.Format (.Site.Params.dateFormatToUse | default "2 January 2006") }}</time>
-                </span>
-                {{ i18n "in" }}
-                {{ with .Params.categories -}}
-                <i class="iconfont icon-folder"></i>
-                <span class="post-category">
-                        {{ range . }}
-                        {{- $name := . -}}
-                        {{- with $.Site.GetPage "taxonomy" (printf "categories/%s" $name) | default ($.Site.GetPage "taxonomy" (printf "categories/%s" ($name | urlize))) -}}
-                          <a href="{{ .Permalink }}"> {{ $name }} </a>
-                        {{ end -}}
-                        {{ end }}
-                </span> {{- end }}
-                <i class="iconfont icon-timer"></i>
-                {{.ReadingTime }} min
-        </div>
-    </header>
-    <div class="post-content">
-        <!--featured_image-->
-
-        {{ $images := findRE "<img src=\"[^\"|\\\"]*\"" .Content -}}
-        {{ if ge (len $images) 1}}
-            {{ $.Scratch.Set "postHasImages" true }}
-        {{ end }}
-
-        {{ with .Params.featured_image }}
-          {{- $img := . -}}
-          <img src="{{ printf "%s%s" $cdn_url $img }}" class="featured_image">
-        {{ end }}
-        <!-- end featured_image-->
-     
-          {{ $reAltIn := "<img src=\"([^\"]+)\" alt=\"([^\"]+)?\">" }}
-          {{ $reAltOut :=  ( printf "<figure><img src=\"/images/ring.svg\" data-sizes=\"auto\" data-src=\"%s$1\" alt=\"$2\" class=\"lazyload\"><figcaption class=\"image-caption\">$2</figcaption></figure>" $cdn_url ) }}
-          {{ $altContent := .Content | replaceRE $reAltIn $reAltOut | safeHTML }}
-
-          {{ $reAltTitleIn := "<img src=\"([^\"]+)\" alt=\"([^\"]+)?\" title=\"([^\"]+)?\" />" }}
-          {{ $reAltTitleOut := ( printf "<figure><img src=\"/images/ring.svg\" data-src=\"%s$1\" data-sizes=\"auto\" alt=\"$2\" title=\"$3\" class=\"lazyload\"><figcaption class=\"image-caption\">$2</figcaption></figure>" $cdn_url ) }}
-          {{ $finalContent := $altContent | replaceRE $reAltTitleIn $reAltTitleOut | safeHTML }}
-
-          {{ $finalContent }}
-    </div>
-
-    <div class="post-copyright">
-            {{ with .Site.Params.author }} 
-            <p class="copyright-item">
-                <span>{{ i18n "Author" }}:</span>
-                <span>{{ . }} </span>
-                </p>
-            {{ end }}
-           
-            <p class="copyright-item">
-                    <span>{{ i18n "Words" }}:</span>
-                   <span>{{ .WordCount }}</span>
-            </p>
-
-            <p class="copyright-item">
-                {{ if and ( $.Site.Params.socialShare ) (gt (len ($.Site.Params.share)) 0) }}
-                <span>{{ i18n "Share" }}:</span>
-                <span>{{ partial "share-links.html" . }}</span>
-                {{ end }}
-            </p>
-
-            {{ with .Site.Params.license }} 
-            <p class="copyright-item">
-                {{ . | safeHTML}}
-            </p>
-            {{ end }}
-    </div>
-
-  
-    <div class="post-tags">
-        {{ with .Params.tags }}
-            <section>
-            <i class="iconfont icon-icon-tag"></i>{{ i18n "Tag" }}: 
-            {{ range . }}
-            <span class="tag"><a href="{{ "tags/" | absURL }}{{ . | urlize }}/">
-                    #{{.}}</a></span>
-            {{ end }}
-            </section>
-        {{ end }}
-        <section>
-                <a href="javascript:window.history.back();">{{ i18n "back" }}</a></span> · 
-                <span><a href="{{ .Site.BaseURL }}">{{ i18n "Home" }}</a></span>
-        </section>
-    </div>
-
-    <div class="post-nav">
-        {{ if .PrevInSection }}
-        <a href="{{.PrevInSection.Permalink}}" class="prev" rel="prev" title="{{ .PrevInSection.Title}}"><i class="iconfont icon-dajiantou"></i>&nbsp;{{ .PrevInSection.Title}}</a>
-        {{ end }} 
-        {{ if .NextInSection }}
-        <a href="{{.NextInSection.Permalink}}" class="next" rel="next" title="{{.NextInSection.Title}}">{{.NextInSection.Title}}&nbsp;<i class="iconfont icon-xiaojiantou"></i></a>
-        {{ end }}
-    </div>
-
-    <div class="post-comment">
-          {{ if ( .Params.showComments | default true ) }}
-          {{ partial "comments.html" . }}
-          {{ end }}
-    </div>
-</article>
-{{- end }}
-
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
deleted file mode 100644
index 101102f..0000000
--- a/layouts/partials/footer.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<footer class="footer">
-    <div class="copyright">
-        &copy;
-        {{ with .Site.Params.since }}
-        <span itemprop="copyrightYear">{{.}} - {{ now.Year }}</span>
-        {{ end }}
-         {{ if .Site.Params.author }}
-            <span class="author" itemprop="copyrightHolder"><a href="{{ .Site.BaseURL }}">{{ .Site.Params.author  }}</a></span>
-         {{ end }}
-    </div>
-</footer>
-
-{{ partial "js.html" . }}
diff --git a/themes/KeepIt b/themes/KeepIt
deleted file mode 160000
index 0b50172..0000000
--- a/themes/KeepIt
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0b501727f8e6790e4d6c967e9f003ecd88a0ed87
diff --git a/themes/hugo-coder b/themes/hugo-coder
new file mode 160000
index 0000000..ee7fed1
--- /dev/null
+++ b/themes/hugo-coder
@@ -0,0 +1 @@
+Subproject commit ee7fed1bdb42d9bb1b54df2031b6879117b70e19