Replace gsettings configuration
Fix merge