Do away with theme variants. The prefer-dark setting still works, by looking for THEME-dark before looking for THEME.