Replaced Pierre's component/core with my own.
Synced feed also with my own repo references.