diff --git a/README.rst b/README.rst
index f36ad84..334f29b 100644
--- a/README.rst
+++ b/README.rst
@@ -71,7 +71,7 @@ next
 ++++
 
 * Added `bitcoin`_ module
-* Added `now_playing`_ module
+* Added `now\_playing`_ module
 * Added `reddit`_ module
 * Added `shell`_ module
 * Core: fixed custom statusline colors not working properly (see issue #74)
@@ -338,8 +338,10 @@ Modules
 :Audio: `alsa`_ - `pulseaudio`_
 :Hardware: `battery`_ - `backlight`_ - `temp`_
 :Network: `network`_ - `wireless`_
-:Other: `mail`_ - `parcel`_ - `pyload`_ - `weather`_ - `mpd`_ - `text`_
-:Advanced: `file`_ - `regex`_ - `runwatch`_
+:Music: `now\_playing`_ - `mpd`_
+:Websites & stuff: `weather`_ - `bitcoin`_ - `reddit`_ - `parcel`_
+:Other: `mail`_ - `pyload`_ -  `text`_ 
+:Advanced: `file`_ - `regex`_ - `runwatch`_ - `shell`_
 
 
 alsa
@@ -424,7 +426,7 @@ Settings:
 :alert_format_title: The title of the notification, all formatters can be used (default: ``Low battery``)
 :alert_format_body: The body text of the notification, all formatters can be used (default: ``Battery {battery_ident} has only {percentage:.2f}% ({remaining:%E%hh:%Mm}) remaining!``)
 :path: Override the default-generated path (default: ``None``)
-:status: A dictionary mapping ('DIS', 'CHR', 'FULL') to alternative names (default: ``{'CHR': 'CHR', 'FULL': 'FULL', 'DIS': 'DIS'}``)
+:status: A dictionary mapping ('DIS', 'CHR', 'FULL') to alternative names (default: ``{'DIS': 'DIS', 'CHR': 'CHR', 'FULL': 'FULL'}``)
 :color: The text color (default: ``#ffffff``)
 :full_color: The full color (default: ``#00ff00``)
 :charging_color: The charging color (default: ``#00ff00``)
@@ -472,7 +474,7 @@ Settings:
 :leftclick: URL to visit or command to run on left click (default: ``electrum``)
 :rightclick: URL to visit or command to run on right click (default: ``https://bitcoinaverage.com/``)
 :interval: Update interval. (default: ``600``)
-:status:  (default: ``{'price_down': '▼', 'price_up': '▲'}``)
+:status:  (default: ``{'price_up': '▲', 'price_down': '▼'}``)
 
 
 
@@ -805,7 +807,7 @@ Settings:
 :host:  (default: ``localhost``)
 :port: MPD port (default: ``6600``)
 :format: formatp string (default: ``{title} {status}``)
-:status: Dictionary mapping pause, play and stop to output (default: ``{'pause': '▷', 'play': '▶', 'stop': '◾'}``)
+:status: Dictionary mapping pause, play and stop to output (default: ``{'play': '▶', 'stop': '◾', 'pause': '▷'}``)
 :color: The color of the text (default: ``#FFFFFF``)
 :interval:  (default: ``1``)
 
@@ -872,7 +874,7 @@ Requires python-dbus available from every distros' package manager.
 Settings:
 
 :player: Player name (default: ``None``)
-:status: Dictionary mapping pause, play and stop to output text (default: ``{'pause': '▷', 'play': '▶', 'stop': '◾'}``)
+:status: Dictionary mapping pause, play and stop to output text (default: ``{'play': '▶', 'stop': '◾', 'pause': '▷'}``)
 :color: Text color (default: ``#FFFFFF``)
 :format: formatp string (default: ``{title} {status}``)
 :interval:  (default: ``1``)
@@ -996,7 +998,7 @@ Settings:
 :mail_brackets: Display unread message count in square-brackets. (default: ``False``)
 :title_maxlen: Maximum number of characters to display in title. (default: ``80``)
 :interval: Update interval. (default: ``300``)
-:status: New message indicator. (default: ``{'no_mail': '', 'new_mail': '✉'}``)
+:status: New message indicator. (default: ``{'new_mail': '✉', 'no_mail': ''}``)
 
 
 
diff --git a/README.tpl.rst b/README.tpl.rst
index 81c27cf..4a709c0 100644
--- a/README.tpl.rst
+++ b/README.tpl.rst
@@ -71,7 +71,7 @@ next
 ++++
 
 * Added `bitcoin`_ module
-* Added `now_playing`_ module
+* Added `now\_playing`_ module
 * Added `reddit`_ module
 * Added `shell`_ module
 * Core: fixed custom statusline colors not working properly (see issue #74)
@@ -338,8 +338,10 @@ Modules
 :Audio: `alsa`_ - `pulseaudio`_
 :Hardware: `battery`_ - `backlight`_ - `temp`_
 :Network: `network`_ - `wireless`_
-:Other: `mail`_ - `parcel`_ - `pyload`_ - `weather`_ - `mpd`_ - `text`_
-:Advanced: `file`_ - `regex`_ - `runwatch`_
+:Music: `now\_playing`_ - `mpd`_
+:Websites & stuff: `weather`_ - `bitcoin`_ - `reddit`_ - `parcel`_
+:Other: `mail`_ - `pyload`_ -  `text`_ 
+:Advanced: `file`_ - `regex`_ - `runwatch`_ - `shell`_
 
 !!module_doc!!