Rename some variables, abstract orange color
Remove unused CPI methods
Rebuild files