Added surrounding plugin and nomap arrow keys