diff --git a/.gitmodules b/.gitmodules
index 9958036..e6821b4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "themes/sakura-hugo-theme"]
-	path = themes/sakura-hugo-theme
-	url = https://git.elnu.com/ElnuDev/sakura-hugo-theme.git
+[submodule "themes/blog-theme"]
+	path = themes/blog-theme
+	url = https://git.elnu.com/ElnuDev/blog-theme.git
diff --git a/config.toml b/config.toml
index e53861d..7776d0d 100644
--- a/config.toml
+++ b/config.toml
@@ -1,7 +1,7 @@
 baseURL = 'https://blog.elnu.com/'
 languageCode = 'en-us'
 title = "Elnu's Blog"
-theme = 'sakura-hugo-theme'
+theme = 'blog-theme'
 enableEmoji = true
 paginate = 3
 ignoreFiles = ['\.org$']
@@ -14,8 +14,6 @@ ignoreFiles = ['\.org$']
 	MatomoURL = 'matomo.elnu.com'
 	MatomoSiteId = '5'
 	HomepageHeader = '<a href="https://elnu.com/">&laquo; Back to profile</a>'
-	Theme = 'earthly'
-	ThemeColor = '#007559'
 	Stork = true
 	SoudanURL = 'https://soudan.elnu.com'
 
@@ -31,7 +29,7 @@ ignoreFiles = ['\.org$']
 		[markup.goldmark.renderer]
 			unsafe = true
 	[markup.highlight]
-		style = 'friendly'
+		noClasses = false
 	[markup.tableOfContents]
 		endLevel = 6
 
diff --git a/content/_index.org b/content/_index.org
index 65de772..6c27d35 100644
--- a/content/_index.org
+++ b/content/_index.org
@@ -4,7 +4,7 @@
 年暮ぬ笠きて草鞋はきながら
 #+end_quote
 
-Hello! I go by Elnu on the internet, and this is my blog, I hope you find something of interest here. I'm 17, I'm interested in programming, GNU/Linux, studying Japanese, watching anime, drawing, and creative writing. I'm horrible at doing things consistently.
+Hello! I go by Elnu on the internet, and this is my blog, I hope you find something of interest here. I'm 18, I'm interested in programming, GNU/Linux, studying Japanese, watching anime, drawing, and creative writing. I'm horrible at doing things consistently.
 
 For now, I'll be posting small Linux and programming-related posts explaining how to do various things that I happen to find useful. In the future, I'll post larger, more interesting posts. Stay tuned! (〃＾▽＾〃)
 
diff --git a/content/posts/final-fantasy-japanese-playthrough-part-1/index.org b/content/posts/final-fantasy-japanese-playthrough-part-1/index.org
index 892bd5c..af89bab 100644
--- a/content/posts/final-fantasy-japanese-playthrough-part-1/index.org
+++ b/content/posts/final-fantasy-japanese-playthrough-part-1/index.org
@@ -138,7 +138,7 @@ After a long journey, four young warriors arrive, each holding an ORB.
 Overall, I was pretty close, but I made a couple mistakes.
 
 1. 「やみ」was in fact 止み, to stop. (Drago, you were right!)
-2. [@2] Because of the lack of quotations in the Japanese version, I didn't realize that one of the lines was actually a recitation of the prophecy.
+2. Because of the lack of quotations in the Japanese version, I didn't realize that one of the lines was actually a recitation of the prophecy.
 3. 「そまりしとき」was actually 染まりし時, so /when/ the world is becomes tainted with darkness, specifying the time condition for the prophecy. I didn't recognize the construction here of /verb nominalization/ + し (nominalization of する) + 時. Because I didn't realize that this line was a direction quotation of the prophecy, I didn't pick up on this, even though I should have. What the し is doing here is that it's rather like 〜にする, and turns it from being simply /the time when the world is tainted with darkness/, 染まり時, to /the time when the world *becomes* tainted with darkness/.
 
 * Conclusion
diff --git a/content/posts/how-to-configure-vim-for-writing/index.org b/content/posts/how-to-configure-vim-for-writing/index.org
index fa5a9bd..d8bac1b 100644
--- a/content/posts/how-to-configure-vim-for-writing/index.org
+++ b/content/posts/how-to-configure-vim-for-writing/index.org
@@ -34,9 +34,9 @@ Most Vim configurations are done in the user's =~/.vimrc= file, which applies to
 
 Inside this file, add the following:
 
-#+begin_example
+#+begin_src vim
 setlocal linebreak
-#+end_example
+#+end_src
 
 We want to use =setlocal= (or its shorthand =setl=) over the usual =set= because this only sets =linebreak= on the current buffer. If we have multiple files open in Vim, we want to make sure that this setting only applies to open Markdown files.
 
diff --git a/themes/blog-theme b/themes/blog-theme
new file mode 160000
index 0000000..e00e616
--- /dev/null
+++ b/themes/blog-theme
@@ -0,0 +1 @@
+Subproject commit e00e6162acc7b2f3ad95658885837a1fd83f263f
diff --git a/themes/sakura-hugo-theme b/themes/sakura-hugo-theme
deleted file mode 160000
index 29b925d..0000000
--- a/themes/sakura-hugo-theme
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 29b925d36bf459e9630fe96abd28896b6f29d4ef