Extend system settings

tbd