More tweaks to which context to use for retrieving theme values.