diff --git a/awesome.1.txt b/awesome.1.txt
index 75711ca42..08104b764 100644
--- a/awesome.1.txt
+++ b/awesome.1.txt
@@ -35,7 +35,6 @@ title. The selected tags are indicated with a different color. The tags of
 the focused window are indicated with a filled square in the top left
 corner. The tags which are applied to one or more windows are indicated
 with an empty square in the top left corner.
-
 awesome can draw a small border around windows to indicate the focus state.
 
 OPTIONS
@@ -46,87 +45,87 @@ OPTIONS
     use an alternate configuration file instead of $HOME/.awesomerc.
 
 DEFAULTS MOUSE BINDINGS
-------------------------
-*Button1* on tag name:::
+-----------------------
+*Button1* on tag name::
     View tag.
-*Mod4 + Button1* on tag name:::
+*Mod4 + Button1* on tag name::
     Tag current client with this tag.
-*Button3* on tag name:::
+*Button3* on tag name::
     Add this tag to current view.
-*Mod4 + Button3*:::
+*Mod4 + Button3* on tag name::
     Toggle this tag for client.
-*Button4*, *Button5* on tag name:::
+*Button4*, *Button5* on tag name::
     Switch to previous or next tag.
-*Button1*, *Button3*, *Button4*, *Button5* on layout symbol:::
+*Button1*, *Button3*, *Button4*, *Button5* on layout symbol::
     Switch to previous or next layout.
-*Button4*, *Button5* on root window:::
+*Button4*, *Button5* on root window::
     Switch to previous or next tag.
-*Mod4 + Button1* on client window:::
+*Mod4 + Button1* on client window::
     Move window.
-*Mod4 + Button2* on client window:::
+*Mod4 + Button2* on client window::
     Zoom window.
-*Mod4 + Button3* on client window:::
+*Mod4 + Button3* on client window::
     Resize window.
 
 DEFAULTS KEY BINDINGS
 ---------------------
-*Mod4 + Return*:::
+*Mod4 + Return*::
     Spawn xterm.
-*Mod4 + space*:::
+*Mod4 + space*::
     Switch to next layout.
-*Mod4 \+ Shift \+ space*:::
+*Mod4 \+ Shift \+ space*::
     Switch to previous layout.
-*Mod4 + b*:::
+*Mod4 + b*::
     Toggle statusbar.
-*Mod4 + j*:::
+*Mod4 + j*::
     Focus next client.
-*Mod4 + k*:::
+*Mod4 + k*::
     Focus previous client.
-*Mod4 \+ Shift \+ j*:::
+*Mod4 \+ Shift \+ j*::
     Switch client with next client.
-*Mod4 \+ Shift \+ k*:::
+*Mod4 \+ Shift \+ k*::
     Switch client with previous client.
-*Mod4 \+ Control \+ j*:::
+*Mod4 \+ Control \+ j*::
     Focus next screen.
-*Mod4 \+ Control \+ k*:::
+*Mod4 \+ Control \+ k*::
     Focus previous screen.
-*Mod4 + h*:::
+*Mod4 + h*::
     Decrease master width factor by 5%.
-*Mod4 + l*:::
+*Mod4 + l*::
     Increase master width factor by 5%.
-*Mod4 \+ Shift \+ h*:::
+*Mod4 \+ Shift \+ h*::
     Increase number of master windows by 1.
-*Mod4 \+ Shift \+ l*:::
+*Mod4 \+ Shift \+ l*::
     Decrease number of master windows by 1.
-*Mod4 \+ Control \+ h*:::
+*Mod4 \+ Control \+ h*::
     Increase number of column for non-master windows by 1.
-*Mod4 \+ Control \+ l*:::
+*Mod4 \+ Control \+ l*::
     Decrease number of column for non-master windows by 1.
-*Mod4 + Escape*:::
+*Mod4 + Escape*::
     View previously selected tag.
-*Mod4 + Left*:::
+*Mod4 + Left*::
     View previous tag.
-*Mod4 + Right*:::
+*Mod4 + Right*::
     View next tag.
-*Mod4 + m*:::
+*Mod4 + m*::
     Set client maximized.
-*Mod4 \+ Control \+ Return*:::
+*Mod4 \+ Control \+ Return*::
     Zoom client.
-*Mod4 \+ Control \+ space*:::
+*Mod4 \+ Control \+ space*::
     Set client floating.
-*Mod4 \+ Shift \+ c*:::
+*Mod4 \+ Shift \+ c*::
     Kill client.
-*Mod4 \+ Shift \+ q*:::
+*Mod4 \+ Shift \+ q*::
     Quit awesome.
-*Mod4 \+ Shift \+ r*:::
+*Mod4 \+ Shift \+ r*::
     Reload awesome config.
-*Mod4 + 0-9*:::
+*Mod4 + 0-9*::
     Switch to tag 1-9, 0 for all.
-*Mod4 \+ Control \+ 0-9*:::
+*Mod4 \+ Control \+ 0-9*::
     Toggle tag view.
-*Mod4 \+ Shift \+ 0-9*:::
+*Mod4 \+ Shift \+ 0-9*::
     Tag client with tag.
-*Mod4 \+ Shift \+ Control \+ 0-9*:::
+*Mod4 \+ Shift \+ Control \+ 0-9*::
     Toggle tag on client.
 
 CUSTOMIZATION