diff --git a/bspwm/.config/wal/templates/kitty.conf b/bspwm/.config/wal/templates/kitty.conf
index 3813c8ca..9555a92c 100644
--- a/bspwm/.config/wal/templates/kitty.conf
+++ b/bspwm/.config/wal/templates/kitty.conf
@@ -1,12 +1,65 @@
+# New Start: A modern Arch workflow built with an emphasis on functionality.
+# Copyright (C) 2018 Donovan Glover
+
+# =============================
+# ========== General ==========
+# =============================
+
+# Set the font family
 font_family Hack
+
+# Font size (respects DPI)
 font_size 11.0
 
-window_border_width 5.0
-draw_minimal_borders no
+# Set the default background opacity to 1
+background_opacity 1.0
 
+# Enable changing the background with "kitty @ set-background-opacity <value>"
+dynamic_background_opacity yes
+
+# Allow remote control so the above command can be executed
+allow_remote_control yes
+
+# Don't limit frames per second to the monitor's refresh rate
+sync_to_monitor no
+
+# ==========================
+# ========== URLs ==========
+# ==========================
+
+# Use ctrl+click to open URLs
+open_url_modifiers ctrl
+
+# Open URLs with firefox
+open_url_with /usr/bin/firefox
+
+# ===============================
+# ========== Clipboard ==========
+# ===============================
+
+# Sometimes we forget whether copy/paste is ctrl+shift or ctrl+alt
+map ctrl+alt+c copy_to_clipboard
+map ctrl+alt+v paste_from_clipboard
+
+# =============================
+# ========== Spacing ==========
+# =============================
+
+# Add some spacing between kitty windows
+window_margin_width 10.0
+
+# Don't add extra spacing if there's only one visible kitty window
+single_window_margin_width 0.0
+
+# Add padding (spacing) inside of each kitty window
 window_padding_width 10.0
 
-background_opacity 1.0
+# Make the tab bar margin the same as the window padding
+tab_bar_margin_width 10.0
+
+# ============================
+# ========== Colors ==========
+# ============================
 
 foreground            {foreground}
 background            {background}
@@ -15,8 +68,8 @@ cursor                {cursor}
 selection_foreground  {background}
 selection_background  {foreground}
 
-active_border_color   {color1}
-inactive_border_color {color2}
+active_border_color   {color3}
+inactive_border_color {color3}
 bell_border_color     {color3}
 
 color0  {color0}
@@ -36,11 +89,7 @@ color13 {color13}
 color14 {color14}
 color15 {color15}
 
-tab_bar_style separator
-tab_bar_margin_width 10.0
-tab_separator " "
-
-active_tab_foreground   {color1}
+active_tab_foreground   {color2}
 active_tab_background   {background}
 active_tab_font_style   normal