diff --git a/data/org.gnome.boxes.gschema.xml b/data/org.gnome.boxes.gschema.xml
index 2cc1c5701c1c240a7153448fe6bd01f3d8712b6e..e3b0d31787024279407ce04e69f6579caa304ea9 100644
--- a/data/org.gnome.boxes.gschema.xml
+++ b/data/org.gnome.boxes.gschema.xml
@@ -47,13 +47,6 @@
         Whether Boxes is running for the first time
       </description>
     </key>
-    <key name="override-theme" type="b">
-      <default>true</default>
-      <summary>Override theme</summary>
-      <description>
-        Whether Boxes will override the user's theme
-      </description>
-    </key>
 
     <key name="shared-folders" type="s">
       <default>""</default>
diff --git a/src/app-window.vala b/src/app-window.vala
index 7ee13cbc048560660bd47f0bb2713a1a20f343d5..770cd436b08bce5d24c2d6cbd5270b240b4049a7 100644
--- a/src/app-window.vala
+++ b/src/app-window.vala
@@ -140,8 +140,7 @@ public AppWindow (Gtk.Application app) {
         notify["ui-state"].connect (ui_state_changed);
 
         Gtk.Window.set_default_icon_name (Config.APPLICATION_ID);
-        var override_theme = settings.get_boolean ("override-theme");
-        Gtk.Settings.get_default ().gtk_application_prefer_dark_theme = override_theme;
+        Hdy.StyleManager.get_default ().color_scheme = PREFER_DARK;
 
         var provider = Boxes.load_css ("gtk-style.css");
         Gtk.StyleContext.add_provider_for_screen (Gdk.Screen.get_default (),
diff --git a/src/meson.build b/src/meson.build
index a84bde5d91a641687d35d929bc8c8e1f40b7f51b..def83629e01a22842d9ba3f1f61af8f69724cea2 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -143,6 +143,8 @@ dependencies = [
 spice = dependency ('spice-client-gtk-3.0', version: '>= 0.32')
 if spice.found ()
   vala_args += '--define=HAS_SPICE'
+  # FIXME Remove and bump version after libhandy 1.6 is released.
+  vala_args += '--disable-since-check'
 
   dependencies += [
     spice,