Refactor: Remove hardcoded arrays in templates, keep upgrades order
Name all upgrades (not sometimes extras, sometimes upgrades)