6 files changed, 111 insertions, 79 deletions
diff --git a/doc/en/autogen/user/aspell_options.txt b/doc/en/autogen/user/aspell_options.txt
index b7c5f8386..79c1ee35d 100644
--- a/doc/en/autogen/user/aspell_options.txt
+++ b/doc/en/autogen/user/aspell_options.txt
@@ -26,5 +26,5 @@
 * *aspell.look.color*
 ** description: `color used for misspelled words`
 ** type: color
-** values: a color name (default value: `lightred`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `lightred`)
 
diff --git a/doc/en/autogen/user/irc_options.txt b/doc/en/autogen/user/irc_options.txt
index 656bc27e7..1f53c1ee9 100644
--- a/doc/en/autogen/user/irc_options.txt
+++ b/doc/en/autogen/user/irc_options.txt
@@ -1,77 +1,77 @@
 * *irc.color.input_nick*
 ** description: `color for nick in input bar`
 ** type: color
-** values: a color name (default value: `lightcyan`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `lightcyan`)
 
 * *irc.color.item_away*
 ** description: `color for away item`
 ** type: color
-** values: a color name (default value: `yellow`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `yellow`)
 
 * *irc.color.item_channel_modes*
 ** description: `color for channel modes, near channel name`
 ** type: color
-** values: a color name (default value: `default`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `default`)
 
 * *irc.color.item_lag_counting*
 ** description: `color for lag indicator, when counting (pong not received from server, lag is increasing)`
 ** type: color
-** values: a color name (default value: `default`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `default`)
 
 * *irc.color.item_lag_finished*
 ** description: `color for lag indicator, when pong has been received from server`
 ** type: color
-** values: a color name (default value: `yellow`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `yellow`)
 
 * *irc.color.message_join*
 ** description: `color for text in join messages`
 ** type: color
-** values: a color name (default value: `green`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `green`)
 
 * *irc.color.message_quit*
 ** description: `color for text in part/quit messages`
 ** type: color
-** values: a color name (default value: `red`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `red`)
 
 * *irc.color.nick_prefix*
 ** description: `color for nick prefix (prefix is custom string displayed before nick)`
 ** type: color
-** values: a color name (default value: `green`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `green`)
 
 * *irc.color.nick_prefix_halfop*
 ** description: `color for prefix of nick which is halfop on channel`
 ** type: color
-** values: a color name (default value: `lightmagenta`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `lightmagenta`)
 
 * *irc.color.nick_prefix_op*
 ** description: `color for prefix of nick which is op/admin/owner on channel`
 ** type: color
-** values: a color name (default value: `lightgreen`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `lightgreen`)
 
 * *irc.color.nick_prefix_user*
 ** description: `color for prefix of nick which is user on channel`
 ** type: color
-** values: a color name (default value: `blue`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `blue`)
 
 * *irc.color.nick_prefix_voice*
 ** description: `color for prefix of nick which has voice on channel`
 ** type: color
-** values: a color name (default value: `yellow`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `yellow`)
 
 * *irc.color.nick_suffix*
 ** description: `color for nick suffix (suffix is custom string displayed after nick)`
 ** type: color
-** values: a color name (default value: `green`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `green`)
 
 * *irc.color.notice*
 ** description: `color for text "Notice" in notices`
 ** type: color
-** values: a color name (default value: `green`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `green`)
 
 * *irc.color.reason_quit*
 ** description: `color for reason in part/quit messages`
 ** type: color
-** values: a color name (default value: `default`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `default`)
 
 * *irc.look.color_nicks_in_server_messages*
 ** description: `use nick color in messages from server`
diff --git a/doc/en/autogen/user/relay_options.txt b/doc/en/autogen/user/relay_options.txt
index fcc700958..450cd8e13 100644
--- a/doc/en/autogen/user/relay_options.txt
+++ b/doc/en/autogen/user/relay_options.txt
@@ -1,42 +1,42 @@
 * *relay.color.status_active*
 ** description: `text color for "connected" status`
 ** type: color
-** values: a color name (default value: `lightblue`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `lightblue`)
 
 * *relay.color.status_auth_failed*
 ** description: `text color for "authentication failed" status`
 ** type: color
-** values: a color name (default value: `lightred`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `lightred`)
 
 * *relay.color.status_connecting*
 ** description: `text color for "connecting" status`
 ** type: color
-** values: a color name (default value: `yellow`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `yellow`)
 
 * *relay.color.status_disconnected*
 ** description: `text color for "disconnected" status`
 ** type: color
-** values: a color name (default value: `lightred`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `lightred`)
 
 * *relay.color.status_waiting_auth*
 ** description: `text color for "waiting authentication" status`
 ** type: color
-** values: a color name (default value: `brown`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `brown`)
 
 * *relay.color.text*
 ** description: `text color`
 ** type: color
-** values: a color name (default value: `default`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `default`)
 
 * *relay.color.text_bg*
 ** description: `background color`
 ** type: color
-** values: a color name (default value: `default`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `default`)
 
 * *relay.color.text_selected*
 ** description: `text color of selected client line`
 ** type: color
-** values: a color name (default value: `white`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `white`)
 
 * *relay.look.auto_open_buffer*
 ** description: `auto open relay buffer when a new client is connecting`
diff --git a/doc/en/autogen/user/weechat_options.txt b/doc/en/autogen/user/weechat_options.txt
index 6592e90a6..ad4e6877f 100644
--- a/doc/en/autogen/user/weechat_options.txt
+++ b/doc/en/autogen/user/weechat_options.txt
@@ -1,52 +1,52 @@
 * *weechat.color.bar_more*
 ** description: `text color for '+' when scrolling bars`
 ** type: color
-** values: a color name (default value: `lightmagenta`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `lightmagenta`)
 
 * *weechat.color.chat*
 ** description: `text color for chat`
 ** type: color
-** values: a color name (default value: `default`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `default`)
 
 * *weechat.color.chat_bg*
 ** description: `background color for chat`
 ** type: color
-** values: a color name (default value: `default`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `default`)
 
 * *weechat.color.chat_buffer*
 ** description: `text color for buffer names`
 ** type: color
-** values: a color name (default value: `white`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `white`)
 
 * *weechat.color.chat_channel*
 ** description: `text color for channel names`
 ** type: color
-** values: a color name (default value: `white`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `white`)
 
 * *weechat.color.chat_delimiters*
 ** description: `text color for delimiters`
 ** type: color
-** values: a color name (default value: `green`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `green`)
 
 * *weechat.color.chat_highlight*
 ** description: `text color for highlighted prefix`
 ** type: color
-** values: a color name (default value: `yellow`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `yellow`)
 
 * *weechat.color.chat_highlight_bg*
 ** description: `background color for highlighted prefix`
 ** type: color
-** values: a color name (default value: `magenta`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `magenta`)
 
 * *weechat.color.chat_host*
 ** description: `text color for hostnames`
 ** type: color
-** values: a color name (default value: `cyan`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `cyan`)
 
 * *weechat.color.chat_nick*
 ** description: `text color for nicks in chat window`
 ** type: color
-** values: a color name (default value: `lightcyan`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `lightcyan`)
 
 * *weechat.color.chat_nick_colors*
 ** description: `text color for nicks (comma separated list of colors, background is allowed with format: "fg/bg", for example: "blue/red")`
@@ -56,172 +56,172 @@
 * *weechat.color.chat_nick_other*
 ** description: `text color for other nick in private buffer`
 ** type: color
-** values: a color name (default value: `cyan`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `cyan`)
 
 * *weechat.color.chat_nick_self*
 ** description: `text color for local nick in chat window`
 ** type: color
-** values: a color name (default value: `white`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `white`)
 
 * *weechat.color.chat_prefix_action*
 ** description: `text color for action prefix`
 ** type: color
-** values: a color name (default value: `white`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `white`)
 
 * *weechat.color.chat_prefix_buffer*
 ** description: `text color for buffer name (before prefix, when many buffers are merged with same number)`
 ** type: color
-** values: a color name (default value: `brown`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `brown`)
 
 * *weechat.color.chat_prefix_error*
 ** description: `text color for error prefix`
 ** type: color
-** values: a color name (default value: `yellow`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `yellow`)
 
 * *weechat.color.chat_prefix_join*
 ** description: `text color for join prefix`
 ** type: color
-** values: a color name (default value: `lightgreen`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `lightgreen`)
 
 * *weechat.color.chat_prefix_more*
 ** description: `text color for '+' when prefix is too long`
 ** type: color
-** values: a color name (default value: `lightmagenta`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `lightmagenta`)
 
 * *weechat.color.chat_prefix_network*
 ** description: `text color for network prefix`
 ** type: color
-** values: a color name (default value: `magenta`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `magenta`)
 
 * *weechat.color.chat_prefix_quit*
 ** description: `text color for quit prefix`
 ** type: color
-** values: a color name (default value: `lightred`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `lightred`)
 
 * *weechat.color.chat_prefix_suffix*
 ** description: `text color for suffix (after prefix)`
 ** type: color
-** values: a color name (default value: `green`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `green`)
 
 * *weechat.color.chat_read_marker*
 ** description: `text color for unread data marker`
 ** type: color
-** values: a color name (default value: `magenta`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `magenta`)
 
 * *weechat.color.chat_read_marker_bg*
 ** description: `background color for unread data marker`
 ** type: color
-** values: a color name (default value: `default`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `default`)
 
 * *weechat.color.chat_server*
 ** description: `text color for server names`
 ** type: color
-** values: a color name (default value: `brown`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `brown`)
 
 * *weechat.color.chat_text_found*
 ** description: `text color for marker on lines where text sought is found`
 ** type: color
-** values: a color name (default value: `yellow`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `yellow`)
 
 * *weechat.color.chat_text_found_bg*
 ** description: `background color for marker on lines where text sought is found`
 ** type: color
-** values: a color name (default value: `lightmagenta`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `lightmagenta`)
 
 * *weechat.color.chat_time*
 ** description: `text color for time in chat window`
 ** type: color
-** values: a color name (default value: `default`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `default`)
 
 * *weechat.color.chat_time_delimiters*
 ** description: `text color for time delimiters`
 ** type: color
-** values: a color name (default value: `brown`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `brown`)
 
 * *weechat.color.chat_value*
 ** description: `text color for values`
 ** type: color
-** values: a color name (default value: `cyan`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `cyan`)
 
 * *weechat.color.input_actions*
 ** description: `text color for actions in input line`
 ** type: color
-** values: a color name (default value: `lightgreen`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `lightgreen`)
 
 * *weechat.color.input_text_not_found*
 ** description: `text color for unsucessful text search in input line`
 ** type: color
-** values: a color name (default value: `red`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `red`)
 
 * *weechat.color.nicklist_away*
 ** description: `text color for away nicknames`
 ** type: color
-** values: a color name (default value: `cyan`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `cyan`)
 
 * *weechat.color.nicklist_group*
 ** description: `text color for groups in nicklist`
 ** type: color
-** values: a color name (default value: `green`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `green`)
 
 * *weechat.color.nicklist_offline*
 ** description: `text color for offline nicknames`
 ** type: color
-** values: a color name (default value: `blue`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `blue`)
 
 * *weechat.color.separator*
 ** description: `background color for window separators (when split)`
 ** type: color
-** values: a color name (default value: `blue`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `blue`)
 
 * *weechat.color.status_data_highlight*
 ** description: `text color for buffer with highlight (status bar)`
 ** type: color
-** values: a color name (default value: `lightmagenta`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `lightmagenta`)
 
 * *weechat.color.status_data_msg*
 ** description: `text color for buffer with new messages (status bar)`
 ** type: color
-** values: a color name (default value: `yellow`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `yellow`)
 
 * *weechat.color.status_data_other*
 ** description: `text color for buffer with new data (not messages) (status bar)`
 ** type: color
-** values: a color name (default value: `default`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `default`)
 
 * *weechat.color.status_data_private*
 ** description: `text color for buffer with private message (status bar)`
 ** type: color
-** values: a color name (default value: `lightgreen`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `lightgreen`)
 
 * *weechat.color.status_filter*
 ** description: `text color for filter indicator in status bar`
 ** type: color
-** values: a color name (default value: `green`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `green`)
 
 * *weechat.color.status_more*
 ** description: `text color for buffer with new data (status bar)`
 ** type: color
-** values: a color name (default value: `yellow`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `yellow`)
 
 * *weechat.color.status_name*
 ** description: `text color for current buffer name in status bar`
 ** type: color
-** values: a color name (default value: `white`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `white`)
 
 * *weechat.color.status_name_ssl*
 ** description: `text color for current buffer name in status bar, if data are secured with a protocol like SSL`
 ** type: color
-** values: a color name (default value: `lightgreen`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `lightgreen`)
 
 * *weechat.color.status_number*
 ** description: `text color for current buffer number in status bar`
 ** type: color
-** values: a color name (default value: `yellow`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `yellow`)
 
 * *weechat.color.status_time*
 ** description: `text color for time (status bar)`
 ** type: color
-** values: a color name (default value: `default`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `default`)
 
 * *weechat.completion.default_template*
 ** description: `default completion template (please see documentation for template codes and values)`
diff --git a/doc/en/autogen/user/xfer_options.txt b/doc/en/autogen/user/xfer_options.txt
index 79900db80..c53cae2a8 100644
--- a/doc/en/autogen/user/xfer_options.txt
+++ b/doc/en/autogen/user/xfer_options.txt
@@ -1,47 +1,47 @@
 * *xfer.color.status_aborted*
 ** description: `text color for "aborted" status`
 ** type: color
-** values: a color name (default value: `lightred`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `lightred`)
 
 * *xfer.color.status_active*
 ** description: `text color for "active" status`
 ** type: color
-** values: a color name (default value: `lightblue`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `lightblue`)
 
 * *xfer.color.status_connecting*
 ** description: `text color for "connecting" status`
 ** type: color
-** values: a color name (default value: `yellow`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `yellow`)
 
 * *xfer.color.status_done*
 ** description: `text color for "done" status`
 ** type: color
-** values: a color name (default value: `lightgreen`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `lightgreen`)
 
 * *xfer.color.status_failed*
 ** description: `text color for "failed" status`
 ** type: color
-** values: a color name (default value: `lightred`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `lightred`)
 
 * *xfer.color.status_waiting*
 ** description: `text color for "waiting" status`
 ** type: color
-** values: a color name (default value: `lightcyan`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `lightcyan`)
 
 * *xfer.color.text*
 ** description: `text color`
 ** type: color
-** values: a color name (default value: `default`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `default`)
 
 * *xfer.color.text_bg*
 ** description: `background color`
 ** type: color
-** values: a color name (default value: `default`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `default`)
 
 * *xfer.color.text_selected*
 ** description: `text color of selected xfer line`
 ** type: color
-** values: a color name (default value: `white`)
+** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "%" for reverse, "_" for underline (default value: `white`)
 
 * *xfer.file.auto_accept_chats*
 ** description: `automatically accept chat requests (use carefully!)`
diff --git a/doc/en/weechat_user.en.txt b/doc/en/weechat_user.en.txt
index 44bcb1827..e0dd89c2e 100644
--- a/doc/en/weechat_user.en.txt
+++ b/doc/en/weechat_user.en.txt
@@ -965,8 +965,8 @@ Or if you want a very dark green background for status bar:
 ----------------------------------------
 
 [[colors_aliases]]
-Alises for colors
-^^^^^^^^^^^^^^^^^
+Aliases
+^^^^^^^
 
 You can add color aliases with command `/color alias` and then use this alias
 in any color option.
@@ -978,6 +978,38 @@ For example:
 /set weechat.color.chat_delimiters orange
 ----------------------------------------
 
+[[colors_attributes]]
+Attributes
+^^^^^^^^^^
+
+It is possible to use some attributes for colors. One or more attributes can be
+added before color name or number:
+
+* "*": bold text
+* "%": reverse video
+* "_": underlined text
+
+For example if you want self nick as white underlined, do:
+
+----------------------------------------
+/set weechat.color.chat_nick_self _white
+----------------------------------------
+
+Or if you want time in status bar as orange underlined with bold:
+
+----------------------------------------
+/set weechat.color.status_time *_214
+----------------------------------------
+
+To use an attribute with default terminal color (-1), you must use a number
+greater than last terminal color, for example max color in WeeChat: 99999.
+
+Example of bold with terminal foreground color:
+
+----------------------------------------
+/set weechat.color.status_time *99999
+----------------------------------------
+
 
 [[plugins]]
 Plugins