HPS Themes V2.0.1

Bug Fixes for V2