Fixed RBY keys, tweaked maps