Updates for 1.5; rearranging how settings are done