Replacing shitty component files