Fixed issues with item colouring.
Merge commit 'a9d30023b1dec7264e4ca3f58cb46a1527416f2e'