diff --git a/lib/awful/hotkeys_popup/keys/vim.lua b/lib/awful/hotkeys_popup/keys/vim.lua
index 2c03360c..fce68b18 100644
--- a/lib/awful/hotkeys_popup/keys/vim.lua
+++ b/lib/awful/hotkeys_popup/keys/vim.lua
@@ -37,32 +37,43 @@ local vim_keys = {
             [';']="repeat t/T/f/F",
             ["'"]=". goto mk. BOL",
             b="prev word",
-            n="next word",
+            n="next search match",
             [',']="reverse t/T/f/F",
             ['/']=". find",
             ['~']="toggle case",
             ["#"]='prev indent',
             ["$"]='EOL',
-            ["%"]='goto match bracket',
+            ["%"]='goto matching bracket',
             ["^"]='"soft" BOL',
-            ["*"]='next indent',
-            ["("]='begin sentence',
-            [")"]='end sentence',
+            ["*"]='search word under cursor',
+            ["("]='sentence begin',
+            [")"]='sentence end',
             ["_"]='"soft" BOL down',
             ["+"]='next line',
             W='next WORD',
             E='end WORD',
-            T=". back 'till",
-            ['{']="begin parag.",
-            ['}']="end parag.",
+            T=". \"back\" 'till",
+            ['{']="paragraph begin",
+            ['}']="paragraph end",
             F='. "back" find char',
             G='EOF/goto line',
-            H='screen top',
-            L='screen bottom',
+            H='move cursor to screen top',
+            M='move cursor to screen middle',
+            L='move cursor to screen bottom',
             B='prev WORD',
-            N='prev (find)',
-            M='screen middle',
-            ['?']='. find(rev.)',
+            N='prev search match',
+            ['?']='. "back" find',
+        }
+    }, {
+        modifiers = {"Ctrl"},
+        keys = {
+            e="scroll line up",
+            y="scroll line down",
+            u="half page up",
+            d="half page down",
+            b="page up",
+            f="page down",
+            o="prev mark",
         }
     }},
 
@@ -86,8 +97,11 @@ local vim_keys = {
             r=". replace char",
             u="undo",
             p="paste after",
-            g="gg: top of file, gf: open file here",
-            z="zt: cursor to top, zb: bottom, zz: center",
+            gg="go to the top of file",
+            gf="open file under cursor",
+            zt="scroll cursor to the top",
+            zz="scroll cursor to the center",
+            zb="scroll cursor to the bottom",
             x="delete char",
             v="visual mode",
             m=". set mark",
@@ -97,16 +111,30 @@ local vim_keys = {
             Q='ex mode',
             Y='yank line',
             U='undo line',
-            P='paste before',
+            P='paste before cursor',
             D='delete to EOL',
             J='join lines',
             K='help',
             [':']='ex cmd line',
             ['"']='. register spec',
             ["|"]='BOL/goto col',
-            Z='quit and ZZ:save or ZQ:not',
+            ZZ='quit and save',
+            ZQ='quit discarding changes',
             X='back-delete',
-            V='visual lines',
+            V='visual lines selection',
+        }
+    }, {
+        modifiers = {"Ctrl"},
+        keys = {
+            w=". window operations",
+            r="redo",
+            ["["]="normal mode",
+            a="increase number",
+            x="decrease number",
+            g="file/cursor info",
+            z="suspend",
+            c="cancel/normal mode",
+            v="visual block selection",
         }
     }},