Remapped keys more fully