More templates, fixed X-a-thon and X City / Xville, added zeropadded random numbers