Swapping CAPS lock and CTRL on Raspbian

I was fiddling with one of my (new) RPi's, and realized there was no UI component to switch the CAPS lock to be CTRL. Really? So, found a couple of things that has to be modified:

First, I edited /etc/default/keyboard, adding


​​Secondly, I modified my ~/.config/lxkeymap.cfg, adding

option = ctrl:swapcaps