Improved "cube shaving" heuristics
Refining colour picking