Okay, great.
As a matter of fact I have already tried if the changes would work and they do

.
Unless you have already changed something else in the components.txt file, here is the fix. It is the original file with only the changes that I suggested below. Maybe that can save you some time.
I will continue with my little test game tomorrow and let you know, if I notice something else.
Rollo