No more mutables and fix tint color