added theme switching