Remove duplicate settings
Re-add change cursor shape
Mapping to toggle cursorline