Updated bootstrap and finalize the adding of Plugins