Add xfce4-terminal
Improve xfce integration
Merge