Theme selection fix