Slight modification to vim colors to make diffs and statusline more readable, plus js and pb strings