change logic in theme::which