Added theme asset support