diff --git a/modules/home/programs/gui/foot/default.nix b/modules/home/programs/gui/foot/default.nix
index c91dc8e9..27f704d5 100644
--- a/modules/home/programs/gui/foot/default.nix
+++ b/modules/home/programs/gui/foot/default.nix
@@ -6,7 +6,7 @@
     settings = {
       main = {
         term = "xterm-256color";
-        font = "${config.look.fonts.nerd}:size=14.7";
+        font = "${config.look.fonts.mono}:size=14.7";
       };
       colors = {
         alpha = "0.85";
diff --git a/modules/home/programs/gui/librewolf/default.nix b/modules/home/programs/gui/librewolf/default.nix
index 136c711f..8f5291be 100644
--- a/modules/home/programs/gui/librewolf/default.nix
+++ b/modules/home/programs/gui/librewolf/default.nix
@@ -123,7 +123,7 @@
           # Fonts
           "font.name.serif.x-western" = config.look.fonts.main;
           "font.name.sans-serif.x-western" = config.look.fonts.main;
-          "font.name.monospace.x-western" = config.look.fonts.nerd;
+          "font.name.monospace.x-western" = config.look.fonts.mono;
 
           # Theming and visibility
           "browser.aboutConfig.showWarning" = false;
diff --git a/modules/home/settings/dconf/default.nix b/modules/home/settings/dconf/default.nix
index 9e04e03f..38cda938 100644
--- a/modules/home/settings/dconf/default.nix
+++ b/modules/home/settings/dconf/default.nix
@@ -2,9 +2,7 @@
 {
   config = lib.mkIf config.home.desktop.enable {
     dconf.settings = {
-      "org/gnome/desktop/interface/color-scheme" = {
-        color-scheme = "prefer-dark";
-      };
+      "org/gnome/desktop/interface/color-scheme".color-scheme = "prefer-dark";
       "org/virt-manager/virt-manager/connections" = {
         autoconnect = [ "qemu:///system" ];
         uris = [ "qemu:///system" ];
diff --git a/modules/home/settings/fonts/default.nix b/modules/home/settings/fonts/default.nix
index 8f52ecaa..644410bf 100644
--- a/modules/home/settings/fonts/default.nix
+++ b/modules/home/settings/fonts/default.nix
@@ -1,21 +1,7 @@
-{ config, lib, pkgsStable, ... }:
+{ ... }:
 {
-  config = lib.mkIf config.home.desktop.enable {
-    home.packages = with pkgsStable; [
-      liberation_ttf
-      twitter-color-emoji
-      noto-fonts
-      sarasa-gothic
-      ubuntu_font_family
-      (nerdfonts.override { fonts = [ "UbuntuMono" ]; })
-    ];
-    fonts.fontconfig = {
-      enable = true;
-      defaultFonts = {
-        sansSerif = [ "Ubuntu" ];
-        monospace = [ "UbuntuMono Nerd Font Mono" ];
-        emoji = [ "Twitter Color Emoji" ];
-      };
-    };
-  };
+  imports = [
+    ./fontconfig
+    ./packages
+  ];
 }
diff --git a/modules/home/settings/fonts/fontconfig/default.nix b/modules/home/settings/fonts/fontconfig/default.nix
new file mode 100644
index 00000000..0ad9bae1
--- /dev/null
+++ b/modules/home/settings/fonts/fontconfig/default.nix
@@ -0,0 +1,11 @@
+{ config, ... }:
+{
+  fonts.fontconfig = {
+    enable = config.home.desktop.enable;
+    defaultFonts = {
+      sansSerif = [ config.look.fonts.main ];
+      monospace = [ config.look.fonts.mono ];
+      emoji = [ "Twitter Color Emoji" ];
+    };
+  };
+}
diff --git a/modules/home/settings/fonts/packages/default.nix b/modules/home/settings/fonts/packages/default.nix
new file mode 100644
index 00000000..d7cae882
--- /dev/null
+++ b/modules/home/settings/fonts/packages/default.nix
@@ -0,0 +1,11 @@
+{ config, lib, pkgsStable, ... }:
+{
+  home.packages = lib.mkIf config.home.desktop.enable (with pkgsStable; [
+    liberation_ttf
+    twitter-color-emoji
+    noto-fonts
+    sarasa-gothic
+    ubuntu_font_family
+    (nerdfonts.override { fonts = [ "UbuntuMono" ]; })
+  ]);
+}
diff --git a/modules/home/settings/gtk/default.nix b/modules/home/settings/gtk/default.nix
index 65c04c12..a31cec5c 100644
--- a/modules/home/settings/gtk/default.nix
+++ b/modules/home/settings/gtk/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 {
   imports = [
     ./bookmarks
diff --git a/modules/home/variables/look/fonts/default.nix b/modules/home/variables/look/fonts/default.nix
index 3f56b733..b8cc234c 100644
--- a/modules/home/variables/look/fonts/default.nix
+++ b/modules/home/variables/look/fonts/default.nix
@@ -6,6 +6,6 @@
 
   config.look.fonts = {
     main = "Ubuntu";
-    nerd = "UbuntuMono Nerd Font";
+    mono = "UbuntuMono Nerd Font";
   };
 }
diff --git a/modules/home/wms/programs/waybar/default.nix b/modules/home/wms/programs/waybar/default.nix
index 46243893..ba2d3f12 100644
--- a/modules/home/wms/programs/waybar/default.nix
+++ b/modules/home/wms/programs/waybar/default.nix
@@ -300,7 +300,7 @@
         border: 0;
         border-radius: 0;
         min-height: 0;
-        font-family: ${config.look.fonts.main}, ${config.look.fonts.nerd};
+          font-family: ${config.look.fonts.main}, ${config.look.fonts.mono};
         font-size: 15.5px;
         color: #${config.look.colors.text};
       }