better ring colors
Merge branch 'feature/mergeallthethings' of github.com:exproductions/ClumsyNinja into feature/mergeallthethings