Simplify modifier key configuration, removes the need to swap keys