Nice catch, Marius. Welcome back!
I still remember your work on good ol Holowan & Lucasforums.
Really like your lightsaber ports, if your planning to edit blade colors at some point too you may checkout these ones here:
Ambient LS
@ZeldaTheSwordsman thanks for posting a detailed guide regarding the XnView installation. Very much appreciated!
The CM_Baremetal should be identical, so you can overwrite/ skip it safely. Either option will be fine.