Swapped around colouring some more and cleaned up the new '.t(ags)'