Index: gnome-shell-40.2/debian/ubuntu-session-mods/ubuntu.json
===================================================================
--- gnome-shell-40.2.orig/debian/ubuntu-session-mods/ubuntu.json
+++ gnome-shell-40.2/debian/ubuntu-session-mods/ubuntu.json
@@ -1,6 +1,6 @@
 {
     "parentMode": "user",
-    "stylesheetName": "Yaru/gnome-shell.css",
+    "stylesheetName": "gnome-shell.css",
     "themeResourceName": "theme/Yaru/gnome-shell-theme.gresource",
     "debugFlags": ["backtrace-crashes-all"],
     "enabledExtensions": [
Index: gnome-shell-40.2/js/ui/main.js
===================================================================
--- gnome-shell-40.2.orig/js/ui/main.js
+++ gnome-shell-40.2/js/ui/main.js
@@ -387,6 +387,10 @@ function _getDefaultStylesheet() {
     // theme
     if (St.Settings.get().gtk_theme == 'HighContrast')
         stylesheet = _getStylesheet(name.replace('.css', '-high-contrast.css'));
+        
+    // Look for -dark theme if GTK theme ends in -dark
+    if (St.Settings.get().gtk_theme.endsWith('-dark'))
+        stylesheet = _getStylesheet(name.replace('.css', '-dark.css'));
 
     if (stylesheet == null)
         stylesheet = _getStylesheet(sessionMode.stylesheetName);