Added theme switching