Bunch of i3 changes