Make sure Theme has an ObjectId