Fixed custom themes