JBIDE-16978 - Update main template from latest version of community theme (part 2)