diff --git a/src/adw-style-manager.c b/src/adw-style-manager.c
index 8515e89b2416b057c83039e2634be8bd7d6040bf..49530b5910c008077b74cb5eff4bd223c0bda29d 100644
--- a/src/adw-style-manager.c
+++ b/src/adw-style-manager.c
@@ -248,7 +248,7 @@ adw_style_manager_constructed (GObject *object)
 
     if (!g_getenv ("GTK_THEME")) {
       g_object_set (gtk_settings_get_for_display (self->display),
-                    "gtk-theme-name", "Empty",
+                    "gtk-theme-name", "Adwaita-empty",
                     NULL);
 
       self->provider = gtk_css_provider_new ();
diff --git a/src/inspector/adw-inspector-page.c b/src/inspector/adw-inspector-page.c
index 52056a5ae550afe8749fb34292d9353f77a23e55..c953b0a1866db8ca0411c86ca9e2fb12dcc531c5 100644
--- a/src/inspector/adw-inspector-page.c
+++ b/src/inspector/adw-inspector-page.c
@@ -186,12 +186,12 @@ adw_inspector_page_init (AdwInspectorPage *self)
 
   adw_settings_start_override (self->settings);
 
-  supports = adw_settings_get_system_supports_color_schemes (self->settings);
-  gtk_switch_set_active (self->support_color_schemes_switch, supports);
-
   color_scheme = adw_settings_get_color_scheme (self->settings);
   adw_combo_row_set_selected (self->color_scheme_row, color_scheme);
 
+  supports = adw_settings_get_system_supports_color_schemes (self->settings);
+  gtk_switch_set_active (self->support_color_schemes_switch, supports);
+
   hc = adw_settings_get_high_contrast (self->settings);
   gtk_switch_set_active (self->high_contrast_switch, hc);
 }
diff --git a/src/inspector/meson.build b/src/inspector/meson.build
index 7f23bc501cedc9538eadb6c82a400862b8742370..1d5d1fc15b18209735409692d31c519aca6fac3d 100644
--- a/src/inspector/meson.build
+++ b/src/inspector/meson.build
@@ -13,10 +13,9 @@ if get_option('inspector')
     'adw-inspector-page.c',
   ]
 
-  shared_library(
+  shared_module(
     'adwaita-inspector-module' + apiversion,
     libadwaita_inspector_sources,
-              soversion: soversion,
            dependencies: libadwaita_dep,
                 install: true,
             install_dir: module_libdir,
diff --git a/src/stylesheet/adwaita-stylesheet.gresources.xml b/src/stylesheet/adwaita-stylesheet.gresources.xml
index 83ed9c02f70a6bf06bc7dd8116f061b2951c4423..e4785906b521f944f1a73fe358a0a021d14e6e6d 100644
--- a/src/stylesheet/adwaita-stylesheet.gresources.xml
+++ b/src/stylesheet/adwaita-stylesheet.gresources.xml
@@ -18,4 +18,11 @@
     <file>assets/dash-symbolic.svg</file>
     <file>assets/devel-symbolic.svg</file>
   </gresource>
+
+  <gresource prefix="/org/gtk/libgtk/theme/Adwaita-empty">
+    <file alias='gtk.css'>empty.css</file>
+    <file alias='gtk-dark.css'>empty.css</file>
+    <file alias='gtk-hc.css'>empty.css</file>
+    <file alias='gtk-hc-dark.css'>empty.css</file>
+  </gresource>
 </gresources>
diff --git a/src/stylesheet/empty.css b/src/stylesheet/empty.css
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/stylesheet/gtk-dark.css b/src/stylesheet/gtk-dark.css
deleted file mode 100644
index d6711af3877f74bc4a6578c98d2e651fac3138d8..0000000000000000000000000000000000000000
--- a/src/stylesheet/gtk-dark.css
+++ /dev/null
@@ -1 +0,0 @@
-@import url("resource:///org/gtk/libgtk/theme/Adwaita/Adwaita-dark.css");
diff --git a/src/stylesheet/gtk-hc-dark.css b/src/stylesheet/gtk-hc-dark.css
deleted file mode 100644
index 16800c347cab95ff3292c4ed4239139bf31f5d20..0000000000000000000000000000000000000000
--- a/src/stylesheet/gtk-hc-dark.css
+++ /dev/null
@@ -1 +0,0 @@
-@import url("resource:///org/gtk/libgtk/theme/Adwaita/Adwaita-hc-dark.css");
diff --git a/src/stylesheet/gtk-hc.css b/src/stylesheet/gtk-hc.css
deleted file mode 100644
index e7e855fd9053f5707817a24813c7e538d9997bde..0000000000000000000000000000000000000000
--- a/src/stylesheet/gtk-hc.css
+++ /dev/null
@@ -1 +0,0 @@
-@import url("resource:///org/gtk/libgtk/theme/Adwaita/Adwaita-hc.css");
diff --git a/src/stylesheet/gtk-light.css b/src/stylesheet/gtk-light.css
deleted file mode 100644
index 895ee4600a6b5cd20ffc5bd07be9fe9eb8eb0efa..0000000000000000000000000000000000000000
--- a/src/stylesheet/gtk-light.css
+++ /dev/null
@@ -1 +0,0 @@
-@import url("resource:///org/gtk/libgtk/theme/Adwaita/Adwaita-light.css");
diff --git a/src/stylesheet/gtk.css b/src/stylesheet/gtk.css
deleted file mode 100644
index 895ee4600a6b5cd20ffc5bd07be9fe9eb8eb0efa..0000000000000000000000000000000000000000
--- a/src/stylesheet/gtk.css
+++ /dev/null
@@ -1 +0,0 @@
-@import url("resource:///org/gtk/libgtk/theme/Adwaita/Adwaita-light.css");
diff --git a/src/stylesheet/meson.build b/src/stylesheet/meson.build
index e266d2261fc89fe5affbe47fbbd826da92192df9..188c1740e7b4bdc272838149de088db85553a3f6 100644
--- a/src/stylesheet/meson.build
+++ b/src/stylesheet/meson.build
@@ -97,4 +97,3 @@ libadwaita_stylesheet_resources = gnome.compile_resources(
   dependencies: stylesheet_deps,
   c_name: 'adw_stylesheet',
 )
-