Adding options to work with multiple themes