Rework to use System Settings Option