[cflsystems]

I think the way ot works is that XC is looking for the file in {yourtheme} - if it finds one will use it if not will use the one form common_files. You can leave common_files as is and any template you want to change just recreate files structure in {yourtheme} and have copy of that file there.