diff --git a/layouts/index.html b/layouts/index.html
index 8316343..1957615 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -32,7 +32,7 @@ class="toxicGlow"
 			<div id="home-nav-header">
 				All the fun lies right here
 				<br>
-				<img width="30" height="20" alt="Down arrow" src="{{"arrow.svg" | relURL}}">
+				<object type="image/svg+xml" width="30" height="20" data="{{"arrow.svg" | relURL}}"></object>
 			</div>
 			<nav id="home-nav" class="site-nav">
 				{{ partialCached "menu.html" . }}
diff --git a/layouts/partials/svg.html b/layouts/partials/svg.html
index 39610ee..43c1a46 100644
--- a/layouts/partials/svg.html
+++ b/layouts/partials/svg.html
@@ -43,9 +43,9 @@
 {{- else if (eq .name "qq") -}}
 <svg xmlns="http://www.w3.org/2000/svg" class="feather" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path transform="scale(0.04) translate(75 40)" stroke-width="50" d="M433.754 420.445c-11.526 1.393-44.86-52.741-44.86-52.741 0 31.345-16.136 72.247-51.051 101.786 16.842 5.192 54.843 19.167 45.803 34.421-7.316 12.343-125.51 7.881-159.632 4.037-34.122 3.844-152.316 8.306-159.632-4.037-9.045-15.25 28.918-29.214 45.783-34.415-34.92-29.539-51.059-70.445-51.059-101.792 0 0-33.334 54.134-44.859 52.741-5.37-.65-12.424-29.644 9.347-99.704 10.261-33.024 21.995-60.478 40.144-105.779C60.683 98.063 108.982.006 224 0c113.737.006 163.156 96.133 160.264 214.963 18.118 45.223 29.912 72.85 40.144 105.778 21.768 70.06 14.716 99.053 9.346 99.704z"></path></svg>
 {{- else if (eq .name "root me") -}}
-<img class="feather" width="24" height="24" alt="Root-me" src="{{"rootme.svg" | relURL}}">
+<object type="image/svg+xml" class="feather" width="24" height="24" alt="Root-me" data="{{"rootme.svg" | relURL}}"></object>
 {{- else if  (eq .name "GPG") -}}
-<img class="feather" width="24" height="24" alt="GPG" src="{{"Gnupg-logo.svg" | relURL}}">
+<object type="image/svg+xml" class="feather" width="24" height="24" alt="GPG" data="{{"Gnupg-logo.svg" | relURL}}"></object>
 {{- else -}}
 <svg xmlns="http://www.w3.org/2000/svg" class="feather feather-link" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71"></path><path d="M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71"></path></svg>
 {{- end -}}
diff --git a/layouts/posts/single.html b/layouts/posts/single.html
index d48d910..4924fc8 100644
--- a/layouts/posts/single.html
+++ b/layouts/posts/single.html
@@ -1,77 +1,86 @@
 {{ define "head" }}
-	{{ if .Params.featuredImg -}}
-	<style>.bg-img {background-image: url('{{.Params.featuredImg}}');}</style>
-	{{- else if .Params.images -}}
-		{{- range first 1 .Params.images -}}
-		<style>.bg-img {background-image: url('{{. | absURL}}');}</style>
-		{{- end -}}
-	{{- end -}}
+{{ if .Params.featuredImg -}}
+<style>
+    .bg-img {
+        background-image: url('{{.Params.featuredImg}}');
+    }
+</style>
+{{- else if .Params.images -}}
+{{- range first 1 .Params.images -}}
+<style>
+    .bg-img {
+        background-image: url('{{. | absURL}}');
+    }
+</style>
+{{- end -}}
+{{- end -}}
 {{ end }}
-
 {{ define "header" }}
 {{ partial "header.html" . }}
 {{ end }}
-
 {{ define "main" }}
-	{{- if (or .Params.images .Params.featuredImg) }}
-	<div class="bg-img"></div>
-	{{- end }}
-	<main class="site-main section-inner animated fadeIn faster">
-		<article class="thin">
-			<header class="post-header">
-				<div class="post-meta"><span>{{ .Date.Format .Site.Params.dateform }}</span></div>
-				<h1>{{ .Title }}</h1>
-			</header>
-			<div class="content">
-				{{ .Content | replaceRE "(<h[1-6] id=\"([^\"]+)\".+)(</h[1-6]+>)" `${1}<a href="#${2}" class="anchor" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M15 7h3a5 5 0 0 1 5 5 5 5 0 0 1-5 5h-3m-6 0H6a5 5 0 0 1-5-5 5 5 0 0 1 5-5h3"></path><line x1="8" y1="12" x2="16" y2="12"></line></svg></a>${3}` | safeHTML }}
-			</div>
-			{{- if .Site.Params.relatedPosts }}
-			{{- partial "related-posts.html" . -}}
-			{{- end }}
-			<hr class="post-end">
-			<footer class="post-info">
-				{{- with $.Param "author" }}
-				<p><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-feather"><path d="M20.24 12.24a6 6 0 0 0-8.49-8.49L5 10.5V19h8.5z"></path><line x1="16" y1="8" x2="2" y2="22"></line><line x1="17.5" y1="15" x2="9" y2="15"></line></svg>{{ . }}</p>
-				{{- end }}
-				{{- with .Params.tags }}
-				<p>
-					<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#fff" 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 }}
-				<p><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-file-text"><path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"></path><polyline points="14 2 14 8 20 8"></polyline><line x1="16" y1="13" x2="8" y2="13"></line><line x1="16" y1="17" x2="8" y2="17"></line><polyline points="10 9 9 9 8 9"></polyline></svg>{{ i18n "wordCount" . }}</p>
-				<p><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-calendar"><rect x="3" y="4" width="18" height="18" rx="2" ry="2"></rect><line x1="16" y1="2" x2="16" y2="6"></line><line x1="8" y1="2" x2="8" y2="6"></line><line x1="3" y1="10" x2="21" y2="10"></line></svg>{{ dateFormat .Site.Params.dateformNumTime .Date.Local }}</p>
-				{{- if and .GitInfo .Site.Params.gitUrl }}
-				<p><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#fff" 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> @ {{ dateFormat .Site.Params.dateformNum .GitInfo.AuthorDate.Local }}</p>
-				{{- end }}
-			</footer>
-		</article>
-		{{- if .Params.toc }}
-		<aside id="toc">
-			<div class="toc-title">{{ i18n "tableOfContents" }}</div>
-			{{ .TableOfContents }}
-		</aside>
-		{{- end }}
-		<div class="post-nav thin">
-			{{- with .NextInSection }}
-			<a class="next-post" href="{{ .Permalink }}">
-				<span class="post-nav-label"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-arrow-left"><line x1="19" y1="12" x2="5" y2="12"></line><polyline points="12 19 5 12 12 5"></polyline></svg>&nbsp;{{ i18n "newer" }}</span><br><span>{{ .Title }}</span>
-			</a>
-			{{- end }}
-			{{- with .PrevInSection }}
-			<a class="prev-post" href="{{ .Permalink }}">
-				<span class="post-nav-label">{{ i18n "older" }}&nbsp;<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-arrow-right"><line x1="5" y1="12" x2="19" y2="12"></line><polyline points="12 5 19 12 12 19"></polyline></svg></span><br><span>{{ .Title }}</span>
-			</a>
-			{{- end }}
-		</div>
-		<div id="comments" class="thin">
-		{{- partial "comments.html" . -}}
-		</div>
-	</main>
-{{ end }}
-
-{{ define "footer" }}
-{{ partialCached "footer.html" . }}
+{{- if (or .Params.images .Params.featuredImg) }}
+<div class="bg-img"></div>
+{{- end }}
+<main class="site-main section-inner animated fadeIn faster">
+    <article class="thin">
+        <header class="post-header">
+            <div class="post-meta"><span>{{ .Date.Format .Site.Params.dateform }}</span></div>
+            <h1>{{ .Title }}</h1>
+        </header>
+        <div class="content">
+            {{ .Content | replaceRE "(
+            <h[1-6] id=\ "([^\"]+)\ ".+)(</h[1-6]+>)" `${1}<a href="#${2}" class="anchor" aria-hidden="true"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M15 7h3a5 5 0 0 1 5 5 5 5 0 0 1-5 5h-3m-6 0H6a5 5 0 0 1-5-5 5 5 0 0 1 5-5h3"></path><line x1="8" y1="12" x2="16" y2="12"></line></svg></a>${3}`
+                | safeHTML }}
+        </div>
+        {{- if .Site.Params.relatedPosts }} {{- partial "related-posts.html" . -}} {{- end }}
+        <hr class="post-end">
+        <footer class="post-info">
+            {{- with $.Param "author" }}
+            <p>
+                <object type="image/svg+xml" width="24" height="24" data="{{"author.svg" | relURL}}">{{.}}</object>
+            </p>
+            {{- end }}
+            {{- with .Params.tags }}
+            <p>
+                <object type="image/svg+xml" width="24" height="24" data="{{"tag.svg" | relURL}}"></object>
+                {{- range . -}}
+                <span class="tag"><a href="{{ "tags/" | absLangURL }}{{ . | urlize }}">{{.}}</a></span>
+                {{- end }}
+            </p>
+            {{- end }}
+            <p><object type="image/svg+xml" width="24" height="24" data="{{"page.svg" | relURL}}">{{ i18n "wordCount " . }}</object></p>
+            <p><object type="image/svg+xml" width="24" height="24" data="{{"calendar.svg" | relURL}}">{{ dateFormat .Site.Params.dateform .Date.Local }}</object></p>
+            {{- if and .GitInfo .Site.Params.gitUrl }}
+            <p><object type="image/svg+xml" width="24" height="24" data="{{"gitinfo.svg" | relURL}}"></object><a href="{{ .Site.Params.gitUrl -}}{{ .GitInfo.Hash }}" target="_blank" rel="noopener">{{ .GitInfo.AbbreviatedHash }}</a> @ {{ dateFormat .Site.Params.dateform .GitInfo.AuthorDate.Local }}</p>
+            {{- end }}
+        </footer>
+    </article>
+    {{- if .Params.toc }}
+    <aside id="toc ">
+        <div class="toc-title ">{{ i18n "tableOfContents " }}</div>
+        {{ .TableOfContents }}
+    </aside>
+    {{- end }}
+    <div class="post-nav thin ">
+        {{- with .NextInSection }}
+        <a class="next-post " href="{{ .Permalink }} ">
+            <span class="post-nav-label "><svg xmlns="http://www.w3.org/2000/svg " width="24 " height="24 " viewBox="0 0 24 24 " fill="none " stroke="#fff " stroke-width="2 " stroke-linecap="round " stroke-linejoin="round " class="feather feather-arrow-left
+                    "><line x1="19 " y1="12 " x2="5 " y2="12 "></line><polyline points="12 19 5 12 12 5 "></polyline></svg>&nbsp;{{ i18n "newer " }}</span><br><span>{{ .Title }}</span>
+        </a>
+        {{- end }}
+        {{- with .PrevInSection }}
+        <a class="prev-post " href="{{ .Permalink }} ">
+            <span class="post-nav-label ">{{ i18n "older " }}&nbsp;<svg xmlns="http://www.w3.org/2000/svg " width="24 " height="24 " viewBox="0 0 24 24 " fill="none " stroke="#fff " stroke-width="2 " stroke-linecap="round " stroke-linejoin="round
+                    " class="feather feather-arrow-right "><line x1="5 " y1="12 " x2="19 " y2="12 "></line><polyline points="12 5 19 12 12 19 "></polyline></svg></span><br><span>{{ .Title }}</span>
+        </a>
+        {{- end }}
+    </div>
+    <div id="comments " class="thin ">
+        {{- partial "comments.html " . -}}
+    </div>
+</main>
 {{ end }}
+{{ define "footer " }}
+{{ partialCached "footer.html " . }}
+{{ end }}
\ No newline at end of file
diff --git a/static/author.svg b/static/author.svg
new file mode 100644
index 0000000..ae4c286
--- /dev/null
+++ b/static/author.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-feather"><path d="M20.24 12.24a6 6 0 0 0-8.49-8.49L5 10.5V19h8.5z"></path><line x1="16" y1="8" x2="2" y2="22"></line><line x1="17.5" y1="15" x2="9" y2="15"></line></svg>
\ No newline at end of file
diff --git a/static/calendar.svg b/static/calendar.svg
new file mode 100644
index 0000000..d87d00e
--- /dev/null
+++ b/static/calendar.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-calendar"><rect x="3" y="4" width="18" height="18" rx="2" ry="2"></rect><line x1="16" y1="2" x2="16" y2="6"></line><line x1="8" y1="2" x2="8" y2="6"></line><line x1="3" y1="10" x2="21" y2="10"></line></svg>
\ No newline at end of file
diff --git a/static/gitinfo.svg b/static/gitinfo.svg
new file mode 100644
index 0000000..2d71662
--- /dev/null
+++ b/static/gitinfo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#fff" 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>
\ No newline at end of file
diff --git a/static/page.svg b/static/page.svg
new file mode 100644
index 0000000..65f07d8
--- /dev/null
+++ b/static/page.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#fff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-file-text"><path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"></path><polyline points="14 2 14 8 20 8"></polyline><line x1="16" y1="13" x2="8" y2="13"></line><line x1="16" y1="17" x2="8" y2="17"></line><polyline points="10 9 9 9 8 9"></polyline></svg>
\ No newline at end of file
diff --git a/static/tag.svg b/static/tag.svg
new file mode 100644
index 0000000..0382e4c
--- /dev/null
+++ b/static/tag.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#fff" 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>
\ No newline at end of file