diff --git a/programs/desktop/default.nix b/programs/desktop/default.nix
index 7128c6a..bb664df 100644
--- a/programs/desktop/default.nix
+++ b/programs/desktop/default.nix
@@ -54,26 +54,29 @@
     };
   };
   programs.mpv.enable = true;
-  gtk = let
-    # Make this smarter at some point
-    type =
-      if config.scheme.variant == "light"
-      then "Light"
-      else "Dark";
-  in {
+  gtk = {
     enable = true;
     iconTheme = {
       package = pkgs.papirus-icon-theme.override {color = "violet";};
-      name = "Papirus-${type}";
+      name =
+        if config.scheme.variant == "light"
+        then "Papirus-Light"
+        else "Papirus-Dark";
     };
     cursorTheme = {
       package = pkgs.volantes-cursors;
-      name = "volantes_cursors";
+      name =
+        if config.scheme.variant == "light"
+        then "volantes_cursors"
+        else "volantes_light_cursors";
       size = 32;
     };
     theme = {
       package = pkgs.arc-theme;
-      name = "Arc-Lighter";
+      name =
+        if config.scheme.variant == "light"
+        then "Arc-Lighter"
+        else "Arc-Dark";
     };
   };
   xdg = {