diff --git a/Makefile b/Makefile
index 2a7c838ee5ec2869a988d6d5671097b9bdd9c975..507ed38452f08a84534ef27dff474a88bc15f33d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,12 @@
-EDITOR = geany
+help: # Print help on Makefile
+	@grep '^[^.#]\+:\s\+.*#' Makefile | \
+	sed "s/\(.\+\):\s*\(.*\) #\s*\(.*\)/`printf "\e[1;33;4;40m"`\1`printf "\033[0m"`	\3/" | \
+	expand -t20
 
-clean:
-	# Remove files not in source control
-	find . -type f -name "*.retry" -delete
+clean: # Remove files not tracked in source control
 	find . -type f -name "*.orig" -delete
 
-open_all:
+open_all: # Open all projects files
 	${EDITOR} .gitignore inv* Makefile README.md
 	${EDITOR} tasks/*.yml
 	${EDITOR} tasks/files/sshd_config
@@ -18,5 +19,5 @@ open_all:
 	${EDITOR} tasks/user_cfg/vars/*.yml
 	${EDITOR} tasks/vars/*.yml
 
-inventory_generation:
+gen_invent: # Generate base inventory
 	cp inventory.sample inventory && ${EDITOR} inventory
diff --git a/README.md b/README.md
index 8e4249013c4224d47bf0917976671ea7449f2d5f..d002fd3477f145c63fb4c68666dda34c413f7c8f 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,6 @@ Suitable for server and workstation.
 -------------
 
 1. Setup your `inventory` file from [`inventory.sample`](inventory.sample) :
-    - `make inventory_generation`
+    - `make gen_invent`
 1. Run `host_info` playbook to `<group_foo>` & `<group_bar>` :
     - `ansible-playbook tasks/host_info.yml -i inventory -e host_list=<group_foo>:<group_bar>`
diff --git a/tasks/vars/main.yml b/tasks/vars/main.yml
index 86128043aba8a0260a4f79ab9aab2d02313e5c3a..e19d8bd6122250473d5116c06ba3abcec882dc23 100644
--- a/tasks/vars/main.yml
+++ b/tasks/vars/main.yml
@@ -18,11 +18,15 @@ base_pkg:
   - xkcdpass
   - zsh
 
-base_uninstall_pkg: []
+base_uninstall_pkg:
+  - geany-plugin-shiftcolumn
+  - jq
+  - httpie
 
 station_pkg:
   - ansible
   - cheese
+  - detox
   - easytag
   - evolution
   - evolution-plugins
@@ -31,7 +35,6 @@ station_pkg:
   - geany-plugin-git-changebar
   - geany-plugin-markdown
   - geany-plugin-prettyprinter
-  - geany-plugin-shiftcolumn
   - geany-plugin-spellcheck
   - geany-plugin-workbench
   - geany-plugin-xmlsnippets
@@ -40,9 +43,7 @@ station_pkg:
   - gnome-disk-utility
   - gpsprune
   - hplip
-  - httpie
   - jhead
-  - jq
   - keepassx
   - make
   - meld