Theme selection working for add unit page