Move theme overrides to theme