add surround and powerline
conclued merge