[2/2]New Theme engine: Remove old theme components & add new ones.