Update indentation and add evil mode