modified colours and fixed git status check