added surround
updated colors, added new git alias