More changes to i3
More i3 changes

Because i3 is awesome (pun indented)