improve diffs and folds a bit
tmux colors, update dark16