diff --git a/config/_default/config.toml b/config/_default/config.toml
index db638ad..8e9b871 100644
--- a/config/_default/config.toml
+++ b/config/_default/config.toml
@@ -47,13 +47,16 @@ ignoreFiles = ["\\.ipynb$", ".ipynb_checkpoints$", "\\.Rmd$", "\\.Rmarkdown$", "
   mediaType = "application/manifest+json"
   rel = "manifest"
 
-# Configure BlackFriday Markdown rendering.
-#   See: https://gohugo.io/getting-started/configuration/#configure-blackfriday
-[blackfriday]
-  hrefTargetBlank = true  # `true` opens external links in a new tab. See https://github.com/gohugoio/hugo/issues/2424
-	angledQuotes = false
-	latexDashes = true
-  extensions = ["backslashLineBreak"]
+[markup]
+  defaultMarkdownHandler = "goldmark"
+  [markup.goldmark]
+    [markup.goldmark.renderer]
+      unsafe = true  # Enable user to embed HTML snippets in Markdown content.
+  [markup.highlight]
+    codeFences = false  # Disable Hugo's code highlighter as it conflicts with Academic's highligher.
+  [markup.tableOfContents]
+    startLevel = 2
+    endLevel = 3
 
 [imaging]
   resampleFilter = "lanczos"
diff --git a/config/_default/params.toml b/config/_default/params.toml
index dc0fe94..2a43655 100644
--- a/config/_default/params.toml
+++ b/config/_default/params.toml
@@ -212,6 +212,11 @@ plugins_js  = []
     shortname = ""  # Paste the shortname from your Disqus dashboard.
     show_count = true  # Show comment count in page header? (true/false)
 
+  # Configuration of Commento.
+  [comments.commento]
+    # If self-hosting Commento, enter its URL here (e.g. "https://commento.?.com"), otherwise leave empty.
+    url = ""
+
 ############################
 ## Search
 ############################
diff --git a/netlify.toml b/netlify.toml
index 0d0f88c..81bc41d 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -3,7 +3,7 @@
   publish = "public"
 
 [build.environment]
-  HUGO_VERSION = "0.58.3"
+  HUGO_VERSION = "0.60.1"
   HUGO_ENABLEGITINFO = "true"
 
 [context.production.environment]
diff --git a/themes/academic b/themes/academic
index 023a9fe..aa4c952 160000
--- a/themes/academic
+++ b/themes/academic
@@ -1 +1 @@
-Subproject commit 023a9fef27f218a03735bab68141d7712a8e5a16
+Subproject commit aa4c95277c2ddf6dfb16591e7cf38b649ec42ca2