diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
new file mode 100644
index 00000000..14bb56bc
--- /dev/null
+++ b/.config/alacritty/alacritty.yml
@@ -0,0 +1,7 @@
+font:
+  normal:
+    family: FiraCode Nerd Font
+  bold:
+    family: FiraCode Nerd Font
+    style: Bold
+  size: 13.0
diff --git a/.config/kitty/config/font.conf b/.config/kitty/config/font.conf
new file mode 100644
index 00000000..1802df3c
--- /dev/null
+++ b/.config/kitty/config/font.conf
@@ -0,0 +1,10 @@
+# Font Settings
+font_family      Fira Code Regular
+bold_font        auto
+italic_font      auto
+bold_italic_font auto
+font_size 14.0
+font_features FiraCodeRoman-Regular +cv01 +cv02 +ss01 +zero +ss05 +ss04 +cv30 +ss03 +cv29
+font_features FiraCodeRoman-Medium +cv01 +cv02 +ss01 +zero +ss05 +ss04 +cv30 +ss03 +cv29
+font_features FiraCodeRoman-SemiBold +cv01 +cv02 +ss01 +zero +ss05 +ss04 +cv30 +ss03 +cv29
+font_features FiraCode-Light +cv01 +cv02 +ss01 +zero +ss05 +ss04 +cv30 +ss03 +cv29
diff --git a/.config/kitty/config/mappings.conf b/.config/kitty/config/mappings.conf
new file mode 100644
index 00000000..c7d10dd2
--- /dev/null
+++ b/.config/kitty/config/mappings.conf
@@ -0,0 +1,34 @@
+# Clear default keybinds
+clear_all_shortcuts yes
+
+# Set Mod Key
+kitty_mod ctrl+shift
+
+## NOTE: Window Management
+### Window Movement
+map kitty_mod+left neighboring_window left
+map kitty_mod+right neighboring_window right
+map kitty_mod+up neighboring_window up
+map kitty_mod+down neighboring_window down
+
+### Window Creation
+map kitty_mod+enter launch
+
+### Layout Management
+map kitty_mod+space next_layout
+
+### Misc
+map kitty_mod+w close_window
+
+## NOTE: Tab Management
+map kitty_mod+x next_tab
+map kitty_mod+z previous_tab
+map kitty_mod+t new_tab_with_cwd
+map kitty_mod+q close_tab
+
+## NOTE: Mouse Mappings
+mouse_map left click ungrabbed no-op
+
+
+## Miscellaneous
+map kitty_mod+, load_config_file
diff --git a/.config/kitty/config/options.conf b/.config/kitty/config/options.conf
new file mode 100644
index 00000000..f6473b22
--- /dev/null
+++ b/.config/kitty/config/options.conf
@@ -0,0 +1,7 @@
+# Boolean options
+allow_remote_control yes
+shell_integration enabled
+
+# NOTE: Window Layout Options
+enabled_layouts tall,fat,grid,horizontal,vertical
+
diff --git a/.config/kitty/config/os/mac.conf b/.config/kitty/config/os/mac.conf
new file mode 100644
index 00000000..37498705
--- /dev/null
+++ b/.config/kitty/config/os/mac.conf
@@ -0,0 +1,5 @@
+# Mac Specific Settings
+macos_titlebar_color background
+macos_option_as_alt yes
+macos_quit_when_last_window_closed yes
+macos_thicken_font .3
diff --git a/.config/kitty/config/theme.conf b/.config/kitty/config/theme.conf
new file mode 100644
index 00000000..6301c92a
--- /dev/null
+++ b/.config/kitty/config/theme.conf
@@ -0,0 +1,7 @@
+tab_bar_style powerline
+tab_powerline_style round
+
+# NOTE: Opacity Options
+background_opacity 0.95
+
+include ../themes/tokyo-night.conf
diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
index 4cdee1a3..f0136670 100644
--- a/.config/kitty/kitty.conf
+++ b/.config/kitty/kitty.conf
@@ -1,58 +1,11 @@
-#Font Settings
-font_family      Fira Code Regular
-bold_font        auto
-italic_font      auto
-bold_italic_font auto
-font_size 14.0
-font_features FiraCodeRoman-Regular +cv01 +cv02 +ss01 +zero +ss05 +ss04 +cv30 +ss03 +cv29
-font_features FiraCodeRoman-Medium +cv01 +cv02 +ss01 +zero +ss05 +ss04 +cv30 +ss03 +cv29
-font_features FiraCodeRoman-SemiBold +cv01 +cv02 +ss01 +zero +ss05 +ss04 +cv30 +ss03 +cv29
-font_features FiraCode-Light +cv01 +cv02 +ss01 +zero +ss05 +ss04 +cv30 +ss03 +cv29
-
-# Scrollback Settings
-scrollback_lines 4000
-# scrollback_pager less --chop-long-lines --RAW-CONTROL-CHARS +INPUT_LINE_NUMBER
+# NOTE: Miscellaneous Options Above Includes
+## Scrollback Settings
+scrollback_lines 8000
 scrollback_pager nvim -c "set signcolumn=no showtabline=0" -c "silent write! /tmp/kitty_scrollback_buffer | te cat /tmp/kitty_scrollback_buffer - "
 
-# Mouse Settings
-mouse_map left click ungrabbed no-op
-
-# Layouts
-enabled_layouts Grid,Fat,Horizontal,Tall,Vertical
-
-# Mac Specific Settings
-macos_titlebar_color background
-macos_option_as_alt yes
-macos_quit_when_last_window_closed yes
-macos_thicken_font .35
-
-# Maps
-kitty_mod ctrl+shift
-
-map ctrl+alt+] next_layout
-map ctrl+alt+[ last_used_layout
-map ctrl+alt+1 goto_layout Grid
-map ctrl+alt+2 goto_layout Fat
-map ctrl+alt+3 goto_layout Horizontal
-map ctrl+alt+4 goto_layout Tall
-map ctrl+alt+5 goto_layout Veritcal
-map alt+left neighboring_window left
-map alt+right neighboring_window right
-map alt+up neighboring_window up
-map alt+down neighboring_window down
-map alt+w close_window
-map alt+enter launch --cwd=current
-map cmd+x next_tab
-map cmd+z previous_tab
-map cmd+t new_tab_with_cwd
-map cmd+w close_tab
-map cmd+alt+t set_tab_title
-map  ctrl+enter      send_text normal,application \x1b[13;5u
-map  shift+enter     send_text normal,application \x1b[13;2u
-map  ctrl+tab        send_text normal,application \x1b[9;5u
-map  ctrl+shift+tab  send_text normal,application \x1b[9;6u
-
-# Themeing
-tab_bar_style powerline
-tab_powerline_style round
-include ./themes/tokyo-night.conf
+# NOTE: Imports
+include ./config/font.conf
+include ./config/mappings.conf
+include ./config/theme.conf
+include ./config/options.conf
+include ./config/os/mac.conf