Fix overwrite of 'dark' settings in master