I just did the Xbox button swap on my #8BitDo Ultimate Bluetooth controller. It wasn't a bad mod and now I have the proper layout on my PC controller. I don't like the colorful thing, but at least ABXY are in the right spots.

I'll leave the Nintendo layout on my Steam Deck's Ultimate controller because my wife likes the monochrome look for the living room and that's not a hill I feel like dying on.