cleaned up code, added new colours and new logo