Add mappings to move windows
Remove movement remappings