Fork of XTK for additional features