Make window shortcuts more conventional.
Swap the displays around one more time.
Various XFCE config changes.

Includes Solarized colour scheme in xfce4-terminal, use media key bindings only.