diff --git a/.gitmodules b/.gitmodules
index c7a140b..d923a31 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "themes/hugo-theme-archbio"]
 	path = themes/hugo-theme-archbio
 	url = git@github.com:BioArchLinux/hugo-theme-archbio.git
+[submodule "themes/hugo-theme-bioarchlinux"]
+	path = themes/hugo-theme-bioarchlinux
+	url = git@github.com:BioArchLinux/hugo-theme-bioarchlinux.git
diff --git a/config.toml b/config.toml
index 565ceac..e1ade51 100644
--- a/config.toml
+++ b/config.toml
@@ -1,88 +1,73 @@
-baseurl = "https://bioarchlinux.org/"
+baseURL = "https://bioarchlinux.org/"
 languageCode = "en-us"
 title = "BioArchLinux"
-# Enable comments by entering your Disqus shortname
-disqusShortname = ""
-# Enable Google Analytics by entering your tracking code
-googleAnalytics = ""
-# Define the number of posts per site
-paginate = 10
-theme = "hugo-theme-archbio"
+theme = "hugo-theme-bioarchlinux"
 
+[markup.goldmark.renderer]
+unsafe= true
 
-[permalinks]
-    post = "/:year/:month/:day/:slug"
+[[menu.main]]
+  Name = "Download"
+  URL = "https://archlinux.org/download"
+  Title = "Get Arch Linux"
+  weight = 0
 
-[params]
-    # Tell me who you're
-    location = ""
-    site_description = ""
-    copyright  = "Powered by ArchLinux. Theme by [hugo-theme-archbio](https://github.com/BioArchLinux/hugo-theme-archbio). Sponered by [xTom](https://v.ps/)"
+[[menu.main]]
+  Name = "Status"
+  URL = "https://build.bioarchlinux.org/"
+  Title = "Find and track bugs"
+  weight = -1
 
-    # Format dates with Go's time formating
-    date_format = "2006-01-02"
+[[menu.main]]
+  Name = "Repository"
+  URL = "https://repo.bioarchlinux.org"
+  Title = "BioArchLinux Database"
+  weight = -2
 
-# Create custom menu entries by defining a label and a link for
-# them. Since you can also link posts you've the option the
-# place the links before or after them.
-#
-# E.g.: "Home" appears before all linked posts in the menu
-# and "Tags" / "Categories" after them.
-[[params.menu]]
-    before = true
-    label  = "Home"
-    link   = "/"
+[[menu.main]]
+  Name = "Wiki"
+  URL = "https://wiki.bioarchlinux.org/"
+  Title = "Community documentation"
+  weight = -3
 
-[[params.menu]]
-    before = false
-    label  = "Tags"
-    link   = "tags/"
+[[menu.main]]
+  Name = "Chat"
+  URL = "https://matrix.to/#/#bioarchlinux:matrix.org"
+  Title = "Community chat"
+  weight = -4
 
-[[params.menu]]
-    before = false
-    label  = "Categories"
-    link   = "categories/"
+[[menu.main]]
+  Name = "Packages"
+  URL = "https://github.com/BioArchLinux/Packages"
+  Title = "BioArchLinux Git Repository"
+  weight = -5
 
-# Enter a link for the follow button on the left
-[params.profile]
-    follow_button = ""
+[[menu.main]]
+  Name = "Home"
+  URL = "https://bioarchlinux.org/"
+  Title = "Return to the main page"
+  weight = -6
 
+[[menu.sidebar]]
+  Name = "Usage"
+  URL = "https://wiki.bioarchlinux.org/index.php?title=Usage"
+  Title = "Usage"
+  weight = -1
 
-[social]
-# Add your social network accounts to the profile section on the left
-# by entering your username. The links to your account will be
-# create automatically.
-    github          = "BioArchLinux"
-    bitbucket       = ""
-    jsfiddle        = ""
-    codepen         = ""
-    foursquare      = ""
-    dribbble        = ""
-    deviantart      = ""
-    behance         = ""
-    flickr          = ""
-    instagram       = ""
-    youtube         = ""
-    vimeo           = ""
-    vine            = ""
-    medium          = ""
-    wordpress       = ""
-    tumblr          = ""
-    xing            = ""
-    linkedin        = ""
-    slideshare      = ""
-    stackoverflow   = ""
-    reddit          = ""
-    pinterest       = ""
-    googleplus      = ""
-    facebook        = ""
-    facebook_admin  = ""
-    twitter_domain  = ""
-    twitter         = ""
+[[menu.sidebar]]
+  Name = "Mirror"
+  URL = "https://raw.githubusercontent.com/BioArchLinux/mirror/main/pacman.conf.bio"
+  Title = "Mirror"
+  weight = 0
 
-# Enable and disable widgets for the right sidebar
-[params.widgets]
-    recent_articles = true
-    categories = true
-    tags = true
-    tag_cloud = true
+[[menu.sidebar]]
+  Name = "Contribution"
+  URL = "https://wiki.bioarchlinux.org/index.php?title=Contribution"
+  Title = "Contribution"
+  weight = 1
+
+[[menu.sponsor]]
+  Name = "xTom"
+  URL = "https://v.ps/"
+  Title = "xTom"
+  weight = 1
diff --git a/config.toml.bak b/config.toml.bak
new file mode 100644
index 0000000..565ceac
--- /dev/null
+++ b/config.toml.bak
@@ -0,0 +1,88 @@
+baseurl = "https://bioarchlinux.org/"
+languageCode = "en-us"
+title = "BioArchLinux"
+# Enable comments by entering your Disqus shortname
+disqusShortname = ""
+# Enable Google Analytics by entering your tracking code
+googleAnalytics = ""
+# Define the number of posts per site
+paginate = 10
+theme = "hugo-theme-archbio"
+
+
+[permalinks]
+    post = "/:year/:month/:day/:slug"
+
+[params]
+    # Tell me who you're
+    location = ""
+    site_description = ""
+    copyright  = "Powered by ArchLinux. Theme by [hugo-theme-archbio](https://github.com/BioArchLinux/hugo-theme-archbio). Sponered by [xTom](https://v.ps/)"
+
+    # Format dates with Go's time formating
+    date_format = "2006-01-02"
+
+# Create custom menu entries by defining a label and a link for
+# them. Since you can also link posts you've the option the
+# place the links before or after them.
+#
+# E.g.: "Home" appears before all linked posts in the menu
+# and "Tags" / "Categories" after them.
+[[params.menu]]
+    before = true
+    label  = "Home"
+    link   = "/"
+
+[[params.menu]]
+    before = false
+    label  = "Tags"
+    link   = "tags/"
+
+[[params.menu]]
+    before = false
+    label  = "Categories"
+    link   = "categories/"
+
+# Enter a link for the follow button on the left
+[params.profile]
+    follow_button = ""
+
+
+[social]
+# Add your social network accounts to the profile section on the left
+# by entering your username. The links to your account will be
+# create automatically.
+    github          = "BioArchLinux"
+    bitbucket       = ""
+    jsfiddle        = ""
+    codepen         = ""
+    foursquare      = ""
+    dribbble        = ""
+    deviantart      = ""
+    behance         = ""
+    flickr          = ""
+    instagram       = ""
+    youtube         = ""
+    vimeo           = ""
+    vine            = ""
+    medium          = ""
+    wordpress       = ""
+    tumblr          = ""
+    xing            = ""
+    linkedin        = ""
+    slideshare      = ""
+    stackoverflow   = ""
+    reddit          = ""
+    pinterest       = ""
+    googleplus      = ""
+    facebook        = ""
+    facebook_admin  = ""
+    twitter_domain  = ""
+    twitter         = ""
+
+# Enable and disable widgets for the right sidebar
+[params.widgets]
+    recent_articles = true
+    categories = true
+    tags = true
+    tag_cloud = true
diff --git a/content/post/2022-01-01.md b/content/posts/2022-01-01.md
similarity index 100%
rename from content/post/2022-01-01.md
rename to content/posts/2022-01-01.md
diff --git a/content/post/2022-04-10.md b/content/posts/2022-04-10.md
similarity index 100%
rename from content/post/2022-04-10.md
rename to content/posts/2022-04-10.md
diff --git a/content/post/2022-04-15.md b/content/posts/2022-04-15.md
similarity index 100%
rename from content/post/2022-04-15.md
rename to content/posts/2022-04-15.md
diff --git a/content/post/2022-04-16.md b/content/posts/2022-04-16.md
similarity index 100%
rename from content/post/2022-04-16.md
rename to content/posts/2022-04-16.md
diff --git a/content/post/2022-04-16a.md b/content/posts/2022-04-16a.md
similarity index 100%
rename from content/post/2022-04-16a.md
rename to content/posts/2022-04-16a.md
diff --git a/content/post/2022-05-28.md b/content/posts/2022-05-28.md
similarity index 100%
rename from content/post/2022-05-28.md
rename to content/posts/2022-05-28.md
diff --git a/content/post/2022-07-21.md b/content/posts/2022-07-21.md
similarity index 100%
rename from content/post/2022-07-21.md
rename to content/posts/2022-07-21.md
diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml
new file mode 100644
index 0000000..ae9c0f0
--- /dev/null
+++ b/layouts/_default/rss.xml
@@ -0,0 +1,27 @@
+{{ printf "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\" ?>" | safeHTML }}
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+  <channel>
+    <title>{{ if eq  .Title  .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }}</title>
+    <link>{{ .Permalink }}</link>
+    <description>Recent content {{ if ne  .Title  .Site.Title }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ .Site.Title }}</description>
+    <generator>Hugo -- gohugo.io</generator>{{ with .Site.LanguageCode }}
+    <language>{{.}}</language>{{end}}{{ with .Site.Author.email }}
+    <managingEditor>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</managingEditor>{{end}}{{ with .Site.Author.email }}
+    <webMaster>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</webMaster>{{end}}{{ with .Site.Copyright }}
+    <copyright>{{.}}</copyright>{{end}}{{ if not .Date.IsZero }}
+    <lastBuildDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</lastBuildDate>{{ end }}
+    {{ with .OutputFormats.Get "RSS" }}
+        {{ printf "<atom:link href=%q rel=\"self\" type=%q />" .Permalink .MediaType | safeHTML }}
+    {{ end }}
+    {{ range where site.RegularPages "Type" "posts" }}
+    <item>
+      <title>{{ .Title }}</title>
+      <link>{{ .Permalink }}</link>
+      <pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>
+      {{ with .Site.Author.email }}<author>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</author>{{end}}
+      <guid>{{ .Permalink }}</guid>
+      <description>{{ .Summary | html }}</description>
+    </item>
+    {{ end }}
+  </channel>
+</rss>
diff --git a/static/images/sponsors/xTom.png b/static/images/sponsors/xTom.png
new file mode 100644
index 0000000..d7eb236
Binary files /dev/null and b/static/images/sponsors/xTom.png differ
diff --git a/themes/hugo-theme-bioarchlinux b/themes/hugo-theme-bioarchlinux
new file mode 160000
index 0000000..3fa3bbe
--- /dev/null
+++ b/themes/hugo-theme-bioarchlinux
@@ -0,0 +1 @@
+Subproject commit 3fa3bbebc466fc2e560689f1bb9f907a53cabc17