Theme options fixes