Fixed theme-selection bug