diff --git a/bin/hgmenu b/bin/hgmenu
index 875a799..72a5567 100755
--- a/bin/hgmenu
+++ b/bin/hgmenu
@@ -24,27 +24,31 @@ do  case "$opt" in
     ;;
     esac
 done
+PRC="cat"
+hash highbeam 2> /dev/null && PRC="highbeam"
+export HB_RULES='"^\[.\]" "$G" \
+'
 
 echo 'Mercurial:
 
-a: Add files to track*
-c: Commit changes to local repository
-d: Difference of current and previous versions
-l: Log
-m: Merge conflicting change sets
-p: Pull changes from remote repository
-P: Push changes to remote repository
-r: Remove files*
-u: Update from local repository
-s: Status
-t: Start thg, graphical repository viewer
-v: View, internal graphical viewer
+[a]  Add files to track*
+[c]  Commit changes to local repository
+[d]  Difference of current and previous versions
+[l]  Log
+[m]  Merge conflicting change sets
+[p]  Pull changes from remote repository
+[P]  Push changes to remote repository
+[r]  Remove files*
+[u]  Update from local repository
+[s]  Status
+[t]  Start thg, graphical repository viewer
+[v]  View, internal graphical viewer
 
-X: Add the required extensions to your ~/.hgrc
-q: Quit
+[X]  Add the required extensions to your ~/.hgrc
+[q]  Quit
 
 * Requires arguments
-'
+' | $PRC
 
 echo Current arguments: "$@"
 read -p "Command: "  -N 1 CMD
@@ -63,7 +67,7 @@ case "$CMD" in
           echo Commiting files:
           find "$@" \( -type d -name .hg -prune \) -o -type f -print
        }
-       read -p "Commit message: " MSG
+       read -e -p "Commit message: " MSG
        hg commit -m "$MSG" "$@"
     ;;
     d)