String updates, profile changes, & color issues
Merge branch 'master' of https://github.com/Astonex/Antox into upstreammy-6
Merge branch 'Proplex-upstreammy-6'