more colouring on the new input types
fixing merge
Merge branch 'testing' of https://github.com/sharewave/frontus into testing