More theme changes to match xbar.