jedi finally playing nicely with company and replace shortcuts