diff --git a/layouts/404.html b/layouts/404.html
index 45556ef4d6..dbc1ff0705 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -14,7 +14,7 @@
     <title>{{ $title }}</title>
     <base href="{{ .Site.BaseURL }}">
     {{- partialCached "favicon.html" . }}
-    {{- partialCached "stylesheet.html" (dict "page" . "outputFormat" $outputFormat) $outputFormat }}
+    {{- partial "stylesheet.html" (dict "page" . "outputFormat" $outputFormat) }}
     <style>
       p {
         text-align: center
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index b557ba7b75..61233e2bc6 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -66,7 +66,7 @@
     {{- end }}
 
     {{- partialCached "favicon.html" . }}
-    {{- partialCached "stylesheet.html" (dict "page" . "outputFormat" $outputFormat) $outputFormat }}
+    {{- partial "stylesheet.html" (dict "page" . "outputFormat" $outputFormat) }}
     {{- partial "dependencies.html" (dict "page" . "location" "header" "outputFormat" $outputFormat) }}
     {{- partial "custom-header.html" . }}
   </head>
diff --git a/layouts/partials/stylesheet.html b/layouts/partials/stylesheet.html
index be55df2aa4..d815918093 100644
--- a/layouts/partials/stylesheet.html
+++ b/layouts/partials/stylesheet.html
@@ -30,8 +30,8 @@
     <script src="{{"js/variant.js" | relURL}}{{ if not .Site.Params.disableAssetsBusting }}?{{ now.Unix }}{{ end }}"></script>
     <script>
       window.relearn = window.relearn || {};
-      window.relearn.baseUri='{{ "css/theme.css" | relURL | safeJS }}'.replace(/(.*)css\/theme\.css/, '$1').replace(/\/*$/, '');
-      window.relearn.baseUriFull='{{ .Site.BaseURL | safeJS }}/'.replace(/\/*$/, '');
+      window.relearn.baseUri='{{ partial "toBaseRelURL.hugo" $page | safeJS }}';
+      window.relearn.baseUriFull='{{ replaceRE "/*$" "" .Site.BaseURL | safeJS }}';
     {{- with .Site.Home.OutputFormats.Get "json" }}
       {{- warnf "%q: DEPRECATED usage of 'json' output format found, use 'search' instead; see https://mcshelby.github.io/hugo-theme-relearn/basics/customization#activate-search" $page.File.Filename }}
       window.index_json_url={{ "index.json" | relLangURL }};
diff --git a/layouts/partials/toBaseRelURL.hugo b/layouts/partials/toBaseRelURL.hugo
new file mode 100644
index 0000000000..81d21ff1cd
--- /dev/null
+++ b/layouts/partials/toBaseRelURL.hugo
@@ -0,0 +1,7 @@
+{{- $url := partial "relLangPrettyUglyURL.hugo" (dict "to" .) }}
+{{- $url = path.Clean $url }}
+{{- $url = replaceRE "/[^/]*$" "" $url }}
+{{- $url = replaceRE "/[^/]*" "/.." $url }}
+{{- $url = replaceRE "^/" "" $url }}
+{{- $url = replaceRE "/$" "" $url }}
+{{- return $url }}
\ No newline at end of file
diff --git a/static/js/theme.js b/static/js/theme.js
index 13828ac616..ea5a415719 100644
--- a/static/js/theme.js
+++ b/static/js/theme.js
@@ -1523,6 +1523,9 @@ if( window.themeUseMermaid ){
 }
 
 function useOpenapi( config ){
+    if( config.css && config.css.startsWith( '/' ) ){
+        config.css = window.relearn.baseUri + config.css;
+    }
 }
 if( window.themeUseOpenapi ){
     useOpenapi( window.themeUseOpenapi );