Follow up on #2129
Reorganize templates list and add missing variables
Merge pull request #2133 from HavokInspiration/3.0

Follow up on #2129