Not being a user of Themes or Custom Fields I am limited here, but, perhaps the reference names have changed and it just a matter of finding the correct reference names to separate the two.
As to re-positioning, there was some guidance in this topic
Not being a user of Themes or Custom Fields I am limited here, but, perhaps the reference names have changed and it just a matter of finding the correct reference names to separate the two.
As to re-positioning, there was some guidance in this topic