better selection of theme variants