diff --git a/nate/dotfiles/helix/config.toml b/nate/dotfiles/helix/config.toml
index 350927b..fb925a7 100644
--- a/nate/dotfiles/helix/config.toml
+++ b/nate/dotfiles/helix/config.toml
@@ -1,5 +1,5 @@
 # Theme
-theme = "catppuccin_frappe"
+theme = "catppuccin_macchiato"
 
 [keys.normal]
 
@@ -9,11 +9,12 @@ i = "move_visual_line_down"
 e = "move_visual_line_up"
 o = "move_char_right"
 
-C-i = "half_page_down"
-C-e = "half_page_up"
+I = "page_down"
+E = "page_up"
 
 # Modes
 h = "insert_mode"
+H = "insert_at_line_start"
 l = "open_below"
 L = "open_above"
 
@@ -21,22 +22,101 @@ L = "open_above"
 k = "search_next"
 K = "search_prev"
 
+# Selection
+C-s = "split_selection_on_newline"
+C-minus = "merge_selections"
+C-_ = "merge_consecutive_selections"
+"C-;" = "flip_selections"
+"C-:" = "ensure_selections_forward"
+"C-," = "remove_primary_selection"
+C-c = "change_selection_noyank"
+C-d = "delete_selection_noyank"
+"C-(" = "rotate_selection_contents_backward"
+"C-)" = "rotate_selection_contents_forward"
+C-x = "shrink_to_line_bounds"
+C-J = "join_selections_space"
+C-K = "remove_selections"
+C-o = "expand_selection"
+C-i = "shrink_selection"
+C-p = "select_prev_sibling"
+C-n = "select_next_sibling"
 
-C-s = ":w" # Maps Ctrl-s to the typable command :w which is an alias for :write (save file)
-C-o = ":open ~/.config/helix/config.toml" # Maps Ctrl-o to opening of the helix config file
-C-l = ":open ~/.config/helix/languages.toml"
+# Misc
+"C-/" = "toggle_comments"
+
+[keys.normal."C-space"]
+x = ":wbc!"
+s = ":w!" # save file
+o = ":config-open"
 
 [keys.normal.g]
-P = "goto_previous_buffer"
-N = "goto_next_buffer"
-n = "goto_line_start"
-o = "goto_line_end"
+"/" = "goto_next_buffer"
+h = "goto_previous_buffer"
+n = ["collapse_selection", "extend_to_line_start"]
+o = ["collapse_selection", "extend_to_line_end"]
+e = "move_line_up"
+i = "move_line_down"
+l = "goto_last_line"
+
+p = "no_op"
+k = "no_op"
+j = "no_op"
+
+[keys.normal.m]
+m = ["select_mode", "match_brackets", "normal_mode"]
 
 [keys.select]
-n = "move_char_left"
-i = "move_visual_line_down"
-e = "move_visual_line_up"
-o = "move_char_right"
+n = "extend_char_left"
+i = "extend_line_down"
+e = "extend_line_up"
+o = "extend_char_right"
+
+[keys.select.g]
+"/" = "goto_next_buffer"
+h = "goto_previous_buffer"
+n = "goto_line_start"
+o = "goto_line_end"
+e = "move_line_up"
+i = "move_line_down"
+l = "goto_last_line"
+
+p = "no_op"
+k = "no_op"
+j = "no_op"
+
+# Window mode
+[keys.normal."C-w"]
+h = "hsplit"
+C-h = "hsplit"
+n = "jump_view_left"
+C-n = "jump_view_left"
+i = "jump_view_down"
+I = "swap_view_down"
+C-i = "jump_view_down"
+e = "jump_view_up"
+E = "swap_view_up"
+C-e = "jump_view_up"
+o = "jump_view_right"
+O = "swap_view_right"
+C-o = "jump_view_right"
+
+# Remove old
+s = "no_op"
+C-s = "no_op"
+H = "no_op"
+j = "no_op"
+J = "no_op"
+C-j = "no_op"
+k = "no_op"
+K = "no_op"
+C-k = "no_op"
+l = "no_op"
+L = "no_op"
+C-l = "no_op"
+
+[keys.normal."space"]
+h = "hover"
+k = "select_references_to_symbol_under_cursor"
 
 [editor]
 bufferline = "multiple"