diff --git a/README.md b/README.md
index 9873209056cc..2bc0ef4981ef 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,6 @@
   <img alt="Coverity Scan Build Status"
        src="https://scan.coverity.com/projects/17046/badge.svg"/>
 </a>
-(Currently run manually)
 
 
 ## Features
@@ -34,10 +33,26 @@ Xournal++ features:
 * Rotation snapping every 45 degrees
 * Rect snapping to grid 
 * Audio recording and playback alongside with handwritten notes
+* Multi Language Support, Like English, German (Deutsch), Italian (Italiano)...
 
 ![Screenshot](readme/main.png?raw=true "Xournal++ Screenshot")
 
-Hopefully you'll enjoy it!
+## Windows 10
+![Screenshot](readme/main-win.png?raw=true "Xournal++ Screenshot on Win10")
+
+## macOS High Sierra
+![Screenshot](readme/main-mac.png?raw=true "Xournal++ Screenshot on macOS")
+
+## Toolbar / Page Background / Layer
+Multiple page background, easy selectable on the toolbar
+![Screenshot](readme/background.png?raw=true "Xournal++ Screenshot")
+
+Layer sidebar and advance Layer selection.
+![Screenshot](readme/layer.png?raw=true "Xournal++ Screenshot")
+
+Multiple predefined and fully customizeable Toolbar.
+![Screenshot](readme/toolbar.png?raw=true "Xournal++ Screenshot")
+
 
 ## How to use audio record and playback feature:
 
diff --git a/readme/background.png b/readme/background.png
new file mode 100644
index 000000000000..092b787fe2d3
Binary files /dev/null and b/readme/background.png differ
diff --git a/readme/layer.png b/readme/layer.png
new file mode 100644
index 000000000000..4bdeae59975b
Binary files /dev/null and b/readme/layer.png differ
diff --git a/readme/main-mac.png b/readme/main-mac.png
new file mode 100644
index 000000000000..13cf01d7c22b
Binary files /dev/null and b/readme/main-mac.png differ
diff --git a/readme/main-win.png b/readme/main-win.png
index dd7f488a9298..8d720cfcecee 100644
Binary files a/readme/main-win.png and b/readme/main-win.png differ
diff --git a/readme/main.png b/readme/main.png
index 4fe2878ca57b..cffa8ea7bbc2 100644
Binary files a/readme/main.png and b/readme/main.png differ
diff --git a/readme/toolbar.png b/readme/toolbar.png
new file mode 100644
index 000000000000..2e046982aa02
Binary files /dev/null and b/readme/toolbar.png differ
diff --git a/windows-setup/xournalpp.nsi b/windows-setup/xournalpp.nsi
index 6b5b1a132e5c..afd723a13690 100644
--- a/windows-setup/xournalpp.nsi
+++ b/windows-setup/xournalpp.nsi
@@ -136,7 +136,7 @@ Section "Uninstall"
 
   Delete "$INSTDIR\Uninstall.exe"
 
-  RMDir "$INSTDIR"
+  RMDir /r "$INSTDIR"
   
   !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder