cleanup and i3 skeleton
case i3, still not linked