rework bootstrap and inclusion system to be more dynamic