more vim colors; separating local aliases
merge
adjust if clause for different output
various improvements