Sorted settings to keep git happy