highlighted all changes from template

changes are between "// spring start" and "// spring end"