Completed functionality for i3

Close #10