bootstrap: updating imports and fixing bootstrap