Adding i3 basic support