Added theme based UI builder