diff --git a/client/config.toml b/client/config.toml
index 470cddf..2923e8c 100644
--- a/client/config.toml
+++ b/client/config.toml
@@ -1,28 +1,36 @@
 # config.toml
 [keybindings]
+# GENERAL
 save = [":w", "ctrl+s"]
 quit = [":q", "ctrl+q"]
 force_quit = [":q!", "ctrl+shift+q"]
 save_and_quit = [":wq", "ctrl+shift+s"]
+
+enter_command_mode = [":", "shift+;"]
+
+# MODE SPECIFIC
+# READ ONLY MODE
 enter_edit_mode_before = ["i"]
 enter_edit_mode_after = ["a"]
-exit_edit_mode = ["esc", "ctrl+e"]
-previous_entry = ["q"]  # Changed from previous_position
-next_entry = ["right","1"]     # Changed from next_position
+previous_entry = ["q"]
+next_entry = ["right","1"]
 
 move_left = ["h"]
 move_right = ["l"]
 move_up = ["k", "Up"]
 move_down = ["j", "Down"]
-move_word_next = ["w"]      # Move to beginning of next word
-move_word_end = ["e"]       # Move to end of current/next word
-move_word_prev = ["b"]      # Move to beginning of previous word
-move_word_end_prev = ["ge"] # Move to end of previous word
-move_line_start = ["0"]     # Move to beginning of line
-move_line_end = ["$"]       # Move to end of line
-move_first_line = ["gg"]     # Move to first line of form
+move_word_next = ["w"]
+move_word_end = ["e"]
+move_word_prev = ["b"]
+move_word_end_prev = ["ge"]
+move_line_start = ["0"]
+move_line_end = ["$"]
+move_first_line = ["gg"]
 move_last_line = ["ctrl+g"]
 
+# EDIT MODE
+exit_edit_mode = ["esc", "ctrl+e"]
+
 [colors]
 theme = "dark" 
 # Options: "light", "dark", "high_contrast"