PM: get diff working + update toolkit css