GPI Case face buttons swapped?

[Articanos]

After updating to 6.1 on my GPI Case the face buttons are swapped in retroarch. A=B and X=Y, and no matter what I change in the config it always reverts back to this setting. I went into my share/system/configs/retroarch and changed it in retroarchcustom.cfg, and it did nothing. I'm at a loss, I hate going into each game and swapping the controls, then as I load another (or again) I have to swap it again. Help!

[paradadf]

@articanos you just need to remap the buttons within EmulationStation and it will work.

[Articanos]

@paradadf

That worked, but now emulation station is backwards, which I guess I can live with, but man that's annoying. Thanks for the help!