diff --git a/zshrc b/zshrc
index d4a35e1..c58d865 100644
--- a/zshrc
+++ b/zshrc
@@ -35,9 +35,10 @@ prompt fresh
 # Enable vi mode
 bindkey -v
 
-# Enable yank whole line with 'yy' and yank end of line with 'Y'
-bindkey -M vicmd 'yy' vi-yank-whole-line
-bindkey -M vicmd 'Y' vi-yank-eol
+# Enable yank, change, and delete whole line with 'Y', 'C', and 'D'
+bindkey -M vicmd 'Y' vi-yank-whole-line
+bindkey -M vicmd 'C' vi-change-whole-line
+bindkey -M vicmd 'D' kill-whole-line
 
 # Enable undo with 'u' and redo with 'U'
 bindkey -M vicmd 'u' undo