diff --git a/alacritty/.config/alacritty/alacritty.toml b/alacritty/.config/alacritty/alacritty.toml
new file mode 100644
index 0000000..6a24d8c
--- /dev/null
+++ b/alacritty/.config/alacritty/alacritty.toml
@@ -0,0 +1,16 @@
+import = ['~/.config/alacritty/themes/solarized_dark.toml']
+
+[window]
+padding.x = 5
+padding.y = 5
+
+[font]
+normal.family = 'Fira Code'
+bold.family = 'Fira Code'
+italic.family = 'Fira Code'
+bold_italic.family = 'Fira Code'
+size = 14.0
+
+[colors]
+cursor.text = '#d33682'
+cursor.cursor = '#d33682'
diff --git a/alacritty/.config/alacritty/themes/solarized_dark.toml b/alacritty/.config/alacritty/themes/solarized_dark.toml
new file mode 100644
index 0000000..dbcce2b
--- /dev/null
+++ b/alacritty/.config/alacritty/themes/solarized_dark.toml
@@ -0,0 +1,28 @@
+# Colors (Solarized Dark)
+
+# Default colors
+[colors.primary]
+background = '#002b36'
+foreground = '#839496'
+
+# Normal colors
+[colors.normal]
+black   = '#073642'
+red     = '#dc322f'
+green   = '#859900'
+yellow  = '#b58900'
+blue    = '#268bd2'
+magenta = '#d33682'
+cyan    = '#2aa198'
+white   = '#eee8d5'
+
+# Bright colors
+[colors.bright]
+black   = '#002b36'
+red     = '#cb4b16'
+green   = '#586e75'
+yellow  = '#657b83'
+blue    = '#839496'
+magenta = '#6c71c4'
+cyan    = '#93a1a1'
+white   = '#fdf6e3'
diff --git a/alacritty/.config/alacritty/themes/solarized_light.toml b/alacritty/.config/alacritty/themes/solarized_light.toml
new file mode 100644
index 0000000..3f7eb25
--- /dev/null
+++ b/alacritty/.config/alacritty/themes/solarized_light.toml
@@ -0,0 +1,28 @@
+# Colors (Solarized Light)
+
+# Default colors
+[colors.primary]
+background = '#fdf6e3'
+foreground = '#586e75'
+
+# Normal colors
+[colors.normal]
+black   = '#073642'
+red     = '#dc322f'
+green   = '#859900'
+yellow  = '#b58900'
+blue    = '#268bd2'
+magenta = '#d33682'
+cyan    = '#2aa198'
+white   = '#eee8d5'
+
+# Bright colors
+[colors.bright]
+black   = '#002b36'
+red     = '#cb4b16'
+green   = '#586e75'
+yellow  = '#657b83'
+blue    = '#839496'
+magenta = '#6c71c4'
+cyan    = '#93a1a1'
+white   = '#fdf6e3'
diff --git a/alacritty/.config/alacritty/themes/solarized_osaka.toml b/alacritty/.config/alacritty/themes/solarized_osaka.toml
new file mode 100644
index 0000000..0f25c29
--- /dev/null
+++ b/alacritty/.config/alacritty/themes/solarized_osaka.toml
@@ -0,0 +1,29 @@
+# Colors (Solarized Osaka)
+# Source https://github.com/craftzdog/solarized-osaka.nvim
+
+# Default colors
+[colors.primary]
+background = '#001a1d'
+foreground = '#839496'
+
+# Normal colors
+[colors.normal]
+black   = '#073642'
+red     = '#dc322f'
+green   = '#859900'
+yellow  = '#b58900'
+blue    = '#268bd2'
+magenta = '#d33682'
+cyan    = '#2aa198'
+white   = '#eee8d5'
+
+# Bright colors
+[colors.bright]
+black   = '#4c4c4c'
+red     = '#cb4b16'
+green   = '#586e75'
+yellow  = '#657b83'
+blue    = '#839496'
+magenta = '#6c71c4'
+cyan    = '#93a1a1'
+white   = '#fdf6e3'
diff --git a/macos/.hammerspoon/init.lua b/macos/.hammerspoon/init.lua
index 7f175fe..1e68a70 100644
--- a/macos/.hammerspoon/init.lua
+++ b/macos/.hammerspoon/init.lua
@@ -6,7 +6,7 @@ local hyper = { 'ctrl', 'alt', 'cmd', 'shift' }
 
 local applicationHotKeys = {
   -- ['0'] = '',
-  ['1'] = 'Terminal',
+  ['1'] = 'Alacritty',
   ['2'] = 'Safari',
   ['3'] = 'Slack',
   ['4'] = 'Discord',