Added shormarks and easymotion