Rework Settings.java