I’ll have to look into it tomorrow, but having the button layout set to Xbox mode, and reconfiguring the keyboard as per this tutorial by @Petrakis should result in everything being corrected, including being able to update the launcher without losing your layout.
Not just the references to keys in the launcher, but also externally maintained packages (eg, dinguxcommander)