diff --git a/vimperator/locale/en-US/asciidoc.conf b/vimperator/locale/en-US/asciidoc.conf
index 73baa4bc..18be3287 100644
--- a/vimperator/locale/en-US/asciidoc.conf
+++ b/vimperator/locale/en-US/asciidoc.conf
@@ -57,15 +57,13 @@ HEADER=<div style="float: right; padding-top: 10px;"><form action="https://www.p
 [quotes]
 |=tag
 ||=key
-[o]=option
+[o]=#option
 '=option2
-[c]=command
-[m]=mapping
-[a]=argument
+[c]=#command
+[m]=#mapping
+[a]=#argument
 # FIXME: this prevents all asciidoc attribute processing
 {|}=argument2
-# FIXME
-((|))=#argument2
 [[|]]=argument3
 # disable monospaced text as all our text is monospaced and it causes problems for some things
 +=
diff --git a/vimperator/locale/en-US/options.txt b/vimperator/locale/en-US/options.txt
index e6f64408..22a04e33 100644
--- a/vimperator/locale/en-US/options.txt
+++ b/vimperator/locale/en-US/options.txt
@@ -38,18 +38,18 @@ Number option: show value. +
 String option: show value.
 ____
 
-||:se[t] no((option)) [...]|| +
+||:se[t] no[a]{option}[a] [...]|| +
 ____
 Toggle option: Reset, switch it off.
 ____
 
 ||:se[t] {option}! [...]|| +
-||:se[t] inv((option)) [...]|| +
+||:se[t] inv[a]{option}[a] [...]|| +
 ____
 Toggle option: Invert value.
 ____
 
-||:se[t] inv((option))={value} [...]|| +
+||:se[t] inv[a]{option}[a]={value} [...]|| +
 ||:se[t] {option}!={value} [...]|| +
 ____
 For list options, toggle the specified values.
@@ -122,8 +122,8 @@ ____
 ||:setl[ocal] all|| +
 ||:setl[ocal] {option}?|| +
 ||:setl[ocal] {option}|| +
-||:setl[ocal] no{option}|| +
-||:setl[ocal] inv{option}|| +
+||:setl[ocal] no[a]{option}[a]|| +
+||:setl[ocal] inv[a]{option}[a]|| +
 ||:setl[ocal] {option}&|| +
 ||:setl[ocal] all&|| +
 ||:setl[ocal] {option}={value}|| +
@@ -141,8 +141,8 @@ ____
 ||:setg[lobal] all|| +
 ||:setg[lobal] {option}?|| +
 ||:setg[lobal] {option}|| +
-||:setg[lobal] no{option}|| +
-||:setg[lobal] inv{option}|| +
+||:setg[lobal] no[a]{option}[a]|| +
+||:setg[lobal] inv[a]{option}[a]|| +
 ||:setg[lobal] {option}&|| +
 ||:setg[lobal] all&|| +
 ||:setg[lobal] {option}={value}|| +