adds starter-kit in layouts
Fix conflicts