added new fields for device and theme ids