Merge remote-tracking branch 'origin/next' into deprecate

21 files changed, 276 insertions, 282 deletions

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 08e02354..8c128925 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -5,7 +5,6 @@ tone will be closed without discussion. Everybody has it own way of working;
 What might be the norm for you, might not be for others. Therefore be verbose in
 your description.
 
-
 **The issue tracker is for bugs only.**
 
 This is an attempt to keep the issue tracker clean and searchable.
@@ -54,8 +53,6 @@ Issue high-jacking, e.g. adding a request/issue to an existing issue, is very
 disruptive.
 Please create a new issue, if it is similar it will be marked duplicate.
 
-
-
 # Creating a feature request
 
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 8f277d85..bf90c389 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -14,8 +14,10 @@ Any report missing these informations will be labeled as “Incomplete Report -
 :exclamation:
 
 ## Before creating a feature request
+
 - [ ] I checked the *next* branch to see if the feature has already been
   implemented
+
 - [ ] I searched existing reports to see if it is already requested.
 
 
@@ -48,7 +50,6 @@ Output of `rofi -help` (in a [gist](https://gist.github.com/), please paste the
 - Include a link to your private config
 - Include screenshots/casts of your issue
 
-
 **Please do not submit reports related to wayland, see
 [here](https://github.com/DaveDavenport/rofi/wiki/Wayland) for more
 information.**
diff --git a/INSTALL.md b/INSTALL.md
index 6c358490..eb60573a 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -10,36 +10,36 @@ You can also use [Meson](https://mesonbuild.com/) as an alternative.
 
 ### For building:
 
-* C compiler that supports the c99 standard. (gcc or clang)
-* make
-* autoconf
-* automake (1.11.3 or up)
-* pkg-config
-* flex 2.5.39 or higher
-* bison
-* check (Can be disabled using the `--disable-check` configure flag)
-  check is used for build-time tests and does not affect functionality.
-* Developer packages of the external libraries
-* glib-compile-resources
+*   C compiler that supports the c99 standard. (gcc or clang)
+*   make
+*   autoconf
+*   automake (1.11.3 or up)
+*   pkg-config
+*   flex 2.5.39 or higher
+*   bison
+*   check (Can be disabled using the `--disable-check` configure flag)
+    check is used for build-time tests and does not affect functionality.
+*   Developer packages of the external libraries
+*   glib-compile-resources
 
 ### External libraries
 
-* libpango
-* libpangocairo
-* libcairo
-* libcairo-xcb
-* libglib2.0 >= 2.40
-  * gmodule-2.0
-  * gio-unix-2.0
-* libgdk-pixbuf-2.0
-* libstartup-notification-1.0
-* libxkbcommon >= 0.4.1
-* libxkbcommon-x11
-* libxcb (sometimes split, you need libxcb, libxcb-xkb and libxcb-randr libxcb-xinerama)
-* xcb-util
-* xcb-util-wm (sometimes split as libxcb-ewmh and libxcb-icccm)
-* xcb-util-xrm [new module might not be available in your distribution. The source can be found
-  here](https://github.com/Airblader/xcb-util-xrm/)
+*   libpango
+*   libpangocairo
+*   libcairo
+*   libcairo-xcb
+*   libglib2.0 >= 2.40
+    *   gmodule-2.0
+    *   gio-unix-2.0
+*   libgdk-pixbuf-2.0
+*   libstartup-notification-1.0
+*   libxkbcommon >= 0.4.1
+*   libxkbcommon-x11
+*   libxcb (sometimes split, you need libxcb, libxcb-xkb and libxcb-randr libxcb-xinerama)
+*   xcb-util
+*   xcb-util-wm (sometimes split as libxcb-ewmh and libxcb-icccm)
+*   xcb-util-xrm [new module might not be available in your distribution. The source can be found
+    here](https://github.com/Airblader/xcb-util-xrm/)
 
 On debian based systems, the developer packages are in the form of: `<package>-dev` on rpm based
 `<package>-devel`.
@@ -50,27 +50,19 @@ On debian based systems, the developer packages are in the form of: `<package>-d
 
 Create a build directory and enter it:
 
-```
-mkdir build && cd build
-```
+    mkdir build && cd build
 
 Check dependencies and configure build system:
 
-```
-../configure
-```
+    ../configure
 
 Build Rofi:
 
-```
-make
-```
+    make
 
 The actual install, execute as root (if needed):
 
-```
-make install
-```
+    make install
 
 The default installation prefix is: `/usr/local/` use `./configure --prefix={prefix}` to install into another location.
 
@@ -78,21 +70,15 @@ The default installation prefix is: `/usr/local/` use `./configure --prefix={pre
 
 Check dependencies and configure build system:
 
-```
-meson setup build
-```
+    meson setup build
 
 Build Rofi:
 
-```
-ninja -C build
-```
+    ninja -C build
 
 The actual install, execute as root (if needed):
 
-```
-ninja -C build install
-```
+    ninja -C build install
 
 The default installation prefix is: `/usr/local/` use `meson setup build --prefix={prefix}` to install into another location.
 
@@ -105,29 +91,21 @@ The GitHub Pages version of these directions may be out of date.  Please use
 
 If you don't have a checkout:
 
-```
-git clone --recursive https://github.com/DaveDavenport/rofi
-cd rofi/
-```
+    git clone --recursive https://github.com/DaveDavenport/rofi
+    cd rofi/
 
 If you already have a checkout:
 
-```
-cd rofi/
-git pull
-git submodule update --init
-```
+    cd rofi/
+    git pull
+    git submodule update --init
 
 For Autotools you have an extra step, to generate build system:
 
-```
-autoreconf -i
-```
+    autoreconf -i
 
 From this point, use the same steps you use for a release.
 
-
-
 ## Options for configure
 
 When you run the configure step there are several options you can configure.
@@ -137,36 +115,29 @@ After the initial setup, use `meson configure build`.
 
 The most useful one to set the installation prefix:
 
-```
-# Autotools
-../configure --prefix=<installation path>
+    # Autotools
+    ../configure --prefix=<installation path>
 
-# Meson
-meson setup build --prefix <installation path>
-```
+    # Meson
+    meson setup build --prefix <installation path>
 
 f.e.
 
-```
-# Autotools
-../configure --prefix=/usr/
+    # Autotools
+    ../configure --prefix=/usr/
 
-# Meson
-meson setup build --prefix /usr
-```
+    # Meson
+    meson setup build --prefix /usr
 
 ### Install locally
 
 or to install locally:
 
-```
-# Autotools
-../configure --prefix=${HOME}/.local/
-
-# Meson
-meson setup build --prefix ${HOME}/.local
-```
+    # Autotools
+    ../configure --prefix=${HOME}/.local/
 
+    # Meson
+    meson setup build --prefix ${HOME}/.local
 
 ## Options for make
 
@@ -176,26 +147,22 @@ When you run make you can tweak the build process a little.
 
 Show the commands called:
 
-```
-# Autotools
-make V=1
+    # Autotools
+    make V=1
 
-# Meson
-ninja -C build -v
-```
+    # Meson
+    ninja -C build -v
 
 ### Debug build
 
 Compile with debug symbols and no optimization, this is useful for making backtraces:
 
-```
-# Autotools
-make CFLAGS="-O0 -g3" clean rofi
+    # Autotools
+    make CFLAGS="-O0 -g3" clean rofi
 
-# Meson
-meson configure build --debug
-ninja -C build
-```
+    # Meson
+    meson configure build --debug
+    ninja -C build
 
 ### Get a backtrace
 
@@ -204,13 +171,11 @@ mouse. So if it crashes in GDB you are stuck.
 The best way to go is to enable core file. (ulimit -c unlimited in bash) then make rofi crash. You
 can then load the core in GDB.
 
-```
-# Autotools
-gdb rofi core
+    # Autotools
+    gdb rofi core
 
-# Meson (because it uses a separate build directory)
-gdb build/rofi core
-```
+    # Meson (because it uses a separate build directory)
+    gdb build/rofi core
 
 > Where the core file is located and what its exact name is different on each distributions. Please consult the
 > relevant documentation.
@@ -219,37 +184,26 @@ gdb build/rofi core
 
 ### Debian or Ubuntu
 
-```
-apt install rofi
-```
+    apt install rofi
 
 ### Fedora
 
-rofi from [russianfedora repository](http://ru.fedoracommunity.org/repository)
-and also
-[Yaroslav's COPR (Cool Other Package Repo)](https://copr.fedorainfracloud.org/coprs/yaroslav/i3desktop/)
-
+    dnf install rofi
 
 ### ArchLinux
 
-```
-pacman -S rofi
-```
+    pacman -S rofi
 
 ### Gentoo
 
 An ebuild is available, `x11-misc/rofi`. It's up to date, but you may need to
 enable ~arch to get the latest release:
 
-```
-echo 'x11-misc/rofi ~amd64' >> /etc/portage/package.accept_keywords
-```
+    echo 'x11-misc/rofi ~amd64' >> /etc/portage/package.accept_keywords
 
 for amd64 or:
 
-```
-echo 'x11-misc/rofi ~x86' >> /etc/portage/package.accept_keywords
-```
+    echo 'x11-misc/rofi ~x86' >> /etc/portage/package.accept_keywords
 
 for i386.
 
@@ -259,12 +213,8 @@ To install it, simply issue `emerge rofi`.
 
 On both openSUSE Leap and openSUSE Tumbleweed rofi can be installed using:
 
-```
-sudo zypper install rofi
-```
+    sudo zypper install rofi
 
 ### FreeBSD
 
-```
-sudo pkg install rofi
-```
+    sudo pkg install rofi
diff --git a/README.md b/README.md
index b4ea744c..76143366 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/ca0310962a7c4b829d0c57f1ab023531)](https://app.codacy.com/app/davatorium/rofi?utm_source=github.com&utm_medium=referral&utm_content=davatorium/rofi&utm_campaign=Badge_Grade_Settings)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/ca0310962a7c4b829d0c57f1ab023531)](https://app.codacy.com/app/davatorium/rofi?utm_source=github.com\&utm_medium=referral\&utm_content=davatorium/rofi\&utm_campaign=Badge_Grade_Settings)
 [![Build Status](https://travis-ci.org/davatorium/rofi.svg?branch=master)](https://travis-ci.org/davatorium/rofi)
 [![codecov.io](https://codecov.io/github/davatorium/rofi/coverage.svg?branch=master)](https://codecov.io/github/davatorium/rofi?branch=master)
 [![Issues](https://img.shields.io/github/issues/davatorium/rofi.svg)](https://github.com/davatorium/rofi/issues)
@@ -7,14 +7,14 @@
 [![Downloads](https://img.shields.io/github/downloads/davatorium/rofi/total.svg)](https://github.com/davatorium/rofi/releases)
 [![Coverity](https://scan.coverity.com/projects/3850/badge.svg)](https://scan.coverity.com/projects/davedavenport-rofi)
 [![Forum](https://img.shields.io/badge/forum-online-green.svg)](https://reddit.com/r/qtools/)
- [![Packages](https://repology.org/badge/tiny-repos/rofi.svg)](https://repology.org/metapackage/rofi/versions)
+[![Packages](https://repology.org/badge/tiny-repos/rofi.svg)](https://repology.org/metapackage/rofi/versions)
 
 # A window switcher, Application launcher and dmenu replacement
 
 **Rofi** started as a clone of simpleswitcher, written by [Sean Pringle](http://github.com/seanpringle/simpleswitcher) - a
 popup window switcher roughly based on [superswitcher](http://code.google.com/p/superswitcher/).
 Simpleswitcher laid the foundations, and therefore Sean Pringle deserves most of the credit for this tool. **Rofi**
-(renamed, as it lost the *simple* property) has been extended with extra features, like an application launcher and 
+(renamed, as it lost the *simple* property) has been extended with extra features, like an application launcher and
 ssh-launcher, and can act as a drop-in dmenu replacement, making it a very versatile tool.
 
 **Rofi**, like dmenu, will provide the user with a textual list of options where one or more can be selected.
@@ -22,29 +22,29 @@ This can either be running an application, selecting a window, or options provid
 
 Its main features are:
 
- * Fully configurable keyboard navigation
- * Type to filter
-    - Tokenized: type any word in any order to filter
-    - Case insensitive (togglable)
-    - Support for fuzzy-, regex-, and glob matching
- * UTF-8 enabled
-    - UTF-8-aware string collating
-    - International keyboard support (`e -> è)
- * RTL language support
- * Cairo drawing and Pango font rendering
- * Built-in modes:
-    - Window switcher mode
-        - EWMH compatible WM
-    - Application launcher
-    - Desktop file application launcher
-    - SSH launcher mode
-    - Combi mode, allowing several modes to be merged into one list
- * History-based ordering — last 25 choices are ordered on top based on use (optional)
- * Levenshtein distance ordering of matches (optional)
- * Drop-in dmenu replacement
-    - Many added improvements
- * Easily extensible using scripts
- * Theming
+*   Fully configurable keyboard navigation
+*   Type to filter
+    *   Tokenized: type any word in any order to filter
+    *   Case insensitive (togglable)
+    *   Support for fuzzy-, regex-, and glob matching
+*   UTF-8 enabled
+    *   UTF-8-aware string collating
+    *   International keyboard support (\`e -> è)
+*   RTL language support
+*   Cairo drawing and Pango font rendering
+*   Built-in modes:
+    *   Window switcher mode
+        *   EWMH compatible WM
+    *   Application launcher
+    *   Desktop file application launcher
+    *   SSH launcher mode
+    *   Combi mode, allowing several modes to be merged into one list
+*   History-based ordering — last 25 choices are ordered on top based on use (optional)
+*   Levenshtein distance ordering of matches (optional)
+*   Drop-in dmenu replacement
+    *   Many added improvements
+*   Easily extensible using scripts
+*   Theming
 
 **Rofi** has several built-in modes implementing common use cases and can be extended by scripts (either called from
 **Rofi** or calling **Rofi**).
@@ -57,15 +57,14 @@ Below is a list of the different modes:
 
 The window switcher shows the following informations in columns (can be customized):
 
-1. Desktop name
-2. Window class
-3. Window title
+1.  Desktop name
+2.  Window class
+3.  Window title
 
 Window mode features:
 
- * Closing applications with `Shift-Delete`
- * Custom command with `Shift-Return`
-
+*   Closing applications with `Shift-Delete`
+*   Custom command with `Shift-Return`
 
 ## Application launcher
 
@@ -75,10 +74,9 @@ The run mode allows users to quickly search for and launch a program.
 
 Run mode features:
 
- * `Shift-Return` to run the selected program in a terminal
- * Favorites list, with frequently used programs sorted on top
- * Custom entries, like aliases, added by executing a command
-
+*   `Shift-Return` to run the selected program in a terminal
+*   Favorites list, with frequently used programs sorted on top
+*   Custom entries, like aliases, added by executing a command
 
 ## Desktop File Application launcher
 
@@ -86,8 +84,8 @@ The desktop run mode allows users to quickly search and launch an application fr
 Entries. These are used by most Desktop Environments to populate launchers and menus.
 Drun mode features:
 
- * Favorites list, with frequently used programs sorted on top
- * Auto starting terminal applications in a terminal
+*   Favorites list, with frequently used programs sorted on top
+*   Auto starting terminal applications in a terminal
 
 ## SSH launcher
 
@@ -99,9 +97,7 @@ Quickly `ssh` into remote machines. Parses `~/.ssh/config` and `~/.ssh/known_hos
 
 Loads external scripts to add modes to **Rofi**, for example a file-browser.
 
-```
-rofi  -show fb -modi fb:../Examples/rofi-file-browser.sh
-```
+    rofi  -show fb -modi fb:../Examples/rofi-file-browser.sh
 
 ## COMBI mode
 
@@ -110,9 +106,7 @@ Allowing to quickly switch to an application, either by switching to it when it
 
 Example to combine Desktop run and the window switcher:
 
-```
-rofi -combi-modi window,drun -show combi -modi combi
-```
+    rofi -combi-modi window,drun -show combi -modi combi
 
 ## dmenu replacement
 
@@ -129,27 +123,25 @@ write them to stdout.
 
 # Usage
 
-If used with `-show [mode]`, rofi will immediately open in the specified [mode].
+If used with `-show [mode]`, rofi will immediately open in the specified \[mode].
 
 If used with `-dmenu`, rofi will use data from STDIN to let the user select an option.
 
 For example, to show a run dialog:
 
-  `rofi -show run`
+`rofi -show run`
 
 To show a ssh dialog:
 
-  `rofi -show ssh`
+`rofi -show ssh`
 
 ## dmenu
 
 If rofi is passed the `-dmenu` option, or run as `dmenu` (ie, /usr/bin/dmenu is symlinked to /usr/bin/rofi),
 it will use the data passed from STDIN.
 
-```
-~/scripts/my_script.sh | rofi -dmenu
-echo -e "Option #1\nOption #2\nOption #3" | rofi -dmenu
-```
+    ~/scripts/my_script.sh | rofi -dmenu
+    echo -e "Option #1\nOption #2\nOption #3" | rofi -dmenu
 
 In both cases, rofi will output the user's selection to STDOUT.
 
@@ -157,7 +149,6 @@ In both cases, rofi will output the user's selection to STDOUT.
 
 Type `Shift-/Left/Right` to switch between active modi.
 
-
 ## Key bindings
 
 | Key                                  | Action                                                             |
@@ -202,10 +193,10 @@ For the full list of key bindings, see: `rofi -show keys` or `rofi -help`.
 
 There are currently three methods of setting configuration options:
 
- * Local configuration. Normally, depending on XDG, in `~/.config/rofi/config`. This uses the Xresources format.
- * Xresources: A method of storing key values in the Xserver. See
-   [here](https://en.wikipedia.org/wiki/X_resources) for more information.
- * Command line options: Arguments are passed to **Rofi**.
+*   Local configuration. Normally, depending on XDG, in `~/.config/rofi/config`. This uses the Xresources format.
+*   Xresources: A method of storing key values in the Xserver. See
+    [here](https://en.wikipedia.org/wiki/X_resources) for more information.
+*   Command line options: Arguments are passed to **Rofi**.
 
 A distribution can ship defaults in `/etc/rofi.conf`.
 
@@ -228,10 +219,10 @@ or in a more readable format:
 
 The configuration system supports the following types:
 
- * String
- * Integer (signed and unsigned)
- * Char
- * Boolean
+*   String
+*   Integer (signed and unsigned)
+*   Char
+*   Boolean
 
 The Boolean option has a non-default command line syntax, to enable option X you do:
 
@@ -254,9 +245,9 @@ install **Rofi**.
 
 Rofi is not:
 
- * A preview application. In other words, it will not show a (small) preview of images, movies or other files.
- * A UI toolkit.
- * A library to be used in other applications.
- * An application that can support every possible use-case. It tries to be generic enough to be usable by everybody.
-   Specific functionality can be added using scripts.
- * Just a dmenu replacement. The dmenu functionality is a nice 'extra' to **rofi**, not its main purpose.
+*   A preview application. In other words, it will not show a (small) preview of images, movies or other files.
+*   A UI toolkit.
+*   A library to be used in other applications.
+*   An application that can support every possible use-case. It tries to be generic enough to be usable by everybody.
+    Specific functionality can be added using scripts.
+*   Just a dmenu replacement. The dmenu functionality is a nice 'extra' to **rofi**, not its main purpose.
diff --git a/configure.ac b/configure.ac
index 9eaefae6..ebe3b0ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AH_BOTTOM([#include "gitconfig.h"])
 dnl ---------------------------------------------------------------------
 dnl Lex & Bison language parser.
 dnl ---------------------------------------------------------------------
-AC_PROG_LEX([flex])
+AC_PROG_LEX
 AC_PROG_YACC
 
 
diff --git a/doc/rofi-script.5 b/doc/rofi-script.5
index 646727d7..57ec3e51 100644
--- a/doc/rofi-script.5
+++ b/doc/rofi-script.5
@@ -1,4 +1,3 @@
-.nh
 .TH ROFI\-SCRIPT 5 rofi\-script
 .SH NAME
 .PP
@@ -175,20 +174,20 @@ rofi(1), rofi\-sensible\-terminal(1), dmenu(1), rofi\-theme(5), rofi\-theme\-sel
 
 .SH AUTHOR
 .PP
-Qball Cow qball@gmpclient.org
-\[la]mailto:qball@gmpclient.org\[ra]
+Qball Cow 
+\[la]qball@gmpclient.org\[ra]
 
 .PP
-Rasmus Steinke rasi@xssn.at
-\[la]mailto:rasi@xssn.at\[ra]
+Rasmus Steinke 
+\[la]rasi@xssn.at\[ra]
 
 .PP
-Quentin Glidic sardemff7+rofi@sardemff7.net
-\[la]mailto:sardemff7+rofi@sardemff7.net\[ra]
+Quentin Glidic 
+\[la]sardemff7+rofi@sardemff7.net\[ra]
 
 .PP
-Original code based on work by: Sean Pringle sean.pringle@gmail.com
-\[la]mailto:sean.pringle@gmail.com\[ra]
+Original code based on work by: Sean Pringle 
+\[la]sean.pringle@gmail.com\[ra]
 
 .PP
 For a full list of authors, check the AUTHORS file.
diff --git a/doc/rofi-sensible-terminal.1 b/doc/rofi-sensible-terminal.1
index 653dee3f..30d4a15d 100644
--- a/doc/rofi-sensible-terminal.1
+++ b/doc/rofi-sensible-terminal.1
@@ -1,4 +1,3 @@
-.nh
 .TH rofi\-sensible\-terminal 1 rofi\-sensible\-terminal
 .SH NAME
 .PP
diff --git a/doc/rofi-theme-selector.1 b/doc/rofi-theme-selector.1
index e0f09c31..de076ff4 100644
--- a/doc/rofi-theme-selector.1
+++ b/doc/rofi-theme-selector.1
@@ -1,4 +1,3 @@
-.nh
 .TH rofi\-theme\-selector 1 rofi\-theme\-selector
 .SH NAME
 .PP
@@ -31,8 +30,8 @@ $XDG\_DATA\_HOME/share/rofi/themes
 .RE
 
 .PP
-${PREFIX} reflects the install location of rofi. In most cases this will be "/usr".
-$XDG\_CONFIG\_HOME is normally unset. Default path is "$HOME/.config".
+${PREFIX} reflects the install location of rofi. In most cases this will be "/usr".<br>
+$XDG\_CONFIG\_HOME is normally unset. Default path is "$HOME/.config".<br>
 $XDG\_DATA\_HOME is normally unset. Default path is "$HOME/.local/share".
 
 .SH SEE ALSO
@@ -41,5 +40,5 @@ rofi(1)
 
 .SH AUTHORS
 .PP
-Qball Cow qball@gmpclient.org
+Qball Cow qball@gmpclient.org<br>
 Rasmus Steinke rasi@xssn.at
diff --git a/doc/rofi-theme.5 b/doc/rofi-theme.5
index f82093cc..3a555fdb 100644
--- a/doc/rofi-theme.5
+++ b/doc/rofi-theme.5
@@ -1,4 +1,3 @@
-.nh
 .TH ROFI\-THEME 5 rofi\-theme
 .SH NAME
 .PP
@@ -96,7 +95,7 @@ abbreviation for \fBr\fPofi \fBa\fPdvanced \fBs\fPtyle \fBi\fPnformation.
 .SH Basic Structure
 .PP
 Each element has a section with defined properties. Global properties can be defined in section \fB\fC* { }\fR\&.
-Sub\-\&section names begin with a hash symbol \fB\fC#\fR\&.
+Sub\-section names begin with a hash symbol \fB\fC#\fR\&.
 
 .PP
 It is advised to define the \fIglobal properties section\fP on top of the file to
@@ -425,7 +424,11 @@ The different values are:
 .IP \(bu 2
 \fB\fC{PERCENTAGE}\fR can be between 0\-1.0, or 0%\-100%
 .IP \(bu 2
-\fB\fC{named\-color}\fR is one of the following colors:AliceBlue, AntiqueWhite, Aqua, Aquamarine, Azure, Beige, Bisque, Black, BlanchedAlmond, Blue, BlueViolet, Brown,
+
+.PP
+\fB\fC{named\-color}\fR is one of the following colors:
+.PP
+AliceBlue, AntiqueWhite, Aqua, Aquamarine, Azure, Beige, Bisque, Black, BlanchedAlmond, Blue, BlueViolet, Brown,
 BurlyWood, CadetBlue, Chartreuse, Chocolate, Coral, CornflowerBlue, Cornsilk, Crimson, Cyan, DarkBlue, DarkCyan,
 DarkGoldenRod, DarkGray, DarkGrey, DarkGreen, DarkKhaki, DarkMagenta, DarkOliveGreen, DarkOrange, DarkOrchid, DarkRed,
 DarkSalmon, DarkSeaGreen, DarkSlateBlue, DarkSlateGray, DarkSlateGrey, DarkTurquoise, DarkViolet, DeepPink, DeepSkyBlue,
@@ -499,7 +502,6 @@ should be applied.
 
 .PP
 For some reason \fB\fCsmall caps\fR does not work on some systems.
-
 .RE
 
 .SH Line style
@@ -667,7 +669,6 @@ style property.
 
 .PP
 When no unit is specified, pixels are assumed.
-
 .RE
 
 .SH Position
@@ -676,14 +677,22 @@ Indicate a place on the window/monitor.
 
 .RS
 .IP \(bu 2
+
+.PP
 Format: \fB\fC(center|east|north|west|south|north east|north west|south west|south east)\fR
-\fB\fC
+.PP
+.RS
+
+.nf
+
 north west   |    north    |  north east
 \-\-\-\-\-\-\-\-\-\-\-\-\-|\-\-\-\-\-\-\-\-\-\-\-\-\-|\-\-\-\-\-\-\-\-\-\-\-\-
   west   |   center    |  east
 \-\-\-\-\-\-\-\-\-\-\-\-\-|\-\-\-\-\-\-\-\-\-\-\-\-\-|\-\-\-\-\-\-\-\-\-\-\-\-
 south west   |    south    |  south east
-\fR
+
+.fi
+.RE
 
 .RE
 
@@ -845,6 +854,7 @@ The current widgets available in \fBrofi\fP:
 .RS
 .IP \(bu 2
 \fB\fCwindow\fR
+
 .RS
 .IP \(bu 2
 \fB\fCoverlay\fR: the overlay widget.
@@ -852,6 +862,7 @@ The current widgets available in \fBrofi\fP:
 \fB\fCmainbox\fR: The mainbox box.
 .IP \(bu 2
 \fB\fCinputbar\fR: The input bar box.
+
 .RS
 .IP \(bu 2
 \fB\fCbox\fR: the horizontal @box packing the widgets
@@ -867,14 +878,15 @@ The current widgets available in \fBrofi\fP:
 \fB\fCnum\-filtered\-rows\fR: Shows the total number of rows after filtering.
 
 .RE
-
 .IP \(bu 2
 \fB\fClistview\fR: The listview.
+
 .RS
 .IP \(bu 2
 \fB\fCscrollbar\fR: the listview scrollbar
 .IP \(bu 2
 \fB\fCelement\fR: a box in the listview holding the entries
+
 .RS
 .IP \(bu 2
 \fB\fCelement\-icon\fR: the widget in the listview's entry showing the (optional) icon
@@ -885,29 +897,26 @@ The current widgets available in \fBrofi\fP:
 
 .RE
 
-
 .RE
-
 .IP \(bu 2
 \fB\fCmode\-switcher\fR: the main horizontal @box packing the buttons.
+
 .RS
 .IP \(bu 2
 \fB\fCbutton\fR: the buttons @textbox for each mode
 
 .RE
-
 .IP \(bu 2
 \fB\fCmessage\fR: The container holding the textbox.
+
 .RS
 .IP \(bu 2
 \fB\fCtextbox\fR: the message textbox
 
 .RE
 
-
 .RE
 
-
 .RE
 
 .PP
@@ -1009,9 +1018,13 @@ Color of the border
 .SS window:
 .RS
 .IP \(bu 2
+
+.PP
 \fBfont\fP:            string
 The font used in the window
 .IP \(bu 2
+
+.PP
 \fBtransparency\fP:    string
 Indicating if transparency should be used and what type:
 \fBreal\fP \- True transparency. Only works with a compositor.
@@ -1019,20 +1032,32 @@ Indicating if transparency should be used and what type:
 \fBscreenshot\fP \- Take a screenshot of the screen and use that.
 \fBPath\fP to png file \- Use an image.
 .IP \(bu 2
+
+.PP
 \fBlocation\fP:       position
 The place of the anchor on the monitor
 .IP \(bu 2
+
+.PP
 \fBanchor\fP:         anchor
 The anchor position on the window
 .IP \(bu 2
+
+.PP
 \fBfullscreen\fP:     boolean
 Window is fullscreen.
 .IP \(bu 2
+
+.PP
 \fBwidth\fP:          distance
 The width of the window
 .IP \(bu 2
+
+.PP
 \fBx\-offset\fP:  distance
 .IP \(bu 2
+
+.PP
 \fBy\-offset\fP:  distance
 The offset of the window to the anchor point, allowing you to push the window left/right/up/down
 
@@ -1091,6 +1116,8 @@ color is optional, multiple highlight styles can be added like: bold underline i
 \fBplaceholder\-color\fP: Color of the placeholder text.
 .IP \(bu 2
 \fBblink\fP:             Enable/Disable blinking on an input textbox (Boolean).
+.IP \(bu 2
+\fBmarkup\fP:            Force markup on, beware that only valid pango markup strings are shown.
 
 .RE
 
@@ -1230,7 +1257,6 @@ The current layout of \fBrofi\fP is structured as follows:
 
 .PP
 ci is the case\-indicator
-
 .RE
 
 .SS Error message structure
diff --git a/doc/rofi-theme.5.markdown b/doc/rofi-theme.5.markdown
index 48942416..4dd20b24 100644
--- a/doc/rofi-theme.5.markdown
+++ b/doc/rofi-theme.5.markdown
@@ -676,6 +676,7 @@ The following properties are currently supported:
 * **placeholder**:       Set the displayed text (String) when nothing is entered.
 * **placeholder-color**: Color of the placeholder text.
 * **blink**:             Enable/Disable blinking on an input textbox (Boolean).
+* **markup**:            Force markup on, beware that only valid pango markup strings are shown.