Feature/git highlighting