Added some functionality for themes