Upgraded template to 2.1.0 and modified literal versions in views to be replaced by g8