Changed colours, added feature blocks