Added theme changes