diff --git a/Readme.md b/Readme.md
index b77e8c96..6d9199d1 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1,16 +1,46 @@
 # fetch
 
-## Big updates: Check the releases page.
-
 This is the home of my fetch script! This script gathers info <br\>
-about your system and prints it to the terminal.
+about your system and prints it to the terminal next to an image of your choice!
 
-The script currently supports Linux, Mac OS X and Windows (Cygwin), if your OS or distro isn't
-supported open an issue and I'll add support for it.
 
 ![1](https://sr.ht/Jd8Y.png)
 
 
+<!-- Features {{{ -->
+
+
+## Features
+
+
+- Supports Linux, Mac OS X and Windows (Cygwin)!
+    - If the script isn't working on your system
+      open an issue.
+
+- It's Fast
+    - The script makes heavy use of bash builtins
+      and string manipulation.
+
+- Display an image next to the info. (or not)
+    - The script can use your wallpaper, shuffle through a
+      directory or just display an image.
+
+- Highly Customizable
+    - You can customize almost everything.
+        - See Usage below or lines 23-233 in script
+
+- Take a screenshot at the end.
+    - It's disabled by default and you can specify the cmd
+      to use with ```--scrotcmd cmd``` at launch or by
+      changing the value of ```$scrotcmd``` in the script.
+
+- Smart crop (or Waifu crop)
+    - See https://github.com/dylanaraps/fetch/wiki/What-is-Smart-Crop
+
+
+<!-- }}} -->
+
+
 <!-- Dependences {{{ -->
 
 
diff --git a/fetch b/fetch
index f2f2504b..f05a1c67 100755
--- a/fetch
+++ b/fetch
@@ -373,7 +373,7 @@ getuptime () {
 # Get package count
 getpackages () {
     case "$distro" in
-        "Arch Linux"|"Parabola GNU/Linux-libre"|"Manjaro"|"Antergos")
+        "Arch Linux" | "Parabola GNU/Linux-libre" | "Manjaro" | "Antergos")
             packages="$(pacman -Q | wc -l)"
         ;;
 
@@ -381,7 +381,7 @@ getpackages () {
             packages="$(xbps-query -l | wc -l)"
         ;;
 
-        "Ubuntu"|"Mint"|"Debian"|"Kali Linux"|"Deepin Linux")
+        "Ubuntu" | "Mint" | "Debian" | "Kali Linux" | "Deepin Linux")
             packages="$(dpkg --get-selections | grep -v deinstall$ | wc -l)"
         ;;
 
@@ -389,11 +389,11 @@ getpackages () {
             packages="$(ls -1 /var/log/packages | wc -l)"
         ;;
 
-        "Gentoo"|"Funtoo")
+        "Gentoo" | "Funtoo")
             packages="$(ls -d /var/db/pkg/*/* | wc -l)"
         ;;
 
-        "Fedora"|"openSUSE"|"Red Hat Enterprise Linux"|"CentOS")
+        "Fedora" | "openSUSE"|"Red Hat Enterprise Linux"|"CentOS")
             packages="$(rpm -qa | wc -l)"
         ;;
 
@@ -666,7 +666,6 @@ getwallpaper () {
 }
 
 getshuffle () {
-    # TODO: Test this on Windows.
     img="$(find $shuffledir -type f \( -name '*.jpg' -o -name '*.png' \) -print0 |
     shuf -n1 -z)"
 }
@@ -949,7 +948,7 @@ while [ "$1" ]; do
         --clean) rm -rf "$imgtempdir" || exit ;;
 
         # Screenshot
-        --scrot|-s) scrot="on" ;;
+        --scrot | -s) scrot="on" ;;
         --scrotdir) scrot="$2" ;;
         --scrotfile) scrot="$2" ;;
         --scrotcmd) scrot="$2" ;;