Update for taglist and shortcuts