s2w: Adjust left->right definitions
s2d: rewrite kcal setting, allow s2d with s2w