diff --git a/app/javascript/entrypoints/theme-selection.ts b/app/javascript/entrypoints/theme-selection.ts
new file mode 100644
index 0000000000..76e46e15f1
--- /dev/null
+++ b/app/javascript/entrypoints/theme-selection.ts
@@ -0,0 +1 @@
+import '../inline/theme-selection';
diff --git a/app/views/layouts/error.html.haml b/app/views/layouts/error.html.haml
index f85a671a53..03cb93dba7 100644
--- a/app/views/layouts/error.html.haml
+++ b/app/views/layouts/error.html.haml
@@ -1,5 +1,5 @@
 !!!
-%html{ lang: I18n.locale }
+%html{ lang: I18n.locale, 'data-contrast': 'auto', 'data-color-scheme': 'auto' }
   %head
     %meta{ 'content' => 'text/html; charset=UTF-8', 'http-equiv' => 'Content-Type' }/
     %meta{ charset: 'utf-8' }/
@@ -8,6 +8,7 @@
     = vite_client_tag
     = vite_react_refresh_tag
     = vite_polyfills_tag
+    = vite_typescript_tag 'theme-selection.ts', crossorigin: 'anonymous', blocking: 'render'
     = theme_style_tags Setting.default_settings['theme']
     = vite_typescript_tag 'error.ts', crossorigin: 'anonymous'
   %body.error