Changed Templates

Three days of work after finding a muse.