Better i3 support