pre-emptive theme changes for upstream style changes

@stvstnfrd & @jbau