diff --git a/doc/_themes/sphinx13/theme.toml b/doc/_themes/sphinx13/theme.toml
index 78bb78f10..ba4fb2bd0 100644
--- a/doc/_themes/sphinx13/theme.toml
+++ b/doc/_themes/sphinx13/theme.toml
@@ -1,4 +1,4 @@
 [theme]
-inherit = basic
-pygments_style = default
-sidebars =
+inherit = "basic"
+pygments_style = { default = "default" }
+sidebars = []
diff --git a/sphinx/themes/agogo/theme.toml b/sphinx/themes/agogo/theme.toml
index 6a4457e95..ebb47aca2 100644
--- a/sphinx/themes/agogo/theme.toml
+++ b/sphinx/themes/agogo/theme.toml
@@ -1,20 +1,22 @@
 [theme]
-inherit = basic
-stylesheet = agogo.css
-pygments_style = tango
+inherit = "basic"
+stylesheets = [
+    "agogo.css",
+]
+pygments_style = { default = "tango" }
 
 [options]
-bodyfont = "Verdana", Arial, sans-serif
-headerfont = "Georgia", "Times New Roman", serif
-pagewidth = 70em
-documentwidth = 50em
-rightsidebar = true
-sidebarwidth = 20em
-bgcolor = #eeeeec
-headerbg = #555573 url(bgtop.png) top left repeat-x
-footerbg = url(bgfooter.png) top left repeat-x
-linkcolor = #ce5c00
-headercolor1 = #204a87
-headercolor2 = #3465a4
-headerlinkcolor = #fcaf3e
-textalign = justify
+bodyfont = "\"Verdana\", Arial, sans-serif"
+headerfont = "\"Georgia\", \"Times New Roman\", serif"
+pagewidth = "70em"
+documentwidth = "50em"
+rightsidebar = "true"
+sidebarwidth = "20em"
+bgcolor = "#eeeeec"
+headerbg = "#555573 url(bgtop.png) top left repeat-x"
+footerbg = "url(bgfooter.png) top left repeat-x"
+linkcolor = "#ce5c00"
+headercolor1 = "#204a87"
+headercolor2 = "#3465a4"
+headerlinkcolor = "#fcaf3e"
+textalign = "justify"
diff --git a/sphinx/themes/basic/theme.toml b/sphinx/themes/basic/theme.toml
index f8e7b263c..f380be0ae 100644
--- a/sphinx/themes/basic/theme.toml
+++ b/sphinx/themes/basic/theme.toml
@@ -1,16 +1,23 @@
 [theme]
-inherit = none
-stylesheet = basic.css
-pygments_style = none
-sidebars = localtoc.html, relations.html, sourcelink.html, searchbox.html
+inherit = "none"
+stylesheets = [
+    "basic.css",
+]
+sidebars = [
+    "localtoc.html",
+    "relations.html",
+    "sourcelink.html",
+    "searchbox.html",
+]
+pygments_style = { default = "none" }
 
 [options]
-nosidebar = false
-sidebarwidth = 230
-body_min_width = 360
-body_max_width = 800
-navigation_with_keys = False
-enable_search_shortcuts = True
-globaltoc_collapse = true
-globaltoc_includehidden = false
-globaltoc_maxdepth =
+nosidebar = "false"
+sidebarwidth = "230"
+body_min_width = "360"
+body_max_width = "800"
+navigation_with_keys = "False"
+enable_search_shortcuts = "True"
+globaltoc_collapse = "true"
+globaltoc_includehidden = "false"
+globaltoc_maxdepth = ""
diff --git a/sphinx/themes/bizstyle/theme.toml b/sphinx/themes/bizstyle/theme.toml
index 3c21b0fe0..f7de8c295 100644
--- a/sphinx/themes/bizstyle/theme.toml
+++ b/sphinx/themes/bizstyle/theme.toml
@@ -1,10 +1,12 @@
 [theme]
-inherit = basic
-stylesheet = bizstyle.css
-pygments_style = friendly
+inherit = "basic"
+stylesheets = [
+    "bizstyle.css",
+]
+pygments_style = { default = "friendly" }
 
 [options]
-rightsidebar = false
-sidebarwidth = 210
+rightsidebar = "false"
+sidebarwidth = "210"
 
-maincolor = #336699
+maincolor = "#336699"
diff --git a/sphinx/themes/classic/theme.toml b/sphinx/themes/classic/theme.toml
index 5963d04d9..fbb2fed87 100644
--- a/sphinx/themes/classic/theme.toml
+++ b/sphinx/themes/classic/theme.toml
@@ -1,32 +1,34 @@
 [theme]
-inherit = basic
-stylesheet = classic.css
-pygments_style = sphinx
+inherit = "basic"
+stylesheets = [
+    "classic.css",
+]
+pygments_style = { default = "sphinx" }
 
 [options]
-rightsidebar = false
-stickysidebar = false
-collapsiblesidebar = false
-externalrefs = false
+rightsidebar = "false"
+stickysidebar = "false"
+collapsiblesidebar = "false"
+externalrefs = "false"
 
-footerbgcolor    = #11303d
-footertextcolor  = #ffffff
-sidebarbgcolor   = #1c4e63
-sidebarbtncolor  = #3c6e83
-sidebartextcolor = #ffffff
-sidebarlinkcolor = #98dbcc
-relbarbgcolor    = #133f52
-relbartextcolor  = #ffffff
-relbarlinkcolor  = #ffffff
-bgcolor          = #ffffff
-textcolor        = #000000
-headbgcolor      = #f2f2f2
-headtextcolor    = #20435c
-headlinkcolor    = #c60f0f
-linkcolor        = #355f7c
-visitedlinkcolor = #551a8b
-codebgcolor      = unset
-codetextcolor    = unset
+footerbgcolor    = "#11303d"
+footertextcolor  = "#ffffff"
+sidebarbgcolor   = "#1c4e63"
+sidebarbtncolor  = "#3c6e83"
+sidebartextcolor = "#ffffff"
+sidebarlinkcolor = "#98dbcc"
+relbarbgcolor    = "#133f52"
+relbartextcolor  = "#ffffff"
+relbarlinkcolor  = "#ffffff"
+bgcolor          = "#ffffff"
+textcolor        = "#000000"
+headbgcolor      = "#f2f2f2"
+headtextcolor    = "#20435c"
+headlinkcolor    = "#c60f0f"
+linkcolor        = "#355f7c"
+visitedlinkcolor = "#551a8b"
+codebgcolor      = "unset"
+codetextcolor    = "unset"
 
-bodyfont = sans-serif
-headfont = 'Trebuchet MS', sans-serif
+bodyfont = "sans-serif"
+headfont = "'Trebuchet MS', sans-serif"
diff --git a/sphinx/themes/default/theme.toml b/sphinx/themes/default/theme.toml
index 0d8403f0b..207c71700 100644
--- a/sphinx/themes/default/theme.toml
+++ b/sphinx/themes/default/theme.toml
@@ -1,2 +1,2 @@
 [theme]
-inherit = classic
+inherit = "classic"
diff --git a/sphinx/themes/epub/theme.toml b/sphinx/themes/epub/theme.toml
index 11f098ec9..8fcf9d9bc 100644
--- a/sphinx/themes/epub/theme.toml
+++ b/sphinx/themes/epub/theme.toml
@@ -1,8 +1,10 @@
 [theme]
-inherit = basic
-stylesheet = epub.css
-pygments_style = none
+inherit = "basic"
+stylesheets = [
+    "epub.css",
+]
+pygments_style = { default = "none" }
 
 [options]
-relbar1 = true
-footer = true
+relbar1 = "true"
+footer = "true"
diff --git a/sphinx/themes/haiku/theme.toml b/sphinx/themes/haiku/theme.toml
index 77dd7c78b..149b89d46 100644
--- a/sphinx/themes/haiku/theme.toml
+++ b/sphinx/themes/haiku/theme.toml
@@ -1,14 +1,16 @@
 [theme]
-inherit = basic
-stylesheet = haiku.css
-pygments_style = autumn
+inherit = "basic"
+stylesheets = [
+    "haiku.css",
+]
+pygments_style = { default = "autumn" }
 
 [options]
-full_logo         = false
-body_min_width    = 59em
-body_max_width    = 70em
-textcolor         = #333333
-headingcolor      = #0c3762
-linkcolor         = #dc3c01
-visitedlinkcolor  = #551a8b
-hoverlinkcolor    = #ff4500
+full_logo        = "false"
+body_min_width   = "59em"
+body_max_width   = "70em"
+textcolor        = "#333333"
+headingcolor     = "#0c3762"
+linkcolor        = "#dc3c01"
+visitedlinkcolor = "#551a8b"
+hoverlinkcolor   = "#ff4500"
diff --git a/sphinx/themes/nature/theme.toml b/sphinx/themes/nature/theme.toml
index 1cc400446..0322e5d64 100644
--- a/sphinx/themes/nature/theme.toml
+++ b/sphinx/themes/nature/theme.toml
@@ -1,4 +1,6 @@
 [theme]
-inherit = basic
-stylesheet = nature.css
-pygments_style = tango
+inherit = "basic"
+stylesheets = [
+    "nature.css",
+]
+pygments_style = { default = "tango" }
diff --git a/sphinx/themes/nonav/theme.toml b/sphinx/themes/nonav/theme.toml
index d4799c75a..420204938 100644
--- a/sphinx/themes/nonav/theme.toml
+++ b/sphinx/themes/nonav/theme.toml
@@ -1,8 +1,10 @@
 [theme]
-inherit = basic
-stylesheet = nonav.css
-pygments_style = none
+inherit = "basic"
+stylesheets = [
+    "nonav.css",
+]
+pygments_style = { default = "none" }
 
 [options]
-relbar1 = true
-footer = true
+relbar1 = "true"
+footer = "true"
diff --git a/sphinx/themes/pyramid/theme.toml b/sphinx/themes/pyramid/theme.toml
index 409579fdd..0e0c487d9 100644
--- a/sphinx/themes/pyramid/theme.toml
+++ b/sphinx/themes/pyramid/theme.toml
@@ -1,4 +1,6 @@
 [theme]
-inherit = basic
-stylesheet = pyramid.css
-pygments_style = sphinx.pygments_styles.PyramidStyle
+inherit = "basic"
+stylesheets = [
+    "pyramid.css",
+]
+pygments_style = { default = "sphinx.pygments_styles.PyramidStyle" }
diff --git a/sphinx/themes/scrolls/theme.toml b/sphinx/themes/scrolls/theme.toml
index 7e83de14a..92b1bfab1 100644
--- a/sphinx/themes/scrolls/theme.toml
+++ b/sphinx/themes/scrolls/theme.toml
@@ -1,13 +1,15 @@
 [theme]
-inherit = basic
-stylesheet = scrolls.css
-pygments_style = tango
+inherit = "basic"
+stylesheets = [
+    "scrolls.css",
+]
+pygments_style = { default = "tango" }
 
 [options]
-body_min_width = 0
-body_max_width = 680
-headerbordercolor = #1752b4
-subheadlinecolor  = #0d306b
-linkcolor         = #1752b4
-visitedlinkcolor  = #551a8b
-admonitioncolor   = #28437f
+body_min_width = "0"
+body_max_width = "680"
+headerbordercolor = "#1752b4"
+subheadlinecolor  = "#0d306b"
+linkcolor         = "#1752b4"
+visitedlinkcolor  = "#551a8b"
+admonitioncolor   = "#28437f"
diff --git a/sphinx/themes/sphinxdoc/theme.toml b/sphinx/themes/sphinxdoc/theme.toml
index 9a22fefd3..472da10e2 100644
--- a/sphinx/themes/sphinxdoc/theme.toml
+++ b/sphinx/themes/sphinxdoc/theme.toml
@@ -1,4 +1,6 @@
 [theme]
-inherit = basic
-stylesheet = sphinxdoc.css
-pygments_style = friendly
+inherit = "basic"
+stylesheets = [
+    "sphinxdoc.css",
+]
+pygments_style = { default = "friendly" }
diff --git a/sphinx/themes/traditional/theme.toml b/sphinx/themes/traditional/theme.toml
index acc6bc7e6..173be97eb 100644
--- a/sphinx/themes/traditional/theme.toml
+++ b/sphinx/themes/traditional/theme.toml
@@ -1,7 +1,9 @@
 [theme]
-inherit = basic
-stylesheet = traditional.css
+inherit = "basic"
+stylesheets = [
+    "traditional.css",
+]
 
 [options]
-body_min_width = 0
-body_max_width = none
+body_min_width = "0"
+body_max_width = "none"