Changed colours, added tag support