Added support for light theme