Added theme and type selector