Update switcher

correct shortcut handling
update to be compatible width core