reindented, added vim-signify highlights