diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 18513ea84..8f416d3a4 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -212,10 +212,6 @@
 |<<colors-completion.scrollbar.bg,completion.scrollbar.bg>>|Color of the scrollbar in completion view
 |<<colors-statusbar.fg,statusbar.fg>>|Foreground color of the statusbar.
 |<<colors-statusbar.bg,statusbar.bg>>|Background color of the statusbar.
-|<<colors-statusbar.fg.error,statusbar.fg.error>>|Foreground color of the statusbar if there was an error.
-|<<colors-statusbar.bg.error,statusbar.bg.error>>|Background color of the statusbar if there was an error.
-|<<colors-statusbar.fg.warning,statusbar.fg.warning>>|Foreground color of the statusbar if there is a warning.
-|<<colors-statusbar.bg.warning,statusbar.bg.warning>>|Background color of the statusbar if there is a warning.
 |<<colors-statusbar.fg.prompt,statusbar.fg.prompt>>|Foreground color of the statusbar if there is a prompt.
 |<<colors-statusbar.bg.prompt,statusbar.bg.prompt>>|Background color of the statusbar if there is a prompt.
 |<<colors-statusbar.fg.insert,statusbar.fg.insert>>|Foreground color of the statusbar in insert mode.
@@ -262,6 +258,15 @@
 |<<colors-keyhint.fg,keyhint.fg>>|Text color for the keyhint widget.
 |<<colors-keyhint.fg.suffix,keyhint.fg.suffix>>|Highlight color for keys to complete the current keychain
 |<<colors-keyhint.bg,keyhint.bg>>|Background color of the keyhint widget.
+|<<colors-messages.fg.error,messages.fg.error>>|Foreground color of an error message.
+|<<colors-messages.bg.error,messages.bg.error>>|Background color of an error message.
+|<<colors-messages.border.error,messages.border.error>>|Border color of an error message.
+|<<colors-messages.fg.warning,messages.fg.warning>>|Foreground color a warning message.
+|<<colors-messages.bg.warning,messages.bg.warning>>|Background color of a warning message.
+|<<colors-messages.border.warning,messages.border.warning>>|Border color of an error message.
+|<<colors-messages.fg.info,messages.fg.info>>|Foreground color an info message.
+|<<colors-messages.bg.info,messages.bg.info>>|Background color of an info message.
+|<<colors-messages.border.info,messages.border.info>>|Border color of an info message.
 |==============
 
 .Quick reference for section ``fonts''
@@ -287,6 +292,9 @@
 |<<fonts-web-size-default,web-size-default>>|The default font size for regular text.
 |<<fonts-web-size-default-fixed,web-size-default-fixed>>|The default font size for fixed-pitch text.
 |<<fonts-keyhint,keyhint>>|Font used in the keyhint widget.
+|<<fonts-messages.error,messages.error>>|Font used for error messages.
+|<<fonts-messages.warning,messages.warning>>|Font used for warning messages.
+|<<fonts-messages.info,messages.info>>|Font used for info messages.
 |==============
 
 == general
@@ -1816,30 +1824,6 @@ Background color of the statusbar.
 
 Default: +pass:[black]+
 
-[[colors-statusbar.fg.error]]
-=== statusbar.fg.error
-Foreground color of the statusbar if there was an error.
-
-Default: +pass:[${statusbar.fg}]+
-
-[[colors-statusbar.bg.error]]
-=== statusbar.bg.error
-Background color of the statusbar if there was an error.
-
-Default: +pass:[red]+
-
-[[colors-statusbar.fg.warning]]
-=== statusbar.fg.warning
-Foreground color of the statusbar if there is a warning.
-
-Default: +pass:[${statusbar.fg}]+
-
-[[colors-statusbar.bg.warning]]
-=== statusbar.bg.warning
-Background color of the statusbar if there is a warning.
-
-Default: +pass:[darkorange]+
-
 [[colors-statusbar.fg.prompt]]
 === statusbar.fg.prompt
 Foreground color of the statusbar if there is a prompt.
@@ -2139,6 +2123,60 @@ Background color of the keyhint widget.
 
 Default: +pass:[rgba(0, 0, 0, 80%)]+
 
+[[colors-messages.fg.error]]
+=== messages.fg.error
+Foreground color of an error message.
+
+Default: +pass:[white]+
+
+[[colors-messages.bg.error]]
+=== messages.bg.error
+Background color of an error message.
+
+Default: +pass:[red]+
+
+[[colors-messages.border.error]]
+=== messages.border.error
+Border color of an error message.
+
+Default: +pass:[#bb0000]+
+
+[[colors-messages.fg.warning]]
+=== messages.fg.warning
+Foreground color a warning message.
+
+Default: +pass:[white]+
+
+[[colors-messages.bg.warning]]
+=== messages.bg.warning
+Background color of a warning message.
+
+Default: +pass:[darkorange]+
+
+[[colors-messages.border.warning]]
+=== messages.border.warning
+Border color of an error message.
+
+Default: +pass:[#d47300]+
+
+[[colors-messages.fg.info]]
+=== messages.fg.info
+Foreground color an info message.
+
+Default: +pass:[white]+
+
+[[colors-messages.bg.info]]
+=== messages.bg.info
+Background color of an info message.
+
+Default: +pass:[black]+
+
+[[colors-messages.border.info]]
+=== messages.border.info
+Border color of an info message.
+
+Default: +pass:[#333333]+
+
 == fonts
 Fonts used for the UI, with optional style/weight/size.
 
@@ -2259,3 +2297,21 @@ Default: empty
 Font used in the keyhint widget.
 
 Default: +pass:[8pt ${_monospace}]+
+
+[[fonts-messages.error]]
+=== messages.error
+Font used for error messages.
+
+Default: +pass:[8pt ${_monospace}]+
+
+[[fonts-messages.warning]]
+=== messages.warning
+Font used for warning messages.
+
+Default: +pass:[8pt ${_monospace}]+
+
+[[fonts-messages.info]]
+=== messages.info
+Font used for info messages.
+
+Default: +pass:[8pt ${_monospace}]+