Updated regexp and key-bindings