Make sure legacy configurations continue to work, and PEP8-ify
Make default templates react to options