I have decided it'll be best to postpone the changes to the included sets for now. However, I would still like to establish guidelines, and suggest that all new sets follow them.
The included sets will still be converted to these guidelines eventually.