V2.0 updates for NTA Models theme