Thread:Shocker03/@comment-24922135-20170617162445/@comment-31420441-20170617171347

Done. I re-did the non-canon template. Here's a look: