Switch to xfce4-terminal (again)
Unify desktop and laptop configs.