Add some changes to prompt and vimode