Added code to support custom themes