diff --git a/configs/alacritty.toml b/configs/alacritty.toml
index ca2cd7f..c906adf 100644
--- a/configs/alacritty.toml
+++ b/configs/alacritty.toml
@@ -1,8 +1,4 @@
-import = [
-  "~/.local/share/omakub/defaults/alacritty.toml",
-  "~/.local/share/omakub/themes/alacritty/tokyo-night.toml"
-]
+import = [ "~/.config/alacritty/theme.toml", "~/.config/alacritty/font.toml", "~/.local/share/omakub/defaults/alacritty.toml" ]
 
 [font]
-normal = { family = "CaskaydiaMono Nerd Font", style = "Regular" }
 size = 7
diff --git a/configs/alacritty/font.toml b/configs/alacritty/font.toml
new file mode 100644
index 0000000..cbc8bd3
--- /dev/null
+++ b/configs/alacritty/font.toml
@@ -0,0 +1,2 @@
+# Leave this file as-is to allow omakub to swap fonts system wide
+import = [ "~/.local/share/omakub/fonts/alacritty/cascadia-mono.toml" ]
diff --git a/configs/alacritty/theme.toml b/configs/alacritty/theme.toml
new file mode 100644
index 0000000..bd8fa4b
--- /dev/null
+++ b/configs/alacritty/theme.toml
@@ -0,0 +1,2 @@
+# Leave this file as-is to allow omakub to swap themes system wide
+import = [ "~/.local/share/omakub/themes/alacritty/tokyo-night.toml" ]
diff --git a/fonts/alacritty/cascadia-mono.toml b/fonts/alacritty/cascadia-mono.toml
new file mode 100644
index 0000000..65a43b1
--- /dev/null
+++ b/fonts/alacritty/cascadia-mono.toml
@@ -0,0 +1,4 @@
+[font]
+normal = { family = "CaskaydiaMono Nerd Font", style = "Regular" }
+bold = { family = "CaskaydiaMono Nerd Font", style = "Bold" }
+italic = { family = "CaskaydiaMono Nerd Font", style = "Italic" }
diff --git a/fonts/alacritty/fira-mono.toml b/fonts/alacritty/fira-mono.toml
new file mode 100644
index 0000000..c1b1def
--- /dev/null
+++ b/fonts/alacritty/fira-mono.toml
@@ -0,0 +1,4 @@
+[font]
+normal = { family = "FiraMono Nerd Font", style = "Regular" }
+bold = { family = "FiraMono Nerd Font", style = "Bold" }
+italic = { family = "FiraMono Nerd Font", style = "Italic" }
diff --git a/install/alacritty.sh b/install/alacritty.sh
index cf3e88a..15aa4d0 100644
--- a/install/alacritty.sh
+++ b/install/alacritty.sh
@@ -2,4 +2,6 @@ if ! command -v alacritty &>/dev/null; then
 	sudo apt install -y alacritty
 	mkdir -p ~/.config/alacritty
 	cp ~/.local/share/omakub/configs/alacritty.toml ~/.config/alacritty/alacritty.toml
+	cp ~/.local/share/omakub/configs/alacritty/theme.toml ~/.config/alacritty/theme.toml
+	cp ~/.local/share/omakub/configs/alacritty/font.toml ~/.config/alacritty/font.toml
 fi