[caravel]

Ok, removed ~/.Xauthority ~/.Xresources and ~/.Xdefaults and now it all works fine. The last two files I had created to try and change the cursor theme (without success), I'm not sure they were related, so I'm guessing removing .Xauthority did it.