Rename hyphen-py to xkcd.py, add other XKCD substitutions.