fixed colouring, added new login system