WIP - Redrawing stuff for i3