diff --git a/vimperator/locale/en-US/eval.txt b/vimperator/locale/en-US/eval.txt
index 28c29149..139001ba 100644
--- a/vimperator/locale/en-US/eval.txt
+++ b/vimperator/locale/en-US/eval.txt
@@ -42,8 +42,8 @@ ________________________________________________________________________________
 
 
 |:js| |:javas| |:javascript|
-||:javas[cript] \\{cmd\\}|| +
-||:javascript <<\\{endpattern\\}\n\\{script\\}\n\\{endpattern\\}|| +
+||:javas[cript] {cmd}|| +
+||:javascript <<{endpattern}\n{empty}{script}\n{empty}{endpattern} || +
 ||:javascript[!]||
 ________________________________________________________________________________
 Run any JavaScript command through eval(). Acts as a JavaScript interpreter by
diff --git a/vimperator/locale/en-US/hints.txt b/vimperator/locale/en-US/hints.txt
index 497970f5..4d79b64f 100644
--- a/vimperator/locale/en-US/hints.txt
+++ b/vimperator/locale/en-US/hints.txt
@@ -5,7 +5,7 @@ HEADER
 INTRO TO BE WRITTEN...
 
 |f| +
-||f\\{hint\\}||
+||#f#{hint}||
 ________________________________________________________________________________
 Start QuickHint mode. In QuickHint mode, every hintable item (according to the
 'hinttags' XPath query) is assigned a unique number. You can now either type
@@ -20,7 +20,7 @@ ________________________________________________________________________________
 
 
 |F| +
-||F\\{hint\\}||
+||#F#{hint}||
 ________________________________________________________________________________
 Start QuickHint mode, but open link in a new tab. Like normal QuickHint mode
 (activated with [m]f[m]) but opens the link in a new tab.
@@ -30,7 +30,7 @@ ________________________________________________________________________________
 |extended-hints| +
 
 |;| +
-||;\\{mode\\}\\{hint\\}||
+||#;#{mode}{empty}{hint}||
 ________________________________________________________________________________
 Start an extended hint mode. ExtendedHint mode is useful, since in this mode
 you can yank link locations, open them in a new window or save images. If