Upgraded based theme to V2