diff --git a/.gitignore b/.gitignore
index 2637619..4d870b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,15 @@
-!public
-public/*
-!public/images
+232 B
+# ---> Hugo
+# Generated files by hugo
+/public/
+/resources/_gen/
+/assets/jsconfig.json
+hugo_stats.json
 
-*.lock
+# Executable may be added to repository
+hugo.exe
+hugo.darwin
+hugo.linux
+
+# Temporary lock file while building
+/.hugo_build.lock
diff --git a/config.toml b/config.toml
index cc7ab8f..6fcd164 100644
--- a/config.toml
+++ b/config.toml
@@ -3,25 +3,25 @@ title = "n0x.io"
 
 theme = "coder"
 
-languagecode = "de"
+languagecode = "en"
 
 paginate = 20
-canonifyurls = true
+canonifyurls = false
 
 pygmentsstyle = "b2"
 pygmentscodefences = true
 pygmentscodefencesguesssyntax = true
 
-favicon = "images/favicon.png"
+favicon = "img/favicon/favicon.ico"
 
 #disqusShortname = "yourdiscussshortname"
 
 [params]
     author = "_N0x"
     description = "Just some small website"
-    keywords = "blog,developer,personal"
+    keywords = "blog,developer,cyber security,personal"
     info = "» Here be dragons «"
-    avatarurl = "images/spoopy.gif"
+    avatarurl = "img/spoopy.gif"
 
     footercontent = ""
     hideFooter = false
@@ -59,28 +59,28 @@ favicon = "images/favicon.png"
 
 [[menu.main]]
     name = "Blog"
-    weight = 1
+    weight = 10
     url  = "/posts/"
-[[menu.main]]
-    name = "About"
-    weight = 999
-    url = "/about/"
 [[menu.main]]
     name = "Cloud"
-    weight = 3
+    weight = 20
     url = "https://cloud.n0x.io/"
+[[menu.main]]
+    name = "FreshRSS"
+    weight = 30
+    url = "https://frss.n0x.io/"
 [[menu.main]]
     name = "Git"
-    weight = 4
+    weight = 40
     url = "https://git.n0x.io/"
+[[menu.main]]
+    name = "About"
+    weight = 100
+    url = "/about/"
 #[[menu.main]]
 #    name = "PrivateBin"
 #    weight = 5
 #    url = "https://pb.n0x.io/"
-[[menu.main]]
-    name = "FreshRSS"
-    weight = 6
-    url = "https://frss.n0x.io/"
 #[[menu.main]]
 #    name = "BitWarden"
 #    weight = 7
diff --git a/public/images/_favicon-16x16.png b/public/images/_favicon-16x16.png
deleted file mode 100644
index 222da97..0000000
Binary files a/public/images/_favicon-16x16.png and /dev/null differ
diff --git a/public/images/_favicon-32x32.png b/public/images/_favicon-32x32.png
deleted file mode 100644
index 660c234..0000000
Binary files a/public/images/_favicon-32x32.png and /dev/null differ
diff --git a/public/images/ava.png b/static/img/ava.png
similarity index 100%
rename from public/images/ava.png
rename to static/img/ava.png
diff --git a/public/images/favicon-16x16.png b/static/img/favicon/favicon-16x16.png
similarity index 100%
rename from public/images/favicon-16x16.png
rename to static/img/favicon/favicon-16x16.png
diff --git a/public/images/favicon-32x32.png b/static/img/favicon/favicon-32x32.png
similarity index 100%
rename from public/images/favicon-32x32.png
rename to static/img/favicon/favicon-32x32.png
diff --git a/static/img/favicon/favicon.ico b/static/img/favicon/favicon.ico
new file mode 100644
index 0000000..0aeb680
Binary files /dev/null and b/static/img/favicon/favicon.ico differ
diff --git a/public/images/spoopy.gif b/static/img/spoopy.gif
similarity index 100%
rename from public/images/spoopy.gif
rename to static/img/spoopy.gif