Fix cursor highlighting, update submodules