Synchronize web archetype with kitchensink quickstart changes