Updated Settings Framework

If this breaks everything, I'm so sorry.
Updated Settings Framework