Improve Bootstrap for WetKit