Merge.
Merge.
GUI/console theme.
Modeline colors.
Tweak header-line.