Merge "Update framework Settings to follow dark theme UI"