merge files with older themes