Feature: Rollover team image selection & Refactor: Pull Templates into Files