diff --git a/.gitmodules b/.gitmodules
index 2b7f43e..d72b6ca 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,3 +2,7 @@
 	path = themes/hugo-bearblog
 	url = https://github.com/BBaoVanC/hugo-bearblog.git
 	branch = master
+[submodule "themes/bobatheme"]
+	path = themes/bobatheme
+	url = https://github.com/BBaoVanC/bobatheme.git
+	branch = master
diff --git a/archetypes/services.md b/archetypes/services.md
deleted file mode 100644
index 994b99c..0000000
--- a/archetypes/services.md
+++ /dev/null
@@ -1,7 +0,0 @@
-+++
-title = "{{ replace .Name "-" " " | title }}"
-
-description = """
-Lorem ipsum
-"""
-+++
diff --git a/config.toml b/config.toml
index d34b546..d6e90f0 100644
--- a/config.toml
+++ b/config.toml
@@ -1,62 +1,19 @@
-
 baseURL = "https://boba.best"
-
-# The name of this wonderful theme ;-).
-theme = 'hugo-bearblog'
-
-# Basic metadata configuration for your blog.
-title = "boba.best"
-author = "bbaovanc"
-copyright = "Copyright © 2021, bbaovanc."
+theme = "bobatheme"
 languageCode = "en-US"
-
-# Generate a nice robots.txt for SEO
+author = "bbaovanc"
+title = "boba.best"
+sectionPagesMenu = "main"
 enableRobotsTXT = true
 
-# Generate "Bearblog"-like URLs !only!, see https://bearblog.dev/.
-disableKinds = ["taxonomy"]
-ignoreErrors = ["error-disable-taxonomy"]
-[permalinks]
-  #blog = "/:slug/"
-  tags = "/blog/:slug"
-
+# these are for the OpenGraph/Twitter embeds
 [params]
-  # The "description" of your website. This is used in the meta data of your generated html.
   description = "Be your boba best"
-
-  # The path to your "favicon". This should be a square (at least 32px x 32px) png-file.
-  # Hint: It's good practise to also put a "favicon.ico"-file into your "static"-folder.
-  favicon = "img/boba_mochi.png"
-
-  # These "images" are used for the structured data templates. This will show up, when
-  # services like Twitter or Slack want to generate a preview of a link to your site.
-  # See https://gohugo.io/templates/internal#twitter-cards and
-  # https://gohugo.io/templates/internal#open-graph.
   images = ["img/boba_mochi.gif"]
-
-  # Another "title" :-). This one is used as the site_name on the Hugo's internal
-  # opengraph structured data template.
-  # See https://ogp.me/ and https://gohugo.io/templates/internal#open-graph.
   title = "boba.best"
 
-  # This theme will, by default, inject a made-with-line at the bottom of the page.
-  # You can turn it off, but we would really appreciate if you don’t :-).
-  # hideMadeWithLine = true
-
-  # By default, this theme displays dates with a format like "02 Jan, 2006", but
-  # you can customize it by setting the `dateFormat` param in your site's config
-  # file. See [Hugo's Format function docs](https://gohugo.io/functions/format/)
-  # for details. An example TOML config that uses [ISO
-  # 8601](https://en.wikipedia.org/wiki/ISO_8601) format:
-  # dateFormat = "2006-01-02"
-
 [menu]
   [[menu.main]]
     identifier = "status-page"
     name = "Status Page"
     url = "https://status.boba.best/status-page"
-
-[markup]
-  [markup.goldmark]
-    [markup.goldmark.renderer]
-      unsafe = true
diff --git a/content/_index.md b/content/_index.md
index efba303..0fecfa6 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -1,5 +1,6 @@
 +++
-title = "boba.best"
+title = "Home"
+description = "Be your boba best"
 +++
 
 Links to all the services (and the software they're using) hosted on boba.best:
diff --git a/content/blog/_index.md b/content/blog/_index.md
deleted file mode 100644
index 34651ab..0000000
--- a/content/blog/_index.md
+++ /dev/null
@@ -1,3 +0,0 @@
-+++
-title = "Blog"
-+++
diff --git a/content/services/_index.md b/content/services/_index.md
index 3a47c38..7ed9bf4 100644
--- a/content/services/_index.md
+++ b/content/services/_index.md
@@ -1,6 +1,5 @@
 +++
 title = "Services"
-menu = "main"
 
 description = """
 Information about each of the services hosted on boba.best.
diff --git a/themes/bobatheme b/themes/bobatheme
new file mode 160000
index 0000000..03eb50c
--- /dev/null
+++ b/themes/bobatheme
@@ -0,0 +1 @@
+Subproject commit 03eb50cccaf43763e2f70bf41509ed869eca9b15