diff --git a/config.toml b/config.toml
index bca615e4..0cb918b2 100644
--- a/config.toml
+++ b/config.toml
@@ -5,7 +5,7 @@ pygmentsCodeFences = true
 pygmentsUseClasses = true
 disableKinds       = ["taxonomy"]
 canonifyURLs       = true
-theme              = "jaeger-docs"
+theme              = ["basetheme", "jaeger-docs"]
 googleAnalytics    = "UA-148208642-1"
 
 [mediaTypes."text/netlify"]
diff --git a/themes/jaeger-docs/layouts/partials/ukraine.html b/themes/basetheme/layouts/partials/ukraine.html
similarity index 100%
rename from themes/jaeger-docs/layouts/partials/ukraine.html
rename to themes/basetheme/layouts/partials/ukraine.html
diff --git a/themes/jaeger-docs/layouts/shortcodes/binaries.html b/themes/basetheme/layouts/shortcodes/binaries.html
similarity index 100%
rename from themes/jaeger-docs/layouts/shortcodes/binaries.html
rename to themes/basetheme/layouts/shortcodes/binaries.html
diff --git a/themes/jaeger-docs/layouts/shortcodes/check_no.html b/themes/basetheme/layouts/shortcodes/check_no.html
similarity index 100%
rename from themes/jaeger-docs/layouts/shortcodes/check_no.html
rename to themes/basetheme/layouts/shortcodes/check_no.html
diff --git a/themes/jaeger-docs/layouts/shortcodes/check_yes.html b/themes/basetheme/layouts/shortcodes/check_yes.html
similarity index 100%
rename from themes/jaeger-docs/layouts/shortcodes/check_yes.html
rename to themes/basetheme/layouts/shortcodes/check_yes.html
diff --git a/themes/jaeger-docs/layouts/shortcodes/cli/tools-list.html b/themes/basetheme/layouts/shortcodes/cli/tools-list.html
similarity index 100%
rename from themes/jaeger-docs/layouts/shortcodes/cli/tools-list.html
rename to themes/basetheme/layouts/shortcodes/cli/tools-list.html
diff --git a/themes/jaeger-docs/layouts/shortcodes/clientsTable.html b/themes/basetheme/layouts/shortcodes/clientsTable.html
similarity index 100%
rename from themes/jaeger-docs/layouts/shortcodes/clientsTable.html
rename to themes/basetheme/layouts/shortcodes/clientsTable.html
diff --git a/themes/jaeger-docs/layouts/shortcodes/currentVersion.html b/themes/basetheme/layouts/shortcodes/currentVersion.html
similarity index 100%
rename from themes/jaeger-docs/layouts/shortcodes/currentVersion.html
rename to themes/basetheme/layouts/shortcodes/currentVersion.html
diff --git a/themes/jaeger-docs/layouts/shortcodes/danger.html b/themes/basetheme/layouts/shortcodes/danger.html
similarity index 100%
rename from themes/jaeger-docs/layouts/shortcodes/danger.html
rename to themes/basetheme/layouts/shortcodes/danger.html
diff --git a/themes/jaeger-docs/layouts/shortcodes/definition.html b/themes/basetheme/layouts/shortcodes/definition.html
similarity index 100%
rename from themes/jaeger-docs/layouts/shortcodes/definition.html
rename to themes/basetheme/layouts/shortcodes/definition.html
diff --git a/themes/jaeger-docs/layouts/shortcodes/dockerImages.html b/themes/basetheme/layouts/shortcodes/dockerImages.html
similarity index 100%
rename from themes/jaeger-docs/layouts/shortcodes/dockerImages.html
rename to themes/basetheme/layouts/shortcodes/dockerImages.html
diff --git a/themes/jaeger-docs/layouts/shortcodes/featuresTable.html b/themes/basetheme/layouts/shortcodes/featuresTable.html
similarity index 100%
rename from themes/jaeger-docs/layouts/shortcodes/featuresTable.html
rename to themes/basetheme/layouts/shortcodes/featuresTable.html
diff --git a/themes/jaeger-docs/layouts/shortcodes/info.html b/themes/basetheme/layouts/shortcodes/info.html
similarity index 100%
rename from themes/jaeger-docs/layouts/shortcodes/info.html
rename to themes/basetheme/layouts/shortcodes/info.html
diff --git a/themes/jaeger-docs/layouts/shortcodes/mermaid.html b/themes/basetheme/layouts/shortcodes/mermaid.html
similarity index 100%
rename from themes/jaeger-docs/layouts/shortcodes/mermaid.html
rename to themes/basetheme/layouts/shortcodes/mermaid.html
diff --git a/themes/jaeger-docs/layouts/shortcodes/requirement.html b/themes/basetheme/layouts/shortcodes/requirement.html
similarity index 100%
rename from themes/jaeger-docs/layouts/shortcodes/requirement.html
rename to themes/basetheme/layouts/shortcodes/requirement.html
diff --git a/themes/jaeger-docs/layouts/shortcodes/success.html b/themes/basetheme/layouts/shortcodes/success.html
similarity index 100%
rename from themes/jaeger-docs/layouts/shortcodes/success.html
rename to themes/basetheme/layouts/shortcodes/success.html
diff --git a/themes/jaeger-docs/layouts/shortcodes/tip.html b/themes/basetheme/layouts/shortcodes/tip.html
similarity index 100%
rename from themes/jaeger-docs/layouts/shortcodes/tip.html
rename to themes/basetheme/layouts/shortcodes/tip.html
diff --git a/themes/jaeger-docs/layouts/shortcodes/warning.html b/themes/basetheme/layouts/shortcodes/warning.html
similarity index 100%
rename from themes/jaeger-docs/layouts/shortcodes/warning.html
rename to themes/basetheme/layouts/shortcodes/warning.html