Make custom themes work again

Change-Id: Ib9ad011428603979f7dd8a2708989feb9b13e075