Added support for custom themes