diff --git a/modules/desktop/fonts.nix b/modules/desktop/fonts.nix
index aee87fb..7cc0d0d 100644
--- a/modules/desktop/fonts.nix
+++ b/modules/desktop/fonts.nix
@@ -87,6 +87,12 @@ in {
     hm.gtk.font = {
       inherit (cfg.fonts.sans) package name size;
     };
+
+    hm.dconf.settings = {
+      "org/gnome/desktop/interface".font-name = with cfg.fonts.sans; "${family} ${toString size}";
+      "org/gnome/desktop/interface".document-font-name = with cfg.fonts.sansSerif; "${family} ${toString size}";
+      "org/gnome/desktop/interface".monospace-font-name = with cfg.fonts.monospace; "${family} ${toString size}";
+    };
   } // (mkIf cfg.baseFonts {
     fonts.packages = with pkgs; [
       fira-code
diff --git a/modules/desktop/themes/default.nix b/modules/desktop/themes/default.nix
index 391777c..73de823 100644
--- a/modules/desktop/themes/default.nix
+++ b/modules/desktop/themes/default.nix
@@ -41,6 +41,11 @@ in {
     hm.dconf = {
       enable = true;
       settings."org/gnome/desktop/interface".color-scheme = mkIf cfg.dark "prefer-dark";
+      settings."org/gnome/desktop/interface".gtk-theme = cfg.gtkTheme.name;
+      settings."org/gnome/desktop/interface".icon-theme = cfg.iconTheme.name;
+      settings."org/gnome/desktop/interface".cursor-theme = cfg.cursor.name;
+
+      settings."org/gnome/shell/extensions/user-theme".name = cfg.gtkTheme.name;
     };
 
     hm.gtk = {
@@ -49,8 +54,6 @@ in {
       iconTheme = cfg.iconTheme;
       theme = cfg.gtkTheme;
     };
-    hm.dconf.settings."org/gnome/desktop/interface/gtk-theme".name = cfg.gtkTheme.name;
-    hm.dconf.settings."org/gnome/shell/extensions/user-theme".name = cfg.gtkTheme.name;
 
     hm.programs.vscode = {
       extensions = [ cfg.editor.vscode.extension ];