Canon and Non-Canon

(For the 1 or 2 people that read these)

I'm changing the shorts to 'canon' because in the forum discussion, the majority of the posts seemed to agree that the shorts are canon.