Tried to add upstream hybrid changes
Updated vim colors header
Weechat