Add custom prompt back, and remove central vim swap location