So basically there are still some remainings of the old decals. To fully get rid of them, you'll need to edit the _BS, _AD and _MU templates (make sure you have a backup of the original files). Just repaint these areas in such a way that nothing remains of the original decals. Then run the repaint tool using your custom paintjob and everything should be painted correctly.