Merge "Update Settings components for dark theme"