Better support for i3