diff -Nru lollypop-1.4.32/debian/changelog lollypop-1.4.33/debian/changelog
--- lollypop-1.4.32/debian/changelog	2022-04-14 21:27:28.000000000 +0000
+++ lollypop-1.4.33/debian/changelog	2022-04-15 16:29:38.000000000 +0000
@@ -1,3 +1,9 @@
+lollypop (1.4.33-1) unstable; urgency=medium
+
+  * New upstream version 1.4.33
+
+ -- Andreas Rönnquist <gusnan@debian.org>  Fri, 15 Apr 2022 18:29:38 +0200
+
 lollypop (1.4.32-1) unstable; urgency=medium
 
   * New upstream version 1.4.32
diff -Nru lollypop-1.4.32/lollypop/application.py lollypop-1.4.33/lollypop/application.py
--- lollypop-1.4.32/lollypop/application.py	2022-04-13 17:26:29.973791600 +0000
+++ lollypop-1.4.33/lollypop/application.py	2022-04-15 09:30:35.054158700 +0000
@@ -309,14 +309,6 @@
         """
         return self.__data_dir
 
-    @property
-    def gtk_application_prefer_dark_theme(self):
-        """
-            Return default gtk value
-            @return bool
-        """
-        return self.__gtk_dark
-
 #######################
 # PRIVATE             #
 #######################
diff -Nru lollypop-1.4.32/lollypop/toolbar_end.py lollypop-1.4.33/lollypop/toolbar_end.py
--- lollypop-1.4.32/lollypop/toolbar_end.py	2022-04-13 17:26:30.007125400 +0000
+++ lollypop-1.4.33/lollypop/toolbar_end.py	2022-04-15 09:30:35.077492500 +0000
@@ -10,7 +10,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-from gi.repository import Gtk, Gio, GLib
+from gi.repository import Gtk, Gio, GLib, Handy
 
 from gettext import gettext as _
 
@@ -293,10 +293,21 @@
             @param action as Gio.SimpleAction
             @param value as bool
         """
-        if not App().gtk_application_prefer_dark_theme and\
-                not App().settings.get_value("dark-ui"):
+        manager = Handy.StyleManager.get_default()
+        if manager.get_system_supports_color_schemes():
+            if value:
+                manager.set_color_scheme(Handy.ColorScheme.PREFER_DARK)
+            else:
+                manager.set_color_scheme(Handy.ColorScheme.PREFER_LIGHT)
+        else:
             settings = Gtk.Settings.get_default()
-            settings.set_property("gtk-application-prefer-dark-theme", value)
+            dark = App().settings.get_value("dark-ui")
+            if value:
+                settings.set_property(
+                    "gtk-application-prefer-dark-theme", True)
+            else:
+                settings.set_property(
+                    "gtk-application-prefer-dark-theme", dark)
         App().player.set_party(value.get_boolean())
         action.set_state(value)
         self.__shuffle_action.set_enabled(not value)
diff -Nru lollypop-1.4.32/meson.build lollypop-1.4.33/meson.build
--- lollypop-1.4.32/meson.build	2022-04-13 17:26:30.030459200 +0000
+++ lollypop-1.4.33/meson.build	2022-04-15 09:30:35.094159400 +0000
@@ -1,5 +1,5 @@
 project('lollypop',
-  version: '1.4.32',
+  version: '1.4.33',
   meson_version: '>= 0.46.0'
 )
 revision = run_command('bin/revision.sh').stdout().strip()