added more theme support