diff --git a/bin/omarchy-theme-set-obsidian b/bin/omarchy-theme-set-obsidian
index 4ff70d4c..83980f6b 100755
--- a/bin/omarchy-theme-set-obsidian
+++ b/bin/omarchy-theme-set-obsidian
@@ -391,7 +391,7 @@ extract_theme_data() {
   readarray -t color_slots < <(fill_color_slots "${unique_colors[@]}" | tr ' ' '\n')
 
   # Extract fonts
-  local monospace_font="CaskaydiaMono Nerd Font"
+  local monospace_font="JetBrainsMono Nerd Font"
   local ui_font="Liberation Sans"
 
   if [ -f "$CURRENT_THEME_DIR/alacritty.toml" ]; then
diff --git a/config/alacritty/alacritty.toml b/config/alacritty/alacritty.toml
index ee1fb6fc..be44031c 100644
--- a/config/alacritty/alacritty.toml
+++ b/config/alacritty/alacritty.toml
@@ -4,9 +4,9 @@ general.import = [ "~/.config/omarchy/current/theme/alacritty.toml" ]
 TERM = "xterm-256color"
 
 [font]
-normal = { family = "CaskaydiaMono Nerd Font", style = "Regular" }
-bold = { family = "CaskaydiaMono Nerd Font", style = "Bold" }
-italic = { family = "CaskaydiaMono Nerd Font", style = "Italic" }
+normal = { family = "JetBrainsMono Nerd Font", style = "Regular" }
+bold = { family = "JetBrainsMono Nerd Font", style = "Bold" }
+italic = { family = "JetBrainsMono Nerd Font", style = "Italic" }
 size = 9
 
 [window]
diff --git a/config/fontconfig/fonts.conf b/config/fontconfig/fonts.conf
index 85c37b99..5463ba30 100644
--- a/config/fontconfig/fonts.conf
+++ b/config/fontconfig/fonts.conf
@@ -24,7 +24,7 @@
       <string>monospace</string>
     </test>
     <edit name="family" mode="assign" binding="strong">
-      <string>CaskaydiaMono Nerd Font</string>
+      <string>JetBrainsMono Nerd Font</string>
     </edit>
   </match>
 
diff --git a/config/ghostty/config b/config/ghostty/config
index 49d2edca..9378376c 100644
--- a/config/ghostty/config
+++ b/config/ghostty/config
@@ -2,7 +2,7 @@
 config-file = ?"~/.config/omarchy/current/theme/ghostty.conf"
 
 # Font
-font-family = "CaskaydiaMono Nerd Font"
+font-family = "JetBrainsMono Nerd Font"
 font-style = Regular
 font-size = 9
 
diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf
index 7b26fd9f..fb982bc1 100644
--- a/config/hypr/hyprlock.conf
+++ b/config/hypr/hyprlock.conf
@@ -22,7 +22,7 @@ input-field {
     outer_color = $outer_color
     outline_thickness = 4
 
-    font_family = CaskaydiaMono Nerd Font
+    font_family = JetBrainsMono Nerd Font
     font_color = $font_color
 
     placeholder_text = Enter Password
diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf
index 88413ad7..04b7440f 100644
--- a/config/kitty/kitty.conf
+++ b/config/kitty/kitty.conf
@@ -1,7 +1,7 @@
 include ~/.config/omarchy/current/theme/kitty.conf
 
 # Font
-font_family CaskaydiaMono Nerd Font
+font_family JetBrainsMono Nerd Font
 bold_italic_font auto
 font_size        9.0
 
diff --git a/config/swayosd/style.css b/config/swayosd/style.css
index 3c372e6b..b95ab9f3 100644
--- a/config/swayosd/style.css
+++ b/config/swayosd/style.css
@@ -9,7 +9,7 @@ window {
 }
 
 label {
-  font-family: 'CaskaydiaMono Nerd Font';
+  font-family: 'JetBrainsMono Nerd Font';
   font-size: 11pt;
 
   color: @label;
diff --git a/config/waybar/style.css b/config/waybar/style.css
index f2b1e9fe..315f887a 100644
--- a/config/waybar/style.css
+++ b/config/waybar/style.css
@@ -7,7 +7,7 @@
   border: none;
   border-radius: 0;
   min-height: 0;
-  font-family: 'CaskaydiaMono Nerd Font';
+  font-family: 'JetBrainsMono Nerd Font';
   font-size: 12px;
 }