move fields from theme