Update how theme checks for range instance