Re-arrange conventions a little bit. Add Typesetting conventions