Changing some field names to match server side dev
Adding missing Theme view