Cleanup and use attributes

Cleanup and use attributes. I understand that there are issues with TOML at the moment, so why not take advantage of attributes in the mean time. If/when TOML starts working, the template can be ripped out, and the content replaced in the default recipe.