Fix a couple more buttons, more terminal theme tweaks