Added code for new device and theme id's