diff --git a/modules/home/programs/hyprland/default.nix b/modules/home/programs/hyprland/default.nix
index dbb9fc3..3b8e5fb 100644
--- a/modules/home/programs/hyprland/default.nix
+++ b/modules/home/programs/hyprland/default.nix
@@ -195,7 +195,7 @@ in
               text = "cmd[update:1000] echo -e \"$(LC_TIME=en_US.UTF-8 date +\"%A, %B %d\")\"";
               color = config.lib.stylix.colors.base06;
               font_size = "25";
-              font_family = lib.mkDefault "JetBrainsMono NFM";
+              font_family = lib.mkDefault config.stylix.fonts.monospace.name;
               position = "0, 350";
               halign = "center";
               valign = "center";
@@ -206,7 +206,7 @@ in
               text = "cmd[update:1000] echo \"<span>$(date +\"%I:%M\")</span>\"";
               color = config.lib.stylix.colors.base06;
               font_size = "120";
-              font_family = lib.mkDefault "JetBrainsMono NFM Bold";
+              font_family = lib.mkDefault "${config.stylix.fonts.monospace.name} Bold";
               position = "0, 230";
               halign = "center";
               valign = "center";
@@ -220,7 +220,7 @@ in
               dots_spacing = 0.2;
               dots_center = true;
               font_size = 18;
-              font_family = lib.mkDefault "JetBrainsMono NFM Bold";
+              font_family = lib.mkDefault "${config.stylix.fonts.monospace.name} Bold";
               position = "0, 0";
               halign = "center";
               valign = "center";
@@ -231,7 +231,7 @@ in
               text = "cmd[update:30000] waybar-weather --hyprlock";
               color = config.lib.stylix.colors.base06;
               font_size = "25";
-              font_family = lib.mkDefault "JetBrainsMono NFM";
+              font_family = lib.mkDefault config.stylix.fonts.monospace.name;
               position = "-100, 100";
               halign = "right";
               valign = "bottom";
@@ -242,7 +242,7 @@ in
               text = "cmd[update:1000] waybar-media";
               color = config.lib.stylix.colors.base06;
               font_size = "15";
-              font_family = lib.mkDefault "JetBrainsMono NFM";
+              font_family = lib.mkDefault config.stylix.fonts.monospace.name;
               position = "100, 100";
               halign = "left";
               valign = "bottom";
@@ -265,7 +265,7 @@ in
             {
               size = "200, 50";
               position = "0, -80";
-              font_family = lib.mkDefault "JetBrainsMono NFM";
+              font_family = lib.mkDefault config.stylix.fonts.monospace.name;
               monitor = cfg.primaryDisplay;
               dots_center = true;
               fade_on_empty = true;
diff --git a/modules/home/programs/hyprland/theme.nix b/modules/home/programs/hyprland/theme.nix
index e4e4a35..9856790 100644
--- a/modules/home/programs/hyprland/theme.nix
+++ b/modules/home/programs/hyprland/theme.nix
@@ -38,8 +38,8 @@ let
   };
 
   # Fonts
-  fontName = "JetBrainsMono NFM";
-  fontPackage = pkgs.nerd-fonts.jetbrains-mono;
+  fontName = config.stylix.fonts.monospace.name;
+  fontPackage = config.stylix.fonts.monospace.package;
   fontSize = 12;
 in
 {
diff --git a/modules/nixos/services/common/default.nix b/modules/nixos/services/common/default.nix
index da477c7..42a1527 100644
--- a/modules/nixos/services/common/default.nix
+++ b/modules/nixos/services/common/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, config, ... }:
 {
   services = {
 
@@ -7,8 +7,8 @@
       hwRender = true;
       fonts = [
         {
-          name = lib.mkDefault "JetBrainsMono NFM";
-          package = lib.mkDefault pkgs.nerd-fonts.jetbrains-mono;
+          name = lib.mkDefault config.stylix.fonts.monospace;
+          package = lib.mkDefault config.stylix.fonts.monospace.package;
         }
       ];
     };
diff --git a/systems/aarch64-linux/pi4/default.nix b/systems/aarch64-linux/pi4/default.nix
index 792e922..9dff7cc 100755
--- a/systems/aarch64-linux/pi4/default.nix
+++ b/systems/aarch64-linux/pi4/default.nix
@@ -4,7 +4,7 @@
 
 {
   lib,
-  pkgs,
+  config,
   namespace,
   ...
 }:
@@ -78,8 +78,8 @@
     hwRender = true;
     fonts = [
       {
-        name = lib.mkDefault "JetBrainsMono NFM";
-        package = lib.mkDefault pkgs.nerd-fonts.jetbrains-mono;
+        name = lib.mkDefault config.stylix.fonts.monospace.name;
+        package = lib.mkDefault config.stylix.fonts.monospace.package;
       }
     ];
   };