Cleaned up some things. It turns out secondary toolbar doesn't really need theming?