MODIFIED: option keys to not be in strings.xml