Little refactoring
Add xfce4-terminal
Merge remote-tracking branch 'origin/master'