tiagos color improvements
map all orange objects to patrik
refactoring