PM: include toolkit js properly + update to new diff js