Improve some security app strings and cherry pick Matt's defaults