fix(theme): re-merge default variables when themes is set